From nobody Mon Feb 9 07:22:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571925707; cv=none; d=zoho.com; s=zohoarc; b=V52F/vvkkE/NIfmubWSw3Q0qQ7NlveztwhtQGB/zr2iNe9iPj6fhsQrU1m78kcepoAhwca6M7DSx+ZIvV3DIiQEd6aVnssyXqwn+qPQnJRJ9yrC/WWzTctNqkV8Hk+XNkL6O+9fgmOgsuRH9DHxkTnazXIhpLbFFIU3hk8AlI+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571925707; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=FDP512GTcywkeshR30bs+z9qqwcjwvJCZ+8yxTyDLro=; b=D8vWIrmh9F4eJJsd80nhErRlji/uFeCf8UyUNM/yqLVD0J+74rXFUwwvlYa7oHglWhDqoH9N4Y/xd3+PKqeFmLa8tZL/5ZsbMcthsKfmm0CDxJifq6Dv6bYerk9dEp6qpxbdgLQ8O0/aFNlf5Ru0bXy49vRvix6ZkPduMiNKf48= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571925707186652.3684489130694; Thu, 24 Oct 2019 07:01:47 -0700 (PDT) Received: from localhost ([::1]:43522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNdgO-0000II-FW for importer@patchew.org; Thu, 24 Oct 2019 10:01:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51477) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNckM-0005Kg-AX for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:01:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNckG-0002TH-Tm for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:01:46 -0400 Received: from mga11.intel.com ([192.55.52.93]:40482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNckG-0002MX-KR for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:01:40 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 06:01:33 -0700 Received: from iov.bj.intel.com ([10.238.145.67]) by fmsmga001.fm.intel.com with ESMTP; 24 Oct 2019 06:01:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,224,1569308400"; d="scan'208";a="210156218" From: Liu Yi L To: qemu-devel@nongnu.org, mst@redhat.com, pbonzini@redhat.com, alex.williamson@redhat.com, peterx@redhat.com Subject: [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback Date: Thu, 24 Oct 2019 08:34:29 -0400 Message-Id: <1571920483-3382-9-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571920483-3382-1-git-send-email-yi.l.liu@intel.com> References: <1571920483-3382-1-git-send-email-yi.l.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tianyu.lan@intel.com, kevin.tian@intel.com, yi.l.liu@intel.com, Yi Sun , kvm@vger.kernel.org, jun.j.tian@intel.com, eric.auger@redhat.com, yi.y.sun@intel.com, jacob.jun.pan@linux.intel.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds get_iommu_context() callback to return an iommu_context Intel VT-d platform. Cc: Kevin Tian Cc: Jacob Pan Cc: Peter Xu Cc: Yi Sun Signed-off-by: Liu Yi L --- hw/i386/intel_iommu.c | 57 ++++++++++++++++++++++++++++++++++++++-= ---- include/hw/i386/intel_iommu.h | 14 ++++++++++- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 67a7836..e9f8692 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3288,22 +3288,33 @@ static const MemoryRegionOps vtd_mem_ir_ops =3D { }, }; =20 -VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devf= n) +static VTDBus *vtd_find_add_bus(IntelIOMMUState *s, PCIBus *bus) { uintptr_t key =3D (uintptr_t)bus; - VTDBus *vtd_bus =3D g_hash_table_lookup(s->vtd_as_by_busptr, &key); - VTDAddressSpace *vtd_dev_as; - char name[128]; + VTDBus *vtd_bus; =20 + vtd_iommu_lock(s); + vtd_bus =3D g_hash_table_lookup(s->vtd_as_by_busptr, &key); if (!vtd_bus) { uintptr_t *new_key =3D g_malloc(sizeof(*new_key)); *new_key =3D (uintptr_t)bus; /* No corresponding free() */ - vtd_bus =3D g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) *= \ - PCI_DEVFN_MAX); + vtd_bus =3D g_malloc0(sizeof(VTDBus) + PCI_DEVFN_MAX * \ + (sizeof(VTDAddressSpace *) + sizeof(VTDIOMMUContext *)= )); vtd_bus->bus =3D bus; g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus); } + vtd_iommu_unlock(s); + return vtd_bus; +} + +VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devf= n) +{ + VTDBus *vtd_bus; + VTDAddressSpace *vtd_dev_as; + char name[128]; + + vtd_bus =3D vtd_find_add_bus(s, bus); =20 vtd_dev_as =3D vtd_bus->dev_as[devfn]; =20 @@ -3370,6 +3381,27 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s,= PCIBus *bus, int devfn) return vtd_dev_as; } =20 +VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s, + PCIBus *bus, int devfn) +{ + VTDBus *vtd_bus; + VTDIOMMUContext *vtd_dev_ic; + + vtd_bus =3D vtd_find_add_bus(s, bus); + + vtd_dev_ic =3D vtd_bus->dev_ic[devfn]; + + if (!vtd_dev_ic) { + vtd_bus->dev_ic[devfn] =3D vtd_dev_ic =3D + g_malloc0(sizeof(VTDIOMMUContext)); + vtd_dev_ic->vtd_bus =3D vtd_bus; + vtd_dev_ic->devfn =3D (uint8_t)devfn; + vtd_dev_ic->iommu_state =3D s; + iommu_context_init(&vtd_dev_ic->iommu_context); + } + return vtd_dev_ic; +} + static uint64_t get_naturally_aligned_size(uint64_t start, uint64_t size, int gaw) { @@ -3666,8 +3698,21 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus,= void *opaque, int devfn) return &vtd_as->as; } =20 +static IOMMUContext *vtd_dev_iommu_context(PCIBus *bus, + void *opaque, int devfn) +{ + IntelIOMMUState *s =3D opaque; + VTDIOMMUContext *vtd_ic; + + assert(0 <=3D devfn && devfn < PCI_DEVFN_MAX); + + vtd_ic =3D vtd_find_add_ic(s, bus, devfn); + return &vtd_ic->iommu_context; +} + static PCIIOMMUOps vtd_iommu_ops =3D { .get_address_space =3D vtd_host_dma_iommu, + .get_iommu_context =3D vtd_dev_iommu_context, }; =20 static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 6062588..1c580c1 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -68,6 +68,7 @@ typedef union VTD_IR_TableEntry VTD_IR_TableEntry; typedef union VTD_IR_MSIAddress VTD_IR_MSIAddress; typedef struct VTDPASIDDirEntry VTDPASIDDirEntry; typedef struct VTDPASIDEntry VTDPASIDEntry; +typedef struct VTDIOMMUContext VTDIOMMUContext; =20 /* Context-Entry */ struct VTDContextEntry { @@ -116,9 +117,19 @@ struct VTDAddressSpace { IOVATree *iova_tree; /* Traces mapped IOVA ranges */ }; =20 +struct VTDIOMMUContext { + VTDBus *vtd_bus; + uint8_t devfn; + IOMMUContext iommu_context; + IntelIOMMUState *iommu_state; +}; + struct VTDBus { PCIBus* bus; /* A reference to the bus to provide translation for */ - VTDAddressSpace *dev_as[0]; /* A table of VTDAddressSpace objects inde= xed by devfn */ + /* A table of VTDAddressSpace objects indexed by devfn */ + VTDAddressSpace *dev_as[PCI_DEVFN_MAX]; + /* A table of VTDIOMMUContext objects indexed by devfn */ + VTDIOMMUContext *dev_ic[PCI_DEVFN_MAX]; }; =20 struct VTDIOTLBEntry { @@ -282,5 +293,6 @@ struct IntelIOMMUState { * create a new one if none exists */ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devf= n); +VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s, PCIBus *bus, int devf= n); =20 #endif --=20 2.7.4