net/virtio: fix device configure without jumbo Rx offload

[dpdk.git] / drivers / net / virtio / virtio_user / vhost_user.c

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index 088aae3..aec6664 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -148,38 +148,43 @@ vhost_user_read(int fd, struct vhost_user_msg *msg)
        int ret, sz_hdr = VHOST_USER_HDR_SIZE, sz_payload;
 
        ret = recv(fd, (void *)msg, sz_hdr, 0);
-       if (ret < sz_hdr) {
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "Failed to recv msg header: %s", strerror(errno));
+               return -1;
+       } else if (ret < sz_hdr) {
                PMD_DRV_LOG(ERR, "Failed to recv msg hdr: %d instead of %d.",
                            ret, sz_hdr);
-               goto fail;
+               return -1;
        }
 
        /* validate msg flags */
        if (msg->flags != (valid_flags)) {
-               PMD_DRV_LOG(ERR, "Failed to recv msg: flags %x instead of %x.",
+               PMD_DRV_LOG(ERR, "Failed to recv msg: flags 0x%x instead of 0x%x.",
                            msg->flags, valid_flags);
-               goto fail;
+               return -1;
        }
 
        sz_payload = msg->size;
 
-       if ((size_t)sz_payload > sizeof(msg->payload))
-               goto fail;
+       if ((size_t)sz_payload > sizeof(msg->payload)) {
+               PMD_DRV_LOG(ERR, "Payload size overflow, header says %d but max %zu\n",
+                               sz_payload, sizeof(msg->payload));
+               return -1;
+       }
 
        if (sz_payload) {
                ret = recv(fd, (void *)((char *)msg + sz_hdr), sz_payload, 0);
-               if (ret < sz_payload) {
-                       PMD_DRV_LOG(ERR,
-                               "Failed to recv msg payload: %d instead of %d.",
+               if (ret < 0) {
+                       PMD_DRV_LOG(ERR, "Failed to recv msg payload: %s", strerror(errno));
+                       return -1;
+               } else if (ret < sz_payload) {
+                       PMD_DRV_LOG(ERR, "Failed to recv msg payload: %d instead of %u.",
                                ret, msg->size);
-                       goto fail;
+                       return -1;
                }
        }
 
        return 0;
-
-fail:
-       return -1;
 }
 
 static int
@@ -826,6 +831,7 @@ vhost_user_setup(struct virtio_user_dev *dev)
        dev->backend_data = data;
 
        data->vhostfd = -1;
+       data->listenfd = -1;
 
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd < 0) {
@@ -945,13 +951,15 @@ vhost_user_update_link_state(struct virtio_user_dev *dev)
                r = recv(data->vhostfd, buf, 128, MSG_PEEK);
                if (r == 0 || (r < 0 && errno != EAGAIN)) {
                        dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
-                       PMD_DRV_LOG(ERR, "virtio-user port %u is down", dev->port_id);
+                       PMD_DRV_LOG(ERR, "virtio-user port %u is down", dev->hw.port_id);
 
                        /* This function could be called in the process
                         * of interrupt handling, callback cannot be
                         * unregistered here, set an alarm to do it.
                         */
-                       rte_eal_alarm_set(1, virtio_user_dev_delayed_handler, (void *)dev);
+                       rte_eal_alarm_set(1,
+                               virtio_user_dev_delayed_disconnect_handler,
+                               (void *)dev);
                } else {
                        dev->net_status |= VIRTIO_NET_S_LINK_UP;
                }