From patchwork Mon Jun 10 12:08:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 166311 Delivered-To: patches@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp949354ilk; Mon, 10 Jun 2019 05:08:59 -0700 (PDT) X-Received: by 2002:a17:90a:23ce:: with SMTP id g72mr21102650pje.77.1560168539018; Mon, 10 Jun 2019 05:08:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560168539; cv=none; d=google.com; s=arc-20160816; b=EOtalYkXGVr2DUvBDCVD+QExtjoumiRGdTwadZXQw6rHbmOziUIM2zTdmLQVjTD+M+ jYBt/vJDt6nJHPI3j79xtHByv9MpL+DWSZLzpQ5iIl/1DVi+2Ic1AY4wxUZT2inTW+9I UnJakWeHJERFGXM/QU/vc666YGPg9XI7YW2n6cEuMvnNXqhyxcemMIXCJ7SA/P/FmOi6 BnD+Chr/8OMKOSrLTdiocyIpfPux6lZQxmKmNFmY5xab5XCX9+6LiefKMIk83WVF5gF3 jiWKYhsGrI4dAvCW26Yq+TCfDMeZ5V9Fn8TVjiHGNe7yX3I4sOZY2PE5uov2vmLx8aTQ MGEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9XWEUuRS3wPrwIfibHck48S9qLV9JnhjzVFmaJ7/rHk=; b=XfWK+5VJcC66h+P70A8YdYHCoDbh8kU5C6B5rfI0lqNje6kJwP+74Dp3pZmt9pGrhL M4SWvD1Q3OB/ectzBC7dL/zV0xoKeUuKAvlcoyCakcvMlCLvhfOz0i2T0yyaf7vWO3nF TUg7QFJ2ygCJzDjsZ8PLFssmMZm6MS9WfKW+08rxto5zvFrWCICP1V/8aEIORFy8XKH6 sa84bzrHygkbodDTW9aLlAJwv/KXvCXW7cxHVEkTWXNGyfCK4Dz/3nKAGmLQDPtB+dex P2I/ZWEgi3QAeMW0VJ3al3N3S0DNNQe6xYfCwPTO2wNeDYIkLJucYP5q/Maofa8JDYOl fwiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IZ1hAjtg; spf=pass (google.com: domain of sumit.garg@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=sumit.garg@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f9sor11423332plr.31.2019.06.10.05.08.58 for (Google Transport Security); Mon, 10 Jun 2019 05:08:59 -0700 (PDT) Received-SPF: pass (google.com: domain of sumit.garg@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IZ1hAjtg; spf=pass (google.com: domain of sumit.garg@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=sumit.garg@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9XWEUuRS3wPrwIfibHck48S9qLV9JnhjzVFmaJ7/rHk=; b=IZ1hAjtgssPpiPAfjiphO2ulb2qgPEmXp89CXn3FdP6NzeYFbpL/M8hSZf2/rZ6BEB 52kX0nybHX0QGOcEvvDuhDcUl41XRVcsoZEI1Zw1i2RLjdYUVFYKEAJ3leaLgbjag1X1 V4ANCfn5G5HbcZkiU4jE2rgP85i6pB4vc9fYuhc8q9fwuJmN6wyVZpeAiL/p91jLF+Lq wW66qOBA0ikQ5zB3YAv57RGjAAHoTu29PuBBO+nVicFGQbI6p/uGeTgjWebU2e3dVdqM KPzO0ZvAVHEasOmwZWp5zpubPcofqH57KQ55AKlKN2AajR2RvWCBi207G87jPmiXJ6G/ udOQ== 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:in-reply-to :references; bh=9XWEUuRS3wPrwIfibHck48S9qLV9JnhjzVFmaJ7/rHk=; b=aWGPh/ROF97Mq7iA2U0HrQZlXsZR1I9vTuluZ/Y91AuMS9C2ER442Fv7O1A736mgv0 hbMRv3hy/0enG9YVJy7TUY5gbXgxEcrd4j9XKGlgfJpRniKdyAoKnQXky/ShqU4f/9QC e7JOf2cVtWZsN/U2oAI1cLogFOL2cuIHTcbEq6IlKLKTB+9X1GCuDBwEL/H3mWpK7keU zR/7SX5kTf+K8acnp0vkWlxXcZqcXTAavmIkA1RT2XpMkCb87Ph39hc5nJ4BlYaX7zqE 4UoClJ37CbhUITpS3PlSljgdAO0Z9bx6tIRVySdG6ygzWoXNg2yFcWaBA1hs5g+rRdST ppVw== X-Gm-Message-State: APjAAAXCg2avrltTsBSBVjPBks+A+rLD2i5QAEK0IsuB2sm7WzQxSu56 wl/9Ph4KoV+lobieewPm6NT2+GDBQtk2+Q== X-Google-Smtp-Source: APXvYqxSSPV2pQyrYXbpd01cMTF933Lfi2k8OWyg0IBm/6FhiW6P5b7L7R3iXqeZSEb6nSB81M3/CQ== X-Received: by 2002:a17:902:b43:: with SMTP id 61mr71871420plq.322.1560168538750; Mon, 10 Jun 2019 05:08:58 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([117.196.234.139]) by smtp.gmail.com with ESMTPSA id f7sm2452961pfd.43.2019.06.10.05.08.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jun 2019 05:08:58 -0700 (PDT) From: Sumit Garg To: daniel.thompson@linaro.org Cc: patches@linaro.org, Sumit Garg Subject: [PATCH 2/7] tee: enable support to register kernel memory Date: Mon, 10 Jun 2019 17:38:30 +0530 Message-Id: <1560168515-32714-3-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560168515-32714-1-git-send-email-sumit.garg@linaro.org> References: <1560168515-32714-1-git-send-email-sumit.garg@linaro.org> Enable support to register kernel memory reference with TEE. This change will allow TEE bus drivers to register memory references. Signed-off-by: Sumit Garg --- drivers/tee/tee_shm.c | 15 +++++++++++++-- include/linux/tee_drv.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index a20a043..2bb9a18 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "tee_private.h" /* extra references appended to shm object for registered shared memory */ @@ -248,13 +249,14 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, { struct tee_device *teedev = ctx->teedev; const u32 req_flags = TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED; + const u32 req_ker_flags = TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED; struct tee_shm *shm; void *ret; int rc; int num_pages; unsigned long start; - if (flags != req_flags) + if (flags != req_flags && flags != req_ker_flags) return ERR_PTR(-ENOTSUPP); if (!tee_device_get(teedev)) @@ -288,7 +290,16 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, goto err; } - rc = get_user_pages_fast(start, num_pages, 1, shm->pages); + if (flags & TEE_SHM_USER_MAPPED) { + rc = get_user_pages_fast(start, num_pages, 1, shm->pages); + } else { + const struct kvec kiov = { + .iov_base = (void *)start, + .iov_len = PAGE_SIZE + }; + + rc = get_kernel_pages(&kiov, num_pages, 1, shm->pages); + } if (rc > 0) shm->num_pages = rc; if (rc != num_pages) { diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 805163e..ec2aab2 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -35,6 +35,7 @@ #define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */ #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ +#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ struct device; struct tee_device;