github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

TEE accept vmalloc()ed buffers for tee_shm_register_kernel_buf()

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmJxgEYaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJfRmBAAqqqcACLZe0kaV5ngiVm6
 JEpBjlKHdArifWg9wH3D/xpV6huJLve2aut9ppZXA6lm2r+Gt9JLkSygGfpBeHiO
 CdzNvUeY2rGAMNROGUNE5aeXOF5Sul32Otey8co9p55GCi7WQEIdZ0DDmGrywcSV
 BPdsaqaw+hAo1PbOHk592NK455lO/WQDkEDYr/ySI8RyKhfys1aa/x0Eq3mJOiCv
 10rOP1sSZlR9WmEqnOh+9YMzsPoctrajhCfJgvKLzyWZl3nkNd3KfjI/6on4TAGp
 huX408otz06UTGTb+IxXAhm2PKXHBewWUOeiEHN/AptDgrWVKN4oL9/Z4RFXULfr
 rMohHkxqMeJ39pzBsHVY8fSuQgu9eNkuImncLXBJbBwU8TKU6eXIqWxXAC/PGoso
 pJEG16E1TM6v7Ld0TzMAEqiWMcDahA27A4NNhEtZUA9yR8AiiwdpnKXmFHmBaKfV
 kSxcvK1xUrEP19AU7Jf+zLRMx44pQ8X9dIoh5mSMjIkwhvsu0CV0xCXJSv/LOznb
 6P0hlyi/lbfb73pFe93a/fW8NwplArIFK77j8WugIZ9V1AwgACi4YGNJs/zqgy+A
 zwuoRgVAWvu8hPpNodMZl2LYPYF8pBOl2jTPtdhqZY75ulxjaYuH7V/H9DE/zQ4L
 GbMMpLS0joTkVx3cM0CFzxE=
 =30Ow
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJz16YACgkQmmx57+YA
 GNlSnA//dzoavHz1PMVA3iMLAk4u9Lm+UKDGrB2vgSzldaEDhged8mVM+//ihU69
 wlMLf8tujiYEcqt63ceFYGNUVtBzollXu/k58U2AnUCheQA5CaACvuroDOlxRpOA
 gdwDCmOfl/fom0evoYuGO/E6J+ICBda5t1lYCxer4w1h8Znl9NlE3M9KJOOiiZXv
 SXVZ4fgp3cdcXIdyEeuMsM+2dv8FnPjT4eHR840lVJ0Gjv8sZGXB79OviX6yyG4D
 Z0QmvtVzRse1qUCBZbyqTDdvSWLlijSjxW7v6GPSAvT7vULYeeZtbv7PwdTCQhEt
 PyqUQd/qGW4LQfferDXsXYykPFTDL9jRia54k54o6e+VNQlpepFMI7isQxRj8EIK
 Qt7Yuri8lZzOFB91BIGWM8h3ZD3rP0f/WR4DESnYOLFlEVRc9cMR4HooXdSg9bhb
 0O8zkuE6XfZwixnXgafoaO/RWJ1VacZSusTM/cCYWk6F7hj1DYewbXE+wxAOmYiu
 S9NerFvu/89o2iIBHC7acoigBC7Uw0Yw+aoZiZU47iHbNwGgjrWkUPZfYOeVB6e9
 p0Khq6jkeuw/K0r/aQ9Gq2Jp9JprBmzhTJs/GCmMlRq6kq14HqyZZZ/PJZbcJQkA
 tfSYeQO6gxYs9fvuB3HFDlyVUuuNf7MgEEnMZoQJsQkUPKSj0m0=
 =pqsk
 -----END PGP SIGNATURE-----

Merge tag 'tee-shm-vmalloc-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

TEE accept vmalloc()ed buffers for tee_shm_register_kernel_buf()

* tag 'tee-shm-vmalloc-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: make tee_shm_register_kernel_buf vmalloc supported

Link: https://lore.kernel.org/r/20220503192916.GA3288817@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-05 15:56:54 +02:00
commit a37de2ad8e
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tee/optee/call.c
View File

@ -362,7 +362,7 @@ int optee_check_mem_type(unsigned long start, size_t num_pages)
* Allow kernel address to register with OP-TEE as kernel
* pages are configured as normal memory only.
*/
if (virt_addr_valid(start))
if (virt_addr_valid(start) || is_vmalloc_addr((void *)start))
return 0;
mmap_read_lock(mm);

35
drivers/tee/tee_shm.c
View File

@ -23,22 +23,37 @@ 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;
kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL);
if (!kiov)
return -ENOMEM;
if (is_vmalloc_addr((void *)start)) {
struct page *page;
for (n = 0; n < page_count; n++) {
kiov[n].iov_base = (void *)(start + n * PAGE_SIZE);
kiov[n].iov_len = PAGE_SIZE;
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;
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);
}
rc = get_kernel_pages(kiov, page_count, 0, pages);
kfree(kiov);
return rc;
}