From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: "Xia, Chenbo" <chenbo.xia@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"olivier.matz@6wind.com" <olivier.matz@6wind.com>,
"amorenoz@redhat.com" <amorenoz@redhat.com>,
"david.marchand@redhat.com" <david.marchand@redhat.com>
Subject: Re: [dpdk-dev] [PATCH 39/40] net/virtio: move Vhost-kernel data to its backend
Date: Fri, 15 Jan 2021 12:54:03 +0100 [thread overview]
Message-ID: <815d7088-7b23-e181-f0d0-c07953e53121@redhat.com> (raw)
In-Reply-To: <MN2PR11MB4063E142536614C0EF93A4BC9CAB0@MN2PR11MB4063.namprd11.prod.outlook.com>
On 1/11/21 9:02 AM, Xia, Chenbo wrote:
> Hi Maxime,
>
>> -----Original Message-----
>> From: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Sent: Monday, December 21, 2020 5:14 AM
>> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
>> amorenoz@redhat.com; david.marchand@redhat.com
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Subject: [PATCH 39/40] net/virtio: move Vhost-kernel data to its backend
>>
>> As done earlier for Vhost-user, this patch moves the
>> Vhost-Kernel specific data to its backend file.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> drivers/net/virtio/virtio_user/vhost_kernel.c | 78 +++++++++++++++----
>> .../net/virtio/virtio_user/virtio_user_dev.c | 43 ++--------
>> .../net/virtio/virtio_user/virtio_user_dev.h | 7 +-
>> 3 files changed, 72 insertions(+), 56 deletions(-)
>
> <snip>
>
>> vhost_kernel_setup(struct virtio_user_dev *dev)
>> {
>> int vhostfd;
>> - uint32_t i;
>> + uint32_t q, i;
>> + struct vhost_kernel_data *data;
>> +
>> + data = malloc(sizeof(*data));
>> + if (!data) {
>> + PMD_INIT_LOG(ERR, "(%s) Failed to allocate Vhost-kernel data",
>> dev->path);
>> + return -1;
>> + }
>> +
>> + data->vhostfds = malloc(dev->max_queue_pairs * sizeof(int));
>> + data->tapfds = malloc(dev->max_queue_pairs * sizeof(int));
>> + if (!data->vhostfds || !data->tapfds) {
>> + PMD_INIT_LOG(ERR, "(%s) Failed to allocate FDs", dev->path);
>> + return -1;
>> + }
>> +
>> + for (q = 0; q < dev->max_queue_pairs; ++q) {
>> + data->vhostfds[q] = -1;
>> + data->tapfds[q] = -1;
>> + }
>
> Forget to do 'dev->backend_data = data'? 😊
Indeed! As I mentionned in the cover letter, I didn't test last 5
patches... and we can see it confirmed right here :)
I have reworked the fucntion to handle error properly (free allocated
resources, close opened FDs...)
>
> Besides,
>
> When I do test 'virtio_user for exceptional path', iperf just cannot normally
> send/recv pkts. Testpmd have some pkts (<10), guess tcp connection cannot be
> established. I have not tried to locate the root cause. Just thinking it's
> better to tell you first.
Thanks for the heads-up, I will look into it before posting v2.
Maxime
> Thanks!
> Chenbo
>
>>
>> get_vhost_kernel_max_regions();
>>
>> for (i = 0; i < dev->max_queue_pairs; ++i) {
>> vhostfd = open(dev->path, O_RDWR);
>> if (vhostfd < 0) {
>> - PMD_DRV_LOG(ERR, "fail to open %s, %s",
>> - dev->path, strerror(errno));
>> + PMD_DRV_LOG(ERR, "fail to open %s, %s", dev->path,
>> strerror(errno));
>> return -1;
>> }
>>
>> - dev->vhostfds[i] = vhostfd;
>> + data->vhostfds[i] = vhostfd;
>> }
>>
>> return 0;
>> @@ -360,6 +392,19 @@ vhost_kernel_setup(struct virtio_user_dev *dev)
>> static int
>> vhost_kernel_destroy(struct virtio_user_dev *dev)
>> {
>> + struct vhost_kernel_data *data = dev->backend_data;
>> + uint32_t i;
>> +
>> + for (i = 0; i < dev->max_queue_pairs; ++i) {
>> + close(data->vhostfds[i]);
>> + if (data->tapfds[i] >= 0)
>> + close(data->tapfds[i]);
>> + }
>> +
>> + free(data->vhostfds);
>> + free(data->tapfds);
>> + free(data);
>> +
>> return 0;
>> }
>>
>> @@ -395,14 +440,15 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev
>> *dev,
>> int vhostfd;
>> int tapfd;
>> int req_mq = (dev->max_queue_pairs > 1);
>> + struct vhost_kernel_data *data = dev->backend_data;
>>
>> - vhostfd = dev->vhostfds[pair_idx];
>> + vhostfd = data->vhostfds[pair_idx];
>>
>> if (dev->qp_enabled[pair_idx] == enable)
>> return 0;
>>
>> if (!enable) {
>> - tapfd = dev->tapfds[pair_idx];
>> + tapfd = data->tapfds[pair_idx];
>> if (vhost_kernel_set_backend(vhostfd, -1) < 0) {
>> PMD_DRV_LOG(ERR, "fail to set backend for vhost kernel");
>> return -1;
>> @@ -415,8 +461,8 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,
>> return 0;
>> }
>>
>> - if (dev->tapfds[pair_idx] >= 0) {
>> - tapfd = dev->tapfds[pair_idx];
>> + if (data->tapfds[pair_idx] >= 0) {
>> + tapfd = data->tapfds[pair_idx];
>> if (vhost_kernel_tap_set_offload(tapfd, dev->features) == -1)
>> return -1;
>> if (req_mq && vhost_kernel_tap_set_queue(tapfd, true) < 0) {
>> @@ -439,7 +485,7 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,
>> return -1;
>> }
>>
>> - dev->tapfds[pair_idx] = tapfd;
>> + data->tapfds[pair_idx] = tapfd;
>>
>> set_backend:
>> if (vhost_kernel_set_backend(vhostfd, tapfd) < 0) {
>> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
>> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
>> index 93a9ce2cd2..154aecc209 100644
>> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
>> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
>> @@ -397,11 +397,6 @@ virtio_user_mem_event_cb(enum rte_mem_event type
>> __rte_unused,
>> static int
>> virtio_user_dev_setup(struct virtio_user_dev *dev)
>> {
>> - uint32_t q;
>> -
>> - dev->vhostfds = NULL;
>> - dev->tapfds = NULL;
>> -
>> if (dev->is_server) {
>> if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER) {
>> PMD_DRV_LOG(ERR, "Server mode only supports vhost-user!");
>> @@ -409,34 +404,21 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
>> }
>> }
>>
>> - if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) {
>> + switch (dev->backend_type) {
>> + case VIRTIO_USER_BACKEND_VHOST_USER:
>> dev->ops = &virtio_ops_user;
>> - } else if (dev->backend_type ==
>> - VIRTIO_USER_BACKEND_VHOST_KERNEL) {
>> + break;
>> + case VIRTIO_USER_BACKEND_VHOST_KERNEL:
>> dev->ops = &virtio_ops_kernel;
>> -
>> - dev->vhostfds = malloc(dev->max_queue_pairs *
>> - sizeof(int));
>> - dev->tapfds = malloc(dev->max_queue_pairs *
>> - sizeof(int));
>> - if (!dev->vhostfds || !dev->tapfds) {
>> - PMD_INIT_LOG(ERR, "(%s) Failed to allocate FDs", dev->path);
>> - return -1;
>> - }
>> -
>> - for (q = 0; q < dev->max_queue_pairs; ++q) {
>> - dev->vhostfds[q] = -1;
>> - dev->tapfds[q] = -1;
>> - }
>> - } else if (dev->backend_type ==
>> - VIRTIO_USER_BACKEND_VHOST_VDPA) {
>> + break;
>> + case VIRTIO_USER_BACKEND_VHOST_VDPA:
>> dev->ops = &virtio_ops_vdpa;
>> - } else {
>> + break;
>> + default:
>> PMD_DRV_LOG(ERR, "(%s) Unknown backend type", dev->path);
>> return -1;
>> }
>>
>> -
>> if (dev->ops->setup(dev) < 0) {
>> PMD_INIT_LOG(ERR, "(%s) Failed to setup backend\n", dev->path);
>> return -1;
>> @@ -592,15 +574,6 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev)
>> close(dev->callfds[i]);
>> close(dev->kickfds[i]);
>> }
>> - if (dev->vhostfds) {
>> - for (i = 0; i < dev->max_queue_pairs; ++i) {
>> - close(dev->vhostfds[i]);
>> - if (dev->tapfds[i] >= 0)
>> - close(dev->tapfds[i]);
>> - }
>> - free(dev->vhostfds);
>> - free(dev->tapfds);
>> - }
>>
>> free(dev->ifname);
>>
>> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> b/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> index a429dcc57c..5a2c9d38dd 100644
>> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> @@ -31,11 +31,6 @@ struct virtio_user_dev {
>> /* for vhost_vdpa backend */
>> int vhostfd;
>>
>> - /* for vhost_kernel backend */
>> - char *ifname;
>> - int *vhostfds;
>> - int *tapfds;
>> -
>> /* for both vhost_user and vhost_kernel */
>> int callfds[VIRTIO_MAX_VIRTQUEUES];
>> int kickfds[VIRTIO_MAX_VIRTQUEUES];
>> @@ -55,6 +50,8 @@ struct virtio_user_dev {
>> uint16_t port_id;
>> uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
>> char path[PATH_MAX];
>> + char *ifname;
>> +
>> union {
>> struct vring vrings[VIRTIO_MAX_VIRTQUEUES];
>> struct vring_packed packed_vrings[VIRTIO_MAX_VIRTQUEUES];
>> --
>> 2.29.2
>
next prev parent reply other threads:[~2021-01-15 11:54 UTC|newest]
Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-20 21:13 [dpdk-dev] [PATCH 00/40] net/virtio: Virtio PMD rework Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 01/40] bus/vdev: add helper to get vdev from eth dev Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:15 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 02/40] net/virtio: Introduce Virtio bus type Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:15 ` David Marchand
2021-01-14 9:24 ` Maxime Coquelin
2021-01-14 10:54 ` Maxime Coquelin
2021-01-14 11:55 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 03/40] net/virtio: refactor virtio-user device Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:16 ` David Marchand
2021-01-14 9:26 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 04/40] net/virtio: introduce PCI device metadata Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:16 ` David Marchand
2021-01-14 11:05 ` Maxime Coquelin
2021-01-14 14:40 ` David Marchand
2021-01-14 14:44 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 05/40] net/virtio: move PCI device init in dedicated file Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:19 ` David Marchand
2021-01-14 16:04 ` Maxime Coquelin
2021-01-14 16:14 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 06/40] net/virtio: move PCI specific dev init to PCI ethdev init Maxime Coquelin
2020-12-30 3:05 ` Xia, Chenbo
2021-01-06 8:58 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 07/40] net/virtio: move MSIX detection to PCI ethdev Maxime Coquelin
2020-12-30 3:05 ` Xia, Chenbo
2021-01-06 8:22 ` David Marchand
2021-01-14 17:19 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 08/40] net/virtio: force IOVA as VA mode for Virtio-user Maxime Coquelin
2020-12-30 3:06 ` Xia, Chenbo
2021-01-06 9:06 ` David Marchand
2021-01-06 9:11 ` Thomas Monjalon
2021-01-06 9:22 ` Maxime Coquelin
2021-01-06 16:37 ` Kinsella, Ray
2021-01-06 9:14 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 09/40] net/virtio: store PCI type in Virtio device metadata Maxime Coquelin
2020-12-30 3:07 ` Xia, Chenbo
2021-01-06 9:14 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 10/40] net/virtio: add callback for device closing Maxime Coquelin
2020-12-30 3:07 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 11/40] net/virtio: validate features at bus level Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2021-01-15 9:20 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 12/40] net/virtio: remove bus type enum Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 13/40] net/virtio: move PCI-specific fields to PCI device Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:58 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 14/40] net/virtio: pack virtio HW struct Maxime Coquelin
2020-12-30 3:09 ` Xia, Chenbo
2021-01-06 9:58 ` David Marchand
2021-01-15 9:35 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 15/40] net/virtio: move legacy IO to Virtio PCI Maxime Coquelin
2020-12-30 3:09 ` Xia, Chenbo
2021-01-06 10:09 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 16/40] net/virtio: introduce generic virtio header Maxime Coquelin
2020-12-30 3:09 ` Xia, Chenbo
2021-01-06 10:08 ` David Marchand
2021-01-15 9:39 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 17/40] net/virtio: move features definition to generic header Maxime Coquelin
2020-12-30 3:14 ` Xia, Chenbo
2021-01-14 8:40 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 18/40] net/virtio: move virtqueue defines in " Maxime Coquelin
2020-12-30 3:14 ` Xia, Chenbo
2021-01-06 15:53 ` David Marchand
2021-01-15 10:55 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 19/40] net/virtio: move config definitions to " Maxime Coquelin
2020-12-30 3:15 ` Xia, Chenbo
2021-01-06 16:01 ` David Marchand
2021-01-15 11:01 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 20/40] net/virtio: make interrupt handling more generic Maxime Coquelin
2020-12-30 3:17 ` Xia, Chenbo
2021-01-14 8:43 ` Maxime Coquelin
2021-01-06 16:07 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 21/40] net/virtio: move vring alignment to generic header Maxime Coquelin
2020-12-30 3:18 ` Xia, Chenbo
2021-01-06 16:13 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 22/40] net/virtio: remove last PCI refs in non-PCI code Maxime Coquelin
2020-12-30 3:25 ` Xia, Chenbo
2021-01-14 8:46 ` Maxime Coquelin
2021-01-06 16:18 ` David Marchand
2021-01-15 11:10 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 23/40] net/virtio: make Vhost-user req sender consistent Maxime Coquelin
2021-01-06 11:50 ` Xia, Chenbo
2021-01-15 9:47 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 24/40] net/virtio: add Virtio-user ops to set owner Maxime Coquelin
2021-01-06 11:50 ` Xia, Chenbo
2020-12-20 21:13 ` [dpdk-dev] [PATCH 25/40] net/virtio: add Virtio-user features ops Maxime Coquelin
2021-01-06 11:54 ` Xia, Chenbo
2021-01-13 13:43 ` Adrian Moreno
2021-01-13 13:54 ` Maxime Coquelin
2021-01-15 14:19 ` Maxime Coquelin
2021-01-13 13:57 ` Adrian Moreno
2021-01-15 14:29 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 26/40] net/virtio: add Virtio-user protocol " Maxime Coquelin
2021-01-06 11:55 ` Xia, Chenbo
2020-12-20 21:13 ` [dpdk-dev] [PATCH 27/40] net/virtio: add Virtio-user memory tables ops Maxime Coquelin
2021-01-06 11:57 ` Xia, Chenbo
2021-01-15 9:57 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 28/40] net/virtio: add Virtio-user vring setting ops Maxime Coquelin
2021-01-05 21:24 ` David Marchand
2021-01-06 12:01 ` Xia, Chenbo
2021-01-15 10:12 ` Maxime Coquelin
2021-01-06 12:03 ` Xia, Chenbo
2021-01-15 10:15 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 29/40] net/virtio: add Virtio-user vring file ops Maxime Coquelin
2021-01-05 21:24 ` David Marchand
2021-01-06 12:04 ` Xia, Chenbo
2021-01-15 10:17 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 30/40] net/virtio: add Virtio-user vring address ops Maxime Coquelin
2021-01-06 12:06 ` Xia, Chenbo
2021-01-15 10:19 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 31/40] net/virtio: add Virtio-user status ops Maxime Coquelin
2021-01-06 12:09 ` Xia, Chenbo
2021-01-15 10:48 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 32/40] net/virtio: remove useless request ops Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 33/40] net/virtio: improve Virtio-user errors handling Maxime Coquelin
2021-01-07 2:26 ` Xia, Chenbo
2021-01-15 11:09 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 34/40] net/virtio: move Vhost-user reqs to Vhost-user backend Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 35/40] net/virtio: make server mode blocking Maxime Coquelin
2021-01-07 3:20 ` Xia, Chenbo
2021-01-15 11:13 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 36/40] net/virtio: move protocol features to Vhost-user Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 37/40] net/virtio: introduce backend data Maxime Coquelin
2021-01-05 21:26 ` David Marchand
2021-01-13 17:18 ` Adrian Moreno
2021-01-15 16:49 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 38/40] net/virtio: move Vhost-user specifics to its backend Maxime Coquelin
2021-01-07 6:32 ` Xia, Chenbo
2021-01-15 12:03 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 39/40] net/virtio: move Vhost-kernel data " Maxime Coquelin
2021-01-07 6:42 ` Xia, Chenbo
2021-01-11 8:02 ` Xia, Chenbo
2021-01-15 11:54 ` Maxime Coquelin [this message]
2021-01-18 20:36 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 40/40] net/virtio: move Vhost-vDPA " Maxime Coquelin
2020-12-22 15:20 ` Maxime Coquelin
2021-01-07 6:50 ` Xia, Chenbo
2021-01-15 12:08 ` Maxime Coquelin
2021-01-11 8:05 ` Xia, Chenbo
2020-12-21 10:58 ` [dpdk-dev] [PATCH 00/40] net/virtio: Virtio PMD rework 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=815d7088-7b23-e181-f0d0-c07953e53121@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).