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 75BC942CBC for ; Thu, 15 Jun 2023 03:35:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FA5C42D4B; Thu, 15 Jun 2023 03:35:44 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id E6BF840DDA for ; Thu, 15 Jun 2023 03:35:43 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-3f7fcdc7f7fso1744325e9.0 for ; Wed, 14 Jun 2023 18:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792943; x=1689384943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jSlyAUG5EwW2ffsPbyjpkT3jT6uXb/etvr5viN3LHW0=; b=UHrHzDoLD0lbPDOA2/v4bwBhzsH3MrG3oUmGBcJvqr4tCp88lGz6JnVUaZbjjsJ9Wh +cwOV+wUk9xp1MHbI+PwFqI2aVREZ0NLFGHrqTmW9MCIlAoiKyeEKIVGRCFtmw6B2ljp jj/0yoabAQvEKeBRGmOq1rP3w4UnvUBokJuCv/JIv6Ns7ZVc0iJlSrEzSEA5P9rIPtRQ qC6ZjQ008Ew8VJ6Hc5sI+A9UMnxmlOnOEZQGyFKxhOigElNCHw79TLGqAkwkiismjZk2 Y9HgvNyHcRGS7ghIwHha/kiGnwgkgptgpCr0DvN2ZGSeTiADzYO3da05mDtJuDNUZuOF jVAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792943; x=1689384943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jSlyAUG5EwW2ffsPbyjpkT3jT6uXb/etvr5viN3LHW0=; b=WfXmQlJhtpMkefA/mn6So7Qo+pwOfMJcN+MUJkqd8lDrJ1+OKtsP0irqzo64VURfkQ wnMBk8FjQcpHUhI/Obo+teZKDlTTJyjGKhYO20GR/d/atjOUFJQDqccs/uIbhqRjjAH8 oYuJEU8lCYD2eqglwRAsMCtQ13zJoGYfa2RwT7YpG1Kjd4xWUwE/609eVEGHsIJnRJpQ gh1v4BBVcJ9lJsN6rSfJaJb7NPcra4jCFtRyLkVZfjke+oqagdKgDO3ZxUk8GR5bUZaP Njq9tTFILWZNIQnUP917wY1OdXT9GmLQFuxbbe4OYvtgqeESp86H2wDW9oSPqEJYKR+r ASDQ== X-Gm-Message-State: AC+VfDwwm2gJ/mU+BT2De7NLTBHvYA1YBMvmDxdKLgWAlYBlfa4PsbuB gimPoG+FHtO9YohiGqIXDToHmwu9XUydYIng X-Google-Smtp-Source: ACHHUZ6yTTZ+8XNE45n5D6tiM/d9gWChTuM0Gv9YwfyQATEzatyDKFRRGn9pLreJw60MJyCVsABx9w== X-Received: by 2002:a5d:46d2:0:b0:30f:df4e:217d with SMTP id g18-20020a5d46d2000000b0030fdf4e217dmr2758839wrs.6.1686792943513; Wed, 14 Jun 2023 18:35:43 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m12-20020adfe0cc000000b003078681a1e8sm19675124wri.54.2023.06.14.18.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:35:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix Rx data buffer size' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:46 +0100 Message-Id: <20230615013258.1439718-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/26559168c9cf41d2a7325a9f6786c1bae0c286b0 Thanks. Luca Boccassi --- >From 26559168c9cf41d2a7325a9f6786c1bae0c286b0 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 8a687803b9..071345da09 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2818,6 +2818,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) rxq->rx_hdr_len = 0; 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 0671750779..2786bdcff9 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -21,6 +21,9 @@ /* In none-PXE mode QLEN must be whole number of 32 descriptors. */ #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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:37.290691750 +0100 +++ 0051-net-i40e-fix-Rx-data-buffer-size.patch 2023-06-15 01:56:34.695544100 +0100 @@ -1 +1 @@ -From ff2ec0ce04739240205628207881a91e1e330cb7 Mon Sep 17 00:00:00 2001 +From 26559168c9cf41d2a7325a9f6786c1bae0c286b0 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 8a687803b9..071345da09 100644 @@ -23 +24 @@ -@@ -2904,6 +2904,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) +@@ -2818,6 +2818,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) @@ -33 +34 @@ -index 5e6eecc501..0376c219be 100644 +index 0671750779..2786bdcff9 100644