Re: [dpdk-dev] [PATCH v2 3/8] net/virtio-user: add mrg_rxbuf and in_order vdev parameters

[Maxime Coquelin]

On 06/25/2018 05:17 PM, Marvin Liu wrote:

Add parameters for configuring VIRTIO_NET_F_MRG_RXBUF and
VIRTIO_F_IN_ORDER feature bits. If feature is disabled, also update
corresponding unsupported feature bit.

Signed-off-by: Marvin Liu <yong....@intel.com>

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c 
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 360a92eae..34a7f53ac 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -375,7 +375,8 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)

int

  virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-                    int cq, int queue_size, const char *mac, char **ifname)
+                    int cq, int queue_size, const char *mac, char **ifname,
+                    int mrg_rxbuf, int in_order)
  {
        pthread_mutex_init(&dev->mutex, NULL);
        snprintf(dev->path, PATH_MAX, "%s", path);
@@ -420,6 +421,16 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char 
*path, int queues,
                dev->device_features = VIRTIO_USER_SUPPORTED_FEATURES;
        }

+ if (!mrg_rxbuf) {

+               dev->device_features &= ~(1ull << VIRTIO_NET_F_MRG_RXBUF);
+               dev->unmask_features |= (1ull << VIRTIO_NET_F_MRG_RXBUF);
+       }
+
+       if (!in_order) {
+               dev->device_features &= ~(1ull << VIRTIO_F_IN_ORDER);
+               dev->unmask_features |= (1ull << VIRTIO_F_IN_ORDER);
+       }
+
        if (dev->mac_specified)
                dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
        else {
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h 
b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index a1da5f56c..b97eec075 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -48,7 +48,8 @@ int is_vhost_user_by_type(const char *path);
  int virtio_user_start_device(struct virtio_user_dev *dev);
  int virtio_user_stop_device(struct virtio_user_dev *dev);
  int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-                        int cq, int queue_size, const char *mac, char 
**ifname);
+                        int cq, int queue_size, const char *mac, char **ifname,
+                        int mrg_rxbuf, int in_order);
  void virtio_user_dev_uninit(struct virtio_user_dev *dev);
  void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);
  uint8_t virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs);
diff --git a/drivers/net/virtio/virtio_user_ethdev.c 
b/drivers/net/virtio/virtio_user_ethdev.c
index 0c02c6851..e9a5039aa 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -358,8 +358,12 @@ static const char *valid_args[] = {
        VIRTIO_USER_ARG_QUEUE_SIZE,
  #define VIRTIO_USER_ARG_INTERFACE_NAME "iface"
        VIRTIO_USER_ARG_INTERFACE_NAME,
-#define VIRTIO_USER_ARG_SERVER_MODE "server"
+#define VIRTIO_USER_ARG_SERVER_MODE    "server"
        VIRTIO_USER_ARG_SERVER_MODE,
+#define VIRTIO_USER_ARG_MRG_RXBUF      "mrg_rxbuf"
+       VIRTIO_USER_ARG_MRG_RXBUF,
+#define VIRTIO_USER_ARG_IN_ORDER       "in_order"
+       VIRTIO_USER_ARG_IN_ORDER,
        NULL
  };

@@ -462,6 +466,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)

        uint64_t cq = VIRTIO_USER_DEF_CQ_EN;
        uint64_t queue_size = VIRTIO_USER_DEF_Q_SZ;
        uint64_t server_mode = VIRTIO_USER_DEF_SERVER_MODE;
+       uint64_t mrg_rxbuf = 1;
+       uint64_t in_order = 1;
        char *path = NULL;
        char *ifname = NULL;
        char *mac_addr = NULL;
@@ -561,6 +567,24 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
                goto end;
        }

+ if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MRG_RXBUF) == 1) {

+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MRG_RXBUF,
+                                      &get_integer_arg, &mrg_rxbuf) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_MRG_RXBUF);
+                       goto end;
+               }
+       }
+
+       if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_IN_ORDER) == 1) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_IN_ORDER,
+                                      &get_integer_arg, &in_order) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_IN_ORDER);
+                       goto end;
+               }
+       }
+
        if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                struct virtio_user_dev *vu_dev;

@@ -577,7 +601,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)

                else
                        vu_dev->is_server = false;
                if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-                                queue_size, mac_addr, &ifname) < 0) {
+                       queue_size, mac_addr, &ifname, mrg_rxbuf,
+                       in_order) < 0) {

Doesn't the indent change looks weird here?

                        PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
                        virtio_user_eth_dev_free(eth_dev);
                        goto end;
@@ -655,4 +680,6 @@ RTE_PMD_REGISTER_PARAM_STRING(net_virtio_user,
        "cq=<int> "
        "queue_size=<int> "
        "queues=<int> "
-       "iface=<string>");
+       "iface=<string>"
+       "mrg_rxbuf=<0|1>"
+       "in_order=<0|1>");

Maybe the new options should be documented?

Regards,
Maxime