From patchwork Thu Dec 31 08:50:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongji Xie X-Patchwork-Id: 7935741 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C1A0BBEEED for ; Thu, 31 Dec 2015 08:53:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0004B20263 for ; Thu, 31 Dec 2015 08:53:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0444120279 for ; Thu, 31 Dec 2015 08:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755436AbbLaIwY (ORCPT ); Thu, 31 Dec 2015 03:52:24 -0500 Received: from e28smtp05.in.ibm.com ([125.16.236.5]:45098 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755329AbbLaIwR (ORCPT ); Thu, 31 Dec 2015 03:52:17 -0500 Received: from localhost by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Dec 2015 14:22:14 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 31 Dec 2015 14:22:12 +0530 X-IBM-Helo: d28dlp02.in.ibm.com X-IBM-MailFrom: xyjxie@linux.vnet.ibm.com X-IBM-RcptTo: kvm@vger.kernel.org; linux-doc@vger.kernel.org; linux-kernel@vger.kernel.org; linux-pci@vger.kernel.org Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 040B53940062; Thu, 31 Dec 2015 14:22:12 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBV8qAcO47055044; Thu, 31 Dec 2015 14:22:10 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBV8q9f5003131; Thu, 31 Dec 2015 14:22:10 +0530 Received: from localhost (commit.cn.ibm.com [9.123.228.72]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tBV8q8DD003080; Thu, 31 Dec 2015 14:22:09 +0530 From: Yongji Xie To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org Cc: bhelgaas@google.com, corbet@lwn.net, aik@ozlabs.ru, alex.williamson@redhat.com, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, warrier@linux.vnet.ibm.com, zhong@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com, Yongji Xie Subject: [RFC PATCH v2 3/3] vfio-pci: Allow to mmap MSI-X table if EEH is supported Date: Thu, 31 Dec 2015 16:50:44 +0800 Message-Id: <1451551844-11732-4-git-send-email-xyjxie@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1451551844-11732-1-git-send-email-xyjxie@linux.vnet.ibm.com> References: <1451551844-11732-1-git-send-email-xyjxie@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15123108-0017-0000-0000-0000093ECBC9 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current vfio-pci implementation disallows to mmap MSI-X table in case that user get to touch this directly. However, EEH mechanism can ensure that a given pci device can only shoot the MSIs assigned for its PE. So we think it's safe to expose the MSI-X table to userspace because the exposed MSI-X table can't be used to do harm to other memory space. And with MSI-X table mmapped, some performance issues which are caused when PCI adapters have critical registers in the same page as the MSI-X table also can be resolved. So this patch adds a Kconfig option, VFIO_PCI_MMAP_MSIX, to support for mmapping MSI-X table. Signed-off-by: Yongji Xie --- drivers/vfio/pci/Kconfig | 4 ++++ drivers/vfio/pci/vfio_pci.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig index 02912f1..67b0a2c 100644 --- a/drivers/vfio/pci/Kconfig +++ b/drivers/vfio/pci/Kconfig @@ -23,6 +23,10 @@ config VFIO_PCI_MMAP depends on VFIO_PCI def_bool y if !S390 +config VFIO_PCI_MMAP_MSIX + depends on VFIO_PCI_MMAP + def_bool y if EEH + config VFIO_PCI_INTX depends on VFIO_PCI def_bool y if !S390 diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 09b3805..d536985 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -555,7 +555,8 @@ static long vfio_pci_ioctl(void *device_data, IORESOURCE_MEM && (info.size >= PAGE_SIZE || pci_resource_page_aligned)) { info.flags |= VFIO_REGION_INFO_FLAG_MMAP; - if (info.index == vdev->msix_bar) { + if (!IS_ENABLED(CONFIG_VFIO_PCI_MMAP_MSIX) && + info.index == vdev->msix_bar) { ret = msix_sparse_mmap_cap(vdev, &caps); if (ret) return ret; @@ -967,7 +968,8 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma) if (phys_len < PAGE_SIZE || req_start + req_len > phys_len) return -EINVAL; - if (index == vdev->msix_bar) { + if (!IS_ENABLED(CONFIG_VFIO_PCI_MMAP_MSIX) && + index == vdev->msix_bar) { /* * Disallow mmaps overlapping the MSI-X table; users don't * get to touch this directly. We could find somewhere