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 ED7E3A0351 for ; Thu, 6 Aug 2020 11:58:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E73891C0AE; Thu, 6 Aug 2020 11:58:35 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 1CB6B1C11D for ; Thu, 6 Aug 2020 11:58:35 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id a5so33428217wrm.6 for ; Thu, 06 Aug 2020 02:58:35 -0700 (PDT) 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=JTslUUvgBTdqG3CH+ZEN+foAlU3p2+B2/uzWNEKyib8=; b=U1T4/Dt8YJ28SLNhbGu7R28dIeIB6PqCJvivPdCDf1gZRyU0ER79YUe3IKLUCpX2aD rc8gLlt7/DhJa0AAOPN1FWbhEfY39pn+t6USXUkKBFnzTYnvKoC2VVcMZhrJn/mO6dRk eDzhCCVSCMinFRNho+IiPCVtrySzh+C3yDXghO0w0uD2Zqpio8CkYKoMHCViYpqCVrGq 9coQkSriKN2XADlsJJ12QBTFnNOV3jWlurWCPIjA3CF/Zg4/rDYzh9lhRu/dsgamkaug 7i3Bob0/Af3sZsKuuHyoCMehCvyUKhwTZroOWn7DErzow6wVyn9UY4TU73B+e5zavgJ8 wXcg== 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=JTslUUvgBTdqG3CH+ZEN+foAlU3p2+B2/uzWNEKyib8=; b=TerhUe3GqbUpHwapN8rs4RUqFYgjJMW7WzqWJwq+HvYh6fk3Wp5QT2nCkhlnymqv7x 7fcT4fi0/1vNt5U6NectlXsjgu0DiTIRnXLdmMWiTI8i/P9+yL6xHpstCxMkUyRLiQMU tr9wjaUu2eeLe6djan1KsWbjfWQJc4Rd8oNwLJKrwVFh46uF8km+cA9kZq215eiTbEU8 /fULc2qwACXAdr8I/+Lk7s3aANtiqFlOyxzs7lxvK57vrgad2Ad6IvO4NbgznqC1SOdM zEMzqQbBbxf/cSLNvWl0oXqKY7ol/ZaRHvugcDwzb5jHSD+Fq1odpF4BQvXV87kS+y8s uIxw== X-Gm-Message-State: AOAM5325PTNV9jkTuSSGTKsxHw/cCRD4wGv7seQTdxb062ww71u91Zkj 2PI8byKQqwIQt+6F3UlehPyuBLoZ8rc= X-Google-Smtp-Source: ABdhPJwv3y53pqGdeVgu0swwKW+A6uOJZ05c0B66ca1AX6mzt9EjLCmVTnkSAYLfXpFQLOvLM81IyA== X-Received: by 2002:adf:fd04:: with SMTP id e4mr6461780wrr.353.1596707914652; Thu, 06 Aug 2020 02:58:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p14sm6248286wrg.96.2020.08.06.02.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Mao Jiang Cc: Qi Zhang , dpdk stable Date: Thu, 6 Aug 2020 10:53:48 +0100 Message-Id: <20200806095411.774624-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix flow director MSI-X resource allocation' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. 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. Thanks. Luca Boccassi --- >From 8d03e02240191a8fe2330c561a2106d096b20598 Mon Sep 17 00:00:00 2001 From: Mao Jiang Date: Fri, 24 Jul 2020 00:11:52 +0800 Subject: [PATCH] net/i40e: fix flow director MSI-X resource allocation [ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ] FDIR allocating msix resource is not strictly necessary, if no resource left, jump the error. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Mao Jiang Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 39c8b847c..5081cab4f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -5722,10 +5722,14 @@ i40e_vsi_setup(struct i40e_pf *pf, ret = i40e_res_pool_alloc(&pf->msix_pool, 1); if (ret < 0) { PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret); - goto fail_queue_alloc; + if (type != I40E_VSI_FDIR) + goto fail_queue_alloc; + vsi->msix_intr = 0; + vsi->nb_msix = 0; + } else { + vsi->msix_intr = ret; + vsi->nb_msix = 1; } - vsi->msix_intr = ret; - vsi->nb_msix = 1; } else { vsi->msix_intr = 0; vsi->nb_msix = 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.578789098 +0100 +++ 0020-net-i40e-fix-flow-director-MSI-X-resource-allocation.patch 2020-08-06 10:53:15.788597164 +0100 @@ -1,13 +1,14 @@ -From 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 Mon Sep 17 00:00:00 2001 +From 8d03e02240191a8fe2330c561a2106d096b20598 Mon Sep 17 00:00:00 2001 From: Mao Jiang Date: Fri, 24 Jul 2020 00:11:52 +0800 Subject: [PATCH] net/i40e: fix flow director MSI-X resource allocation +[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ] + FDIR allocating msix resource is not strictly necessary, if no resource left, jump the error. Fixes: 4861cde46116 ("i40e: new poll mode driver") -Cc: stable@dpdk.org Signed-off-by: Mao Jiang Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c -index 0c32e451c..f9a8e7132 100644 +index 39c8b847c..5081cab4f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c -@@ -5839,10 +5839,14 @@ i40e_vsi_setup(struct i40e_pf *pf, +@@ -5722,10 +5722,14 @@ i40e_vsi_setup(struct i40e_pf *pf, ret = i40e_res_pool_alloc(&pf->msix_pool, 1); if (ret < 0) { PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret);