lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 25/34] swiotlb: Add warnings for use of bounce buffers with SME
    Date
    Add warnings to let the user know when bounce buffers are being used for
    DMA when SME is active. Since the bounce buffers are not in encrypted
    memory, these notifications are to allow the user to determine some
    appropriate action - if necessary.

    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
    ---
    arch/x86/include/asm/mem_encrypt.h | 8 ++++++++
    include/asm-generic/mem_encrypt.h | 5 +++++
    include/linux/dma-mapping.h | 9 +++++++++
    lib/swiotlb.c | 3 +++
    4 files changed, 25 insertions(+)

    diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
    index f1215a4..c7a2525 100644
    --- a/arch/x86/include/asm/mem_encrypt.h
    +++ b/arch/x86/include/asm/mem_encrypt.h
    @@ -69,6 +69,14 @@ static inline bool sme_active(void)
    return !!sme_me_mask;
    }

    +static inline u64 sme_dma_mask(void)
    +{
    + if (!sme_me_mask)
    + return 0ULL;
    +
    + return ((u64)sme_me_mask << 1) - 1;
    +}
    +
    /*
    * The __sme_pa() and __sme_pa_nodebug() macros are meant for use when
    * writing to or comparing values from the cr3 register. Having the
    diff --git a/include/asm-generic/mem_encrypt.h b/include/asm-generic/mem_encrypt.h
    index b55c3f9..fb02ff0 100644
    --- a/include/asm-generic/mem_encrypt.h
    +++ b/include/asm-generic/mem_encrypt.h
    @@ -22,6 +22,11 @@ static inline bool sme_active(void)
    return false;
    }

    +static inline u64 sme_dma_mask(void)
    +{
    + return 0ULL;
    +}
    +
    /*
    * The __sme_set() and __sme_clr() macros are useful for adding or removing
    * the encryption mask from a value (e.g. when dealing with pagetable
    diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
    index 4f3eece..e2c5fda 100644
    --- a/include/linux/dma-mapping.h
    +++ b/include/linux/dma-mapping.h
    @@ -10,6 +10,7 @@
    #include <linux/scatterlist.h>
    #include <linux/kmemcheck.h>
    #include <linux/bug.h>
    +#include <linux/mem_encrypt.h>

    /**
    * List of possible attributes associated with a DMA mapping. The semantics
    @@ -577,6 +578,10 @@ static inline int dma_set_mask(struct device *dev, u64 mask)

    if (!dev->dma_mask || !dma_supported(dev, mask))
    return -EIO;
    +
    + if (sme_active() && (mask < sme_dma_mask()))
    + dev_warn(dev, "SME is active, device will require DMA bounce buffers\n");
    +
    *dev->dma_mask = mask;
    return 0;
    }
    @@ -596,6 +601,10 @@ static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
    {
    if (!dma_supported(dev, mask))
    return -EIO;
    +
    + if (sme_active() && (mask < sme_dma_mask()))
    + dev_warn(dev, "SME is active, device will require DMA bounce buffers\n");
    +
    dev->coherent_dma_mask = mask;
    return 0;
    }
    diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    index 74d6557..f78906a 100644
    --- a/lib/swiotlb.c
    +++ b/lib/swiotlb.c
    @@ -509,6 +509,9 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
    if (no_iotlb_memory)
    panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");

    + if (sme_active())
    + pr_warn_once("SME is active and system is using DMA bounce buffers\n");
    +
    mask = dma_get_seg_boundary(hwdev);

    tbl_dma_addr &= mask;
    \
     
     \ /
      Last update: 2017-06-12 01:11    [W:3.274 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site