DPDK patches and discussions
 help / color / mirror / Atom feed
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 38/40] net/virtio: move Vhost-user specifics to its backend
Date: Fri, 15 Jan 2021 13:03:05 +0100
Message-ID: <f790dde9-b8eb-0dc4-75f6-2b57bec602cf@redhat.com> (raw)
In-Reply-To: <MN2PR11MB4063B722DB5CC90F9E3019E29CAF0@MN2PR11MB4063.namprd11.prod.outlook.com>



On 1/7/21 7:32 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 38/40] net/virtio: move Vhost-user specifics to its backend
>>
>> This patch moves all the Vhost-user backend specific
>> logic like Vhost FD, listen FD and interrupt handling
>> to the vhost-user backend implementation.
>>
>> In order to achieve that, new ops are created to update
>> the link status, disconnect and reconnect the server,
>> and fetch the link state interrupt FD.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>>  drivers/net/virtio/virtio_user/vhost.h        |   4 +
>>  drivers/net/virtio/virtio_user/vhost_kernel.c |  18 +-
>>  drivers/net/virtio/virtio_user/vhost_user.c   | 169 ++++++++++++++---
>>  drivers/net/virtio/virtio_user/vhost_vdpa.c   |  16 ++
>>  .../net/virtio/virtio_user/virtio_user_dev.c  | 175 ++++++++++++++---
>>  .../net/virtio/virtio_user/virtio_user_dev.h  |   9 +-
>>  drivers/net/virtio/virtio_user_ethdev.c       | 179 +-----------------
>>  7 files changed, 340 insertions(+), 230 deletions(-)
>>
>> diff --git a/drivers/net/virtio/virtio_user/vhost.h
>> b/drivers/net/virtio/virtio_user/vhost.h
>> index ee5598226d..6001d7a164 100644
>> --- a/drivers/net/virtio/virtio_user/vhost.h
>> +++ b/drivers/net/virtio/virtio_user/vhost.h
>> @@ -75,6 +75,10 @@ struct virtio_user_backend_ops {
>>  	int (*enable_qp)(struct virtio_user_dev *dev, uint16_t pair_idx, int
>> enable);
>>  	int (*dma_map)(struct virtio_user_dev *dev, void *addr, uint64_t iova,
>> size_t len);
>>  	int (*dma_unmap)(struct virtio_user_dev *dev, void *addr, uint64_t iova,
>> size_t len);
>> +	int (*update_link_state)(struct virtio_user_dev *dev);
>> +	int (*server_disconnect)(struct virtio_user_dev *dev);
>> +	int (*server_reconnect)(struct virtio_user_dev *dev);
>> +	int (*get_intr_fd)(struct virtio_user_dev *dev);
> 
> This get_intr_fd is for getting link state interrupt fd. I think his name is a little bit
> generic. What do you think? Maybe we could change the name or add comment here to clarify here?
> 
>>  };
>>
>>  extern struct virtio_user_backend_ops virtio_ops_user;
>> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c
>> b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> index 023fddcd69..0ba37b23dc 100644
>> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c
>> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
>> @@ -459,6 +459,20 @@ vhost_kernel_get_backend_features(uint64_t *features)
>>  	return 0;
>>  }
>>
> 
> <snip>
> 
>> +static void
>> +virtio_user_dev_reset_queues_packed(struct rte_eth_dev *eth_dev)
>> +{
>> +	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;
>> +
>> +	/* Add lock to avoid queue contention. */
>> +	rte_spinlock_lock(&hw->state_lock);
>> +	hw->started = 0;
>> +
>> +	/*
>> +	 * Waitting for datapath to complete before resetting queues.
> 
> s/Waitting/Waiting

Fixed

>> +	 * 1 ms should be enough for the ongoing Tx/Rx function to finish.
>> +	 */
>> +	rte_delay_ms(1);
>> +
>> +	/* Vring reset for each Tx queue and Rx queue. */
>> +	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(eth_dev, 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);
>> +	}
>> +
>> +	hw->started = 1;
>> +	rte_spinlock_unlock(&hw->state_lock);
>> +}
>> +
>> +void
>> +virtio_user_dev_delayed_handler(void *param)
>> +{
>> +	struct virtio_user_dev *dev = param;
>> +	struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
>> +
>> +	if (rte_intr_disable(eth_dev->intr_handle) < 0) {
>> +		PMD_DRV_LOG(ERR, "interrupt disable failed");
>> +		return;
>> +	}
>> +	rte_intr_callback_unregister(eth_dev->intr_handle,
>> +				     virtio_interrupt_handler, eth_dev);
>> +	if (dev->is_server) {
>> +		dev->ops->server_disconnect(dev);
> 
> Better to check ops existence too?

Indeed, v2 will check its existence before calling.

>> +		eth_dev->intr_handle->fd = dev->ops->get_intr_fd(dev);
>> +		rte_intr_callback_register(eth_dev->intr_handle,
>> +					   virtio_interrupt_handler, eth_dev);
>> +		if (rte_intr_enable(eth_dev->intr_handle) < 0) {
>> +			PMD_DRV_LOG(ERR, "interrupt enable failed");
>> +			return;
>> +		}
>> +	}
>> +}
>> +
>> +int
>> +virtio_user_dev_server_reconnect(struct virtio_user_dev *dev)
>> +{
>> +	int ret, old_status;
>> +	struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
>> +	struct virtio_hw *hw = &dev->hw;
>> +
>> +	if (!dev->ops->server_reconnect) {
>> +		PMD_DRV_LOG(ERR, "(%s) Missing server reconnect callback", dev-
>>> path);
>> +		return -1;
>> +	}
> 
> Forget to call server_reconnect? :) 

Indeed! When I said I didn't tried last 5 patches, I wasn't lying! :)

>> +
>> +	old_status = virtio_get_status(hw);
>> +
>> +	virtio_reset(hw);
>> +
>> +	virtio_set_status(hw, VIRTIO_CONFIG_STATUS_ACK);
>> +
>> +	virtio_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);
>> +
>> +	if (dev->ops->get_features(dev, &dev->device_features) < 0) {
>> +		PMD_INIT_LOG(ERR, "get_features failed: %s",
>> +			     strerror(errno));
>> +		return -1;
>> +	}
>> +
>> +	dev->device_features |= dev->frontend_features;
>> +
>> +	/* umask vhost-user unsupported features */
> 
> s/umask/unmask

Fixed.

Thanks,
Maxime

> Thanks,
> Chenbo
> 


  reply	other threads:[~2021-01-15 12:03 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 [this message]
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
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=f790dde9-b8eb-0dc4-75f6-2b57bec602cf@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

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git