From nobody Tue Feb 10 01:35:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1596550223; cv=none; d=zohomail.com; s=zohoarc; b=LPvKMTWsU0Jg2xSgs6851axgY2/h1gEWodE/n5lDbF0W7JHoCYivnKNVw36hDG6J4W3c6iy10biPYxfO9WOxy2hLnK06jpL37rL6BsJE3WGur0+2CcFtV3fPeGOZmjALRK1zo5yfO2KHLyeUZ5sUIMX9Vhsske8b0aaf5humEzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596550223; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vAf8F1azmxpSkAU8hG593+fhhZfmNP3RoDkUnJJss0w=; b=dsGpCxrkDq7wZ3zM5OUyyu88vS0aSVxXDd/GGXpPCPl13p0D+MAUOolMjkLUmZu+D7chXKfcgtxuR6W5SHjb9gLfOsEIXu6N42FhzweX8JUHnlS1HQRGaau/MH3zSL9HH2U2VXWN3NwGOOJA2NNOiHR9Rt9PwKmobYXs3A+IUNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1596550223347497.99213701037695; Tue, 4 Aug 2020 07:10:23 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k2xde-0002tR-GT; Tue, 04 Aug 2020 14:09:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k2xdd-0002sc-A8 for xen-devel@lists.xenproject.org; Tue, 04 Aug 2020 14:09:57 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 90780af9-081f-42d5-b893-424c160e7350; Tue, 04 Aug 2020 14:09:51 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k2xdW-0000NZ-Bq; Tue, 04 Aug 2020 14:09:50 +0000 Received: from host86-143-223-30.range86-143.btcentralplus.com ([86.143.223.30] helo=u2f063a87eabd5f.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k2xD2-0003ag-Eg; Tue, 04 Aug 2020 13:42:28 +0000 X-Inumbo-ID: 90780af9-081f-42d5-b893-424c160e7350 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vAf8F1azmxpSkAU8hG593+fhhZfmNP3RoDkUnJJss0w=; b=prve2la1ewe4a9OxTHH6gPrFEH B8TkYPdb3iFIQ0Coz6PZg3AyB6HjvJicebvoBR2FVNF5sppLB4XJAi6sDhatxMD481BMYm6q7fxSU 2gYS9iPcBoiB7BgdzLp1yhooNMLSDRqU/3UQxHE7R+AXPdtX5ofGA+VhRA/Q9nZRhkSY=; From: Paul Durrant To: xen-devel@lists.xenproject.org Subject: [PATCH v4 12/14] vtd: use a bit field for root_entry Date: Tue, 4 Aug 2020 14:42:07 +0100 Message-Id: <20200804134209.8717-13-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200804134209.8717-1-paul@xen.org> References: <20200804134209.8717-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Paul Durrant , Kevin Tian Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paul Durrant This makes the code a little easier to read and also makes it more consiste= nt with iremap_entry. Also take the opportunity to tidy up the implementation of device_in_domain= (). Signed-off-by: Paul Durrant --- Cc: Kevin Tian v4: - New in v4 --- xen/drivers/passthrough/vtd/iommu.c | 4 ++-- xen/drivers/passthrough/vtd/iommu.h | 33 ++++++++++++++++----------- xen/drivers/passthrough/vtd/utils.c | 4 ++-- xen/drivers/passthrough/vtd/x86/ats.c | 27 ++++++++++++---------- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/= vtd/iommu.c index f8da4fe0e7..76025f6ccd 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -245,11 +245,11 @@ static u64 bus_to_context_maddr(struct vtd_iommu *iom= mu, u8 bus) unmap_vtd_domain_page(root_entries); return 0; } - set_root_value(*root, maddr); + set_root_ctp(*root, maddr); set_root_present(*root); iommu_sync_cache(root, sizeof(struct root_entry)); } - maddr =3D (u64) get_context_addr(*root); + maddr =3D root_ctp(*root); unmap_vtd_domain_page(root_entries); return maddr; } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/= vtd/iommu.h index 216791b3d6..031ac5f66c 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -184,21 +184,28 @@ #define dma_frcd_source_id(c) (c & 0xffff) #define dma_frcd_page_addr(d) (d & (((u64)-1) << 12)) /* low 64 bit */ =20 -/* - * 0: Present - * 1-11: Reserved - * 12-63: Context Ptr (12 - (haw-1)) - * 64-127: Reserved - */ struct root_entry { - u64 val; - u64 rsvd1; + union { + __uint128_t val; + struct { uint64_t lo, hi; }; + struct { + /* 0 - 63 */ + uint64_t p:1; + uint64_t reserved0:11; + uint64_t ctp:52; + + /* 64 - 127 */ + uint64_t reserved1; + }; + }; }; -#define root_present(root) ((root).val & 1) -#define set_root_present(root) do {(root).val |=3D 1;} while(0) -#define get_context_addr(root) ((root).val & PAGE_MASK_4K) -#define set_root_value(root, value) \ - do {(root).val |=3D ((value) & PAGE_MASK_4K);} while(0) + +#define root_present(r) (r).p +#define set_root_present(r) do { (r).p =3D 1; } while (0) + +#define root_ctp(r) ((r).ctp << PAGE_SHIFT_4K) +#define set_root_ctp(r, val) \ + do { (r).ctp =3D ((val) >> PAGE_SHIFT_4K); } while (0) =20 struct context_entry { u64 lo; diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/= vtd/utils.c index 4febcf506d..4c85242894 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -112,7 +112,7 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus= , int devfn, u64 gmfn) return; } =20 - printk(" root_entry[%02x] =3D %"PRIx64"\n", bus, root_entry[bus].va= l); + printk(" root_entry[%02x] =3D %"PRIx64"\n", bus, root_entry[bus].lo= ); if ( !root_present(root_entry[bus]) ) { unmap_vtd_domain_page(root_entry); @@ -120,7 +120,7 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus= , int devfn, u64 gmfn) return; } =20 - val =3D root_entry[bus].val; + val =3D root_ctp(root_entry[bus]); unmap_vtd_domain_page(root_entry); ctxt_entry =3D map_vtd_domain_page(val); if ( ctxt_entry =3D=3D NULL ) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthroug= h/vtd/x86/ats.c index 04d702b1d6..8369415dcc 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -74,8 +74,8 @@ int ats_device(const struct pci_dev *pdev, const struct a= cpi_drhd_unit *drhd) static bool device_in_domain(const struct vtd_iommu *iommu, const struct pci_dev *pdev, uint16_t did) { - struct root_entry *root_entry; - struct context_entry *ctxt_entry =3D NULL; + struct root_entry *root_entry, *root_entries =3D NULL; + struct context_entry *context_entry, *context_entries =3D NULL; unsigned int tt; bool found =3D false; =20 @@ -85,25 +85,28 @@ static bool device_in_domain(const struct vtd_iommu *io= mmu, return false; } =20 - root_entry =3D map_vtd_domain_page(iommu->root_maddr); - if ( !root_present(root_entry[pdev->bus]) ) + root_entries =3D (struct root_entry *)map_vtd_domain_page(iommu->root_= maddr); + root_entry =3D &root_entries[pdev->bus]; + if ( !root_present(*root_entry) ) goto out; =20 - ctxt_entry =3D map_vtd_domain_page(root_entry[pdev->bus].val); - if ( context_domain_id(ctxt_entry[pdev->devfn]) !=3D did ) + context_entries =3D map_vtd_domain_page(root_ctp(*root_entry)); + context_entry =3D &context_entries[pdev->devfn]; + if ( context_domain_id(*context_entry) !=3D did ) goto out; =20 - tt =3D context_translation_type(ctxt_entry[pdev->devfn]); + tt =3D context_translation_type(*context_entry); if ( tt !=3D CONTEXT_TT_DEV_IOTLB ) goto out; =20 found =3D true; -out: - if ( root_entry ) - unmap_vtd_domain_page(root_entry); =20 - if ( ctxt_entry ) - unmap_vtd_domain_page(ctxt_entry); + out: + if ( root_entries ) + unmap_vtd_domain_page(root_entries); + + if ( context_entries ) + unmap_vtd_domain_page(context_entries); =20 return found; } --=20 2.20.1