From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7AB5A04A5; Wed, 17 Jun 2020 14:22:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 870B51252; Wed, 17 Jun 2020 14:22:09 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DA7DE100C for ; Wed, 17 Jun 2020 14:22:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592396527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Xf3Y6t6h28sCrZxQKI9L5uwLWr+Doz8qryw6qt/EKX8=; b=iXNW/uP2p/ebbmDFfeoycBRy9IlLoSQ7wjtbaYW+C+mcViUgWbuavilIdne8RTHTzq8WSZ xyTP41QR2P4tvnTD88aud5k5AfiLA5uphahpHrw2Msl+ifcUwxId3VhZhGOrvooQAmqo9E WGPXVO4/8mTzhG+E6QrMqZQE2WNTWxA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-Uk4q7V5NPpiAKqxUiTB_PA-1; Wed, 17 Jun 2020 08:22:05 -0400 X-MC-Unique: Uk4q7V5NPpiAKqxUiTB_PA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3C3A107AD74; Wed, 17 Jun 2020 12:22:04 +0000 (UTC) Received: from [10.36.110.7] (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C7955D9D3; Wed, 17 Jun 2020 12:22:02 +0000 (UTC) To: "Xia, Chenbo" , "dev@dpdk.org" , "amorenoz@redhat.com" , "Ye, Xiaolong" , "shahafs@mellanox.com" , "matan@mellanox.com" References: <20200528074627.439192-1-maxime.coquelin@redhat.com> <20200528074627.439192-2-maxime.coquelin@redhat.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <80c396dc-1294-cf70-4fb3-86ff6a9b3918@redhat.com> Date: Wed, 17 Jun 2020 14:22:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 1/3] net/virtio: add vhost-user protocol features support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 6/17/20 1:57 PM, Xia, Chenbo wrote: > Hi Maxime, > >> -----Original Message----- >> From: dev On Behalf Of Maxime Coquelin >> Sent: Thursday, May 28, 2020 3:46 PM >> To: dev@dpdk.org; amorenoz@redhat.com; Ye, Xiaolong >> ; shahafs@mellanox.com; matan@mellanox.com >> Cc: Maxime Coquelin >> Subject: [dpdk-dev] [PATCH 1/3] net/virtio: add vhost-user protocol features >> support >> >> This patch adds support for Vhost-user protocol features. >> It is required to support protocol features that were not in initial Vhost-user >> specification, such as reply-ack, MTU... >> >> Also, this patch prevents Virtio multiqueue feature negotiation if the slave does >> not support MQ protocol feature as stated in Vhost-user specification: >> "The multiple queues feature is supported only when the protocol feature >> ``VHOST_USER_PROTOCOL_F_MQ`` (bit 0) is set." >> >> Signed-off-by: Maxime Coquelin >> --- >> drivers/net/virtio/virtio_user/vhost.h | 9 +++++ >> drivers/net/virtio/virtio_user/vhost_user.c | 3 ++ >> .../net/virtio/virtio_user/virtio_user_dev.c | 39 ++++++++++++++++++- >> .../net/virtio/virtio_user/virtio_user_dev.h | 3 ++ >> drivers/net/virtio/virtio_user_ethdev.c | 19 +++++++++ >> 5 files changed, 71 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/virtio/virtio_user/vhost.h >> b/drivers/net/virtio/virtio_user/vhost.h >> index 1e784e58ef..9ace1a90c3 100644 >> --- a/drivers/net/virtio/virtio_user/vhost.h >> +++ b/drivers/net/virtio/virtio_user/vhost.h >> @@ -44,6 +44,15 @@ struct vhost_vring_addr { >> uint64_t log_guest_addr; >> }; >> >> +#ifndef VHOST_USER_F_PROTOCOL_FEATURES >> +#define VHOST_USER_F_PROTOCOL_FEATURES 30 #endif >> + >> +/** Protocol features. */ >> +#ifndef VHOST_USER_PROTOCOL_F_MQ >> +#define VHOST_USER_PROTOCOL_F_MQ 0 >> +#endif >> + >> enum vhost_user_request { >> VHOST_USER_NONE = 0, >> VHOST_USER_GET_FEATURES = 1, >> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c >> b/drivers/net/virtio/virtio_user/vhost_user.c >> index 74b82e56e4..b687665042 100644 >> --- a/drivers/net/virtio/virtio_user/vhost_user.c >> +++ b/drivers/net/virtio/virtio_user/vhost_user.c >> @@ -269,10 +269,12 @@ vhost_user_sock(struct virtio_user_dev *dev, >> >> switch (req) { >> case VHOST_USER_GET_FEATURES: >> + case VHOST_USER_GET_PROTOCOL_FEATURES: >> need_reply = 1; >> break; >> >> case VHOST_USER_SET_FEATURES: >> + case VHOST_USER_SET_PROTOCOL_FEATURES: >> case VHOST_USER_SET_LOG_BASE: >> msg.payload.u64 = *((__u64 *)arg); >> msg.size = sizeof(m.payload.u64); >> @@ -351,6 +353,7 @@ vhost_user_sock(struct virtio_user_dev *dev, >> >> switch (req) { >> case VHOST_USER_GET_FEATURES: >> + case VHOST_USER_GET_PROTOCOL_FEATURES: >> if (msg.size != sizeof(m.payload.u64)) { >> PMD_DRV_LOG(ERR, "Received bad msg size"); >> return -1; >> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> index 7fb135f49a..3afb09df2d 100644 >> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> @@ -151,8 +151,10 @@ virtio_user_start_device(struct virtio_user_dev *dev) >> if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0) >> goto error; >> >> - /* Step 1: set features */ >> + /* Step 1: negotiate protocol features & set features */ >> features = dev->features; >> + >> + >> /* Strip VIRTIO_NET_F_MAC, as MAC address is handled in vdev init */ >> features &= ~(1ull << VIRTIO_NET_F_MAC); >> /* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know >> */ @@ -417,13 +419,19 @@ virtio_user_dev_setup(struct virtio_user_dev *dev) >> 1ULL << VIRTIO_NET_F_GUEST_TSO6 | \ >> 1ULL << VIRTIO_F_IN_ORDER | \ >> 1ULL << VIRTIO_F_VERSION_1 | \ >> - 1ULL << VIRTIO_F_RING_PACKED) >> + 1ULL << VIRTIO_F_RING_PACKED | \ >> + 1ULL << VHOST_USER_F_PROTOCOL_FEATURES) >> + >> +#define VIRTIO_USER_SUPPORTED_PROTOCOL_FEATURES \ >> + (1ULL << VHOST_USER_PROTOCOL_F_MQ) >> >> 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 server, int mrg_rxbuf, int in_order, int packed_vq) { >> + uint64_t protocol_features = 0; >> + >> pthread_mutex_init(&dev->mutex, NULL); >> strlcpy(dev->path, path, PATH_MAX); >> dev->started = 0; >> @@ -434,6 +442,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char >> *path, int queues, >> dev->mac_specified = 0; >> dev->frontend_features = 0; >> dev->unsupported_features = ~VIRTIO_USER_SUPPORTED_FEATURES; >> + dev->protocol_features = >> VIRTIO_USER_SUPPORTED_PROTOCOL_FEATURES; >> parse_mac(dev, mac); >> >> if (*ifname) { >> @@ -446,6 +455,10 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char >> *path, int queues, >> return -1; >> } >> >> + if (!is_vhost_user_by_type(dev->path)) >> + dev->unsupported_features |= >> + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES); >> + >> if (!dev->is_server) { >> if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER, >> NULL) < 0) { >> @@ -460,6 +473,26 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char >> *path, int queues, >> strerror(errno)); >> return -1; >> } >> + >> + >> + if (dev->device_features & >> + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) { >> + if (dev->ops->send_request(dev, >> + VHOST_USER_GET_PROTOCOL_FEATURES, >> + &protocol_features)) >> + return -1; >> + } > > Should we put '}' after sending VHOST_USER_SET_PROTOCOL_FEATURES like in virtio_user_server_reconnect? Good catch, we indeed don't want to send a Vhost-user request if it is not supported by the Vhost-user backend. >> + >> + dev->protocol_features &= protocol_features; >> + >> + if (dev->ops->send_request(dev, >> + VHOST_USER_SET_PROTOCOL_FEATURES, >> + &dev->protocol_features)) >> + return -1; >> + >> + if (!(dev->protocol_features & >> + (1ULL << >> VHOST_USER_PROTOCOL_F_MQ))) >> + dev->unsupported_features |= (1ull << >> VIRTIO_NET_F_MQ); >> } else { >> /* We just pretend vhost-user can support all these features. >> * Note that this could be problematic that if some feature is >> @@ -469,6 +502,8 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char >> *path, int queues, >> dev->device_features = VIRTIO_USER_SUPPORTED_FEATURES; >> } >> >> + >> + >> if (!mrg_rxbuf) >> dev->unsupported_features |= (1ull << >> VIRTIO_NET_F_MRG_RXBUF); >> >> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h >> b/drivers/net/virtio/virtio_user/virtio_user_dev.h >> index 3b6b6065a5..56e638f8a6 100644 >> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h >> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h >> @@ -40,6 +40,9 @@ struct virtio_user_dev { >> uint64_t device_features; /* supported features by device */ >> uint64_t frontend_features; /* enabled frontend features */ >> uint64_t unsupported_features; /* unsupported features mask >> */ >> + uint64_t protocol_features; /* negotiated protocol features >> + * (Vhost-user only) >> + */ >> uint8_t status; >> uint16_t port_id; >> uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; >> diff --git a/drivers/net/virtio/virtio_user_ethdev.c >> b/drivers/net/virtio/virtio_user_ethdev.c >> index 798f191c32..ccb5a18e25 100644 >> --- a/drivers/net/virtio/virtio_user_ethdev.c >> +++ b/drivers/net/virtio/virtio_user_ethdev.c >> @@ -68,6 +68,7 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) >> int connectfd; >> struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id]; >> struct virtio_hw *hw = eth_dev->data->dev_private; >> + uint64_t protocol_features; >> >> connectfd = accept(dev->listenfd, NULL, NULL); >> if (connectfd < 0) >> @@ -81,6 +82,24 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) >> return -1; >> } >> >> + if (dev->device_features & >> + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) { >> + if (dev->ops->send_request(dev, >> + >> VHOST_USER_GET_PROTOCOL_FEATURES, >> + &protocol_features)) >> + return -1; >> + >> + dev->protocol_features &= protocol_features; >> + >> + if (dev->ops->send_request(dev, >> + >> VHOST_USER_SET_PROTOCOL_FEATURES, >> + &dev->protocol_features)) >> + return -1; >> + } >> + >> + if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ))) >> + dev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ); > > Should we consider the case that vhost-user does not support VHOST_USER_F_PROTOCOL_FEATURES but support > VIRTIO_NET_F_MQ? Because if the device negotiated feature does not include that, we should not use above logic to decide > whether MQ is supported. If the case should be considered, the above two lines should be moved into last '{}' and > same thing should be done in virtio_user_dev_init. The Vhost-user specification says: " Masters must not rely on the ``VHOST_USER_PROTOCOL_F_MQ`` protocol feature for devices with a fixed number of virtqueues. Only true multiqueue devices require this protocol feature. " Virtio-net device being a true multiqueue device it should require this. But for now Virtio-user PMD does not use VHOST_USER_GET_QUEUE_NUM, so it might not be mandatory. I can drop it for now, but we should consider adding support for sending VHOST_USER_GET_QUEUE_NUM, as the container may want to know how many queues are supported by the Vhost-user backend or the vDPA device. Thanks! Maxime > Thanks! > Chenbo > >> + >> dev->device_features |= dev->frontend_features; >> >> /* umask vhost-user unsupported features */ >> -- >> 2.26.2 >