From: "Tian, Kevin" <kevin.tian@intel.com>
To: Paul Durrant <paul@xen.org>,
"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Paul Durrant <pdurrant@amazon.com>
Subject: RE: [PATCH v4 12/14] vtd: use a bit field for root_entry
Date: Fri, 14 Aug 2020 07:17:07 +0000 [thread overview]
Message-ID: <MWHPR11MB1645EE41E12753088BC01AF78C400@MWHPR11MB1645.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200804134209.8717-13-paul@xen.org>
> From: Paul Durrant <paul@xen.org>
> Sent: Tuesday, August 4, 2020 9:42 PM
>
> From: Paul Durrant <pdurrant@amazon.com>
>
> This makes the code a little easier to read and also makes it more consistent
> with iremap_entry.
I feel the original readability is slightly better, as ctp is less obvious than
set_root_value, get_context_addr, etc.
Thanks
Kevin
>
> Also take the opportunity to tidy up the implementation of
> device_in_domain().
>
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> ---
> Cc: Kevin Tian <kevin.tian@intel.com>
>
> 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 *iommu, 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 = (u64) get_context_addr(*root);
> + maddr = 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 */
>
> -/*
> - * 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 |= 1;} while(0)
> -#define get_context_addr(root) ((root).val & PAGE_MASK_4K)
> -#define set_root_value(root, value) \
> - do {(root).val |= ((value) & PAGE_MASK_4K);} while(0)
> +
> +#define root_present(r) (r).p
> +#define set_root_present(r) do { (r).p = 1; } while (0)
> +
> +#define root_ctp(r) ((r).ctp << PAGE_SHIFT_4K)
> +#define set_root_ctp(r, val) \
> + do { (r).ctp = ((val) >> PAGE_SHIFT_4K); } while (0)
>
> 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;
> }
>
> - printk(" root_entry[%02x] = %"PRIx64"\n", bus, root_entry[bus].val);
> + printk(" root_entry[%02x] = %"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;
> }
>
> - val = root_entry[bus].val;
> + val = root_ctp(root_entry[bus]);
> unmap_vtd_domain_page(root_entry);
> ctxt_entry = map_vtd_domain_page(val);
> if ( ctxt_entry == NULL )
> diff --git a/xen/drivers/passthrough/vtd/x86/ats.c
> b/xen/drivers/passthrough/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
> acpi_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 = NULL;
> + struct root_entry *root_entry, *root_entries = NULL;
> + struct context_entry *context_entry, *context_entries = NULL;
> unsigned int tt;
> bool found = false;
>
> @@ -85,25 +85,28 @@ static bool device_in_domain(const struct
> vtd_iommu *iommu,
> return false;
> }
>
> - root_entry = map_vtd_domain_page(iommu->root_maddr);
> - if ( !root_present(root_entry[pdev->bus]) )
> + root_entries = (struct root_entry *)map_vtd_domain_page(iommu-
> >root_maddr);
> + root_entry = &root_entries[pdev->bus];
> + if ( !root_present(*root_entry) )
> goto out;
>
> - ctxt_entry = map_vtd_domain_page(root_entry[pdev->bus].val);
> - if ( context_domain_id(ctxt_entry[pdev->devfn]) != did )
> + context_entries = map_vtd_domain_page(root_ctp(*root_entry));
> + context_entry = &context_entries[pdev->devfn];
> + if ( context_domain_id(*context_entry) != did )
> goto out;
>
> - tt = context_translation_type(ctxt_entry[pdev->devfn]);
> + tt = context_translation_type(*context_entry);
> if ( tt != CONTEXT_TT_DEV_IOTLB )
> goto out;
>
> found = true;
> -out:
> - if ( root_entry )
> - unmap_vtd_domain_page(root_entry);
>
> - 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);
>
> return found;
> }
> --
> 2.20.1
next prev parent reply other threads:[~2020-08-14 7:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 13:41 [PATCH v4 00/14] IOMMU cleanup Paul Durrant
2020-08-04 13:41 ` [PATCH v4 01/14] x86/iommu: re-arrange arch_iommu to separate common fields Paul Durrant
2020-08-14 6:14 ` Tian, Kevin
2020-08-04 13:41 ` [PATCH v4 02/14] x86/iommu: add common page-table allocator Paul Durrant
2020-08-05 15:39 ` Jan Beulich
2020-08-04 13:41 ` [PATCH v4 03/14] x86/iommu: convert VT-d code to use new page table allocator Paul Durrant
2020-08-14 6:41 ` Tian, Kevin
2020-08-14 7:16 ` Durrant, Paul
2020-08-04 13:41 ` [PATCH v4 04/14] x86/iommu: convert AMD IOMMU " Paul Durrant
2020-08-04 13:42 ` [PATCH v4 05/14] iommu: remove unused iommu_ops method and tasklet Paul Durrant
2020-08-04 13:42 ` [PATCH v4 06/14] iommu: flush I/O TLB if iommu_map() or iommu_unmap() fail Paul Durrant
2020-08-05 16:06 ` Jan Beulich
2020-08-05 16:18 ` Paul Durrant
2020-08-06 11:41 ` Jan Beulich
2020-08-14 6:53 ` Tian, Kevin
2020-08-14 7:19 ` Durrant, Paul
2020-08-04 13:42 ` [PATCH v4 07/14] iommu: make map, unmap and flush all take both an order and a count Paul Durrant
2020-08-06 9:57 ` Jan Beulich
2020-08-11 11:00 ` Durrant, Paul
2020-08-14 6:57 ` Tian, Kevin
2020-08-04 13:42 ` [PATCH v4 08/14] remove remaining uses of iommu_legacy_map/unmap Paul Durrant
2020-08-06 10:28 ` Jan Beulich
2020-08-12 9:36 ` [EXTERNAL] " Paul Durrant
2020-08-04 13:42 ` [PATCH v4 09/14] common/grant_table: batch flush I/O TLB Paul Durrant
2020-08-06 11:49 ` Jan Beulich
2020-08-04 13:42 ` [PATCH v4 10/14] iommu: remove the share_p2m operation Paul Durrant
2020-08-06 12:18 ` Jan Beulich
2020-08-14 7:04 ` Tian, Kevin
2020-08-04 13:42 ` [PATCH v4 11/14] iommu: stop calling IOMMU page tables 'p2m tables' Paul Durrant
2020-08-06 12:23 ` Jan Beulich
2020-08-14 7:12 ` Tian, Kevin
2020-08-04 13:42 ` [PATCH v4 12/14] vtd: use a bit field for root_entry Paul Durrant
2020-08-06 12:34 ` Jan Beulich
2020-08-12 13:13 ` Durrant, Paul
2020-08-18 8:27 ` Jan Beulich
2020-08-14 7:17 ` Tian, Kevin [this message]
2020-08-04 13:42 ` [PATCH v4 13/14] vtd: use a bit field for context_entry Paul Durrant
2020-08-06 12:46 ` Jan Beulich
2020-08-12 13:47 ` Paul Durrant
2020-08-14 7:19 ` Tian, Kevin
2020-08-04 13:42 ` [PATCH v4 14/14] vtd: use a bit field for dma_pte Paul Durrant
2020-08-06 12:53 ` Jan Beulich
2020-08-12 13:49 ` Paul Durrant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MWHPR11MB1645EE41E12753088BC01AF78C400@MWHPR11MB1645.namprd11.prod.outlook.com \
--to=kevin.tian@intel.com \
--cc=paul@xen.org \
--cc=pdurrant@amazon.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).