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 40/40] net/virtio: move Vhost-vDPA data to its backend
Date: Fri, 15 Jan 2021 13:08:15 +0100 [thread overview]
Message-ID: <f30c79b8-41c3-6206-07ae-a99174db616a@redhat.com> (raw)
In-Reply-To: <MN2PR11MB40638F045130CBEA3A2A7C9C9CAF0@MN2PR11MB4063.namprd11.prod.outlook.com>
On 1/7/21 7:50 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 40/40] net/virtio: move Vhost-vDPA data to its backend
>>
>> As done earlier for Vhost-user and Vhost-kernel, this
>> patch moves the Vhost-vDPA specific data to its backend
>> file.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> drivers/net/virtio/virtio_user/vhost_vdpa.c | 77 ++++++++++++++-----
>> .../net/virtio/virtio_user/virtio_user_dev.h | 3 -
>> 2 files changed, 58 insertions(+), 22 deletions(-)
>>
>
> <snip>
>
>> @@ -269,16 +298,23 @@ vhost_vdpa_set_status(struct virtio_user_dev *dev,
>> uint8_t status)
>> static int
>> vhost_vdpa_setup(struct virtio_user_dev *dev)
>> {
>> + struct vhost_vdpa_data *data;
>> uint32_t did = (uint32_t)-1;
>>
>> - dev->vhostfd = open(dev->path, O_RDWR);
>> - if (dev->vhostfd < 0) {
>> + data = malloc(sizeof(*data));
>> + if (!data) {
>> + PMD_DRV_LOG(ERR, "(%s) Faidle to allocate backend data", dev-
>>> path);
>> + return -1;
>> + }
>> +
>> + data->vhostfd = open(dev->path, O_RDWR);
>> + if (data->vhostfd < 0) {
>> PMD_DRV_LOG(ERR, "Failed to open %s: %s\n",
>> dev->path, strerror(errno));
>> return -1;
>> }
>>
>> - if (ioctl(dev->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 ||
>> + if (ioctl(data->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 ||
>> did != VIRTIO_ID_NETWORK) {
>> PMD_DRV_LOG(ERR, "Invalid vdpa device ID: %u\n", did);
>> return -1;
>
> Need to clean up resources when error happens?
Yes, and also assign ddev->backend_data in case of success.
>
>> @@ -288,9 +324,12 @@ vhost_vdpa_setup(struct virtio_user_dev *dev)
>> }
>>
>> static int
>> -vhost_vdpa_destroy(struct virtio_user_dev *dev __rte_unused)
>> +vhost_vdpa_destroy(struct virtio_user_dev *dev )
>
> Should delete the space before ')'?
Done
>> {
>> - return;
>> + struct vhost_vdpa_data *data = dev->backend_data;
>> +
>> + close(data->vhostfd);
>> +
>> return 0;
>> }
>>
>> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> b/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> index 5a2c9d38dd..2e0d6504f6 100644
>> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
>> @@ -28,9 +28,6 @@ struct virtio_user_dev {
>> enum virtio_user_backend_type backend_type;
>> bool is_server; /* server or client mode */
>>
>> - /* for vhost_vdpa backend */
>> - int vhostfd;
>> -
>> /* for both vhost_user and vhost_kernel */
>
> Is this comment no longer needed too?
Removed.
Thanks!
Maxime
> Thanks!
> Chenbo
>
>> int callfds[VIRTIO_MAX_VIRTQUEUES];
>> int kickfds[VIRTIO_MAX_VIRTQUEUES];
>> --
>> 2.29.2
>
next prev parent reply other threads:[~2021-01-15 12:08 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
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 [this message]
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=f30c79b8-41c3-6206-07ae-a99174db616a@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).