Commit dd8dc442 authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Greg Kroah-Hartman

misc/vmw_vmci: Use kmap_local_page() in vmci_queue_pair.c

kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as
the mapping space is restricted and protected by a global lock for
synchronization and (2) it also requires global TLB invalidation when the
kmap’s pool wraps and it might block when the mapping space is fully
utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take
page faults, and can be called from any context (including interrupts).
It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore,
the tasks can be preempted and, when they are scheduled to run again, the
kernel virtual addresses are restored and still valid.

Since its use in vmci_queue_pair.c is safe everywhere, replace kmap() with
kmap_local_page().

Cc: "Venkataramanan, Anirudh" <anirudh.venkataramanan@intel.com>
Suggested-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20220901135714.16481-1-fmdefrancesco@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2699e6e9
...@@ -324,7 +324,7 @@ static void *qp_alloc_queue(u64 size, u32 flags) ...@@ -324,7 +324,7 @@ static void *qp_alloc_queue(u64 size, u32 flags)
/* /*
* Copies from a given buffer or iovector to a VMCI Queue. Uses * Copies from a given buffer or iovector to a VMCI Queue. Uses
* kmap()/kunmap() to dynamically map/unmap required portions of the queue * kmap_local_page() to dynamically map required portions of the queue
* by traversing the offset -> page translation structure for the queue. * by traversing the offset -> page translation structure for the queue.
* Assumes that offset + size does not wrap around in the queue. * Assumes that offset + size does not wrap around in the queue.
*/ */
...@@ -345,7 +345,7 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue, ...@@ -345,7 +345,7 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue,
size_t to_copy; size_t to_copy;
if (kernel_if->host) if (kernel_if->host)
va = kmap(kernel_if->u.h.page[page_index]); va = kmap_local_page(kernel_if->u.h.page[page_index]);
else else
va = kernel_if->u.g.vas[page_index + 1]; va = kernel_if->u.g.vas[page_index + 1];
/* Skip header. */ /* Skip header. */
...@@ -359,12 +359,12 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue, ...@@ -359,12 +359,12 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue,
if (!copy_from_iter_full((u8 *)va + page_offset, to_copy, if (!copy_from_iter_full((u8 *)va + page_offset, to_copy,
from)) { from)) {
if (kernel_if->host) if (kernel_if->host)
kunmap(kernel_if->u.h.page[page_index]); kunmap_local(va);
return VMCI_ERROR_INVALID_ARGS; return VMCI_ERROR_INVALID_ARGS;
} }
bytes_copied += to_copy; bytes_copied += to_copy;
if (kernel_if->host) if (kernel_if->host)
kunmap(kernel_if->u.h.page[page_index]); kunmap_local(va);
} }
return VMCI_SUCCESS; return VMCI_SUCCESS;
...@@ -372,7 +372,7 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue, ...@@ -372,7 +372,7 @@ static int qp_memcpy_to_queue_iter(struct vmci_queue *queue,
/* /*
* Copies to a given buffer or iovector from a VMCI Queue. Uses * Copies to a given buffer or iovector from a VMCI Queue. Uses
* kmap()/kunmap() to dynamically map/unmap required portions of the queue * kmap_local_page() to dynamically map required portions of the queue
* by traversing the offset -> page translation structure for the queue. * by traversing the offset -> page translation structure for the queue.
* Assumes that offset + size does not wrap around in the queue. * Assumes that offset + size does not wrap around in the queue.
*/ */
...@@ -393,7 +393,7 @@ static int qp_memcpy_from_queue_iter(struct iov_iter *to, ...@@ -393,7 +393,7 @@ static int qp_memcpy_from_queue_iter(struct iov_iter *to,
int err; int err;
if (kernel_if->host) if (kernel_if->host)
va = kmap(kernel_if->u.h.page[page_index]); va = kmap_local_page(kernel_if->u.h.page[page_index]);
else else
va = kernel_if->u.g.vas[page_index + 1]; va = kernel_if->u.g.vas[page_index + 1];
/* Skip header. */ /* Skip header. */
...@@ -407,12 +407,12 @@ static int qp_memcpy_from_queue_iter(struct iov_iter *to, ...@@ -407,12 +407,12 @@ static int qp_memcpy_from_queue_iter(struct iov_iter *to,
err = copy_to_iter((u8 *)va + page_offset, to_copy, to); err = copy_to_iter((u8 *)va + page_offset, to_copy, to);
if (err != to_copy) { if (err != to_copy) {
if (kernel_if->host) if (kernel_if->host)
kunmap(kernel_if->u.h.page[page_index]); kunmap_local(va);
return VMCI_ERROR_INVALID_ARGS; return VMCI_ERROR_INVALID_ARGS;
} }
bytes_copied += to_copy; bytes_copied += to_copy;
if (kernel_if->host) if (kernel_if->host)
kunmap(kernel_if->u.h.page[page_index]); kunmap_local(va);
} }
return VMCI_SUCCESS; return VMCI_SUCCESS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment