From patchwork Thu Mar 1 10:33:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Yi L" X-Patchwork-Id: 10250981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50F74602B5 for ; Thu, 1 Mar 2018 11:11:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4120028FEA for ; Thu, 1 Mar 2018 11:11:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35BC72901A; Thu, 1 Mar 2018 11:11:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9326329010 for ; Thu, 1 Mar 2018 11:11:02 +0000 (UTC) Received: from localhost ([::1]:55639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erM73-00060d-Du for patchwork-qemu-devel@patchwork.kernel.org; Thu, 01 Mar 2018 06:11:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erLnc-0005si-64 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:50:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erLnW-0000FY-Gj for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:50:56 -0500 Received: from mga14.intel.com ([192.55.52.115]:7359) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erLnW-00006Y-4K for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:50:50 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2018 02:50:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,408,1515484800"; d="scan'208";a="208048745" Received: from sky-dev.bj.intel.com ([10.238.144.105]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2018 02:50:47 -0800 From: "Liu, Yi L" To: qemu-devel@nongnu.org, mst@redhat.com, david@gibson.dropbear.id.au Date: Thu, 1 Mar 2018 18:33:34 +0800 Message-Id: <1519900415-30314-12-git-send-email-yi.l.liu@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519900415-30314-1-git-send-email-yi.l.liu@linux.intel.com> References: <1519900415-30314-1-git-send-email-yi.l.liu@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v3 11/12] intel_iommu: add framework for PASID AddressSpace management X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Liu, Yi L" , kevin.tian@intel.com, yi.l.liu@intel.com, jasowang@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, pbonzini@redhat.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch introduces a framework to manage PASID tagged AddressSpace in Intel vIOMMU emulator. PASID tagged AddressSpace is an address sapce which is an abstract of guest process address space in Qemu. The management framework is as below: s->pasid_as_list /|\ \ / | \ \ pasid_as_node ... /|\ \ / | \ \ device ... There is a list to store all the PASID tagged AddressSpace, and each PASID tagged AddressSpace has a device list behind it. This is due to the fact that a PASID tagged AddressSpace can have multiple devices binded. Signed-off-by: Liu, Yi L --- hw/i386/intel_iommu.c | 1 + include/hw/i386/intel_iommu.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index d92a66d..b8e8dbb 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3174,6 +3174,7 @@ static void vtd_realize(DeviceState *dev, Error **errp) } QLIST_INIT(&s->notifiers_list); + QLIST_INIT(&s->pasid_as_list); memset(s->vtd_as_by_bus_num, 0, sizeof(s->vtd_as_by_bus_num)); memory_region_init_io(&s->csrmem, OBJECT(s), &vtd_mem_ops, s, "intel_iommu", DMAR_REG_SIZE); diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 0b6dc32..c45dbfe 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -61,6 +61,7 @@ typedef struct VTDContextEntry VTDContextEntry; typedef struct VTDContextCacheEntry VTDContextCacheEntry; typedef struct IntelIOMMUState IntelIOMMUState; typedef struct VTDAddressSpace VTDAddressSpace; +typedef struct VTDPASIDAddressSpace VTDPASIDAddressSpace; typedef struct VTDIOTLBEntry VTDIOTLBEntry; typedef struct VTDBus VTDBus; typedef union VTD_IR_TableEntry VTD_IR_TableEntry; @@ -69,6 +70,8 @@ typedef struct VTDIrq VTDIrq; typedef struct VTD_MSIMessage VTD_MSIMessage; typedef struct IntelIOMMUMRNotifierNode IntelIOMMUMRNotifierNode; typedef struct IntelIOMMUAssignedDeviceNode IntelIOMMUAssignedDeviceNode; +typedef struct IntelPASIDNode IntelPASIDNode; +typedef struct VTDDeviceNode VTDDeviceNode; /* Context-Entry */ struct VTDContextEntry { @@ -84,6 +87,20 @@ struct VTDContextCacheEntry { struct VTDContextEntry context_entry; }; +struct VTDDeviceNode { + PCIBus *bus; + uint8_t devfn; + QLIST_ENTRY(VTDDeviceNode) next; +}; + +struct VTDPASIDAddressSpace { + AddressSpace as; + IOMMUSVAContext sva_ctx; + IntelIOMMUState *iommu_state; + /* list of devices binded to a pasid tagged address space */ + QLIST_HEAD(, VTDDeviceNode) device_list; +}; + struct VTDAddressSpace { PCIBus *bus; uint8_t devfn; @@ -264,6 +281,11 @@ struct IntelIOMMUAssignedDeviceNode { QLIST_ENTRY(IntelIOMMUAssignedDeviceNode) next; }; +struct IntelPASIDNode { + VTDPASIDAddressSpace *pasid_as; + QLIST_ENTRY(IntelPASIDNode) next; +}; + /* The iommu (DMAR) device state struct */ struct IntelIOMMUState { X86IOMMUState x86_iommu; @@ -304,6 +326,8 @@ struct IntelIOMMUState { QLIST_HEAD(, IntelIOMMUMRNotifierNode) notifiers_list; /* list of assigned devices */ QLIST_HEAD(, IntelIOMMUAssignedDeviceNode) assigned_device_list; + /* list of pasid tagged address space */ + QLIST_HEAD(, IntelPASIDNode) pasid_as_list; /* interrupt remapping */ bool intr_enabled; /* Whether guest enabled IR */