| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20231025065700.1556152-2-JESHWANTHKUMAR.NK@amd.com>
Date: Wed, 25 Oct 2023 12:26:58 +0530
From: jeshwank <JESHWANTHKUMAR.NK@....com>
To: <thomas.lendacky@....com>, <john.allen@....com>,
<herbert@...dor.apana.org.au>, <davem@...emloft.net>,
<jens.wiklander@...aro.org>, <sumit.garg@...aro.org>,
<jarkko.nikula@...ux.intel.com>, <mario.limonciello@....com>,
<linux-crypto@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<op-tee@...ts.trustedfirmware.org>
CC: <Mythri.Pandeshwarakrishna@....com>, <Devaraj.Rangasamy@....com>,
<Rijo-john.Thomas@....com>, <nimesh.easow@....com>,
<JESHWANTHKUMAR.NK@....com>
Subject: [PATCH 1/3] crypto: ccp - Add function to allocate and free memory using DMA APIs
From: Rijo Thomas <Rijo-john.Thomas@....com>
As part of cleanup, memory allocation using get_free_pages() is replaced
with DMA APIs.
psp_tee_alloc_buffer() and psp_tee_free_buffer() has been introduced, so
that DMA address can be shared with PSP Trusted OS for buffer mapping.
In the presence of IOMMU, the address will be an IOVA. So, it must be
converted into a physical address before sharing it with PSP Trusted OS.
Signed-off-by: Rijo Thomas <Rijo-john.Thomas@....com>
Signed-off-by: Jeshwanth Kumar <JESHWANTHKUMAR.NK@....com>
---
drivers/crypto/ccp/psp-dev.c | 3 +++
drivers/crypto/ccp/tee-dev.c | 51 ++++++++++++++++++++++++++++++++++++
include/linux/psp-tee.h | 47 +++++++++++++++++++++++++++++++++
3 files changed, 101 insertions(+)
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index d42d7bc62352..049954d9984b 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -163,6 +163,9 @@ int psp_dev_init(struct sp_device *sp)
goto e_err;
}
+ if (sp->set_psp_master_device)
+ sp->set_psp_master_device(sp);
+
psp->io_regs = sp->io_map;
ret = psp_get_capability(psp);
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 5560bf8329a1..fa6f89572613 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -13,6 +13,8 @@
#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.h>
#include <linux/psp-tee.h>
@@ -22,6 +24,55 @@
static bool psp_dead;
+struct psp_tee_buffer *psp_tee_alloc_buffer(unsigned long size, gfp_t gfp)
+{
+ struct psp_device *psp = psp_get_master_device();
+ struct psp_tee_buffer *tee_buf;
+ struct iommu_domain *dom;
+
+ if (!psp || !size)
+ return NULL;
+
+ tee_buf = kzalloc(sizeof(*tee_buf), GFP_KERNEL);
+ if (!tee_buf)
+ return NULL;
+
+ tee_buf->vaddr = dma_alloc_coherent(psp->dev, size, &tee_buf->dma, gfp);
+ if (!tee_buf->vaddr || !tee_buf->dma) {
+ kfree(tee_buf);
+ return NULL;
+ }
+
+ tee_buf->size = size;
+
+ /* Check whether IOMMU is present. If present, translate IOVA
+ * to physical address, else the dma handle is the physical
+ * address.
+ */
+ dom = iommu_get_domain_for_dev(psp->dev);
+ if (dom)
+ tee_buf->paddr = iommu_iova_to_phys(dom, tee_buf->dma);
+ else
+ tee_buf->paddr = tee_buf->dma;
+
+ return tee_buf;
+}
+EXPORT_SYMBOL(psp_tee_alloc_buffer);
+
+void psp_tee_free_buffer(struct psp_tee_buffer *tee_buf)
+{
+ struct psp_device *psp = psp_get_master_device();
+
+ if (!psp || !tee_buf)
+ return;
+
+ dma_free_coherent(psp->dev, tee_buf->size,
+ tee_buf->vaddr, tee_buf->dma);
+
+ kfree(tee_buf);
+}
+EXPORT_SYMBOL(psp_tee_free_buffer);
+
static int tee_alloc_ring(struct psp_tee_device *tee, int ring_size)
{
struct ring_buf_manager *rb_mgr = &tee->rb_mgr;
diff --git a/include/linux/psp-tee.h b/include/linux/psp-tee.h
index cb0c95d6d76b..c3db3f33d069 100644
--- a/include/linux/psp-tee.h
+++ b/include/linux/psp-tee.h
@@ -40,6 +40,20 @@ enum tee_cmd_id {
TEE_CMD_ID_UNMAP_SHARED_MEM,
};
+/**
+ * struct psp_tee_buffer - Structure of a TEE buffer shared with PSP.
+ * @dma: DMA buffer address
+ * @paddr: Physical address of DMA buffer
+ * @vaddr: CPU virtual address of DMA buffer
+ * @size: Size of DMA buffer in bytes
+ */
+struct psp_tee_buffer {
+ dma_addr_t dma;
+ phys_addr_t paddr;
+ void *vaddr;
+ unsigned long size;
+};
+
#ifdef CONFIG_CRYPTO_DEV_SP_PSP
/**
* psp_tee_process_cmd() - Process command in Trusted Execution Environment
@@ -75,6 +89,28 @@ int psp_tee_process_cmd(enum tee_cmd_id cmd_id, void *buf, size_t len,
*/
int psp_check_tee_status(void);
+/**
+ * psp_tee_alloc_buffer() - Allocates memory of requested size and flags using
+ * dma_alloc_coherent() API.
+ *
+ * This function can be used to allocate a shared memory region between the
+ * host and PSP TEE.
+ *
+ * Returns:
+ * non-NULL a valid pointer to struct psp_tee_buffer
+ * NULL on failure
+ */
+struct psp_tee_buffer *psp_tee_alloc_buffer(unsigned long size, gfp_t gfp);
+
+/**
+ * psp_tee_free_buffer() - Deallocates memory using dma_free_coherent() API.
+ *
+ * This function can be used to release shared memory region between host
+ * and PSP TEE.
+ *
+ */
+void psp_tee_free_buffer(struct psp_tee_buffer *tee_buffer);
+
#else /* !CONFIG_CRYPTO_DEV_SP_PSP */
static inline int psp_tee_process_cmd(enum tee_cmd_id cmd_id, void *buf,
@@ -87,5 +123,16 @@ static inline int psp_check_tee_status(void)
{
return -ENODEV;
}
+
+static inline
+struct psp_tee_buffer *psp_tee_alloc_buffer(unsigned long size, gfp_t gfp)
+{
+ return NULL;
+}
+
+static inline void psp_tee_free_buffer(struct psp_tee_buffer *tee_buffer)
+{
+}
+
#endif /* CONFIG_CRYPTO_DEV_SP_PSP */
#endif /* __PSP_TEE_H_ */
--
2.25.1
Powered by blists - more mailing lists