diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 08:30:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 08:30:40 -0700 |
| commit | b2e45b46d85bfc67b7b28e0e0c1c7e9b9a35892c (patch) | |
| tree | c032cc4ddc637e0c61530412f27873c8d136ee5b | |
| parent | 08b297bb10d6a270739d92098adabe3c550377e9 (diff) | |
| parent | b3e9b515b08e407ab3a026dc2e4d935c48d05f69 (diff) | |
| download | linux-rpi3-b2e45b46d85bfc67b7b28e0e0c1c7e9b9a35892c.tar.gz linux-rpi3-b2e45b46d85bfc67b7b28e0e0c1c7e9b9a35892c.tar.bz2 linux-rpi3-b2e45b46d85bfc67b7b28e0e0c1c7e9b9a35892c.zip | |
Merge tag 'iommu-fixes-v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Joerg writes:
"IOMMU Fix for Linux v4.19-rc6
One important fix:
- Fix a memory leak with AMD IOMMU when SME is active and a VM
has assigned devices. In that case the complete guest memory
will be leaked without this fix."
* tag 'iommu-fixes-v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/amd: Clear memory encryption mask from physical address
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 73e47d93e7a0..bee0dfb7b93b 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3069,7 +3069,7 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom, return 0; offset_mask = pte_pgsize - 1; - __pte = *pte & PM_ADDR_MASK; + __pte = __sme_clr(*pte & PM_ADDR_MASK); return (__pte & ~offset_mask) | (iova & offset_mask); } |