From: Jens Freimann <jfreimann@redhat.com>
To: dev@dpdk.org
Cc: tiwei.bie@intel.com, yliu@fridaylinux.org,
maxime.coquelin@redhat.com, mst@redhat.com
Subject: [dpdk-dev] [PATCH 06/14] net/virtio-user: add option to use packed queues
Date: Mon, 29 Jan 2018 15:11:35 +0100 [thread overview]
Message-ID: <20180129141143.13437-7-jfreimann@redhat.com> (raw)
In-Reply-To: <20180129141143.13437-1-jfreimann@redhat.com>
From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Add option to enable packed queue support for virtio-user
devices.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 12 ++++++++++--
drivers/net/virtio/virtio_user/virtio_user_dev.h | 3 ++-
drivers/net/virtio/virtio_user_ethdev.c | 15 ++++++++++++++-
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 7a70c1867..05e3f2c28 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -305,11 +305,13 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
1ULL << VIRTIO_NET_F_GUEST_CSUM | \
1ULL << VIRTIO_NET_F_GUEST_TSO4 | \
1ULL << VIRTIO_NET_F_GUEST_TSO6 | \
- 1ULL << VIRTIO_F_VERSION_1)
+ 1ULL << VIRTIO_F_VERSION_1 | \
+ 1ULL << VIRTIO_F_PACKED)
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 version_1_1)
{
snprintf(dev->path, PATH_MAX, "%s", path);
dev->max_queue_pairs = queues;
@@ -337,6 +339,12 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
PMD_INIT_LOG(ERR, "get_features failed: %s", strerror(errno));
return -1;
}
+
+ if (version_1_1)
+ dev->device_features |= (1ull << VIRTIO_F_PACKED);
+ else
+ dev->device_features &= ~(1ull << VIRTIO_F_PACKED);
+
if (dev->mac_specified)
dev->device_features |= (1ull << VIRTIO_NET_F_MAC);
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 64467b4f9..ce1e1034c 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -42,7 +42,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 version_1_1);
void virtio_user_dev_uninit(struct virtio_user_dev *dev);
void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);
#endif
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 452cdfc88..59d786434 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -274,6 +274,8 @@ 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_VERSION_1_1 "version_1_1"
+ VIRTIO_USER_ARG_VERSION_1_1,
NULL
};
@@ -378,6 +380,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
char *ifname = NULL;
char *mac_addr = NULL;
int ret = -1;
+ uint64_t version_1_1 = 0;
kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_args);
if (!kvlist) {
@@ -452,6 +455,15 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
cq = 1;
}
+ if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_VERSION_1_1) == 1) {
+ if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_VERSION_1_1,
+ &get_integer_arg, &version_1_1) < 0) {
+ PMD_INIT_LOG(ERR, "error to parse %s",
+ VIRTIO_USER_ARG_VERSION_1_1);
+ goto end;
+ }
+ }
+
if (queues > 1 && cq == 0) {
PMD_INIT_LOG(ERR, "multi-q requires ctrl-q");
goto end;
@@ -473,7 +485,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
hw = eth_dev->data->dev_private;
if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
- queue_size, mac_addr, &ifname) < 0) {
+ queue_size, mac_addr, &ifname,
+ version_1_1) < 0) {
PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
virtio_user_eth_dev_free(eth_dev);
goto end;
--
2.14.3
next prev parent reply other threads:[~2018-01-29 14:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 14:11 [dpdk-dev] [PATCH 00/14] implement packed virtqueues Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 01/14] net/virtio: vring init for packed queues Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 02/14] net/virtio: don't call virtio_disable_intr() " Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 03/14] net/virtio: add virtio 1.1 defines Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 04/14] net/virtio: add packed virtqueue helpers Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 05/14] net/virtio: don't dump split virtqueue data Jens Freimann
2018-01-29 14:11 ` Jens Freimann [this message]
2018-01-29 14:11 ` [dpdk-dev] [PATCH 07/14] net/virtio: implement transmit path for packed queues Jens Freimann
2018-02-12 13:16 ` Jason Wang
2018-02-13 9:10 ` Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 08/14] net/virtio: implement receive " Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 09/14] vhost: add virtio 1.1 defines Jens Freimann
2018-01-29 14:24 ` Yuanhan Liu
2018-01-29 14:28 ` Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 10/14] vhost: vring address setup for packed queues Jens Freimann
2018-02-01 9:16 ` Maxime Coquelin
2018-01-29 14:11 ` [dpdk-dev] [PATCH 11/14] vhost: add helpers for packed virtqueues Jens Freimann
2018-02-01 9:20 ` Maxime Coquelin
2018-01-29 14:11 ` [dpdk-dev] [PATCH 12/14] vhost: dequeue for packed queues Jens Freimann
2018-02-01 9:35 ` Maxime Coquelin
2018-02-01 10:23 ` Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 13/14] vhost: packed queue enqueue path Jens Freimann
2018-01-29 14:11 ` [dpdk-dev] [PATCH 14/14] vhost: enable packed virtqueues Jens Freimann
2018-01-30 10:45 ` Jens Freimann
2018-02-06 6:20 ` [dpdk-dev] [PATCH 00/14] implement " Jason Wang
2018-02-06 13:58 ` Jens Freimann
2018-02-07 8:37 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180129141143.13437-7-jfreimann@redhat.com \
--to=jfreimann@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=mst@redhat.com \
--cc=tiwei.bie@intel.com \
--cc=yliu@fridaylinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).