dma_buf support

Reviewed-by: Joakim Bech <[email protected]>
Reviewed-by: Jerome Forissier <[email protected]>
Tested-by: Pascal Brand <[email protected]> (STM platform)
Tested-by: Pascal Brand <[email protected]> (QEMU platform)
Tested-by: Jerome Forissier <[email protected]> (FVP)
Signed-off-by: Pascal Brand <[email protected]>

Author: Pascal Brand

armtz/tee_mem.c

@@ -318,6 +318,7 @@ void *tee_shm_pool_p2v(struct device *dev, struct shm_pool *pool,
 	} else {
 		unsigned long offset = paddr - pool->paddr;
 		void *p = (void *)((unsigned long)pool->vaddr + offset);
+
 		mutex_unlock(&pool->lock);
 		return p;
 	}
@@ -351,6 +352,7 @@ unsigned long tee_shm_pool_v2p(struct device *dev, struct shm_pool *pool,
 	} else {
 		unsigned long offset = vaddr - pool->vaddr;
 		unsigned long p = pool->paddr + offset;
+
 		mutex_unlock(&pool->lock);
 		return p;
 	}

armtz/tee_smc-arm.S

@@ -27,5 +27,3 @@ ENTRY(tee_smc_call)
 	stm	r8, {r0-r7}
 	pop	{r4-r8, pc}
 ENDPROC(tee_smc_call)
-
-

armtz/tee_tz_drv.c

@@ -257,6 +257,26 @@ static void handle_rpc_func_cmd(struct tee_tz *ptee, u32 parg32)
 	}
 }
 
+static struct tee_shm *handle_rpc_alloc(struct tee_tz *ptee, size_t size)
+{
+	struct tee_rpc_alloc rpc_alloc;
+
+	rpc_alloc.size = size;
+	tee_supp_cmd(ptee->tee, TEE_RPC_ICMD_ALLOCATE,
+		     &rpc_alloc, sizeof(rpc_alloc));
+	return rpc_alloc.shm;
+}
+
+static void handle_rpc_free(struct tee_tz *ptee, struct tee_shm *shm)
+{
+	struct tee_rpc_free rpc_free;
+
+	if (!shm)
+		return;
+	rpc_free.shm = shm;
+	tee_supp_cmd(ptee->tee, TEE_RPC_ICMD_FREE, &rpc_free, sizeof(rpc_free));
+}
+
 static u32 handle_rpc(struct tee_tz *ptee, struct smc_param *param)
 {
 	struct tee_shm *shm;
@@ -278,27 +298,23 @@ static u32 handle_rpc(struct tee_tz *ptee, struct smc_param *param)
 		/* Can't support payload shared memory with this interface */
 		break;
 	case TEESMC_ST_RPC_FUNC_ALLOC_PAYLOAD:
-		shm = tee_shm_alloc_from_rpc(ptee->tee, param->a1,
-					TEE_SHM_TEMP | TEE_SHM_FROM_RPC);
-		if (!shm) {
+		shm = handle_rpc_alloc(ptee, param->a1);
+		if (IS_ERR_OR_NULL(shm)) {
 			param->a1 = 0;
 			break;
 		}
 		cookie = handle_get(&shm_handle_db, shm);
 		if (cookie < 0) {
-			tee_shm_free_from_rpc(shm);
+			handle_rpc_free(ptee, shm);
 			param->a1 = 0;
 			break;
 		}
 		param->a1 = shm->paddr;
 		param->a2 = cookie;
 		break;
 	case TEESMC_ST_RPC_FUNC_FREE_PAYLOAD:
-		if (true || param->a1) {
-			shm = handle_put(&shm_handle_db, param->a1);
-			if (shm)
-				tee_shm_free_from_rpc(shm);
-		}
+		shm = handle_put(&shm_handle_db, param->a1);
+		handle_rpc_free(ptee, shm);
 		break;
 	case TEESMC_RPC_FUNC_IRQ:
 		break;
@@ -1164,8 +1180,6 @@ static void tz_tee_deinit(struct platform_device *pdev)
 
 	dev_dbg(tee->dev, "%s: dev=%s, Secure armv7 started=%d\n", __func__,
 		 tee->name, ptee->started);
-
-	return;
 }
 
 static int tz_tee_probe(struct platform_device *pdev)

core/tee_context.c

@@ -28,7 +28,7 @@
  */
 int tee_context_dump(struct tee *tee, char *buff, size_t len)
 {
-	struct list_head *ptrCtx, *ptrSess, *ptrShm;
+	struct list_head *ptr_ctx, *ptr_sess, *ptr_shm;
 	struct tee_context *ctx;
 	struct tee_session *sess;
 	struct tee_shm *shm;
@@ -39,74 +39,75 @@ int tee_context_dump(struct tee *tee, char *buff, size_t len)
 
 	BUG_ON(!tee);
 
-	if (len < 80)
+	if (len < 80 || list_empty(&tee->list_ctx))
 		return 0;
 
 	mutex_lock(&tee->lock);
-	if (!list_empty(&tee->list_ctx)) {
-		list_for_each(ptrCtx, &tee->list_ctx) {
-			ctx = list_entry(ptrCtx, struct tee_context, entry);
+
+	list_for_each(ptr_ctx, &tee->list_ctx) {
+		ctx = list_entry(ptr_ctx, struct tee_context, entry);
+
+		pos += sprintf(buff + pos,
+				"[%02d] ctx=%p (refcount=%d) (usr=%d)",
+				i, ctx,
+				(int)atomic_read(&ctx->refcount.
+					refcount),
+				ctx->usr_client);
+		pos += sprintf(buff + pos, "name=\"%s\" (tgid=%d)\n",
+				ctx->name,
+				ctx->tgid);
+		if ((len - pos) < 80) {
+			pos = 0;
+			goto out;
+		}
+
+		if (list_empty(&ctx->list_sess))
+			goto out;
+
+		j = 0;
+		list_for_each(ptr_sess, &ctx->list_sess) {
+			sess = list_entry(ptr_sess,
+					struct tee_session,
+					entry);
 
 			pos += sprintf(buff + pos,
-				       "[%02d] ctx=%p (refcount=%d) (usr=%d) "
-				       "name=\"%s\" (tgid=%d)\n",
-				       i, ctx,
-				       (int)atomic_read(&ctx->refcount.
-							refcount),
-				       ctx->usr_client, ctx->name, ctx->tgid);
+					"[%02d.%d] sess=%p sessid=%08x\n",
+					i, j, sess,
+					sess->sessid);
 
 			if ((len - pos) < 80) {
 				pos = 0;
 				goto out;
 			}
 
-			j = 0;
-			if (!list_empty(&ctx->list_sess)) {
-				list_for_each(ptrSess, &ctx->list_sess) {
-					sess = list_entry(ptrSess,
-							  struct tee_session,
-							  entry);
-
-					pos += sprintf(buff + pos,
-						       " [%02d.%d] sess=%p sessid=%08x\n",
-						       i, j, sess,
-						       sess->sessid);
-
-					if ((len - pos) < 80) {
-						pos = 0;
-						goto out;
-					}
-
-					j++;
-				}
-			}
+			j++;
+		}
+
+		if (list_empty(&ctx->list_shm))
+			goto out;
+
+		j = 0;
+		list_for_each(ptr_shm, &ctx->list_shm) {
+			shm = list_entry(ptr_shm, struct tee_shm, entry);
 
-			j = 0;
-			if (!list_empty(&ctx->list_shm)) {
-				list_for_each(ptrShm, &ctx->list_shm) {
-					shm =
-					    list_entry(ptrShm, struct tee_shm,
-						       entry);
-
-					pos += sprintf(buff + pos,
-						       " [%02d.%d] shm=%p paddr=%pad "
-						       "kaddr=%p s=%zu(%zu)\n",
-						       i, j, shm,
-						       &shm->paddr,
-						       shm->kaddr,
-						       shm->size_req,
-						       shm->size_alloc);
-
-					if ((len - pos) < 80) {
-						pos = 0;
-						goto out;
-					}
-
-					j++;
-				}
+			pos += sprintf(buff + pos,
+					"[%02d.%d] shm=%p paddr=%p kaddr=%p",
+					i, j, shm,
+					&shm->paddr,
+					shm->kaddr);
+			pos += sprintf(buff + pos,
+					" s=%zu(%zu)\n",
+					shm->size_req,
+					shm->size_alloc);
+			if ((len - pos) < 80) {
+				pos = 0;
+				goto out;
 			}
-			i++;
+
+			j++;
 		}
+
+		i++;
 	}
 
 out:
@@ -200,6 +201,7 @@ void tee_context_get(struct tee_context *ctx)
 static int is_in_list(struct tee *tee, struct list_head *entry)
 {
 	int present = 1;
+
 	mutex_lock(&tee->lock);
 	if ((entry->next == LIST_POISON1) && (entry->prev == LIST_POISON2))
 		present = 0;
@@ -216,6 +218,7 @@ void tee_context_put(struct tee_context *ctx)
 {
 	struct tee_context *_ctx = ctx;
 	struct tee *tee;
+
 	BUG_ON(!ctx || !ctx->tee);
 	tee = ctx->tee;
 
@@ -249,6 +252,7 @@ int tee_context_copy_from_client(const struct tee_context *ctx,
 				 void *dest, const void *src, size_t size)
 {
 	int res = 0;
+
 	if (dest && src && (size > 0)) {
 		if (ctx->usr_client)
 			res = copy_from_user(dest, src, size);
@@ -259,22 +263,25 @@ int tee_context_copy_from_client(const struct tee_context *ctx,
 }
 
 struct tee_shm *tee_context_alloc_shm_tmp(struct tee_context *ctx,
-					  size_t size, const void *data,
+					  size_t size, const void *src,
 					  int type)
 {
 	struct tee_shm *shm;
 
 	type &= (TEEC_MEM_INPUT | TEEC_MEM_OUTPUT);
 
-	shm = tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_TEMP | type);
+	shm = tee_shm_alloc(ctx->tee, size,
+			TEE_SHM_MAPPED | TEE_SHM_TEMP | type);
 	if (IS_ERR_OR_NULL(shm)) {
 		dev_err(_DEV(ctx->tee), "%s: buffer allocation failed (%ld)\n",
 			__func__, PTR_ERR(shm));
 		return shm;
 	}
 
-	if (shm && (type & TEEC_MEM_INPUT)) {
-		if (tee_context_copy_from_client(ctx, shm->kaddr, data, size)) {
+	shm->ctx = ctx;
+
+	if (type & TEEC_MEM_INPUT) {
+		if (tee_context_copy_from_client(ctx, shm->kaddr, src, size)) {
 			dev_err(_DEV(ctx->tee),
 				"%s: tee_context_copy_from_client failed\n",
 				__func__);

core/tee_core.c

@@ -48,6 +48,7 @@ static int device_match(struct device *device, const void *devname)
 {
 	struct tee *tee = dev_get_drvdata(device);
 	int ret = strncmp(devname, tee->name, sizeof(tee->name));
+
 	BUG_ON(!tee);
 	if (ret == 0)
 		return 1;
@@ -62,6 +63,7 @@ static int device_match(struct device *device, const void *devname)
 struct tee *tee_get_tee(const char *devname)
 {
 	struct device *device;
+
 	if (!devname)
 		return NULL;
 	device = class_find_device(misc_class, NULL, devname, device_match);
@@ -115,6 +117,7 @@ int tee_get(struct tee *tee)
 		atomic_dec(&tee->refcount);
 	} else {
 		int count = (int)atomic_read(&tee->refcount);
+
 		dev_dbg(_DEV(tee), "%s: refcount=%d\n", __func__, count);
 		if (count > tee->max_refcount)
 			tee->max_refcount = count;
@@ -157,6 +160,7 @@ int tee_put(struct tee *tee)
 static int tee_supp_open(struct tee *tee)
 {
 	int ret = 0;
+
 	dev_dbg(_DEV(tee), "%s: appclient=\"%s\" pid=%d\n", __func__,
 		current->comm, current->pid);
 
@@ -290,6 +294,7 @@ static int tee_do_shm_alloc(struct tee_context *ctx,
 	int ret = -EINVAL;
 	struct tee_shm_io k_shm;
 	struct tee *tee = ctx->tee;
+
 	BUG_ON(!ctx->usr_client);
 
 	dev_dbg(_DEV(tee), "%s: >\n", __func__);
@@ -310,11 +315,12 @@ static int tee_do_shm_alloc(struct tee_context *ctx,
 		goto exit;
 	}
 
-	ret = tee_shm_alloc_fd(ctx, &k_shm);
+	ret = tee_shm_alloc_io(ctx, &k_shm);
 	if (ret)
 		goto exit;
 
 	put_user(k_shm.fd_shm, &u_shm->fd_shm);
+	put_user(k_shm.flags, &u_shm->flags);
 
 exit:
 	dev_dbg(_DEV(tee), "%s: < ret=%d, shmfd=%d\n", __func__, ret,
@@ -346,7 +352,7 @@ static int tee_do_get_fd_for_rpc_shm(struct tee_context *ctx,
 		goto exit;
 	}
 
-	ret = tee_shm_get_fd(ctx, &k_shm);
+	ret = tee_shm_fd_for_rpc(ctx, &k_shm);
 	if (ret)
 		goto exit;