From patchwork Fri Jan 29 16:53:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 60808 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1234002lbb; Fri, 29 Jan 2016 08:56:59 -0800 (PST) X-Received: by 10.140.86.85 with SMTP id o79mr11830027qgd.3.1454086619756; Fri, 29 Jan 2016 08:56:59 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a126si15985039qkb.100.2016.01.29.08.56.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jan 2016 08:56:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dkim=fail header.i=@linaro.org Received: from localhost ([::1]:35325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPCLz-0006Bv-C1 for patch@linaro.org; Fri, 29 Jan 2016 11:56:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPCJB-0001iW-HU for qemu-devel@nongnu.org; Fri, 29 Jan 2016 11:54:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPCJ6-0003vh-59 for qemu-devel@nongnu.org; Fri, 29 Jan 2016 11:54:05 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:34661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPCJ5-0003vc-UB for qemu-devel@nongnu.org; Fri, 29 Jan 2016 11:54:00 -0500 Received: by mail-wm0-x229.google.com with SMTP id 128so60839201wmz.1 for ; Fri, 29 Jan 2016 08:53:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SQiVRgyRE5YBEufwQNdwJMCFDkzRgeA46exBv8mBUE8=; b=Bqy8+TYC8RVm91vhv/zWeZINnRvVX8iRdpOruqlcM84kSdN+XHFMIy/kE1fvFy/Eca yuGjFiU+XbZMS7MucPrKisiTHhsCJe0VyAAGs62BAqU4d9Y8e9lh+KdQEnLvSbnTsDft OBVL/tKKSglcTyeOxR+FKFkKhtftyBu/xIxj4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SQiVRgyRE5YBEufwQNdwJMCFDkzRgeA46exBv8mBUE8=; b=F10ifBZPBRs2qDcG0uKXwBjzNvv7MKnnAvLENlM6xAKtyItVBKJ+3E6XhMIZVioHoc lV41lb0f9Wm5mu6YIQoJjeHqM6Gzziht2TPA/lJ1qQnA9YTu1GUOKREdgSo9HcvHNip+ ZZetWodCl8xdkEaiiv2wtMDnLugd4R262rzihHuc2OGyyMMaNoeeFLhzw43URA6MnA0y BwNj7ICJCyq+AhNRwgC4x/3D3hE6V/76FYvklD9RBONQJreWY5CtDlWirWi7msk12aKx HUl525lRnAuSqT0u/d+OCnB5KfEFBWn9qrPwAGSpJAV8e0brBDHK9I7bW/18rNum/xpg vz6g== X-Gm-Message-State: AG10YOT5S0LNeU98IrE0Bljmaa9SYMNtIXB2b3sH0nxqGx4JY3sHBlQddL5aeEIaryM1/XQZ X-Received: by 10.194.112.41 with SMTP id in9mr9852269wjb.139.1454086439231; Fri, 29 Jan 2016 08:53:59 -0800 (PST) Received: from new-host-12.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ei9sm16415530wjd.40.2016.01.29.08.53.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Jan 2016 08:53:58 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, alex.williamson@redhat.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, pbonzini@redhat.com, agraf@suse.de Date: Fri, 29 Jan 2016 16:53:42 +0000 Message-Id: <1454086429-4373-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454086429-4373-1-git-send-email-eric.auger@linaro.org> References: <1454086429-4373-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::229 Cc: Bharat.Bhushan@freescale.com, suravee.suthikulpanit@amd.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [RFC v2 1/8] linux-headers: partial update for VFIO reserved IOVA registration 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is a partial update aiming at enhancing the VFIO user API according to not yet upstreamed kernel developments available at: https://git.linaro.org/people/eric.auger/linux.git/shortlog/refs/heads/v4.5-rc1-pcie-passthrough-v1 See https://lkml.org/lkml/2016/1/26/371 for more details. Signed-off-by: Eric Auger --- linux-headers/linux/vfio.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index aa276bc..ac6032e 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -8,8 +8,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef VFIO_H -#define VFIO_H +#ifndef _UAPIVFIO_H +#define _UAPIVFIO_H #include #include @@ -393,6 +393,7 @@ struct vfio_iommu_type1_info { __u32 argsz; __u32 flags; #define VFIO_IOMMU_INFO_PGSIZES (1 << 0) /* supported page sizes info */ +#define VFIO_IOMMU_INFO_REQUIRE_MSI_MAP (1 << 1)/* MSI must be mapped */ __u64 iova_pgsizes; /* Bitmap of supported page sizes */ }; @@ -403,12 +404,20 @@ struct vfio_iommu_type1_info { * * Map process virtual addresses to IO virtual addresses using the * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required. + * + * In case MSI_RESERVED_IOVA is set, the API only aims at registering an IOVA + * region which will be used on some platforms to map the host MSI frame. + * in that specific case, vaddr is ignored. The requirement for provisioning + * such IOVA range can be checked by calling VFIO_IOMMU_GET_INFO with the + * VFIO_IOMMU_INFO_REQUIRE_MSI_MAP attribute. */ struct vfio_iommu_type1_dma_map { __u32 argsz; __u32 flags; #define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */ #define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */ +/* reserved iova for MSI vectors*/ +#define VFIO_DMA_MAP_FLAG_MSI_RESERVED_IOVA (1 << 2) __u64 vaddr; /* Process virtual address */ __u64 iova; /* IO virtual address */ __u64 size; /* Size of mapping (bytes) */ @@ -591,4 +600,4 @@ struct vfio_iommu_spapr_tce_remove { /* ***************************************************************** */ -#endif /* VFIO_H */ +#endif /* _UAPIVFIO_H */