From patchwork Thu Oct 31 13:07:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 178172 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2816946ill; Thu, 31 Oct 2019 06:08:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvfiwkSKws30FNAY5l6xrf4NLcx7WciXo8puEakq/b6Eoo0jiwA33p/zM8zi/FZ421JiPK X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr5249966wmj.48.1572527299466; Thu, 31 Oct 2019 06:08:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572527299; cv=none; d=google.com; s=arc-20160816; b=cxT+MuLtweNK2+s0qhV14he76C95v0kMOThe2s+uO8ESAoy5ypVtSHXyal9ZaHTCg4 nCivQplq6JY4UT19zRSNO+/yN7F7VMUUkNGK7YDoS+djLr0pfn3nAE6detAL+OlVJoli ZbGgeU0u2vqf74YZp9mrqkxhq3RJVkAUTY9rY3OUqYnzzKzQtyyv01TFD35EWZ3Xielj iNvzbfEBTAVLTxZIiH7BYFYGyrG288l7LCZunftjqoCwbdE7eDpoUGi/owTP4rB4wj2h vYHqDJNJvhE69W2nz+O4YhZ6TYfr+/WrJaXvKDmwk9Zl/+3eiadJ9g8R7YUzDdXXhMB+ ARdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=Cqtq1IsBvtgaQwOqUXmWPFyxcxq2W1VJqxtqgd6DBaU=; b=yF7dpYih5QuExeRWyKWI7yLbGb6nVa2n8d/gLOK+rEX8Q2mRDYDvEcDZFprBNmQGvX QAhMZpFL0xkO4cYJCGib9RyQkJWTZNlX/4sfLVvGWger2xlJav/Qu+qL7XhrHAu7KC4J /xIEFdg2T9ObqyQsTg9dzqWPqrppgU4C5H+wJykM3Is/r9ojCRebNnB0JEGX37c8wlkO O4BEKMFS2pPPDaNxLCX432YNaPbDTrx85J8l49scOWV058oWAwbV/aVA45X8X9bmy2je eK2lLy0oEHrjIQ1V3Lu1rR9K9xT38dlc7m0hfKEPRT1J4VeWsmHOkus1v0i7gA5saD0u xt1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jyvmGq/A"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w15si3390277ejn.88.2019.10.31.06.08.19; Thu, 31 Oct 2019 06:08:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jyvmGq/A"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727220AbfJaNIO (ORCPT + 26 others); Thu, 31 Oct 2019 09:08:14 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38871 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbfJaNIO (ORCPT ); Thu, 31 Oct 2019 09:08:14 -0400 Received: by mail-pg1-f194.google.com with SMTP id j30so548246pgn.5 for ; Thu, 31 Oct 2019 06:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Cqtq1IsBvtgaQwOqUXmWPFyxcxq2W1VJqxtqgd6DBaU=; b=jyvmGq/AZbhexcviyS38XwiyXODIyJx+96AloAXfuIf/GSvQGpp1jbggAPZkwrDfGG +KAqmp9H8ABVy2hahkyNpPuk6spAfau+upjKsCfoeIiay7dAJzn5kzEBzyQfUsuQfYUE 6tp5pziaMcynKbntx2SeIl1FPld3QxkCiwBlWeJLRdGOvkz1LNMu8uNX2GP/tJKTr8mf vexk+iyl4JDS3D8Vysl7IDbMbT9ldnIikCyXLtS+FYmHgBOZSZS1FkeLVor+Qmz3w4pE 7ltY+VlPzSxe4PEhOTL5g3eF8864B0Lc7uehwz8xyTfRJGia7kY14twmsrWz0b4+22ER ozcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Cqtq1IsBvtgaQwOqUXmWPFyxcxq2W1VJqxtqgd6DBaU=; b=nRVcg2nC6SOL+EokH5flxM3kVploO5GrWHzzXUKwIxscC7xT+2yNna2Dx1GM0BnRCf UuNeUFwi3kGo+Wf3wbOkdM8ABu3ylKGTZHjMfWd8BJLPSoshgn+zTGzDu4ki+Qqpev2o Nhxf4BcBvtiw9WF7NrvIxdtTc1sev9eiIfhIMNJGpAjwiVQEUBUJtq5vgXfS76riVUlW 3evUHICsjTvkv2oVPjD8juGJBTHuuuvFegz0jMN8qBhbkQK/PbY7qNemgA81xFNOPyB9 t1wK80zJD+c+3qAa1+1MG7Apn+4iSI/dZ13A2XlsTENs4yyDRbYJkK6d27Hyg3hLSzZM 19FQ== X-Gm-Message-State: APjAAAUgLUTg/wHh2AIMb8Jz1DUUXOqKy0MHW2EvYYCS0pkWJDbt9JWq EYhFERl/BcamP571+ZM07j1pIw== X-Received: by 2002:a17:90a:be07:: with SMTP id a7mr7525331pjs.5.1572527293515; Thu, 31 Oct 2019 06:08:13 -0700 (PDT) Received: from localhost.localdomain ([117.252.69.143]) by smtp.gmail.com with ESMTPSA id 12sm8085940pjm.11.2019.10.31.06.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Oct 2019 06:08:12 -0700 (PDT) From: Sumit Garg To: jens.wiklander@linaro.org, Volodymyr_Babchuk@epam.com Cc: tee-dev@lists.linaro.org, linux-kernel@vger.kernel.org, Sumit Garg Subject: [PATCH] tee: optee: Fix dynamic shm pool allocations Date: Thu, 31 Oct 2019 18:37:54 +0530 Message-Id: <1572527274-21925-1-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case of dynamic shared memory pool, kernel memory allocated using dmabuf_mgr pool needs to be registered with OP-TEE prior to its usage during optee_open_session() or optee_invoke_func(). So fix dmabuf_mgr pool allocations via an additional call to optee_shm_register(). Fixes: 9733b072a12a ("optee: allow to work without static shared memory") Signed-off-by: Sumit Garg --- Depends on patch: https://lkml.org/lkml/2019/7/30/506 that adds support to allow registration of kernel buffers with OP-TEE. drivers/tee/optee/shm_pool.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.7.4 Tested-by: Etienne Carriere diff --git a/drivers/tee/optee/shm_pool.c b/drivers/tee/optee/shm_pool.c index de1d9b8..0332a53 100644 --- a/drivers/tee/optee/shm_pool.c +++ b/drivers/tee/optee/shm_pool.c @@ -17,6 +17,7 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, { unsigned int order = get_order(size); struct page *page; + int rc = 0; page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); if (!page) @@ -26,12 +27,21 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, shm->paddr = page_to_phys(page); shm->size = PAGE_SIZE << order; - return 0; + if (shm->flags & TEE_SHM_DMA_BUF) { + shm->flags |= TEE_SHM_REGISTER; + rc = optee_shm_register(shm->ctx, shm, &page, 1 << order, + (unsigned long)shm->kaddr); + } + + return rc; } static void pool_op_free(struct tee_shm_pool_mgr *poolm, struct tee_shm *shm) { + if (shm->flags & TEE_SHM_DMA_BUF) + optee_shm_unregister(shm->ctx, shm); + free_pages((unsigned long)shm->kaddr, get_order(shm->size)); shm->kaddr = NULL; }