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 26913A054F; Tue, 18 Feb 2020 11:42:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09D241D654; Tue, 18 Feb 2020 11:42:15 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id F35021D653 for ; Tue, 18 Feb 2020 11:42:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582022532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc: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=lA1Zx5xPrea84t1svIcw4WIG5oOyp2m+7IluWzZZwhw=; b=OfhGRSrZZHfLwpeDrqCRFZ5lRfaQRE5s3NzbgK5y/8TdHluxtir3Y8smMBO3f6LDEGl8XP D4FsegqP0ytUG8FJ6yoDfsvZ0NYKDxCsKItv07+7y+aJ6IK+n9Ka+HNBEFLrDFCgYe+eWQ 3+bXucFI8L1dwPP9zshxvV9k6gz0L74= 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-139-xzc_7ZIuPXmPBt0TZZnxWg-1; Tue, 18 Feb 2020 05:42:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4DEBA107ACC4; Tue, 18 Feb 2020 10:42:06 +0000 (UTC) Received: from [10.36.112.45] (ovpn-112-45.ams2.redhat.com [10.36.112.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE9CA1001B28; Tue, 18 Feb 2020 10:42:02 +0000 (UTC) To: "Wang, Yinan" , Itsuro Oda , "dev@dpdk.org" , "Bie, Tiwei" , "Wang, Zhihong" , "Burakov, Anatoly" Cc: Thomas Monjalon , "Xu, Qian Q" , "Yao, Lei A" References: <20200108062510.3478-1-oda@valinux.co.jp> <20200206013936.11119-1-oda@valinux.co.jp> <20200206013936.11119-3-oda@valinux.co.jp> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: Date: Tue, 18 Feb 2020 11:42:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: xzc_7ZIuPXmPBt0TZZnxWg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v3 2/4] net/vhost: delay vhost driver setup 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" Thanks Yinan for reporting the issue. I'm working on a fix, which should be ready today: 1. Don't do vhost setup if device is already in the list 2. Fix the error path in setup function. Maxime On 2/18/20 9:50 AM, Wang, Yinan wrote: > Hi Itsuro/Maxime, > > Below patch (commit id:3d01b759d2679c216725689eabe44147d1737326)blocked vhost/virtio basic test: If re-config vhost port，testpmd will launch failed. > > Reproduce steps: > > ./x86_64-native-linuxapp-gcc/app/testpmd -l 2-4 -n 4 --socket-mem 1024,1024 --legacy-mem --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' --no-pci -- -i --txd=1024 --rxd=1024 > testpmd>set fwd csum > testpmd>stop > testpmd>port stop 0 > testpmd>csum set tcp sw 0 > testpmd>port start 0 > > VHOST_CONFIG: vhost-user server: socket created, fd: 26 > VHOST_CONFIG: failed to bind to vhost-net: Address already in use; remove it and try again > Failed to start driver for vhost-net > Port0 dev_configure = -1 > Fail to configure port 0 > > BR, > Yinan >> -----Original Message----- >> From: dev On Behalf Of Itsuro Oda >> Sent: 2020年2月6日 9:40 >> To: dev@dpdk.org; maxime.coquelin@redhat.com; Bie, Tiwei >> ; Wang, Zhihong ; Burakov, >> Anatoly >> Cc: stable@dpdk.org >> Subject: [dpdk-dev] [PATCH v3 2/4] net/vhost: delay vhost driver setup >> >> Vhost driver setup is delayed at eth_dev configuration in order to be able to set >> it from a secondary process. >> >> Fixes: 4852aa8f6e21 (drivers/net: enable hotplug on secondary process) >> Cc: stable@dpdk.org >> >> Signed-off-by: Itsuro Oda >> Reviewed-by: Maxime Coquelin >> --- >> drivers/net/vhost/rte_eth_vhost.c | 130 ++++++++++++++++++------------ >> 1 file changed, 78 insertions(+), 52 deletions(-) >> >> diff --git a/drivers/net/vhost/rte_eth_vhost.c >> b/drivers/net/vhost/rte_eth_vhost.c >> index cea2ead2d..d7bba5c6e 100644 >> --- a/drivers/net/vhost/rte_eth_vhost.c >> +++ b/drivers/net/vhost/rte_eth_vhost.c >> @@ -97,6 +97,8 @@ struct pmd_internal { >> rte_atomic32_t dev_attached; >> char *dev_name; >> char *iface_name; >> + uint64_t flags; >> + uint64_t disable_flags; >> uint16_t max_queues; >> int vid; >> rte_atomic32_t started; >> @@ -491,17 +493,6 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, >> uint16_t nb_bufs) >> return nb_tx; >> } >> >> -static int >> -eth_dev_configure(struct rte_eth_dev *dev __rte_unused) -{ >> - struct pmd_internal *internal = dev->data->dev_private; >> - const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; >> - >> - internal->vlan_strip = !!(rxmode->offloads & >> DEV_RX_OFFLOAD_VLAN_STRIP); >> - >> - return 0; >> -} >> - >> static inline struct internal_list * >> find_internal_resource(char *ifname) >> { >> @@ -877,6 +868,62 @@ static struct vhost_device_ops vhost_ops = { >> .vring_state_changed = vring_state_changed, }; >> >> +static int >> +vhost_driver_setup(struct rte_eth_dev *eth_dev) { >> + struct pmd_internal *internal = eth_dev->data->dev_private; >> + struct internal_list *list = NULL; >> + struct rte_vhost_vring_state *vring_state = NULL; >> + unsigned int numa_node = eth_dev->device->numa_node; >> + const char *name = eth_dev->device->name; >> + >> + list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node); >> + if (list == NULL) >> + goto error; >> + >> + vring_state = rte_zmalloc_socket(name, sizeof(*vring_state), >> + 0, numa_node); >> + if (vring_state == NULL) >> + goto error; >> + >> + list->eth_dev = eth_dev; >> + pthread_mutex_lock(&internal_list_lock); >> + TAILQ_INSERT_TAIL(&internal_list, list, next); >> + pthread_mutex_unlock(&internal_list_lock); >> + >> + rte_spinlock_init(&vring_state->lock); >> + vring_states[eth_dev->data->port_id] = vring_state; >> + >> + if (rte_vhost_driver_register(internal->iface_name, internal->flags)) >> + goto error; >> + >> + if (internal->disable_flags) { >> + if (rte_vhost_driver_disable_features(internal->iface_name, >> + internal->disable_flags)) >> + goto error; >> + } >> + >> + if (rte_vhost_driver_callback_register(internal->iface_name, >> + &vhost_ops) < 0) { >> + VHOST_LOG(ERR, "Can't register callbacks\n"); >> + goto error; >> + } >> + >> + if (rte_vhost_driver_start(internal->iface_name) < 0) { >> + VHOST_LOG(ERR, "Failed to start driver for %s\n", >> + internal->iface_name); >> + goto error; >> + } >> + >> + return 0; >> + >> +error: >> + rte_free(vring_state); >> + rte_free(list); >> + >> + return -1; >> +} >> + >> int >> rte_eth_vhost_get_queue_event(uint16_t port_id, >> struct rte_eth_vhost_queue_event *event) @@ -943,6 +990,24 @@ >> rte_eth_vhost_get_vid_from_port_id(uint16_t port_id) >> return vid; >> } >> >> +static int >> +eth_dev_configure(struct rte_eth_dev *dev) { >> + struct pmd_internal *internal = dev->data->dev_private; >> + const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; >> + >> + /* NOTE: the same process has to operate a vhost interface >> + * from beginning to end (from eth_dev configure to eth_dev close). >> + * It is user's responsibility at the moment. >> + */ >> + if (vhost_driver_setup(dev) < 0) >> + return -1; >> + >> + internal->vlan_strip = !!(rxmode->offloads & >> +DEV_RX_OFFLOAD_VLAN_STRIP); >> + >> + return 0; >> +} >> + >> static int >> eth_dev_start(struct rte_eth_dev *eth_dev) { @@ -1219,16 +1284,10 @@ >> eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, >> struct pmd_internal *internal = NULL; >> struct rte_eth_dev *eth_dev = NULL; >> struct rte_ether_addr *eth_addr = NULL; >> - struct rte_vhost_vring_state *vring_state = NULL; >> - struct internal_list *list = NULL; >> >> VHOST_LOG(INFO, "Creating VHOST-USER backend on numa >> socket %u\n", >> numa_node); >> >> - list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node); >> - if (list == NULL) >> - goto error; >> - >> /* reserve an ethdev entry */ >> eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal)); >> if (eth_dev == NULL) >> @@ -1242,11 +1301,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, >> char *iface_name, >> *eth_addr = base_eth_addr; >> eth_addr->addr_bytes[5] = eth_dev->data->port_id; >> >> - vring_state = rte_zmalloc_socket(name, >> - sizeof(*vring_state), 0, numa_node); >> - if (vring_state == NULL) >> - goto error; >> - >> /* now put it all together >> * - store queue data in internal, >> * - point eth_dev_data to internals >> @@ -1262,18 +1316,12 @@ eth_dev_vhost_create(struct rte_vdev_device >> *dev, char *iface_name, >> goto error; >> strcpy(internal->iface_name, iface_name); >> >> - list->eth_dev = eth_dev; >> - pthread_mutex_lock(&internal_list_lock); >> - TAILQ_INSERT_TAIL(&internal_list, list, next); >> - pthread_mutex_unlock(&internal_list_lock); >> - >> - rte_spinlock_init(&vring_state->lock); >> - vring_states[eth_dev->data->port_id] = vring_state; >> - >> data->nb_rx_queues = queues; >> data->nb_tx_queues = queues; >> internal->max_queues = queues; >> internal->vid = -1; >> + internal->flags = flags; >> + internal->disable_flags = disable_flags; >> data->dev_link = pmd_link; >> data->dev_flags = RTE_ETH_DEV_INTR_LSC | >> RTE_ETH_DEV_CLOSE_REMOVE; >> >> @@ -1283,26 +1331,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, >> char *iface_name, >> eth_dev->rx_pkt_burst = eth_vhost_rx; >> eth_dev->tx_pkt_burst = eth_vhost_tx; >> >> - if (rte_vhost_driver_register(iface_name, flags)) >> - goto error; >> - >> - if (disable_flags) { >> - if (rte_vhost_driver_disable_features(iface_name, >> - disable_flags)) >> - goto error; >> - } >> - >> - if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) { >> - VHOST_LOG(ERR, "Can't register callbacks\n"); >> - goto error; >> - } >> - >> - if (rte_vhost_driver_start(iface_name) < 0) { >> - VHOST_LOG(ERR, "Failed to start driver for %s\n", >> - iface_name); >> - goto error; >> - } >> - >> rte_eth_dev_probing_finish(eth_dev); >> return 0; >> >> @@ -1311,9 +1339,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, >> char *iface_name, >> rte_free(internal->iface_name); >> free(internal->dev_name); >> } >> - rte_free(vring_state); >> rte_eth_dev_release_port(eth_dev); >> - rte_free(list); >> >> return -1; >> } >> -- >> 2.17.0 >