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 A42F2A0C45 for ; Tue, 30 Nov 2021 17:36:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 98D50411A7; Tue, 30 Nov 2021 17:36:53 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 64CDF41186 for ; Tue, 30 Nov 2021 17:36:52 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 445E93F1ED for ; Tue, 30 Nov 2021 16:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290212; bh=aEhW08rhlg8Ctp3YHRMz1JoNZ1gSe/kCzKBNfblJsAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NNh4VMM/ltI/I2h0l+e6mIXymPtNsbuxer9DQ3qWWZ6kbCfpldsZ9lkwJKcesjruX pOemRxdCkdpwV+NetavaMRQTk6oy/GLtTRhdmvtw/KGNsjRxXOYm7ytLkzI+loCgr1 nJ7MCpdgeL3tkP9bJX4Lya8KhIZo03FB2PfhuIZNkqqJhXnXV710JY/MLcWb8iSVqS YVZkGSv9ovVB1GytiQQAaYT1Sq3TuU78czw5VB09Eg+NLMR2pZw7pLkBuUR5JK5xRa I/WK/29onIMIDJ5yHvz+h9MG+tjbgqdDlO10SO3tBpLNd6wEVp47aFWZ4pIBOLwqzG Veur4w8dYKg5g== Received: by mail-ed1-f71.google.com with SMTP id b15-20020aa7c6cf000000b003e7cf0f73daso17402051eds.22 for ; Tue, 30 Nov 2021 08:36:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aEhW08rhlg8Ctp3YHRMz1JoNZ1gSe/kCzKBNfblJsAE=; b=0g8gQkwAcvrWj+3DH8OKcH/DLot3V80Mwoq6jTNDqdz8vB3/99VftMFY758liJU208 BsPoO6hpZGdqsFpV7y4wxhxw/U7cjD9Fbzl00YjDZhLRnVahhr1f4oLo6GXcAZF8CaDu sFtSSSuxR9sQspIEfzHSQg0JReU6CNJJqmPuxLQ+ooxANQNRf97oa0kTeRhRl2ZKsR3+ kak3xHcuGBe6Judl7KdNXJPQ/mRn2VBmBHlSn9yidt5AuIHuo5aoVmn9DY2B5xPVEgIm juQnMSLA8rBz/tRln5ieA0V+HF+6QW3RhP8ZYhPA6gqbGMZFufJRBelp0Jl9Q4ukHQBf k75g== X-Gm-Message-State: AOAM532AsY5SyMsyBScSNIirUwTYVmR+SiCRxBbFstTzNJR69z0GawUw Su4zlLumwyiRMTBq4buClbVabfQIAJvS26mf7fcyRKMLNQAvyAhslTUPv9K6AshMBg9Qi4ixdn2 jKpa+6qO0t8VNNB0ILyKz0akD X-Received: by 2002:a05:6402:1c01:: with SMTP id ck1mr79001edb.262.1638290211668; Tue, 30 Nov 2021 08:36:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtCeE8+pCzVXjNFlZaYXK6gTmwZiELGiM+jREnOYJcIkLDkvTwbnzef0bR2A8sXIpl0wtk5w== X-Received: by 2002:a05:6402:1c01:: with SMTP id ck1mr78980edb.262.1638290211529; Tue, 30 Nov 2021 08:36:51 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id sg39sm9057251ejc.66.2021.11.30.08.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:50 -0800 (PST) From: christian.ehrhardt@canonical.com To: Heinrich Kuhn Cc: Simon Horman , dpdk stable Subject: patch 'net/nfp: fix minimum descriptor sizes' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:38 +0100 Message-Id: <20211130163605.2460997-14-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/568ce330c2a25114333fe8c9ca3549517dd867d1 Thanks. Christian Ehrhardt --- >From 568ce330c2a25114333fe8c9ca3549517dd867d1 Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Mon, 23 Aug 2021 09:59:21 +0200 Subject: [PATCH] net/nfp: fix minimum descriptor sizes [ upstream commit 96289f2b80e5921a3da54650f382b6944d9b39df ] The NFP4000/6000 supports a minimum of 256 Tx/Rx descriptors and not 64. Before this patch when a DPDK application configured < 256 Tx descriptors the hardware read/write pointers would be unmasked and not wrapped at the expected size of the ring. The PMD logic to determine the amount of free space in the Tx ring is incompatible with the unmasked hwqueue pointers and this will result in the PMD not updating the read pointer at all.The knock-on effect is that under high load the PMD will potentially re-use a Tx descriptor before the hw has had a chance to process that particular descriptor. This issue can manifest as a DMA error when the hardware tries to perform a DMA with info from a partially populated descriptor. Fixes: defb9a5dd156 ("nfp: introduce driver initialization") Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/nfp_net_pmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h index 466a11aca2..42ab369cff 100644 --- a/drivers/net/nfp/nfp_net_pmd.h +++ b/drivers/net/nfp/nfp_net_pmd.h @@ -28,10 +28,10 @@ struct nfp_net_adapter; * DPDK uses uint16_t variables for these values */ #define NFP_NET_MAX_TX_DESC (32 * 1024) -#define NFP_NET_MIN_TX_DESC 64 +#define NFP_NET_MIN_TX_DESC 256 #define NFP_NET_MAX_RX_DESC (32 * 1024) -#define NFP_NET_MIN_RX_DESC 64 +#define NFP_NET_MIN_RX_DESC 256 /* Descriptor alignment */ #define NFP_ALIGN_RING_DESC 128 -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.966339360 +0100 +++ 0014-net-nfp-fix-minimum-descriptor-sizes.patch 2021-11-30 16:50:05.530871622 +0100 @@ -1 +1 @@ -From 96289f2b80e5921a3da54650f382b6944d9b39df Mon Sep 17 00:00:00 2001 +From 568ce330c2a25114333fe8c9ca3549517dd867d1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 96289f2b80e5921a3da54650f382b6944d9b39df ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/net/nfp/nfp_rxtx.h | 4 ++-- + drivers/net/nfp/nfp_net_pmd.h | 4 ++-- @@ -27,5 +28,5 @@ -diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h -index d2d0f3f175..b0a8bf81b0 100644 ---- a/drivers/net/nfp/nfp_rxtx.h -+++ b/drivers/net/nfp/nfp_rxtx.h -@@ -30,10 +30,10 @@ +diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h +index 466a11aca2..42ab369cff 100644 +--- a/drivers/net/nfp/nfp_net_pmd.h ++++ b/drivers/net/nfp/nfp_net_pmd.h +@@ -28,10 +28,10 @@ struct nfp_net_adapter;