iommupt: Do not set C-bit on MMIO backed PTEs

AMD Secure Memory Encryption (SME) marks individual memory pages as
encrypted by setting the C-bit in page table entries. According to the
AMD APM,any pages corresponding to MMIO addresses must be configured
with the C-bit clear.

The current *_iommu_set_prot() implementation sets the C-bit on all PTEs
in the IOMMU page tables. This is incorrect for PTEs backed by MMIO, and
can break PCIe peer-to-peer communication when IOVA is used. Fix this by
avoiding the C-bit for MMIO-backed mappings.

For amdv2 IOMMU page tables, there is a usage scenario for GVA->GPA
mappings, and for the trusted MMIO in the TEE-IO case, the C-bit will need
to be added to GPA. However, SNP guests do not yet support vIOMMU, and the
trusted MMIO support is not ready in upstream. Adding the C-bit for trusted
MMIO can be considered once those features land.

Fixes: 879ced2bab1b ("iommupt: Add the AMD IOMMU v1 page table format")
Fixes: aef5de756ea8 ("iommupt: Add the x86 64 bit page table format")
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Wei Wang <wei.w.wang@hotmail.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

diff --git a/drivers/iommu/generic_pt/fmt/amdv1.h b/drivers/iommu/generic_pt/fmt/amdv1.h
index aa8e1a8ec95fdea36b7b62f299ff094b194d9c88..3b2c41d9654d72f856c2fc11017fdcbe9ac3b762 100644 (file)
--- a/drivers/iommu/generic_pt/fmt/amdv1.h
+++ b/drivers/iommu/generic_pt/fmt/amdv1.h
@@ -354,7 +354,8 @@ static inline int amdv1pt_iommu_set_prot(struct pt_common *common,
         * Ideally we'd have an IOMMU_ENCRYPTED flag set by higher levels to
         * control this. For now if the tables use sme_set then so do the ptes.
         */
-       if (pt_feature(common, PT_FEAT_AMDV1_ENCRYPT_TABLES))
+       if (pt_feature(common, PT_FEAT_AMDV1_ENCRYPT_TABLES) &&
+           !(iommu_prot & IOMMU_MMIO))
                pte = __sme_set(pte);
 
        attrs->descriptor_bits = pte;

diff --git a/drivers/iommu/generic_pt/fmt/x86_64.h b/drivers/iommu/generic_pt/fmt/x86_64.h
index 210748d9d6e8aa68bbae8f15072a8ab169b02b9d..ed9a47cbb6e022c781a840f6cf2172a4b3675b97 100644 (file)
--- a/drivers/iommu/generic_pt/fmt/x86_64.h
+++ b/drivers/iommu/generic_pt/fmt/x86_64.h
@@ -227,7 +227,8 @@ static inline int x86_64_pt_iommu_set_prot(struct pt_common *common,
         * Ideally we'd have an IOMMU_ENCRYPTED flag set by higher levels to
         * control this. For now if the tables use sme_set then so do the ptes.
         */
-       if (pt_feature(common, PT_FEAT_X86_64_AMD_ENCRYPT_TABLES))
+       if (pt_feature(common, PT_FEAT_X86_64_AMD_ENCRYPT_TABLES) &&
+           !(iommu_prot & IOMMU_MMIO))
                pte = __sme_set(pte);
 
        attrs->descriptor_bits = pte;