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 7D70DA0524 for ; Fri, 5 Feb 2021 12:39:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74681188A76; Fri, 5 Feb 2021 12:39:52 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 20530188A77 for ; Fri, 5 Feb 2021 12:39:51 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id f16so5746014wmq.5 for ; Fri, 05 Feb 2021 03:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3BrMqJ3TEUBzb7tbh4Ei37+yQbyoYAWa9MBHikyH0LQ=; b=tgXpdNP7vdWW/jcwpHmjOz7khn1AiMtAX44HDeUTKcjAoemkg7jC510WAaR1CWnwtb 47yYMS4SZH5ueg9aChU9hRcdtQbaUS/bVBQaWYNaRDETZ6bVYDrxLcfpv6IhdZlbE0m0 +mGuHP/UnWQHgxu8/0WIjdhNsTSUABDkduintfs9iFt7WjAfwhT5lVllVQgDs/smOMyM R3+euTvJ4uR8vBKbP+R8sxTPZq1R31XLIJiMHLASm6OZQGytnMBUpTIl0SZ0YzqMPyKE gfoo3Ulj1u4B7yVAYKMaD75JaAXyGXYKgHwWC3QbueOnL9D/r7UKjxtO4++a+psX2B71 OhhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3BrMqJ3TEUBzb7tbh4Ei37+yQbyoYAWa9MBHikyH0LQ=; b=E/SpZHkwhiS/XGHnGeBycn7NqFfMW1WH4XllE+nv05KBGCdMmSSPMPb3rjVap85A/1 Gv+F4G8iXgwS0nJ2XA6hkIAHs9BYtzvOOqaMloMZecTKd5uPbgCQZipTa0XEajDK7YL4 CzlnVdYK/+xA0eyJND7OyTlh52ToWKmKuZwt4aDy1dr2tzKRHO3KNxQ6p7WT+HKaznuM l9Ge977Kmg5QTBf3O04ZKVj0sSPTQeEZ/bVV5hQ2hrjpSN0sOVwX4XZIrF/AfLbLW0x/ OD5o8DaHnkwbI9HPMy5J2FT/AMfrzSGhLi0kjJdcAWx3GyNUsSOmPrwp1D97zsIpwCSZ WmBg== X-Gm-Message-State: AOAM5337/8CFmvovwSVuOWwE9fKu2mybNwjAK3i3PVOCdaUMCd0+ikAC b869qBpRFRb9BdEFJT00D4k= X-Google-Smtp-Source: ABdhPJzO+ym0kpO8AuzcVnTJYHWxgizZaxDmAt8xZoyPIberNLlH7+kbzCzzD8536iwTJLvOU2r5dQ== X-Received: by 2002:a1c:9cc5:: with SMTP id f188mr3137020wme.171.1612525190869; Fri, 05 Feb 2021 03:39:50 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j7sm12711121wrp.72.2021.02.05.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:39:50 -0800 (PST) From: luca.boccassi@gmail.com To: Jingjing Wu Cc: Beilei Xing , dpdk stable Date: Fri, 5 Feb 2021 11:19:19 +0000 Message-Id: <20210205111920.1272063-273-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8ead7e57f6dbf8eabc6f84d817c02af064ffc5d7 Thanks. Luca Boccassi --- >From 8ead7e57f6dbf8eabc6f84d817c02af064ffc5d7 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 2a8b47c127..ed69ba483e 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -572,15 +572,15 @@ 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++) { qv_map[i].queue_id = i; qv_map[i].vector_id = vec; 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; } vf->qv_map = qv_map; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:41.225721555 +0000 +++ 0273-net-iavf-fix-vector-mapping-with-queue.patch 2021-02-05 11:18:29.362701697 +0000 @@ -1 +1 @@ -From b08728b4a001822d71e0a88487c3814c60a502c9 Mon Sep 17 00:00:00 2001 +From 8ead7e57f6dbf8eabc6f84d817c02af064ffc5d7 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 2a8b47c127..ed69ba483e 100644 @@ -22 +23 @@ -@@ -610,15 +610,15 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, +@@ -572,15 +572,15 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,