From patchwork Wed Jun 19 15:14:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Dragazis X-Patchwork-Id: 54969 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ACD351C402; Wed, 19 Jun 2019 17:16:26 +0200 (CEST) Received: from mx0.arrikto.com (mx0.arrikto.com [212.71.252.59]) by dpdk.org (Postfix) with ESMTP id C99E41C393 for ; Wed, 19 Jun 2019 17:15:42 +0200 (CEST) Received: from troi.prod.arr (mail.arr [10.99.0.5]) by mx0.arrikto.com (Postfix) with ESMTP id 884F0182013; Wed, 19 Jun 2019 18:15:42 +0300 (EEST) Received: from localhost.localdomain (unknown [10.89.50.133]) by troi.prod.arr (Postfix) with ESMTPSA id C68A1394; Wed, 19 Jun 2019 18:15:41 +0300 (EEST) From: Nikos Dragazis To: dev@dpdk.org Cc: Maxime Coquelin , Tiwei Bie , Zhihong Wang , Stefan Hajnoczi , Wei Wang , Stojaczyk Dariusz , Vangelis Koukis Date: Wed, 19 Jun 2019 18:14:40 +0300 Message-Id: <1560957293-17294-16-git-send-email-ndragazis@arrikto.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> References: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> Subject: [dpdk-dev] [PATCH 15/28] vhost: remove main fd parameter from msg handlers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" After refactoring the socket I/O and the vhost-user map/unmap operations in previous patches, there is no need for the connection fds in the core vhost-user code. This patch removes the connection fds from the core vhost-user code. Connection fds are used for socket I/O between master and slave. However, this mechanism is transport-specific. Other transports may use other mechanisms for the master/slave communication. Therefore, the connection fds are moved into the AF_UNIX transport code. Signed-off-by: Nikos Dragazis --- lib/librte_vhost/trans_af_unix.c | 2 +- lib/librte_vhost/vhost_user.c | 82 ++++++++++++++-------------------------- lib/librte_vhost/vhost_user.h | 2 +- 3 files changed, 30 insertions(+), 56 deletions(-) diff --git a/lib/librte_vhost/trans_af_unix.c b/lib/librte_vhost/trans_af_unix.c index 35b1c45..a451880 100644 --- a/lib/librte_vhost/trans_af_unix.c +++ b/lib/librte_vhost/trans_af_unix.c @@ -374,7 +374,7 @@ vhost_user_read_cb(int connfd, void *dat, int *remove) goto err; } - ret = vhost_user_msg_handler(conn->device.vid, connfd, &msg); + ret = vhost_user_msg_handler(conn->device.vid, &msg); if (ret < 0) { err: close(connfd); diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index acb1135..d3c9c5f 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -151,16 +151,14 @@ vhost_backend_cleanup(struct virtio_net *dev) */ static int vhost_user_set_owner(struct virtio_net **pdev __rte_unused, - struct VhostUserMsg *msg __rte_unused, - int main_fd __rte_unused) + struct VhostUserMsg *msg __rte_unused) { return RTE_VHOST_MSG_RESULT_OK; } static int vhost_user_reset_owner(struct virtio_net **pdev, - struct VhostUserMsg *msg __rte_unused, - int main_fd __rte_unused) + struct VhostUserMsg *msg __rte_unused) { struct virtio_net *dev = *pdev; vhost_destroy_device_notify(dev); @@ -174,8 +172,7 @@ vhost_user_reset_owner(struct virtio_net **pdev, * The features that we support are requested. */ static int -vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint64_t features = 0; @@ -193,8 +190,7 @@ vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg, * The queue number that we support are requested. */ static int -vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint32_t queue_num = 0; @@ -212,8 +208,7 @@ vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg, * We receive the negotiated features supported by us and the virtio device. */ static int -vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint64_t features = msg->payload.u64; @@ -295,8 +290,7 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg, */ static int vhost_user_set_vring_num(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index]; @@ -665,8 +659,7 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) * This function then converts these to our address space. */ static int -vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_virtqueue *vq; @@ -703,8 +696,7 @@ vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg, */ static int vhost_user_set_vring_base(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index]; @@ -857,8 +849,7 @@ vhost_memory_changed(struct VhostUserMemory *new, } static int -vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct VhostUserMemory *memory = &msg->payload.memory; @@ -1019,8 +1010,7 @@ virtio_is_ready(struct virtio_net *dev) } static int -vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_vring_file file; @@ -1044,8 +1034,7 @@ vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg, } static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)) close(msg->fds[0]); @@ -1055,8 +1044,7 @@ static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused, } static int -vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_vring_file file; @@ -1111,8 +1099,7 @@ free_zmbufs(struct vhost_virtqueue *vq) */ static int vhost_user_get_vring_base(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index]; @@ -1182,8 +1169,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev, */ static int vhost_user_set_vring_enable(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; int enable = (int)msg->payload.state.num; @@ -1215,8 +1201,7 @@ vhost_user_set_vring_enable(struct virtio_net **pdev, static int vhost_user_get_protocol_features(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint64_t features, protocol_features; @@ -1242,8 +1227,7 @@ vhost_user_get_protocol_features(struct virtio_net **pdev, static int vhost_user_set_protocol_features(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint64_t protocol_features = msg->payload.u64; @@ -1264,8 +1248,7 @@ vhost_user_set_protocol_features(struct virtio_net **pdev, } static int -vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; int fd = msg->fds[0]; @@ -1312,8 +1295,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, } static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { close(msg->fds[0]); RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n"); @@ -1330,8 +1312,7 @@ static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused, * a flag 'broadcast_rarp' to let rte_vhost_dequeue_burst() inject it. */ static int -vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; uint8_t *mac = (uint8_t *)&msg->payload.u64; @@ -1361,8 +1342,7 @@ vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg, } static int -vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; if (msg->payload.u64 < VIRTIO_MIN_MTU || @@ -1379,8 +1359,7 @@ vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg, } static int -vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg) { int ret; struct virtio_net *dev = *pdev; @@ -1443,8 +1422,7 @@ is_vring_iotlb_invalidate(struct vhost_virtqueue *vq, } static int -vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; struct vhost_iotlb_msg *imsg = &msg->payload.iotlb; @@ -1490,8 +1468,7 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg, static int vhost_user_set_postcopy_advise(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd __rte_unused) + struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; #ifdef RTE_LIBRTE_VHOST_POSTCOPY @@ -1527,8 +1504,7 @@ vhost_user_set_postcopy_advise(struct virtio_net **pdev, static int vhost_user_set_postcopy_listen(struct virtio_net **pdev, - struct VhostUserMsg *msg __rte_unused, - int main_fd __rte_unused) + struct VhostUserMsg *msg __rte_unused) { struct virtio_net *dev = *pdev; @@ -1543,8 +1519,7 @@ vhost_user_set_postcopy_listen(struct virtio_net **pdev, } static int -vhost_user_postcopy_end(struct virtio_net **pdev, struct VhostUserMsg *msg, - int main_fd __rte_unused) +vhost_user_postcopy_end(struct virtio_net **pdev, struct VhostUserMsg *msg) { struct virtio_net *dev = *pdev; @@ -1562,8 +1537,7 @@ vhost_user_postcopy_end(struct virtio_net **pdev, struct VhostUserMsg *msg, } typedef int (*vhost_message_handler_t)(struct virtio_net **pdev, - struct VhostUserMsg *msg, - int main_fd); + struct VhostUserMsg *msg); static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = { [VHOST_USER_NONE] = NULL, [VHOST_USER_GET_FEATURES] = vhost_user_get_features, @@ -1681,7 +1655,7 @@ vhost_user_unlock_all_queue_pairs(struct virtio_net *dev) } int -vhost_user_msg_handler(int vid, int fd, const struct VhostUserMsg *msg_) +vhost_user_msg_handler(int vid, const struct VhostUserMsg *msg_) { struct VhostUserMsg msg = *msg_; /* copy so we can build the reply */ struct virtio_net *dev; @@ -1785,7 +1759,7 @@ vhost_user_msg_handler(int vid, int fd, const struct VhostUserMsg *msg_) if (request > VHOST_USER_NONE && request < VHOST_USER_MAX) { if (!vhost_message_handlers[request]) goto skip_to_post_handle; - ret = vhost_message_handlers[request](&dev, &msg, fd); + ret = vhost_message_handlers[request](&dev, &msg); switch (ret) { case RTE_VHOST_MSG_RESULT_ERR: diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h index 200e47b..4cc912d 100644 --- a/lib/librte_vhost/vhost_user.h +++ b/lib/librte_vhost/vhost_user.h @@ -146,7 +146,7 @@ typedef struct VhostUserMsg { /* vhost_user.c */ -int vhost_user_msg_handler(int vid, int fd, const struct VhostUserMsg *msg); +int vhost_user_msg_handler(int vid, const struct VhostUserMsg *msg); int add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg, uint64_t page_size);