From patchwork Wed Mar 22 10:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boleslav Stankevich X-Patchwork-Id: 125421 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A545742803; Wed, 22 Mar 2023 11:23:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BD9D40E09; Wed, 22 Mar 2023 11:23:38 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id C4D7440A84; Wed, 22 Mar 2023 11:23:36 +0100 (CET) Received: from finrod.oktetlabs.ru (finrod.oktetlabs.ru [192.168.38.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPS id EF4545A; Wed, 22 Mar 2023 13:23:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru EF4545A Authentication-Results: shelob.oktetlabs.ru/EF4545A; dkim=none; dkim-atps=neutral From: Boleslav Stankevich To: dev@dpdk.org Cc: Boleslav Stankevich , stable@dpdk.org, Andrew Rybchenko , Maxime Coquelin , Chenbo Xia , David Marchand , Hyong Youb Kim , Harman Kalra Subject: [PATCH 1/2] net/virtio: propagate return value of called function Date: Wed, 22 Mar 2023 13:23:24 +0300 Message-Id: <20230322102325.1739053-1-boleslav.stankevich@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org rte_intr_vec_list_alloc() may fail because of different reasons which are indicated by different negative errno values. Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Cc: stable@dpdk.org Signed-off-by: Boleslav Stankevich Signed-off-by: Andrew Rybchenko Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_ethdev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index ae84d313be..5c8b7b95e9 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1390,6 +1390,7 @@ static int virtio_configure_intr(struct rte_eth_dev *dev) { struct virtio_hw *hw = dev->data->dev_private; + int ret; if (!rte_intr_cap_multiple(dev->intr_handle)) { PMD_INIT_LOG(ERR, "Multiple intr vector not supported"); @@ -1401,11 +1402,12 @@ virtio_configure_intr(struct rte_eth_dev *dev) return -1; } - if (rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec", - hw->max_queue_pairs)) { + ret = rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec", + hw->max_queue_pairs); + if (ret < 0) { PMD_INIT_LOG(ERR, "Failed to allocate %u rxq vectors", hw->max_queue_pairs); - return -ENOMEM; + return ret; } if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) { From patchwork Wed Mar 22 10:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boleslav Stankevich X-Patchwork-Id: 125422 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6510E42803; Wed, 22 Mar 2023 11:23:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7CE442BAC; Wed, 22 Mar 2023 11:23:40 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 1B847410EF; Wed, 22 Mar 2023 11:23:39 +0100 (CET) Received: from finrod.oktetlabs.ru (finrod.oktetlabs.ru [192.168.38.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPS id 4930E5D; Wed, 22 Mar 2023 13:23:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 4930E5D Authentication-Results: shelob.oktetlabs.ru/4930E5D; dkim=none; dkim-atps=neutral From: Boleslav Stankevich To: dev@dpdk.org Cc: Boleslav Stankevich , stable@dpdk.org, Andrew Rybchenko , Maxime Coquelin , Chenbo Xia , Jianfeng Tan , Yuanhan Liu , Tetsuya Mukawa , Huawei Xie Subject: [PATCH 2/2] net/virtio: fix device init to return negative errno Date: Wed, 22 Mar 2023 13:23:25 +0300 Message-Id: <20230322102325.1739053-2-boleslav.stankevich@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230322102325.1739053-1-boleslav.stankevich@oktetlabs.ru> References: <20230322102325.1739053-1-boleslav.stankevich@oktetlabs.ru> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org virtio_init_device() and called helper functions sometimes return -1 when return code should be negative errno. Fix all such cases to return correct negative errno instead. Fixes: 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts") Fixes: 0c9d66207054 ("net/virtio: support RSS") Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0") Fixes: 49d26d9e3f47 ("net/virtio: support MTU feature") Cc: stable@dpdk.org Signed-off-by: Boleslav Stankevich Signed-off-by: Andrew Rybchenko Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_ethdev.c | 33 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 5c8b7b95e9..ca4ade9ff2 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1397,9 +1397,10 @@ virtio_configure_intr(struct rte_eth_dev *dev) return -ENOTSUP; } - if (rte_intr_efd_enable(dev->intr_handle, dev->data->nb_rx_queues)) { + ret = rte_intr_efd_enable(dev->intr_handle, dev->data->nb_rx_queues); + if (ret < 0) { PMD_INIT_LOG(ERR, "Fail to create eventfd"); - return -1; + return ret; } ret = rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec", @@ -1428,12 +1429,13 @@ virtio_configure_intr(struct rte_eth_dev *dev) */ if (virtio_intr_enable(dev) < 0) { PMD_DRV_LOG(ERR, "interrupt enable failed"); - return -1; + return -EINVAL; } - if (virtio_queues_bind_intr(dev) < 0) { + ret = virtio_queues_bind_intr(dev); + if (ret < 0) { PMD_INIT_LOG(ERR, "Failed to bind queue/interrupt"); - return -1; + return ret; } return 0; @@ -1756,7 +1758,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev) eth_dev->device->numa_node); if (!hw->rss_key) { PMD_INIT_LOG(ERR, "Failed to allocate RSS key"); - return -1; + return -ENOMEM; } } @@ -1778,7 +1780,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev) eth_dev->device->numa_node); if (!hw->rss_reta) { PMD_INIT_LOG(ERR, "Failed to allocate RSS reta"); - return -1; + return -ENOMEM; } hw->rss_rx_queues = 0; @@ -1818,7 +1820,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) /* Tell the host we've known how to drive the device. */ virtio_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER); if (virtio_ethdev_negotiate_features(hw, req_features) < 0) - return -1; + return -EINVAL; hw->weak_barriers = !virtio_with_feature(hw, VIRTIO_F_ORDER_PLATFORM); @@ -1900,7 +1902,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) if (config->mtu < RTE_ETHER_MIN_MTU) { PMD_INIT_LOG(ERR, "invalid max MTU value (%u)", config->mtu); - return -1; + return -EINVAL; } hw->max_mtu = config->mtu; @@ -1913,9 +1915,11 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) } hw->rss_hash_types = 0; - if (virtio_with_feature(hw, VIRTIO_NET_F_RSS)) - if (virtio_dev_rss_init(eth_dev)) - return -1; + if (virtio_with_feature(hw, VIRTIO_NET_F_RSS)) { + ret = virtio_dev_rss_init(eth_dev); + if (ret < 0) + return ret; + } PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=%d", config->max_virtqueue_pairs); @@ -1937,10 +1941,11 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) return ret; if (eth_dev->data->dev_conf.intr_conf.rxq) { - if (virtio_configure_intr(eth_dev) < 0) { + ret = virtio_configure_intr(eth_dev); + if (ret < 0) { PMD_INIT_LOG(ERR, "failed to configure interrupt"); virtio_free_queues(hw); - return -1; + return ret; } }