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 6B9D2A0524 for ; Thu, 4 Feb 2021 12:38:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5547124076C; Thu, 4 Feb 2021 12:38:21 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 1589624076C for ; Thu, 4 Feb 2021 12:38:20 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cxn-0005jf-Rv; Thu, 04 Feb 2021 11:38:19 +0000 From: Christian Ehrhardt To: Jingjing Wu Cc: Beilei Xing , dpdk stable Date: Thu, 4 Feb 2021 12:29:36 +0100 Message-Id: <20210204112954.2488123-121-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix vector mapping with queue' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/4ebd01e0e358cf1f8b7e3ba1867beb67f508a76b Thanks. Christian Ehrhardt --- >From 4ebd01e0e358cf1f8b7e3ba1867beb67f508a76b Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Thu, 28 Jan 2021 23:00:21 +0800 Subject: [PATCH] net/iavf: fix vector mapping with queue [ upstream commit b08728b4a001822d71e0a88487c3814c60a502c9 ] Fix the vector mapping with queue by changing the recircle when exceeds RX_VEC_START + nb_msix; Fixes: d6bde6b5eae9 ("net/avf: enable Rx interrupt") Signed-off-by: Jingjing Wu Acked-by: Beilei Xing --- drivers/net/iavf/iavf_ethdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 386a53cfc9..717d6a242c 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -403,14 +403,14 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, /* If Rx interrupt is reuquired, and we can use * multi interrupts, then the vec is from 1 */ - vf->nb_msix = RTE_MIN(vf->vf_res->max_vectors, - intr_handle->nb_efd); + vf->nb_msix = RTE_MIN(intr_handle->nb_efd, + (uint16_t)(vf->vf_res->max_vectors - 1)); vf->msix_base = IAVF_RX_VEC_START; vec = IAVF_RX_VEC_START; for (i = 0; i < dev->data->nb_rx_queues; i++) { vf->rxq_map[vec] |= 1 << i; intr_handle->intr_vec[i] = vec++; - if (vec >= vf->nb_msix) + if (vec >= vf->nb_msix + IAVF_RX_VEC_START) vec = IAVF_RX_VEC_START; } PMD_DRV_LOG(DEBUG, -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.979675808 +0100 +++ 0121-net-iavf-fix-vector-mapping-with-queue.patch 2021-02-04 12:04:28.178789872 +0100 @@ -1 +1 @@ -From b08728b4a001822d71e0a88487c3814c60a502c9 Mon Sep 17 00:00:00 2001 +From 4ebd01e0e358cf1f8b7e3ba1867beb67f508a76b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b08728b4a001822d71e0a88487c3814c60a502c9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5309427082..b20657221a 100644 +index 386a53cfc9..717d6a242c 100644 @@ -22 +23 @@ -@@ -610,15 +610,15 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, +@@ -403,14 +403,14 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, @@ -33,2 +34 @@ - qv_map[i].queue_id = i; - qv_map[i].vector_id = vec; + vf->rxq_map[vec] |= 1 << i; @@ -40 +40 @@ - vf->qv_map = qv_map; + PMD_DRV_LOG(DEBUG,