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 E739BA04B1 for ; Fri, 28 Aug 2020 12:14:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DD4FE1C119; Fri, 28 Aug 2020 12:14:29 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id B8EA6A3 for ; Fri, 28 Aug 2020 12:14:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609667; 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=pceL6AOLlsovpSi73PWxK3sCCkFig2jubVWAKFxUjzw=; b=WO5q1KisMduF+PBIjUwZm9v8FNVST8ORtC6GySX3O7nTrrDaJB9lgOgRfQNDbce5sWncMj wzsStIwR9EEXWbdw1KPx2Rn8w3hmIrw312pKTtGsMh6X3GwBtU0US6pC6u/LMQ4cxhdbOC mUtFs6zlZBGddyQ/x5xeA3oo/YYzpQs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-120-RGHIqls-NtC5f4zHPKgtjA-1; Fri, 28 Aug 2020 06:14:23 -0400 X-MC-Unique: RGHIqls-NtC5f4zHPKgtjA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E7DB10ABDBF; Fri, 28 Aug 2020 10:14:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C86F19D7C; Fri, 28 Aug 2020 10:14:21 +0000 (UTC) From: Kevin Traynor To: Mao Jiang Cc: Qi Zhang , dpdk stable Date: Fri, 28 Aug 2020 11:12:57 +0100 Message-Id: <20200828101308.223767-31-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix flow director MSI-X resource allocation' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/b136a5c1488b398d75742cbf11ce2dac2f58c64d Thanks. Kevin. --- >From b136a5c1488b398d75742cbf11ce2dac2f58c64d 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 80410e89ea..9aacb12293 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf, 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; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.669203273 +0100 +++ 0031-net-i40e-fix-flow-director-MSI-X-resource-allocation.patch 2020-08-28 11:03:25.982955905 +0100 @@ -1 +1 @@ -From 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 Mon Sep 17 00:00:00 2001 +From b136a5c1488b398d75742cbf11ce2dac2f58c64d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8ed3b9e6e4991932ddf0a10dee4ef8ac8f46f741 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0c32e451c5..f9a8e7132f 100644 +index 80410e89ea..9aacb12293 100644 @@ -22 +23 @@ -@@ -5840,8 +5840,12 @@ i40e_vsi_setup(struct i40e_pf *pf, +@@ -5607,8 +5607,12 @@ i40e_vsi_setup(struct i40e_pf *pf,