net/cnxk: remove restriction on VF for PFC config
[dpdk.git] / lib / vhost / vhost_user.c
index 850848c..2b9a3b6 100644 (file)
@@ -2467,6 +2467,89 @@ static int is_vring_iotlb(struct virtio_net *dev,
                return is_vring_iotlb_split(vq, imsg);
 }
 
+static int
+vhost_user_get_config(struct virtio_net **pdev,
+                       struct vhu_msg_context *ctx,
+                       int main_fd __rte_unused)
+{
+       struct virtio_net *dev = *pdev;
+       struct rte_vdpa_device *vdpa_dev = dev->vdpa_dev;
+       int ret = 0;
+
+       if (validate_msg_fds(dev, ctx, 0) != 0)
+               return RTE_VHOST_MSG_RESULT_ERR;
+
+       if (!vdpa_dev) {
+               VHOST_LOG_CONFIG(ERR, "(%s) is not vDPA device!\n",
+                                dev->ifname);
+               return RTE_VHOST_MSG_RESULT_ERR;
+       }
+
+       if (vdpa_dev->ops->get_config) {
+               ret = vdpa_dev->ops->get_config(dev->vid,
+                                          ctx->msg.payload.cfg.region,
+                                          ctx->msg.payload.cfg.size);
+               if (ret != 0) {
+                       ctx->msg.size = 0;
+                       VHOST_LOG_CONFIG(ERR,
+                                        "(%s) get_config() return error!\n",
+                                        dev->ifname);
+               }
+       } else {
+               VHOST_LOG_CONFIG(ERR, "(%s) get_config() not supported!\n",
+                                dev->ifname);
+       }
+
+       return RTE_VHOST_MSG_RESULT_REPLY;
+}
+
+static int
+vhost_user_set_config(struct virtio_net **pdev,
+                       struct vhu_msg_context *ctx,
+                       int main_fd __rte_unused)
+{
+       struct virtio_net *dev = *pdev;
+       struct rte_vdpa_device *vdpa_dev = dev->vdpa_dev;
+       int ret = 0;
+
+       if (validate_msg_fds(dev, ctx, 0) != 0)
+               return RTE_VHOST_MSG_RESULT_ERR;
+
+       if (ctx->msg.payload.cfg.size > VHOST_USER_MAX_CONFIG_SIZE) {
+               VHOST_LOG_CONFIG(ERR,
+                       "(%s) vhost_user_config size: %"PRIu32", should not be larger than %d\n",
+                       dev->ifname, ctx->msg.payload.cfg.size,
+                       VHOST_USER_MAX_CONFIG_SIZE);
+               goto out;
+       }
+
+       if (!vdpa_dev) {
+               VHOST_LOG_CONFIG(ERR, "(%s) is not vDPA device!\n",
+                                dev->ifname);
+               goto out;
+       }
+
+       if (vdpa_dev->ops->set_config) {
+               ret = vdpa_dev->ops->set_config(dev->vid,
+                       ctx->msg.payload.cfg.region,
+                       ctx->msg.payload.cfg.offset,
+                       ctx->msg.payload.cfg.size,
+                       ctx->msg.payload.cfg.flags);
+               if (ret)
+                       VHOST_LOG_CONFIG(ERR,
+                                        "(%s) set_config() return error!\n",
+                                        dev->ifname);
+       } else {
+               VHOST_LOG_CONFIG(ERR, "(%s) set_config() not supported!\n",
+                                dev->ifname);
+       }
+
+       return RTE_VHOST_MSG_RESULT_OK;
+
+out:
+       return RTE_VHOST_MSG_RESULT_ERR;
+}
+
 static int
 vhost_user_iotlb_msg(struct virtio_net **pdev,
                        struct vhu_msg_context *ctx,
@@ -2686,6 +2769,8 @@ VHOST_MESSAGE_HANDLER(VHOST_USER_SEND_RARP, vhost_user_send_rarp, false) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_NET_SET_MTU, vhost_user_net_set_mtu, false) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_SET_SLAVE_REQ_FD, vhost_user_set_req_fd, true) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_IOTLB_MSG, vhost_user_iotlb_msg, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_CONFIG, vhost_user_get_config, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_CONFIG, vhost_user_set_config, false) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_ADVISE, vhost_user_set_postcopy_advise, false) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_LISTEN, vhost_user_set_postcopy_listen, false) \
 VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_END, vhost_user_postcopy_end, false) \
@@ -2887,7 +2972,6 @@ vhost_user_msg_handler(int vid, int fd)
                return -1;
        }
 
-       ret = 0;
        request = ctx.msg.request.master;
        if (request > VHOST_USER_NONE && request < RTE_DIM(vhost_message_handlers))
                msg_handler = &vhost_message_handlers[request];
@@ -3031,9 +3115,11 @@ skip_to_post_handle:
                send_vhost_reply(dev, fd, &ctx);
        } else if (ret == RTE_VHOST_MSG_RESULT_ERR) {
                VHOST_LOG_CONFIG(ERR, "(%s) vhost message handling failed.\n", dev->ifname);
-               return -1;
+               ret = -1;
+               goto unlock;
        }
 
+       ret = 0;
        for (i = 0; i < dev->nr_vring; i++) {
                struct vhost_virtqueue *vq = dev->virtqueue[i];
                bool cur_ready = vq_is_ready(dev, vq);
@@ -3044,10 +3130,11 @@ skip_to_post_handle:
                }
        }
 
+unlock:
        if (unlock_required)
                vhost_user_unlock_all_queue_pairs(dev);
 
-       if (!virtio_is_ready(dev))
+       if (ret != 0 || !virtio_is_ready(dev))
                goto out;
 
        /*
@@ -3074,7 +3161,7 @@ skip_to_post_handle:
        }
 
 out:
-       return 0;
+       return ret;
 }
 
 static int process_slave_message_reply(struct virtio_net *dev,