Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

misc: vmw_vmci: Remove unused qpair functions

vmci_qpair_dequeue(), vmci_qpair_enqueue() and vmci_qpair_peek()
were added in 2013 by
commit 06164d2b72aa ("VMCI: queue pairs implementation.")

but have remained unused.

Remove them.

(The iov version of those functions is used)

Signed-off-by: "Dr. David Alan Gilbert" <linux@treblig.org>
Link: https://lore.kernel.org/r/20250614010344.636076-4-linux@treblig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dr. David Alan Gilbert and committed by
Greg Kroah-Hartman
ea6895f0 2ce80bc1

-139
-133
drivers/misc/vmw_vmci/vmci_queue_pair.c
··· 3023 3023 EXPORT_SYMBOL_GPL(vmci_qpair_consume_buf_ready); 3024 3024 3025 3025 /* 3026 - * vmci_qpair_enqueue() - Throw data on the queue. 3027 - * @qpair: Pointer to the queue pair struct. 3028 - * @buf: Pointer to buffer containing data 3029 - * @buf_size: Length of buffer. 3030 - * @buf_type: Buffer type (Unused). 3031 - * 3032 - * This is the client interface for enqueueing data into the queue. 3033 - * Returns number of bytes enqueued or < 0 on error. 3034 - */ 3035 - ssize_t vmci_qpair_enqueue(struct vmci_qp *qpair, 3036 - const void *buf, 3037 - size_t buf_size, 3038 - int buf_type) 3039 - { 3040 - ssize_t result; 3041 - struct iov_iter from; 3042 - struct kvec v = {.iov_base = (void *)buf, .iov_len = buf_size}; 3043 - 3044 - if (!qpair || !buf) 3045 - return VMCI_ERROR_INVALID_ARGS; 3046 - 3047 - iov_iter_kvec(&from, ITER_SOURCE, &v, 1, buf_size); 3048 - 3049 - qp_lock(qpair); 3050 - 3051 - do { 3052 - result = qp_enqueue_locked(qpair->produce_q, 3053 - qpair->consume_q, 3054 - qpair->produce_q_size, 3055 - &from); 3056 - 3057 - if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY && 3058 - !qp_wait_for_ready_queue(qpair)) 3059 - result = VMCI_ERROR_WOULD_BLOCK; 3060 - 3061 - } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY); 3062 - 3063 - qp_unlock(qpair); 3064 - 3065 - return result; 3066 - } 3067 - EXPORT_SYMBOL_GPL(vmci_qpair_enqueue); 3068 - 3069 - /* 3070 - * vmci_qpair_dequeue() - Get data from the queue. 3071 - * @qpair: Pointer to the queue pair struct. 3072 - * @buf: Pointer to buffer for the data 3073 - * @buf_size: Length of buffer. 3074 - * @buf_type: Buffer type (Unused). 3075 - * 3076 - * This is the client interface for dequeueing data from the queue. 3077 - * Returns number of bytes dequeued or < 0 on error. 3078 - */ 3079 - ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair, 3080 - void *buf, 3081 - size_t buf_size, 3082 - int buf_type) 3083 - { 3084 - ssize_t result; 3085 - struct iov_iter to; 3086 - struct kvec v = {.iov_base = buf, .iov_len = buf_size}; 3087 - 3088 - if (!qpair || !buf) 3089 - return VMCI_ERROR_INVALID_ARGS; 3090 - 3091 - iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size); 3092 - 3093 - qp_lock(qpair); 3094 - 3095 - do { 3096 - result = qp_dequeue_locked(qpair->produce_q, 3097 - qpair->consume_q, 3098 - qpair->consume_q_size, 3099 - &to, true); 3100 - 3101 - if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY && 3102 - !qp_wait_for_ready_queue(qpair)) 3103 - result = VMCI_ERROR_WOULD_BLOCK; 3104 - 3105 - } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY); 3106 - 3107 - qp_unlock(qpair); 3108 - 3109 - return result; 3110 - } 3111 - EXPORT_SYMBOL_GPL(vmci_qpair_dequeue); 3112 - 3113 - /* 3114 - * vmci_qpair_peek() - Peek at the data in the queue. 3115 - * @qpair: Pointer to the queue pair struct. 3116 - * @buf: Pointer to buffer for the data 3117 - * @buf_size: Length of buffer. 3118 - * @buf_type: Buffer type (Unused on Linux). 3119 - * 3120 - * This is the client interface for peeking into a queue. (I.e., 3121 - * copy data from the queue without updating the head pointer.) 3122 - * Returns number of bytes dequeued or < 0 on error. 3123 - */ 3124 - ssize_t vmci_qpair_peek(struct vmci_qp *qpair, 3125 - void *buf, 3126 - size_t buf_size, 3127 - int buf_type) 3128 - { 3129 - struct iov_iter to; 3130 - struct kvec v = {.iov_base = buf, .iov_len = buf_size}; 3131 - ssize_t result; 3132 - 3133 - if (!qpair || !buf) 3134 - return VMCI_ERROR_INVALID_ARGS; 3135 - 3136 - iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size); 3137 - 3138 - qp_lock(qpair); 3139 - 3140 - do { 3141 - result = qp_dequeue_locked(qpair->produce_q, 3142 - qpair->consume_q, 3143 - qpair->consume_q_size, 3144 - &to, false); 3145 - 3146 - if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY && 3147 - !qp_wait_for_ready_queue(qpair)) 3148 - result = VMCI_ERROR_WOULD_BLOCK; 3149 - 3150 - } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY); 3151 - 3152 - qp_unlock(qpair); 3153 - 3154 - return result; 3155 - } 3156 - EXPORT_SYMBOL_GPL(vmci_qpair_peek); 3157 - 3158 - /* 3159 3026 * vmci_qpair_enquev() - Throw data on the queue using iov. 3160 3027 * @qpair: Pointer to the queue pair struct. 3161 3028 * @iov: Pointer to buffer containing data
-6
include/linux/vmw_vmci_api.h
··· 60 60 s64 vmci_qpair_produce_buf_ready(const struct vmci_qp *qpair); 61 61 s64 vmci_qpair_consume_free_space(const struct vmci_qp *qpair); 62 62 s64 vmci_qpair_consume_buf_ready(const struct vmci_qp *qpair); 63 - ssize_t vmci_qpair_enqueue(struct vmci_qp *qpair, 64 - const void *buf, size_t buf_size, int mode); 65 - ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair, 66 - void *buf, size_t buf_size, int mode); 67 - ssize_t vmci_qpair_peek(struct vmci_qp *qpair, void *buf, size_t buf_size, 68 - int mode); 69 63 ssize_t vmci_qpair_enquev(struct vmci_qp *qpair, 70 64 struct msghdr *msg, size_t iov_size, int mode); 71 65 ssize_t vmci_qpair_dequev(struct vmci_qp *qpair,