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 2264B42ECF for ; Thu, 20 Jul 2023 17:24:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E46C40685; Thu, 20 Jul 2023 17:24:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 51719400D6 for ; Thu, 20 Jul 2023 17:24:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866661; 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=wAcsdEzHgAVz6z57XVLYHoFQGXxJNcsiztBke2bl12A=; b=REHEf+cm3sgA8DspMHMDaf8n4wAOYTAfGYKCCVCAXILjpIOAfRm6QOO7mZgSdLP0hm1bG+ B7GE1YDrQSQcwItbDJ3DwLGAGP/4cWH6tk89vLEIzceN4CEBsLE5hKIFgCao/8klA+taNG leOtEDyL3HcNTZtHxamlQFciDAPkIHg= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-56-s9YMe3eQOCuK6u3C8EV16A-1; Thu, 20 Jul 2023 11:22:42 -0400 X-MC-Unique: s9YMe3eQOCuK6u3C8EV16A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D580A88D1BE; Thu, 20 Jul 2023 15:21:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C99A7492C13; Thu, 20 Jul 2023 15:21:38 +0000 (UTC) From: Kevin Traynor To: Wenjun Wu Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix Rx data buffer size' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:16 +0100 Message-ID: <20230720151942.262154-65-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d5755af28b88ef9b9a072d74412e803f54e57eaa Thanks. Kevin --- >From d5755af28b88ef9b9a072d74412e803f54e57eaa Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 14 Apr 2023 13:47:40 +0800 Subject: [PATCH] net/i40e: fix Rx data buffer size [ upstream commit ff2ec0ce04739240205628207881a91e1e330cb7 ] According to hardware spec, the data buffer size should not be greater than 16K - 128. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 ++ drivers/net/i40e/i40e_rxtx.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 9a00a9b71e..aa188bff14 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2905,4 +2905,6 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size, (1 << I40E_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, + I40E_RX_MAX_DATA_BUF_SIZE); rxq->hs_mode = i40e_header_split_none; break; diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 5e6eecc501..0376c219be 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -22,4 +22,7 @@ #define I40E_ALIGN_RING_DESC 32 +/* Max data buffer size must be 16K - 128 bytes */ +#define I40E_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + #define I40E_MIN_RING_DESC 64 #define I40E_MAX_RING_DESC 4096 -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:02.809025104 +0100 +++ 0065-net-i40e-fix-Rx-data-buffer-size.patch 2023-07-20 16:17:54.847751267 +0100 @@ -1 +1 @@ -From ff2ec0ce04739240205628207881a91e1e330cb7 Mon Sep 17 00:00:00 2001 +From d5755af28b88ef9b9a072d74412e803f54e57eaa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff2ec0ce04739240205628207881a91e1e330cb7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 788ffb51c2..fbbefb5015 100644 +index 9a00a9b71e..aa188bff14 100644