From: Yonghyun Hwang <yonghyun@google.com>
To: David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Havard Skinnemoen <hskinnemoen@google.com>,
Deepa Dinamani <deepadinamani@google.com>,
Moritz Fischer <mdf@kernel.org>,
Yonghyun Hwang <yonghyun@google.com>
Subject: [PATCH] iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
Date: Wed, 19 Feb 2020 11:32:21 -0800 [thread overview]
Message-ID: <20200219193221.19799-1-yonghyun@google.com> (raw)
intel_iommu_iova_to_phys() has a bug when it translates an IOVA for a huge
page onto its corresponding physical address. This commit fixes the bug by
accomodating the level of page entry for the IOVA and adds IOVA's lower
address to the physical address.
Signed-off-by: Yonghyun Hwang <yonghyun@google.com>
---
drivers/iommu/intel-iommu.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0c8d81f56a30..beff7ede41f4 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5548,6 +5548,15 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
return size;
}
+static inline unsigned long pfn_level_mask(unsigned long pfn, int level)
+{
+ if (level > 1)
+ return pfn & (BIT_MASK(level_to_offset_bits(level)) - 1)
+ << VTD_PAGE_SHIFT;
+ else
+ return 0;
+}
+
static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
dma_addr_t iova)
{
@@ -5555,13 +5564,15 @@ static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
struct dma_pte *pte;
int level = 0;
u64 phys = 0;
+ const unsigned long pfn = iova >> VTD_PAGE_SHIFT;
if (dmar_domain->flags & DOMAIN_FLAG_LOSE_CHILDREN)
return 0;
- pte = pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level);
+ pte = pfn_to_dma_pte(dmar_domain, pfn, &level);
if (pte)
- phys = dma_pte_addr(pte);
+ phys = dma_pte_addr(pte) + pfn_level_mask(pfn, level) +
+ (iova & ~VTD_PAGE_MASK);
return phys;
}
--
2.25.0.265.gbab2e86ba0-goog
next reply other threads:[~2020-02-19 19:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 19:32 Yonghyun Hwang [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-18 22:23 [PATCH] iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page Yonghyun Hwang
2020-02-19 3:15 ` Lu Baolu
2020-02-19 4:42 ` Moritz Fischer
[not found] ` <CAEauFbw_FGWuQJMpr7PgyyCAefKChXoszKAz-ykBKgxFc-aa4g@mail.gmail.com>
2020-02-19 23:32 ` Lu Baolu
2020-02-20 0:12 ` Yonghyun Hwang
2020-02-20 2:35 ` Lu Baolu
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=20200219193221.19799-1-yonghyun@google.com \
--to=yonghyun@google.com \
--cc=baolu.lu@linux.intel.com \
--cc=deepadinamani@google.com \
--cc=dwmw2@infradead.org \
--cc=hskinnemoen@google.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.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).