From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1ADCC63777 for ; Fri, 20 Nov 2020 13:25:05 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3914A222BA for ; Fri, 20 Nov 2020 13:25:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="n/nhi0Uc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3914A222BA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.32190.63206 (Exim 4.92) (envelope-from ) id 1kg6PE-0001qj-JB; Fri, 20 Nov 2020 13:24:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 32190.63206; Fri, 20 Nov 2020 13:24:52 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kg6PE-0001qB-9v; Fri, 20 Nov 2020 13:24:52 +0000 Received: by outflank-mailman (input) for mailman id 32190; Fri, 20 Nov 2020 13:24:51 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kg6PD-0001nz-6n for xen-devel@lists.xenproject.org; Fri, 20 Nov 2020 13:24:51 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kg6PB-0007DL-Qk; Fri, 20 Nov 2020 13:24:49 +0000 Received: from host109-146-187-185.range109-146.btcentralplus.com ([109.146.187.185] helo=u2f063a87eabd5f.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kg6PB-00028m-J9; Fri, 20 Nov 2020 13:24:49 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kg6PD-0001nz-6n for xen-devel@lists.xenproject.org; Fri, 20 Nov 2020 13:24:51 +0000 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; bh=ot0EG7c7zJPZbN0sn3F+EUwxX2ndYclESdsFvCm5FbA=; b=n/nhi0UcrYGr5J0hwUOdprtcQ+ gt77c4QRRa+jPxO/Wl3xhDTvzujADk7/SZOX1OWQlKEMpb0Hqcx7wybCXD7Lo6GpwCXJJpR7XdvOt pWVAbA88UKbbLKORG/g8wV0cft+H7Uiekh7e1as86tNm+6QR/bLgQnNIaABAntFJ2QKc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kg6PB-0007DL-Qk; Fri, 20 Nov 2020 13:24:49 +0000 Received: from host109-146-187-185.range109-146.btcentralplus.com ([109.146.187.185] helo=u2f063a87eabd5f.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kg6PB-00028m-J9; Fri, 20 Nov 2020 13:24:49 +0000 From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Kevin Tian Subject: [PATCH v10 5/7] vtd: use a bit field for root_entry Date: Fri, 20 Nov 2020 13:24:38 +0000 Message-Id: <20201120132440.1141-6-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120132440.1141-1-paul@xen.org> References: <20201120132440.1141-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Paul Durrant This makes the code a little easier to read and also makes it more consistent with iremap_entry. Also take the opportunity to tidy up the implementation of device_in_domain(). Signed-off-by: Paul Durrant --- Cc: Kevin Tian v10: - Small tweaks requested by Jan - Remove macros in favour of direct field access - Add missing barrier v4: - New in v4 --- xen/drivers/passthrough/vtd/iommu.c | 9 +++++---- xen/drivers/passthrough/vtd/iommu.h | 25 ++++++++++++------------- xen/drivers/passthrough/vtd/utils.c | 6 +++--- xen/drivers/passthrough/vtd/x86/ats.c | 27 +++++++++++++++------------ 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d136fe36883b..1a038541f0a3 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -237,7 +237,7 @@ static u64 bus_to_context_maddr(struct vtd_iommu *iommu, u8 bus) ASSERT(spin_is_locked(&iommu->lock)); root_entries = (struct root_entry *)map_vtd_domain_page(iommu->root_maddr); root = &root_entries[bus]; - if ( !root_present(*root) ) + if ( !root->p ) { maddr = alloc_pgtable_maddr(1, iommu->node); if ( maddr == 0 ) @@ -245,11 +245,12 @@ 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_present(*root); + root->ctp = paddr_to_pfn(maddr); + smp_wmb(); + root->p = true; iommu_sync_cache(root, sizeof(struct root_entry)); } - maddr = (u64) get_context_addr(*root); + maddr = pfn_to_paddr(root->ctp); 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 216791b3d634..b14628eec260 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -184,21 +184,20 @@ #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 { + struct { uint64_t lo, hi; }; + struct { + /* 0 - 63 */ + bool p:1; + unsigned int 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) struct context_entry { u64 lo; diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index 4febcf506d8a..5f25a86a535c 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -112,15 +112,15 @@ 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); - if ( !root_present(root_entry[bus]) ) + printk(" root_entry[%02x] = %"PRIx64"\n", bus, root_entry[bus].lo); + if ( !root_entry[bus].p ) { unmap_vtd_domain_page(root_entry); printk(" root_entry[%02x] not present\n", bus); return; } - val = root_entry[bus].val; + val = pfn_to_paddr(root_entry[bus].ctp); 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 04d702b1d6b1..fec969ef75bb 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; + 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_entry->p ) 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_entry->ctp); + 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