From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5C2FFA0555 for ; Thu, 9 Jun 2022 13:38:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57BCD42802; Thu, 9 Jun 2022 13:38:39 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 99B6840220 for ; Thu, 9 Jun 2022 13:38:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774717; 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; bh=kBMbXD3FaEe02I2DJ9Mq40ZT0yUT90QYUC3rGvvdomQ=; b=H2+fVM1ACrtUFj2yL0RaljoTbMWldukjBvXIIb9iMLkKKaJsDL/DdUhrFaJnqcag3A0Wlu V0LqdVSfFkrarQWQbQkTTsB1+BSJGtXK5BJoZ4BwZvh7220ycOExTmJJV6ylTSofhWGIFE RudAEhH+CwYLkSkJAJn1+SO/ejrJt0k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-UbC-FGMzNCOHh9jzpUB4xA-1; Thu, 09 Jun 2022 07:38:34 -0400 X-MC-Unique: UbC-FGMzNCOHh9jzpUB4xA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5AFB801755; Thu, 9 Jun 2022 11:38:33 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2198918EA3; Thu, 9 Jun 2022 11:38:33 +0000 (UTC) From: Kevin Traynor To: Qiming Yang Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix queue start exception handling' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:48 +0100 Message-Id: <20220609113701.386938-61-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/01e45a13abdcfd4e958df756da5038a86274501e Thanks. Kevin --- >From 01e45a13abdcfd4e958df756da5038a86274501e Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Thu, 19 May 2022 05:01:56 +0000 Subject: [PATCH] net/iavf: fix queue start exception handling [ upstream commit 1fa739c3f2b3876d21e506c024a3c6bee6562943 ] If any queue start fail during dev_start, all started queues should be stopped. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 79397f15e5..69472869e3 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -897,26 +897,36 @@ iavf_start_queues(struct rte_eth_dev *dev) struct iavf_tx_queue *txq; int i; + uint16_t nb_txq, nb_rxq; - for (i = 0; i < dev->data->nb_tx_queues; i++) { - txq = dev->data->tx_queues[i]; + for (nb_txq = 0; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + txq = dev->data->tx_queues[nb_txq]; if (txq->tx_deferred_start) continue; - if (iavf_dev_tx_queue_start(dev, i) != 0) { - PMD_DRV_LOG(ERR, "Fail to start queue %u", i); - return -1; + if (iavf_dev_tx_queue_start(dev, nb_txq) != 0) { + PMD_DRV_LOG(ERR, "Fail to start tx queue %u", nb_txq); + goto tx_err; } } - for (i = 0; i < dev->data->nb_rx_queues; i++) { - rxq = dev->data->rx_queues[i]; + for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; if (rxq->rx_deferred_start) continue; - if (iavf_dev_rx_queue_start(dev, i) != 0) { - PMD_DRV_LOG(ERR, "Fail to start queue %u", i); - return -1; + if (iavf_dev_rx_queue_start(dev, nb_rxq) != 0) { + PMD_DRV_LOG(ERR, "Fail to start rx queue %u", nb_rxq); + goto rx_err; } } return 0; + +rx_err: + for (i = 0; i < nb_rxq; i++) + iavf_dev_rx_queue_stop(dev, i); +tx_err: + for (i = 0; i < nb_txq; i++) + iavf_dev_tx_queue_stop(dev, i); + + return -1; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.169618556 +0100 +++ 0061-net-iavf-fix-queue-start-exception-handling.patch 2022-06-09 12:34:29.796980727 +0100 @@ -1 +1 @@ -From 1fa739c3f2b3876d21e506c024a3c6bee6562943 Mon Sep 17 00:00:00 2001 +From 01e45a13abdcfd4e958df756da5038a86274501e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1fa739c3f2b3876d21e506c024a3c6bee6562943 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 198d8299af..315ab15aad 100644 +index 79397f15e5..69472869e3 100644 @@ -22 +23 @@ -@@ -927,26 +927,36 @@ iavf_start_queues(struct rte_eth_dev *dev) +@@ -897,26 +897,36 @@ iavf_start_queues(struct rte_eth_dev *dev)