From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,
amorenoz@redhat.com, david.marchand@redhat.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v3 05/44] net/virtio: refactor virtio-user device
Date: Mon, 25 Jan 2021 18:14:05 +0100 [thread overview]
Message-ID: <20210125171444.167241-6-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20210125171444.167241-1-maxime.coquelin@redhat.com>
This patch moves the virtio_hw structure into the virtio_user_dev
structure, with the goal of making virtio_hw bus-agnostic.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
drivers/net/virtio/virtio_ethdev.c | 2 +-
drivers/net/virtio/virtio_pci.h | 1 -
.../net/virtio/virtio_user/virtio_user_dev.h | 1 +
drivers/net/virtio/virtio_user_ethdev.c | 64 ++++++++-----------
4 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 0ba10c274a..c8a01a46df 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -747,7 +747,7 @@ virtio_dev_close(struct rte_eth_dev *dev)
#ifdef RTE_VIRTIO_USER
if (hw->bus_type == VIRTIO_BUS_USER)
- virtio_user_dev_uninit(hw->virtio_user_dev);
+ virtio_user_dev_uninit(dev->data->dev_private);
else
#endif
if (dev->device) {
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 6388f0a74d..b35a596169 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -277,7 +277,6 @@ struct virtio_hw {
uint16_t *notify_base;
struct virtio_pci_common_cfg *common_cfg;
struct virtio_net_config *dev_cfg;
- void *virtio_user_dev;
/*
* App management thread and virtio interrupt handler thread
* both can change device state, this lock is meant to avoid
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 3b5b6bc3ae..b3776cc7a0 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -24,6 +24,7 @@ struct virtio_user_queue {
};
struct virtio_user_dev {
+ struct virtio_hw hw;
enum virtio_user_backend_type backend_type;
/* for vhost_user backend */
int vhostfd;
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 441721b6ca..620ecb126c 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -26,13 +26,13 @@
#include "virtio_user/virtio_user_dev.h"
#include "virtio_user/vhost.h"
-#define virtio_user_get_dev(hw) \
- ((struct virtio_user_dev *)(hw)->virtio_user_dev)
+#define virtio_user_get_dev(hwp) container_of(hwp, struct virtio_user_dev, hw)
static void
-virtio_user_reset_queues_packed(struct rte_eth_dev *dev)
+virtio_user_reset_queues_packed(struct rte_eth_dev *eth_dev)
{
- struct virtio_hw *hw = dev->data->dev_private;
+ struct virtio_user_dev *dev = eth_dev->data->dev_private;
+ struct virtio_hw *hw = &dev->hw;
struct virtnet_rx *rxvq;
struct virtnet_tx *txvq;
uint16_t i;
@@ -48,14 +48,14 @@ virtio_user_reset_queues_packed(struct rte_eth_dev *dev)
rte_delay_ms(1);
/* Vring reset for each Tx queue and Rx queue. */
- for (i = 0; i < dev->data->nb_rx_queues; i++) {
- rxvq = dev->data->rx_queues[i];
+ for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+ rxvq = eth_dev->data->rx_queues[i];
virtqueue_rxvq_reset_packed(rxvq->vq);
- virtio_dev_rx_queue_setup_finish(dev, i);
+ virtio_dev_rx_queue_setup_finish(eth_dev, i);
}
- for (i = 0; i < dev->data->nb_tx_queues; i++) {
- txvq = dev->data->tx_queues[i];
+ for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
+ txvq = eth_dev->data->tx_queues[i];
virtqueue_txvq_reset_packed(txvq->vq);
}
@@ -69,7 +69,7 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
{
int ret, connectfd, old_status;
struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
- struct virtio_hw *hw = eth_dev->data->dev_private;
+ struct virtio_hw *hw = &dev->hw;
uint64_t protocol_features;
connectfd = accept(dev->listenfd, NULL, NULL);
@@ -605,21 +605,15 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
struct virtio_hw *hw;
struct virtio_user_dev *dev;
- eth_dev = rte_eth_vdev_allocate(vdev, sizeof(*hw));
+ eth_dev = rte_eth_vdev_allocate(vdev, sizeof(*dev));
if (!eth_dev) {
PMD_INIT_LOG(ERR, "cannot alloc rte_eth_dev");
return NULL;
}
data = eth_dev->data;
- hw = eth_dev->data->dev_private;
-
- dev = rte_zmalloc(NULL, sizeof(*dev), 0);
- if (!dev) {
- PMD_INIT_LOG(ERR, "malloc virtio_user_dev failed");
- rte_eth_dev_release_port(eth_dev);
- return NULL;
- }
+ dev = eth_dev->data->dev_private;
+ hw = &dev->hw;
hw->port_id = data->port_id;
dev->port_id = data->port_id;
@@ -634,17 +628,13 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
hw->use_vec_tx = 0;
hw->use_inorder_rx = 0;
hw->use_inorder_tx = 0;
- hw->virtio_user_dev = dev;
+
return eth_dev;
}
static void
virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
{
- struct rte_eth_dev_data *data = eth_dev->data;
- struct virtio_hw *hw = data->dev_private;
-
- rte_free(hw->virtio_user_dev);
rte_eth_dev_release_port(eth_dev);
}
@@ -653,11 +643,12 @@ virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
* Returns 0 on success.
*/
static int
-virtio_user_pmd_probe(struct rte_vdev_device *dev)
+virtio_user_pmd_probe(struct rte_vdev_device *vdev)
{
struct rte_kvargs *kvlist = NULL;
struct rte_eth_dev *eth_dev;
struct virtio_hw *hw;
+ struct virtio_user_dev *dev;
enum virtio_user_backend_type backend_type = VIRTIO_USER_BACKEND_UNKNOWN;
uint64_t queues = VIRTIO_USER_DEF_Q_NUM;
uint64_t cq = VIRTIO_USER_DEF_CQ_EN;
@@ -672,8 +663,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
char *mac_addr = NULL;
int ret = -1;
+ RTE_BUILD_BUG_ON(offsetof(struct virtio_user_dev, hw) != 0);
+
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
- const char *name = rte_vdev_device_name(dev);
+ const char *name = rte_vdev_device_name(vdev);
eth_dev = rte_eth_dev_attach_secondary(name);
if (!eth_dev) {
PMD_INIT_LOG(ERR, "Failed to probe %s", name);
@@ -687,12 +680,12 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
}
eth_dev->dev_ops = &virtio_user_secondary_eth_dev_ops;
- eth_dev->device = &dev->device;
+ eth_dev->device = &vdev->device;
rte_eth_dev_probing_finish(eth_dev);
return 0;
}
- kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_args);
+ kvlist = rte_kvargs_parse(rte_vdev_device_args(vdev), valid_args);
if (!kvlist) {
PMD_INIT_LOG(ERR, "error when parsing param");
goto end;
@@ -832,14 +825,15 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
}
}
- eth_dev = virtio_user_eth_dev_alloc(dev);
+ eth_dev = virtio_user_eth_dev_alloc(vdev);
if (!eth_dev) {
PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
goto end;
}
- hw = eth_dev->data->dev_private;
- if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
+ dev = eth_dev->data->dev_private;
+ hw = &dev->hw;
+ if (virtio_user_dev_init(dev, path, queues, cq,
queue_size, mac_addr, &ifname, server_mode,
mrg_rxbuf, in_order, packed_vq, backend_type) < 0) {
PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
@@ -912,7 +906,6 @@ static int virtio_user_pmd_dma_map(struct rte_vdev_device *vdev, void *addr,
const char *name;
struct rte_eth_dev *eth_dev;
struct virtio_user_dev *dev;
- struct virtio_hw *hw;
if (!vdev)
return -EINVAL;
@@ -923,8 +916,7 @@ static int virtio_user_pmd_dma_map(struct rte_vdev_device *vdev, void *addr,
if (!eth_dev)
return 0;
- hw = (struct virtio_hw *)eth_dev->data->dev_private;
- dev = hw->virtio_user_dev;
+ dev = eth_dev->data->dev_private;
if (dev->ops->dma_map)
return dev->ops->dma_map(dev, addr, iova, len);
@@ -938,7 +930,6 @@ static int virtio_user_pmd_dma_unmap(struct rte_vdev_device *vdev, void *addr,
const char *name;
struct rte_eth_dev *eth_dev;
struct virtio_user_dev *dev;
- struct virtio_hw *hw;
if (!vdev)
return -EINVAL;
@@ -949,8 +940,7 @@ static int virtio_user_pmd_dma_unmap(struct rte_vdev_device *vdev, void *addr,
if (!eth_dev)
return 0;
- hw = (struct virtio_hw *)eth_dev->data->dev_private;
- dev = hw->virtio_user_dev;
+ dev = eth_dev->data->dev_private;
if (dev->ops->dma_unmap)
return dev->ops->dma_unmap(dev, addr, iova, len);
--
2.29.2
next prev parent reply other threads:[~2021-01-25 17:15 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 17:14 [dpdk-dev] [PATCH v3 00/44] net/virtio: Virtio PMD rework Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 01/44] bus/vdev: add helper to get vdev from ethdev Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 02/44] bus/vdev: add driver IOVA VA mode requirement Maxime Coquelin
2021-01-26 9:23 ` Xia, Chenbo
2021-01-26 9:24 ` Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 03/44] net/virtio: fix getting old status on reconnect Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 04/44] net/virtio: introduce Virtio bus type Maxime Coquelin
2021-01-25 17:14 ` Maxime Coquelin [this message]
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 06/44] net/virtio: introduce PCI device metadata Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 07/44] net/virtio: move PCI device init in dedicated file Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 08/44] net/virtio: move PCI specific dev init to PCI ethdev init Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 09/44] net/virtio: move MSIX detection to PCI ethdev Maxime Coquelin
2021-01-26 5:53 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 10/44] net/virtio: force IOVA as VA mode for Virtio-user Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 11/44] net/virtio: store PCI type in Virtio device metadata Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 12/44] net/virtio: add callback for device closing Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 13/44] net/virtio: validate features at bus level Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 14/44] net/virtio: remove bus type enum Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 15/44] net/virtio: move PCI-specific fields to PCI device Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 16/44] net/virtio: pack virtio HW struct Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 17/44] net/virtio: move legacy IO to Virtio PCI Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 18/44] net/virtio: introduce generic virtio header Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 19/44] net/virtio: move features definition to generic header Maxime Coquelin
2021-01-26 5:55 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 20/44] net/virtio: move virtqueue defines in " Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 21/44] net/virtio: move config definitions to " Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 22/44] net/virtio: make interrupt handling more generic Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 23/44] net/virtio: move vring alignment to generic header Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 24/44] net/virtio: remove last PCI refs in non-PCI code Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 25/44] net/virtio: make Vhost-user request sender consistent Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 26/44] net/virtio: add Virtio-user ops to set owner Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 27/44] net/virtio: add Virtio-user features ops Maxime Coquelin
2021-01-26 5:58 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 28/44] net/virtio: add Virtio-user protocol " Maxime Coquelin
2021-01-26 6:09 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 29/44] net/virtio: add Virtio-user memory tables ops Maxime Coquelin
2021-01-26 6:09 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 30/44] net/virtio: add Virtio-user vring setting ops Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 31/44] net/virtio: add Virtio-user vring file ops Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 32/44] net/virtio: add Virtio-user vring address ops Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 33/44] net/virtio: add Virtio-user status ops Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 34/44] net/virtio: remove useless request ops Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 35/44] net/virtio: improve Virtio-user errors handling Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 36/44] net/virtio: move Vhost-user requests to Vhost-user backend Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 37/44] net/virtio: make server mode blocking Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 38/44] net/virtio: move protocol features to Vhost-user Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 39/44] net/virtio: introduce backend data Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 40/44] net/virtio: move Vhost-user specifics to its backend Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 41/44] net/virtio: move Vhost-kernel data " Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 42/44] net/virtio: move Vhost-vDPA " Maxime Coquelin
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 43/44] net/virtio: improve Vhost-user error logging Maxime Coquelin
2021-01-26 6:25 ` Xia, Chenbo
2021-01-25 17:14 ` [dpdk-dev] [PATCH v3 44/44] net/virtio: handle Virtio-user setup failure properly Maxime Coquelin
2021-01-26 6:36 ` Xia, Chenbo
2021-01-26 9:15 ` Maxime Coquelin
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=20210125171444.167241-6-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=amorenoz@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=olivier.matz@6wind.com \
/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).