On 12/15/2022 6:59 PM, Jeremi Piotrowski wrote:
> On Tue, Dec 13, 2022 at 04:40:27PM +0530, Rijo Thomas wrote:
>> For AMD Secure Processor (ASP) to map and access TEE ring buffer, the
>> ring buffer address sent by host to ASP must be a real physical
>> address and the pages must be physically contiguous.
>>
>> In a virtualized environment though, when the driver is running in a
>> guest VM, the pages allocated by __get_free_pages() may not be
>> contiguous in the host (or machine) physical address space. Guests
>> will see a guest (or pseudo) physical address and not the actual host
>> (or machine) physical address. The TEE running on ASP cannot decipher
>> pseudo physical addresses. It needs host or machine physical address.
>>
>> To resolve this problem, use DMA APIs for allocating buffers that must
>> be shared with TEE. This will ensure that the pages are contiguous in
>> host (or machine) address space. If the DMA handle is an IOVA,
>> translate it into a physical address before sending it to ASP.
>>
>> This patch also exports two APIs (one for buffer allocation and
>> another to free the buffer). This API can be used by AMD-TEE driver to
>> share buffers with TEE.
>>
>> Fixes: 33960acccfbd ("crypto: ccp - add TEE support for Raven Ridge")
>> Cc: Tom Lendacky <thomas.lendacky@xxxxxxx>
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Rijo Thomas <Rijo-john.Thomas@xxxxxxx>
>> Co-developed-by: Jeshwanth <JESHWANTHKUMAR.NK@xxxxxxx>
>> Signed-off-by: Jeshwanth <JESHWANTHKUMAR.NK@xxxxxxx>
>> Reviewed-by: Devaraj Rangasamy <Devaraj.Rangasamy@xxxxxxx>
>> ---
>> v2:
>> * Removed references to dma_buffer.
>> * If psp_init() fails, clear reference to master device.
>> * Handle gfp flags within psp_tee_alloc_buffer() instead of passing it as
>> a function argument.
>> * Added comments within psp_tee_alloc_buffer() to serve as future
>> documentation.
>>
>> drivers/crypto/ccp/psp-dev.c | 13 ++--
>> drivers/crypto/ccp/tee-dev.c | 124 +++++++++++++++++++++++------------
>> drivers/crypto/ccp/tee-dev.h | 9 +--
>> include/linux/psp-tee.h | 49 ++++++++++++++
>> 4 files changed, 142 insertions(+), 53 deletions(-)
>>
>> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
>> index c9c741ac8442..380f5caaa550 100644
>> --- a/drivers/crypto/ccp/psp-dev.c
>> +++ b/drivers/crypto/ccp/psp-dev.c
>> @@ -161,13 +161,13 @@ int psp_dev_init(struct sp_device *sp)
>> goto e_err;
>> }
>>
>> - ret = psp_init(psp);
>> - if (ret)
>> - goto e_irq;
>> -
>> if (sp->set_psp_master_device)
>> sp->set_psp_master_device(sp);
>>
>> + ret = psp_init(psp);
>> + if (ret)
>> + goto e_clear;
>> +
>> /* Enable interrupt */
>> iowrite32(-1, psp->io_regs + psp->vdata->inten_reg);
>>
>> @@ -175,7 +175,10 @@ int psp_dev_init(struct sp_device *sp)
>>
>> return 0;
>>
>> -e_irq:
>> +e_clear:
>> + if (sp->clear_psp_master_device)
>> + sp->clear_psp_master_device(sp);
>> +
>> sp_free_psp_irq(psp->sp, psp);
>> e_err:
>> sp->psp_data = NULL;
>> diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
>> index 5c9d47f3be37..5c43e6e166f1 100644
>> --- a/drivers/crypto/ccp/tee-dev.c
>> +++ b/drivers/crypto/ccp/tee-dev.c
>> @@ -12,8 +12,9 @@
>> #include <linux/mutex.h>
>> #include <linux/delay.h>
>> #include <linux/slab.h>
>> +#include <linux/dma-direct.h>
>> +#include <linux/iommu.h>
>> #include <linux/gfp.h>
>> -#include <linux/psp-sev.h>
>> #include <linux/psp-tee.h>
>>
>> #include "psp-dev.h"
>> @@ -21,25 +22,73 @@
>>
>> static bool psp_dead;
>>
>> +struct psp_tee_buffer *psp_tee_alloc_buffer(unsigned long size)
>> +{
>> + struct psp_device *psp = psp_get_master_device();
>> + struct psp_tee_buffer *buf;
>> + struct iommu_domain *dom;
>> +
>> + if (!psp || !size)
>> + return NULL;
>> +
>> + buf = kzalloc(sizeof(*buf), GFP_KERNEL);
>> + if (!buf)
>> + return NULL;
>> +
>> + /* The pages allocated for PSP Trusted OS must be physically
>> + * contiguous in host (or machine) address space. Therefore,
>> + * use DMA API to allocate memory.
>> + */
>> +
>> + buf->vaddr = dma_alloc_coherent(psp->dev, size, &buf->dma,
>> + GFP_KERNEL | __GFP_ZERO);
>
> dma_alloc_coherent memory is just as contiguous as __get_free_pages, and
> calling dma_alloc_coherent from a guest does not guarantee that the memory is
> contiguous in host memory either. The memory would look contiguous from the
> device point of view thanks to the IOMMU though (in both cases). So this is not
> about being contiguous but other properties that you might rely on (dma mask
> most likely, or coherent if you're not running this on x86?).
>
> Can you confirm why this fixes things and update the comment to reflect that.
>
I see what you are saying.
We verified this in Xen Dom0 PV guest, where dma_alloc_coherent() returned a memory
that is contiguous in machine address space, and the machine address was returned
in the dma handle (buf->dma).
>> + if (!buf->vaddr || !buf->dma) {
>> + kfree(buf);
>> + return NULL;
>> + }
>> +
>> + buf->size = size;
>> +
>> + /* Check whether IOMMU is present. If present, convert IOVA to
>> + * physical address. In the absence of IOMMU, the DMA address
>> + * is actually the physical address.
>> + */
>> +
>> + dom = iommu_get_domain_for_dev(psp->dev);
>> + if (dom)
>> + buf->paddr = iommu_iova_to_phys(dom, buf->dma);
>> + else
>> + buf->paddr = buf->dma;
>
> This is confusing: you're storing GPA for the guest and HPA in case of the
> host, to pass to the device. Let's talk about the host case.
>
> a) the device is behind an IOMMU. The DMA API gives you an IOVA, and the device
> should be using the IOVA to access memory (because it's behind an IOMMU).
> b) the device is not behind an IOMMU. The DMA API gives you a PA, the device
> uses a PA.
>
> But in case a) you're extracting the PA, which means your device can bypass the
> IOMMU, in which case the system should not think that it is behind an IOMMU. So
> how does this work?
>
PSP Trusted OS maps memory without using IOMMU (it bypasses IOMMU). Hence, we need to pass system
physical address to PSP. That's why we cannot pass IOVA or GPA to PSP.
We are re-evaluating our solution to handle other scenarios as well (not just Xen Dom0 PV).
Thanks,
Rijo
> Jeremi
>
>> +
>> + return buf;
>> +}
>> +EXPORT_SYMBOL(psp_tee_alloc_buffer);
>> +
>
