From: ira.weiny@intel.com
To: Jens Wiklander <jens.wiklander@linaro.org>,
Sumit Garg <sumit.garg@linaro.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Ira Weiny <ira.weiny@intel.com>,
Al Viro <viro@zeniv.linux.org.uk>,
"Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
Christoph Hellwig <hch@lst.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 3/4] tee: Remove call to get_kernel_pages()
Date: Sat, 1 Oct 2022 17:23:25 -0700 [thread overview]
Message-ID: <20221002002326.946620-4-ira.weiny@intel.com> (raw)
In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The kernel pages used by shm_get_kernel_pages() are allocated using
GFP_KERNEL through the following call stack:
trusted_instantiate()
trusted_payload_alloc() -> GFP_KERNEL
<trusted key op>
tee_shm_register_kernel_buf()
register_shm_helper()
shm_get_kernel_pages()
Where <trusted key op> is one of:
trusted_key_unseal()
trusted_key_get_random()
trusted_key_seal()
Because the pages can't be from highmem get_kernel_pages() boils down to
a get_page() call.
Remove the get_kernel_pages() call and open code the get_page().
In case a kmap page does slip through warn on once for a kmap address.
Cc: Jens Wiklander <jens.wiklander@linaro.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
drivers/tee/tee_shm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 527a6eabc03e..45e6ff1a452e 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -11,6 +11,7 @@
#include <linux/tee_drv.h>
#include <linux/uaccess.h>
#include <linux/uio.h>
+#include <linux/highmem.h>
#include "tee_private.h"
static void shm_put_kernel_pages(struct page **pages, size_t page_count)
@@ -26,9 +27,9 @@ static int shm_get_kernel_pages(unsigned long start, size_t page_count,
{
struct kvec *kiov;
size_t n;
- int rc;
- if (WARN_ON_ONCE(is_vmalloc_addr((void *)start)))
+ if (WARN_ON_ONCE(is_vmalloc_addr((void *)start) ||
+ is_kmap_addr((void *)start)))
return -EINVAL;
kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL);
@@ -38,12 +39,12 @@ static int shm_get_kernel_pages(unsigned long start, size_t page_count,
for (n = 0; n < page_count; n++) {
kiov[n].iov_base = (void *)(start + n * PAGE_SIZE);
kiov[n].iov_len = PAGE_SIZE;
+ pages[n] = virt_to_page(kiov[n].iov_base);
+ get_page(pages[n]);
}
-
- rc = get_kernel_pages(kiov, page_count, 0, pages);
kfree(kiov);
- return rc;
+ return page_count;
}
static void release_registered_pages(struct tee_shm *shm)
--
2.37.2
next prev parent reply other threads:[~2022-10-02 0:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 0:23 [PATCH 0/4] Remove get_kernel_pages() ira.weiny
2022-10-02 0:23 ` [PATCH 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings ira.weiny
2022-10-02 0:23 ` [PATCH 2/4] tee: Remove vmalloc page support ira.weiny
2022-10-03 6:41 ` Jens Wiklander
2022-10-03 6:57 ` Sumit Garg
2022-10-05 3:28 ` Phil Chang (張世勳)
2022-10-06 6:23 ` Sumit Garg
2022-10-06 18:19 ` Ira Weiny
2022-10-06 18:20 ` Linus Torvalds
2022-10-07 8:12 ` Jens Wiklander
2022-12-16 0:41 ` Ira Weiny
2022-12-16 5:09 ` Sumit Garg
2022-12-16 8:45 ` Sumit Garg
2022-12-16 7:06 ` Christoph Hellwig
2022-10-10 7:42 ` Christoph Hellwig
2022-10-10 17:20 ` Linus Torvalds
2022-10-10 17:57 ` Al Viro
2022-10-02 0:23 ` ira.weiny [this message]
2022-10-02 0:46 ` [PATCH 3/4] tee: Remove call to get_kernel_pages() Al Viro
2022-10-02 2:30 ` Ira Weiny
2022-10-03 7:17 ` Christoph Hellwig
2022-10-03 15:02 ` Ira Weiny
2022-10-02 0:23 ` [PATCH 4/4] mm: Remove get_kernel_pages() ira.weiny
2022-10-03 20:28 ` John Hubbard
2022-10-03 9:25 ` [PATCH 0/4] " Sumit Garg
2022-10-03 15:22 ` Ira Weiny
2022-10-04 6:32 ` Sumit Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221002002326.946620-4-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=akpm@linux-foundation.org \
--cc=fmdefrancesco@gmail.com \
--cc=hch@lst.de \
--cc=jens.wiklander@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=sumit.garg@linaro.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).