From patchwork Tue Aug 10 17:30:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 494359 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp4178249jap; Tue, 10 Aug 2021 10:40:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1k9o24UzWmuAyeO0CVkOAEB+8tGfulEzC9balgPtbDmkYqDqphxkZQ47eLfsUyzdcxH9f X-Received: by 2002:aa7:ccc1:: with SMTP id y1mr6155142edt.321.1628617216134; Tue, 10 Aug 2021 10:40:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628617216; cv=none; d=google.com; s=arc-20160816; b=aKatSa4jmW6HnceJ+vDDlKSo7POaTV6e/PzvjOFXQ50BVW2e13gG5lM0bEIePXMGZg IqDilhPQCtZNkPn7JoNtgOO8MqjgxmQ9Y3kLz2xS3gRAYbnqU3XjeJrfitz8kTVABvU2 fhhoKNTf2Btg/vGENvKc3XSm//0wqphj7QNAYgJXOARBAKKV2kbMSDouJjeQjXj7gNEg iI+aO+ObluJLQG37Jckj9ClIVhNAhwOA+Wo4k0vnGFzKHMJyy00ngxwLdg5ESUMHvudu TxyjrTYmmPRDJ/H4NIIYn57ZUNKqWUdjGlSnQesM3LmyPpfJMso101kl8Aw9ryKH5K9I 8gqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IGrDlMZbVaYVom5ZSguZqDL9qb17J3vIkgzwnElsRFQ=; b=lxK3461aETzuFEEFKV6dtUn5gyXtt+FVtZcVey4gaAWbRZdNzL7bOphM9fjZ0WCr1i a6ALtT6ek6Lo/kJXcAx60ZEosHjzcVXNclepti4B9JGcD6+Aqd4MJ+O/KyZZQ7McU1e4 FdHPQ8808YDwAQAZUzqMaHuXwhJqJ5f6GEAivVjLAbeC9z3Uy1roCqYGCDV4FI+pE+RV VSU36sINh2X5hKpBlloUx7MLthFKrjBELb5xrj6L8UZco0lEELk42MRukrYkkWAKAvO3 NIThE+5MWEIUYfl8udgCOfLYEggqjjrM/7RU/AYJaUZLkTwQiRQMky0d+Zh45vwWMI3K dKoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UlP4WRw+; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jo21si22108514ejb.82.2021.08.10.10.40.15; Tue, 10 Aug 2021 10:40:16 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UlP4WRw+; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233781AbhHJRkU (ORCPT + 12 others); Tue, 10 Aug 2021 13:40:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:41904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234815AbhHJRiT (ORCPT ); Tue, 10 Aug 2021 13:38:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4186A60F94; Tue, 10 Aug 2021 17:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628616986; bh=rGZAAZud7g183QE05V55OSjEt/5Nazlr+Sqq49jwqSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UlP4WRw+aDeSGMtB+MuV3dDK8AHbb2zJfmARkye8tIcYNd99q57ZlMJfMhBDTAfsj fhNGRqD5i953e4Yc3sL62eUe328f/ixdYyck2v3JWJP8p9olOGv4JMIjilvWU5ndF6 Yluk8x9iGcymdjnw+5d9KKcG0N19CRHUlHOPWFM4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tyler Hicks , Sumit Garg , Jens Wiklander Subject: [PATCH 5.4 53/85] tee: add tee_shm_alloc_kernel_buf() Date: Tue, 10 Aug 2021 19:30:26 +0200 Message-Id: <20210810172950.035313191@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172948.192298392@linuxfoundation.org> References: <20210810172948.192298392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Wiklander commit dc7019b7d0e188d4093b34bd0747ed0d668c63bf upstream. Adds a new function tee_shm_alloc_kernel_buf() to allocate shared memory from a kernel driver. This function can later be made more lightweight by unnecessary dma-buf export. Cc: stable@vger.kernel.org Reviewed-by: Tyler Hicks Reviewed-by: Sumit Garg Signed-off-by: Jens Wiklander Signed-off-by: Greg Kroah-Hartman --- drivers/tee/tee_shm.c | 18 ++++++++++++++++++ include/linux/tee_drv.h | 1 + 2 files changed, 19 insertions(+) --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -219,6 +219,24 @@ struct tee_shm *tee_shm_priv_alloc(struc } EXPORT_SYMBOL_GPL(tee_shm_priv_alloc); +/** + * tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer + * @ctx: Context that allocates the shared memory + * @size: Requested size of shared memory + * + * The returned memory registered in secure world and is suitable to be + * passed as a memory buffer in parameter argument to + * tee_client_invoke_func(). The memory allocated is later freed with a + * call to tee_shm_free(). + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size) +{ + return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); +} +EXPORT_SYMBOL_GPL(tee_shm_alloc_kernel_buf); + struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, size_t length, u32 flags) { --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -317,6 +317,7 @@ void *tee_get_drvdata(struct tee_device * @returns a pointer to 'struct tee_shm' */ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); +struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size); /** * tee_shm_priv_alloc() - Allocate shared memory privately