All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ira Weiny <ira.weiny@intel.com>
To: Sumit Garg <sumit.garg@linaro.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@lst.de>,
	linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org,
	linux-mm@kvack.org, Jens Wiklander <jens.wiklander@linaro.org>,
	"Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
	Ira Weiny <ira.weiny@intel.com>,
	John Hubbard <jhubbard@nvidia.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH v2 2/4] tee: Remove vmalloc page support
Date: Fri, 03 Feb 2023 20:06:33 -0800	[thread overview]
Message-ID: <20230203-get_kernel_pages-v2-2-f1dc4af273f1@intel.com> (raw)
In-Reply-To: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@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()

Remove the vmalloc page support from shm_get_kernel_pages().  Replace
with a warn on once.

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>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
 drivers/tee/tee_shm.c | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 27295bda3e0b..527a6eabc03e 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -24,37 +24,25 @@ static void shm_put_kernel_pages(struct page **pages, size_t page_count)
 static int shm_get_kernel_pages(unsigned long start, size_t page_count,
 				struct page **pages)
 {
+	struct kvec *kiov;
 	size_t n;
 	int rc;
 
-	if (is_vmalloc_addr((void *)start)) {
-		struct page *page;
-
-		for (n = 0; n < page_count; n++) {
-			page = vmalloc_to_page((void *)(start + PAGE_SIZE * n));
-			if (!page)
-				return -ENOMEM;
-
-			get_page(page);
-			pages[n] = page;
-		}
-		rc = page_count;
-	} else {
-		struct kvec *kiov;
-
-		kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL);
-		if (!kiov)
-			return -ENOMEM;
+	if (WARN_ON_ONCE(is_vmalloc_addr((void *)start)))
+		return -EINVAL;
 
-		for (n = 0; n < page_count; n++) {
-			kiov[n].iov_base = (void *)(start + n * PAGE_SIZE);
-			kiov[n].iov_len = PAGE_SIZE;
-		}
+	kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL);
+	if (!kiov)
+		return -ENOMEM;
 
-		rc = get_kernel_pages(kiov, page_count, 0, pages);
-		kfree(kiov);
+	for (n = 0; n < page_count; n++) {
+		kiov[n].iov_base = (void *)(start + n * PAGE_SIZE);
+		kiov[n].iov_len = PAGE_SIZE;
 	}
 
+	rc = get_kernel_pages(kiov, page_count, 0, pages);
+	kfree(kiov);
+
 	return rc;
 }
 

-- 
2.39.1

  parent reply	other threads:[~2023-02-04  4:07 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-04  4:06 [PATCH v2 0/4] Remove get_kernel_pages() Ira Weiny
2023-02-04  4:06 ` [PATCH v2 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings Ira Weiny
2023-02-04  6:50   ` Christoph Hellwig
2023-02-04 18:37     ` Ira Weiny
2023-02-10 21:59   ` Andrew Morton
2023-02-13 15:53   ` Jens Wiklander
2023-02-04  4:06 ` Ira Weiny [this message]
2023-02-04  6:51   ` [PATCH v2 2/4] tee: Remove vmalloc page support Christoph Hellwig
2023-02-06  6:16   ` Sumit Garg
2023-02-13 15:54   ` Jens Wiklander
2023-02-04  4:06 ` [PATCH v2 3/4] tee: Remove call to get_kernel_pages() Ira Weiny
2023-02-04  6:51   ` Christoph Hellwig
2023-02-06  6:17   ` Sumit Garg
2023-02-13 15:55   ` Jens Wiklander
2023-02-04  4:06 ` [PATCH v2 4/4] mm: Remove get_kernel_pages() Ira Weiny
2023-02-04  6:51   ` Christoph Hellwig
2023-02-06  6:17   ` Sumit Garg
2023-02-10 21:59   ` Andrew Morton
2023-02-13 15:55   ` Jens Wiklander
2023-02-04 19:50 ` [PATCH v2 0/4] " Linus Torvalds
2023-02-06  6:22 ` Sumit Garg
2023-02-07 16:19   ` Ira Weiny
2023-02-10 20:27     ` Ira Weiny
2023-02-13 15:02       ` Jens Wiklander
2023-02-13 18:53         ` Ira Weiny
2023-02-13 19:02         ` Linus Torvalds
2023-02-14  8:53           ` Jens Wiklander

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=20230203-get_kernel_pages-v2-2-f1dc4af273f1@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=jhubbard@nvidia.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.