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 C30E042CBC for ; Thu, 15 Jun 2023 03:35:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD13942D4B; Thu, 15 Jun 2023 03:35:49 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 47E3240DDA for ; Thu, 15 Jun 2023 03:35:46 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f739ec88b2so11467425e9.1 for ; Wed, 14 Jun 2023 18:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792946; x=1689384946; 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=NckCABXTXo+DTHQg0iRISEnprSB3P4KLAtKA4HQBEyw=; b=dR85HRNOOy4S3+NN8YRKf/8wt5gAOy+5JDA+rzDXGJ9WFaPX6v2X8kVTCQYUovY5zn 4osmK4UeDsjx1ZskuZpLIjFnAZCXoXECc5v0g8bz2f5uChMPlaS109qN3Bu5VqFifPAJ 96hrPlbc+OoZr9x4eQUY0eO2CJK6qen1gysKVOUkBawBklAriEBCoKhKnVJE3iCREd0V 9OPTCnWNFCJ30gPDxEZHQQgmTpYH57P5uLYXoI1Pjz4Y5OrkS0xM2sxRBmzOCgeGY/YW ylCU03LPoJy/xDqaXHKQi1apn/qGqiQ+H/tITq0E2vHGXbzB79MruDmAf+Ax/dAgP1rh HhIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792946; x=1689384946; 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=NckCABXTXo+DTHQg0iRISEnprSB3P4KLAtKA4HQBEyw=; b=gkJ7U/xFZmyY6O9CVlTet74FIKCnrW+bYNQqa304v39QrBDnmHGOZ3xK7eEn2CYLyY JwsfJkskvjYQ+SMeePumyVB5Msq5REhbhMHMVJuTuyployx/XV/rgnAoqxIpSMPSL3vg GH5SAU2fJTTcy7bq4AaRpWrc8ZQrpSzOU/p8oIZnguTdwXoFvy//maMVufIXYQjvkBKR bzVmNJv7HZj4JpnpAyLM1GCV4tNFFti41ysazaMeXikA8S2Bqf1sYOezky7AmTWCX03Y 1l95awe5xfRH4vdTM9eNVtOBK3K5jBNoqGJusU59XztZQiSLGcfNCgDmI3S1ItzZ+Svg B/wg== X-Gm-Message-State: AC+VfDx7ePwEXXOY1VjqfF8kx2de5HE8eq4CTqtV6o47u2Pb3cqAaVve rW7qAcewWV4BSIOCm+J03Ts= X-Google-Smtp-Source: ACHHUZ5+MUckvXXBn7ZEKL7aW8+D5hpn7gBH768IBevWT4KPrOccbyhWuT0d7Z/ugqoWZvrnZZCuHQ== X-Received: by 2002:a1c:7c19:0:b0:3f5:ff24:27de with SMTP id x25-20020a1c7c19000000b003f5ff2427demr10955168wmc.32.1686792945879; Wed, 14 Jun 2023 18:35:45 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id f9-20020a7bc8c9000000b003f8140763c7sm13779232wml.30.2023.06.14.18.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:35:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenjun Wu Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Rx data buffer size' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:48 +0100 Message-Id: <20230615013258.1439718-53-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/0bf4c1164997fe6330553ddf22e1b8451864e1ee Thanks. Luca Boccassi --- >From 0bf4c1164997fe6330553ddf22e1b8451864e1ee Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 14 Apr 2023 13:47:42 +0800 Subject: [PATCH] net/iavf: fix Rx data buffer size [ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] According to hardware spec, the data buffer size should not be greater than 16K - 128. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 1 + drivers/net/iavf/iavf_rxtx.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index a885d6955c..45b30363df 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -583,6 +583,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, len = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM; rxq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IAVF_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, IAVF_RX_MAX_DATA_BUF_SIZE); /* Allocate the software ring. */ len = nb_desc + IAVF_RX_MAX_BURST; diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index 047743de4f..f961dbaa77 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -16,6 +16,9 @@ /* used for Rx Bulk Allocate */ #define IAVF_RX_MAX_BURST 32 +/* Max data buffer size must be 16K - 128 bytes */ +#define IAVF_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + /* used for Vector PMD */ #define IAVF_VPMD_RX_MAX_BURST 32 #define IAVF_VPMD_TX_MAX_BURST 32 -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:37.389939330 +0100 +++ 0053-net-iavf-fix-Rx-data-buffer-size.patch 2023-06-15 01:56:34.703544275 +0100 @@ -1 +1 @@ -From c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 Mon Sep 17 00:00:00 2001 +From 0bf4c1164997fe6330553ddf22e1b8451864e1ee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b1d0fbceb6..0db3aabd92 100644 +index a885d6955c..45b30363df 100644 @@ -23 +24 @@ -@@ -697,6 +697,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, +@@ -583,6 +583,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, @@ -32 +33 @@ -index 09e2127db0..f205a2aaf1 100644 +index 047743de4f..f961dbaa77 100644