lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 146/265] dma-direct: add missing set_memory_decrypted() for coherent mapping
    Date
    From: David Rientjes <rientjes@google.com>

    [ Upstream commit 1a2b3357e860d890f8045367b179c7e7e802cd71 ]

    When a coherent mapping is created in dma_direct_alloc_pages(), it needs
    to be decrypted if the device requires unencrypted DMA before returning.

    Fixes: 3acac065508f ("dma-mapping: merge the generic remapping helpers into dma-direct")
    Signed-off-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/dma/direct.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
    index 98c445dcb308b..2270930f36f83 100644
    --- a/kernel/dma/direct.c
    +++ b/kernel/dma/direct.c
    @@ -161,6 +161,12 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
    __builtin_return_address(0));
    if (!ret)
    goto out_free_pages;
    + if (force_dma_unencrypted(dev)) {
    + err = set_memory_decrypted((unsigned long)ret,
    + 1 << get_order(size));
    + if (err)
    + goto out_free_pages;
    + }
    memset(ret, 0, size);
    goto done;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-30 00:10    [W:3.374 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site