From: Wenjun Wu <wenjun1.wu@intel.com>
To: dev@dpdk.org, Yuying.Zhang@intel.com, beilei.xing@intel.com,
jingjing.wu@intel.com, qiming.yang@intel.com,
qi.z.zhang@intel.com
Cc: Wenjun Wu <wenjun1.wu@intel.com>, stable@dpdk.org
Subject: [PATCH v1 2/5] net/ice: fix RX data buffer size
Date: Fri, 14 Apr 2023 11:51:48 +0800 [thread overview]
Message-ID: <20230414035151.1377726-3-wenjun1.wu@intel.com> (raw)
In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com>
This patch does two fixes.
1. No matter what the mbuf size is, the data buffer size should not
be greater than 16K - 128.
2. Replace RTE_ALIGN with RTE_ALIGN_FLOOR according to [1].
[1] Commit c9c45beb1b97 ("net/iavf: fix Rx queue buffer size alignment")
Fixes: 50370662b727 ("net/ice: support device and queue ops")
Fixes: 1b009275e2c8 ("net/ice: add Rx queue init in DCF")
Cc: stable@dpdk.org
Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
---
drivers/net/ice/ice_dcf_ethdev.c | 3 ++-
drivers/net/ice/ice_rxtx.c | 3 ++-
drivers/net/ice/ice_rxtx.h | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index dcbf2af5b0..7304ea721c 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -115,7 +115,8 @@ ice_dcf_init_rxq(struct rte_eth_dev *dev, struct ice_rx_queue *rxq)
buf_size = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM;
rxq->rx_hdr_len = 0;
- rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 << ICE_RLAN_CTX_DBUF_S));
+ rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size, (1 << ICE_RLAN_CTX_DBUF_S));
+ rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, ICE_RX_MAX_DATA_BUF_SIZE);
max_pkt_len = RTE_MIN(ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len,
dev->data->mtu + ICE_ETH_OVERHEAD);
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 0ea0045836..560c1a4af7 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -259,7 +259,8 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
/* Set buffer size as the head split is disabled. */
buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
RTE_PKTMBUF_HEADROOM);
- rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 << ICE_RLAN_CTX_DBUF_S));
+ rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size, (1 << ICE_RLAN_CTX_DBUF_S));
+ rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, ICE_RX_MAX_DATA_BUF_SIZE);
rxq->max_pkt_len =
RTE_MIN((uint32_t)ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len,
frame_size);
diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index 94f6bcf3d1..89569029e1 100644
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -51,6 +51,9 @@ extern int ice_timestamp_dynfield_offset;
/* Max header size can be 2K - 64 bytes */
#define ICE_RX_HDR_BUF_SIZE (2048 - 64)
+/* Max data buffer size must be 16K - 128 bytes */
+#define ICE_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128)
+
#define ICE_HEADER_SPLIT_ENA BIT(0)
typedef void (*ice_rx_release_mbufs_t)(struct ice_rx_queue *rxq);
--
2.34.1
next prev parent reply other threads:[~2023-04-14 3:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 3:51 [PATCH v1 0/5] " Wenjun Wu
2023-04-14 3:51 ` [PATCH v1 1/5] net/i40e: " Wenjun Wu
2023-04-14 3:51 ` Wenjun Wu [this message]
2023-04-14 3:51 ` [PATCH v1 3/5] net/iavf: " Wenjun Wu
2023-04-14 3:51 ` [PATCH v1 4/5] net/idpf: " Wenjun Wu
2023-04-14 3:51 ` [PATCH v1 5/5] net/cpfl: " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 0/5] fix Rx " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 1/5] net/i40e: " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 2/5] net/ice: " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 3/5] net/iavf: " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 4/5] net/idpf: " Wenjun Wu
2023-04-14 5:47 ` [PATCH v2 5/5] net/cpfl: " Wenjun Wu
2023-04-26 2:50 ` [PATCH v2 0/5] " Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230414035151.1377726-3-wenjun1.wu@intel.com \
--to=wenjun1.wu@intel.com \
--cc=Yuying.Zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).