From patchwork Wed Apr 26 10:06:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Yi L" X-Patchwork-Id: 9700985 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 F3C30603F4 for ; Wed, 26 Apr 2017 10:24:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0703285F3 for ; Wed, 26 Apr 2017 10:24:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4D7A285F8; Wed, 26 Apr 2017 10:24:39 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A0C0285F3 for ; Wed, 26 Apr 2017 10:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2998086AbdDZKYi (ORCPT ); Wed, 26 Apr 2017 06:24:38 -0400 Received: from mga02.intel.com ([134.134.136.20]:25014 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2997853AbdDZKYf (ORCPT ); Wed, 26 Apr 2017 06:24:35 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2017 03:24:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,254,1488873600"; d="scan'208";a="79066513" Received: from sky-dev.bj.intel.com ([10.238.145.47]) by orsmga002.jf.intel.com with ESMTP; 26 Apr 2017 03:24:31 -0700 From: "Liu, Yi L" To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com Cc: kvm@vger.kernel.org, jasowang@redhat.com, iommu@lists.linux-foundation.org, kevin.tian@intel.com, ashok.raj@intel.com, jacob.jun.pan@intel.com, tianyu.lan@intel.com, yi.l.liu@intel.com, jean-philippe.brucker@arm.com, "Liu, Yi L" Subject: [RFC PATCH 14/20] intel_iommu: add FOR_EACH_ASSIGN_DEVICE macro Date: Wed, 26 Apr 2017 18:06:44 +0800 Message-Id: <1493201210-14357-15-git-send-email-yi.l.liu@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493201210-14357-1-git-send-email-yi.l.liu@linux.intel.com> References: <1493201210-14357-1-git-send-email-yi.l.liu@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add FOR_EACH_ASSIGN_DEVICE. It would be used to loop all assigned devices when processing guest pasid table linking and iommu cache invalidate propagation. Signed-off-by: Liu, Yi L --- hw/i386/intel_iommu.c | 32 ++++++++++++++++++++++++++++++++ hw/i386/intel_iommu_internal.h | 11 +++++++++++ 2 files changed, 43 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 0c412d2..f291995 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -55,6 +55,38 @@ static int vtd_dbgflags = VTD_DBGBIT(GENERAL) | VTD_DBGBIT(CSR); #define VTD_DPRINTF(what, fmt, ...) do {} while (0) #endif +#define FOR_EACH_ASSIGN_DEVICE(__notify_info_type, \ + __opaque_type, \ + __hook_info, \ + __hook_fn) \ +do { \ + IntelIOMMUNotifierNode *node; \ + VTDNotifierIterator iterator; \ + int ret = 0; \ + __notify_info_type *notify_info; \ + __opaque_type *opaq; \ + int argsz; \ + argsz = sizeof(*notify_info) + sizeof(*opaq); \ + notify_info = g_malloc0(argsz); \ + QLIST_FOREACH(node, &(s->notifiers_list), next) { \ + VTDAddressSpace *vtd_as = node->vtd_as; \ + VTDContextEntry ce[2]; \ + iterator.bus = pci_bus_num(vtd_as->bus); \ + ret = vtd_dev_to_context_entry(s, iterator.bus, \ + vtd_as->devfn, &ce[0]); \ + if (ret != 0) { \ + continue; \ + } \ + iterator.sid = vtd_make_source_id(iterator.bus, vtd_as->devfn); \ + iterator.did = VTD_CONTEXT_ENTRY_DID(ce[0].hi); \ + iterator.host_sid = node->host_sid; \ + iterator.vtd_as = vtd_as; \ + iterator.ce = &ce[0]; \ + __hook_fn(&iterator, __hook_info, notify_info); \ + } \ + g_free(notify_info); \ +} while (0) + static void vtd_define_quad(IntelIOMMUState *s, hwaddr addr, uint64_t val, uint64_t wmask, uint64_t w1cmask) { diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index f2a7d12..5178398 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -439,6 +439,17 @@ typedef struct VTDRootEntry VTDRootEntry; #define VTD_EXT_CONTEXT_TT_NO_DEV_IOTLB (4ULL << 2) #define VTD_EXT_CONTEXT_TT_DEV_IOTLB (5ULL << 2) +struct VTDNotifierIterator { + VTDAddressSpace *vtd_as; + VTDContextEntry *ce; + uint16_t host_sid; + uint16_t sid; + uint16_t did; + uint8_t bus; +}; + +typedef struct VTDNotifierIterator VTDNotifierIterator; + /* Paging Structure common */ #define VTD_SL_PT_PAGE_SIZE_MASK (1ULL << 7) /* Bits to decide the offset for each level */