From patchwork Fri Apr 14 03:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 126054 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE50D4293A; Fri, 14 Apr 2023 05:52:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FC0942BB1; Fri, 14 Apr 2023 05:52:09 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id ADDD5400D5; Fri, 14 Apr 2023 05:52:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681444325; x=1712980325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+UArh+vc69k03H6djGJEM8H8bBRGJjnfKacOlSI4A0Y=; b=PyAXbaCxU3A40kHv1p7PQgWzwcmDmZMqrfPp2Gtj0rC2JnMRLf5L9Efd DoHMGGhAsmus1DDWPRucLPUQ5EVN1Wyvk6zzY3EqJvTtMnAwAq+KXkb7H 0bF0C1t3loAlQmf0JffeQLvwwxZzRl4RO2GLtI2ArMWaCwyV4yxjdM7Id wWwudqLl1O2d4QRXHegr+X54OZavhmsSw73DfJTiKXDwH7zTdGRKrMG4P AK2LqnYPvnmZa0QO+cQnjgBf4L+J6nMw0lh3Sxyoxu19jOCrAZxNtC4/s tJwaSMHzET/dhQoh4VSn3a+btca7IUDLFfmFnwmU7byP+Bc03V4+Kvac4 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="343135753" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="343135753" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 20:51:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="683192237" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="683192237" Received: from dpdk-wuwenjun-icelake-ii.sh.intel.com ([10.67.110.157]) by orsmga007.jf.intel.com with ESMTP; 13 Apr 2023 20:51:56 -0700 From: Wenjun Wu 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 , stable@dpdk.org Subject: [PATCH v1 1/5] net/i40e: fix RX data buffer size Date: Fri, 14 Apr 2023 11:51:47 +0800 Message-Id: <20230414035151.1377726-2-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com> References: <20230414035151.1377726-1-wenjun1.wu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org No matter what the mbuf size is, the data buffer size should not be greater than 16K - 128. Fixes: 4861cde46116 ("i40e: new poll mode driver") Cc: stable@dpdk.org Signed-off-by: Wenjun Wu --- 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 788ffb51c2..fbbefb5015 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2904,6 +2904,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 5e6eecc501..0376c219be 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 From patchwork Fri Apr 14 03:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 126055 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26D674293A; Fri, 14 Apr 2023 05:52:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C3EB42D20; Fri, 14 Apr 2023 05:52:11 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 5CA5740144; Fri, 14 Apr 2023 05:52:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681444326; x=1712980326; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9zc1e5iZNT/oSmzgnSg3O+aIopnp+SDV+IhPM1axGH4=; b=KjsjtkMBBoVnEFAqmcKXoRd+Id9Lb4SFjjT5QV/Fe8ipo9DS7ZlaH2y+ hn9jSs3sLVCZIqR1kfInEv57Ntprjdo9WJr5lG8XGpxVS2nRiCU2MC5OM fuwD9wbGdHywwr4owwurp9dCPV7q11Qgf5/fo4CALTwdYbYzxi0wPaZVU nXEudxfAsQ+hBz/yiUD+IgfRn2FaZtAZXqnpKawqZ5ZAZOZDMlL+pxghG MKvYgyzwEkJSKHnHc0sQZywQtAHSKx9q96BAQ5d60f0r4rhvpbmXXkwey Tqmwv63Upoz8uL82JLAoN6U5v0IKH1lmHq8gBPrG+Q90EjAh/hWuBJTvD w==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="343135756" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="343135756" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 20:52:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="683192249" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="683192249" Received: from dpdk-wuwenjun-icelake-ii.sh.intel.com ([10.67.110.157]) by orsmga007.jf.intel.com with ESMTP; 13 Apr 2023 20:51:59 -0700 From: Wenjun Wu 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 , stable@dpdk.org Subject: [PATCH v1 2/5] net/ice: fix RX data buffer size Date: Fri, 14 Apr 2023 11:51:48 +0800 Message-Id: <20230414035151.1377726-3-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com> References: <20230414035151.1377726-1-wenjun1.wu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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); From patchwork Fri Apr 14 03:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 126056 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E1DC84293A; Fri, 14 Apr 2023 05:52:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62F6C42D3C; Fri, 14 Apr 2023 05:52:12 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 7F712400D5; Fri, 14 Apr 2023 05:52:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681444326; x=1712980326; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R9VYDYa9lSFrPR7eA/MHgf1MceLL9gxLVonFo0+FI9o=; b=SljGVL8c9ExDTxF3OsHmV/iuMxfMxsoSbQI5M60ZNWBmM+Zg/qD2l0mC 9i3GIN4W6VNt50A1aldVP0IJyFDIYJLFFCN0G5KpNcYdy5csqAbEjiV4r WGs6sOZM16WR2VByc0fEKhPwaB/mvNFQW5JnN/tcF/s2vsbwgQD/ncgiR pz8FHq15tAsUp4LErZEaz9cVCIRryFptkHJRjy2XCBcpsRz1aVLbvLBfJ A9hXt3DaYzE8LUtArwA+oEoOEJ3YPGASUi8ED5sidoPiQHiFVA7ysjTlN R/BV0EcKoN7QhyJyTGT+rBEGR7Z0YMuM/t0Tdw+jjaUEPyPHOIZaL+GRK Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="343135758" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="343135758" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 20:52:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="683192256" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="683192256" Received: from dpdk-wuwenjun-icelake-ii.sh.intel.com ([10.67.110.157]) by orsmga007.jf.intel.com with ESMTP; 13 Apr 2023 20:52:01 -0700 From: Wenjun Wu 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 , stable@dpdk.org Subject: [PATCH v1 3/5] net/iavf: fix RX data buffer size Date: Fri, 14 Apr 2023 11:51:49 +0800 Message-Id: <20230414035151.1377726-4-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com> References: <20230414035151.1377726-1-wenjun1.wu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org No matter what the mbuf size is, the data buffer size should not be greater than 16K - 128. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Cc: stable@dpdk.org Signed-off-by: Wenjun Wu --- 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 b1d0fbceb6..0db3aabd92 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -697,6 +697,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 09e2127db0..f205a2aaf1 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 From patchwork Fri Apr 14 03:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 126057 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9D2EC4293A; Fri, 14 Apr 2023 05:52:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E68F542D46; Fri, 14 Apr 2023 05:52:13 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 2A0AB40144; Fri, 14 Apr 2023 05:52:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681444327; x=1712980327; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zf95UicB2sR8bUMQkgTDvvIWXiPH4h4nstTj4vuTxYs=; b=Ism1SqwweZ8sYUW6nTsfG2ks6oBCJgdWCKhWYv46VToiuVdIvdyvPQZN 8dMyngcxbhs/tELjLDKjslfFlUxO/ulSPNJQXaHOfh5YqTodFsES+P7/i T6X0m11l2MgtNfMPabY1b8AgSrRm1ojw4wdIan6HVFOy2bDanc4lgYMo+ Ox1tY9DLhGqp+Sgjw/RL7ECCeVCdT9cLpUQX9AH1r2OkbFyxPfL9jcQ9G AOL+/cLlaMKek2YDp6V9j8vqKkucgt8hVv4u5EW5H9QRj605riK66sjS+ RCkRN8Sz2LsI2YPiAMwVOY1FOdw0LgjX/ZLUNHbW4b47UYkTZHRAy4+Ig Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="343135763" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="343135763" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 20:52:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="683192266" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="683192266" Received: from dpdk-wuwenjun-icelake-ii.sh.intel.com ([10.67.110.157]) by orsmga007.jf.intel.com with ESMTP; 13 Apr 2023 20:52:04 -0700 From: Wenjun Wu 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 , stable@dpdk.org Subject: [PATCH v1 4/5] net/idpf: fix RX data buffer size Date: Fri, 14 Apr 2023 11:51:50 +0800 Message-Id: <20230414035151.1377726-5-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com> References: <20230414035151.1377726-1-wenjun1.wu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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. Align data buffer size to 128. Fixes: 9c47c29739a1 ("net/idpf: add Rx queue setup") Cc: stable@dpdk.org Signed-off-by: Wenjun Wu --- drivers/common/idpf/idpf_common_rxtx.h | 3 +++ drivers/net/idpf/idpf_rxtx.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/common/idpf/idpf_common_rxtx.h b/drivers/common/idpf/idpf_common_rxtx.h index 11260d07f9..6cb83fc0a6 100644 --- a/drivers/common/idpf/idpf_common_rxtx.h +++ b/drivers/common/idpf/idpf_common_rxtx.h @@ -34,6 +34,9 @@ #define IDPF_MAX_TSO_FRAME_SIZE 262143 #define IDPF_TX_MAX_MTU_SEG 10 +#define IDPF_RLAN_CTX_DBUF_S 7 +#define IDPF_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + #define IDPF_TX_CKSUM_OFFLOAD_MASK ( \ RTE_MBUF_F_TX_IP_CKSUM | \ RTE_MBUF_F_TX_L4_MASK | \ diff --git a/drivers/net/idpf/idpf_rxtx.c b/drivers/net/idpf/idpf_rxtx.c index 414f9a37f6..3e3d81ca6d 100644 --- a/drivers/net/idpf/idpf_rxtx.c +++ b/drivers/net/idpf/idpf_rxtx.c @@ -155,7 +155,8 @@ idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq, bufq->adapter = adapter; len = rte_pktmbuf_data_room_size(bufq->mp) - RTE_PKTMBUF_HEADROOM; - bufq->rx_buf_len = len; + bufq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IDPF_RLAN_CTX_DBUF_S)); + bufq->rx_buf_len = RTE_MIN(bufq->rx_buf_len, IDPF_RX_MAX_DATA_BUF_SIZE); /* Allocate a little more to support bulk allocate. */ len = nb_desc + IDPF_RX_MAX_BURST; @@ -275,7 +276,8 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, rxq->offloads = idpf_rx_offload_convert(offloads); len = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM; - rxq->rx_buf_len = len; + rxq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IDPF_RLAN_CTX_DBUF_S)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, IDPF_RX_MAX_DATA_BUF_SIZE); /* Allocate a little more to support bulk allocate. */ len = nb_desc + IDPF_RX_MAX_BURST; From patchwork Fri Apr 14 03:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjun Wu X-Patchwork-Id: 126058 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 748964293A; Fri, 14 Apr 2023 05:52:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EF3642D4E; Fri, 14 Apr 2023 05:52:15 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id D4BB142BFE for ; Fri, 14 Apr 2023 05:52:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681444329; x=1712980329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/nbNihj/ZJw1IIHrV50OJLy+LnnYFzXarPiunf2wxn0=; b=Z1OpKtcJPWIAaO3IwYAzf62r/FuHRt21F81LT9N9EL51wM9JrXKleY/F rfNdAvBfmxjDpK2TTwmGhTKnSGumqNWRyF60dPoj2jwethZfG0GkpLhk/ kt663ajW9B6lKJrNEucArrc4reb1JatJY6tA4Q9Cje3AgNvi+jz6rkk8k 11Xko596VuLca5AFeCg0A48fWZvRiWLzIITFeJPh2ehsfr4jeBiLFEg4r 7SlYI7EzLugwjHt1U3E9dXG0IWwXEaxzAjUEjFRDxmNlRn9E0uIjMQTDh ByWPchRB0YUMnmQA9/5OHG1hvlL9hX1cCi0H7MLzPJHmW296Poll7Xq56 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="343135764" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="343135764" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 20:52:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="683192274" X-IronPort-AV: E=Sophos;i="5.99,195,1677571200"; d="scan'208";a="683192274" Received: from dpdk-wuwenjun-icelake-ii.sh.intel.com ([10.67.110.157]) by orsmga007.jf.intel.com with ESMTP; 13 Apr 2023 20:52:06 -0700 From: Wenjun Wu 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 Subject: [PATCH v1 5/5] net/cpfl: fix RX data buffer size Date: Fri, 14 Apr 2023 11:51:51 +0800 Message-Id: <20230414035151.1377726-6-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414035151.1377726-1-wenjun1.wu@intel.com> References: <20230414035151.1377726-1-wenjun1.wu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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. Align data buffer size to 128. Signed-off-by: Wenjun Wu --- drivers/net/cpfl/cpfl_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/cpfl/cpfl_rxtx.c b/drivers/net/cpfl/cpfl_rxtx.c index de59b31b3d..75021c3c54 100644 --- a/drivers/net/cpfl/cpfl_rxtx.c +++ b/drivers/net/cpfl/cpfl_rxtx.c @@ -155,7 +155,8 @@ cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq, bufq->adapter = base; len = rte_pktmbuf_data_room_size(bufq->mp) - RTE_PKTMBUF_HEADROOM; - bufq->rx_buf_len = len; + bufq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IDPF_RLAN_CTX_DBUF_S)); + bufq->rx_buf_len = RTE_MIN(bufq->rx_buf_len, IDPF_RX_MAX_DATA_BUF_SIZE); /* Allocate a little more to support bulk allocate. */ len = nb_desc + IDPF_RX_MAX_BURST;