From patchwork Fri Nov 11 16:01:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingjin Ye X-Patchwork-Id: 119779 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 3CC9BA0542; Fri, 11 Nov 2022 09:14:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA58640143; Fri, 11 Nov 2022 09:14:56 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id AECD440141; Fri, 11 Nov 2022 09:14:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668154495; x=1699690495; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=q8i/myDNUtWCUNSwselhYGHG9I+qjV+vr5b3RshO/co=; b=SHQ78KutODBD8IS2+uv47+WkLRnlViuwEb/jYUP6TY7ZUbMIefr5T7r4 5PvtRpNSr3zwy0fxgjH5xqf1ZqKQbNWuGCaJrg7yCpWosv1MQUrxZ9Ojk IXRWa+W5igWrno00FOslvX2hZUO/4cICWOOF1XoxXqBl1KSTP1LOggXWn fk2nD4afXMHgrW8D++8tq/jSlzcUE1iVZvhxovTGMBYHOW25+gMVVkrg9 ecp7axm8jYNf1lvFuMTqO0jnMxr4tedIiVZSJYq7fZGQNNh4bkZXV7QFV KJnuAzXDVyGvAsVo1iFMsX0Au9/W5h6XcKsCa8tE6JAZEVnKHzZc97Dqu g==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="291957034" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="291957034" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 00:14:53 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706472227" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="706472227" Received: from unknown (HELO yemj..) ([10.239.252.253]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 00:14:41 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, stable@dpdk.org, yidingx.zhou@intel.com, Mingjin Ye , Qi Zhang , Xiaoyun Li , Jingjing Wu , Wenzhuo Lu , Ferruh Yigit Subject: [PATCH v4 1/2] net/ice: fix scalar Rx path segment Date: Fri, 11 Nov 2022 16:01:39 +0000 Message-Id: <20221111160140.860054-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221111120401.802805-2-mingjinx.ye@intel.com> References: <20221111120401.802805-2-mingjinx.ye@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 CRC is stripped by the hardware in the scattered Rx path. The last buffer is invalid if it's packet length is zero. This patch adds a judgment for the last buffer length to fix this issue, it would free the mbuf associated to the last one if the last buffer is empty. Fixes: 6eac0b7fde95 ("net/ice: support advance Rx/Tx") Cc: stable@dpdk.org Signed-off-by: Mingjin Ye --- drivers/net/ice/ice_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 0a2b0376ac..e6ddd2513d 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2111,6 +2111,10 @@ ice_recv_scattered_pkts(void *rx_queue, } else rxm->data_len = (uint16_t)(rx_packet_len - RTE_ETHER_CRC_LEN); + } else if (rx_packet_len == 0) { + rte_pktmbuf_free_seg(rxm); + first_seg->nb_segs--; + last_seg->next = NULL; } first_seg->port = rxq->port_id; From patchwork Fri Nov 11 16:01:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingjin Ye X-Patchwork-Id: 119780 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 B1A99A0542; Fri, 11 Nov 2022 09:15:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3720427F2; Fri, 11 Nov 2022 09:14:57 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 75E5340141; Fri, 11 Nov 2022 09:14:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668154495; x=1699690495; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HgBItZ5oRZNI38DWu1k/BLO3isjCHWlc2wASGMnfx40=; b=UsiQ6VoUHR9vOuReN8L6ZbNAAFmdnl3Okoprhju7ATtQVbIvf9N12CAc KMyyzss6L+waZXScRsA0ycr3+eul+3e4wGvueUfVkOT6JAm0yOKQyJE8q zohurtxEZtx6FWfStamVBSM9XAGuJxaAYfjkGgPwpTCqSASkw48ItScPB v3Uvbn5bokkibEQ81S9tfysKNnwrOVCAYAX/yOk3WPMt2l6qQypzMpP4n 9KEsYqg+uqbtGTWIn9rUeErTEWpoKHf2YjIBR4LBnDCsi+gGSq1m3DMfD 1laBF6RwKcW8PWEyxuWyRmQar9Mx1QSNWq5EVfTubY6sVsPL/E7Plpznn A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="291957036" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="291957036" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 00:14:54 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706472250" X-IronPort-AV: E=Sophos;i="5.96,156,1665471600"; d="scan'208";a="706472250" Received: from unknown (HELO yemj..) ([10.239.252.253]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2022 00:14:46 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, stable@dpdk.org, yidingx.zhou@intel.com, Mingjin Ye , Qi Zhang , Xiaoyun Li , Jingjing Wu , Ferruh Yigit , Wenzhuo Lu , Kevin Liu Subject: [PATCH v4 2/2] net/ice: fix scalar Tx path segment Date: Fri, 11 Nov 2022 16:01:40 +0000 Message-Id: <20221111160140.860054-2-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221111160140.860054-1-mingjinx.ye@intel.com> References: <20221111120401.802805-2-mingjinx.ye@intel.com> <20221111160140.860054-1-mingjinx.ye@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 The scalar Tx path would send empty buffer that causes the Tx queue to overflow. This patch adds the last buffer length judgment in tx_prepare to fix this issue, rte_errno will be set to EINVAL and returned if the last buffer is empty. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes") Cc: stable@dpdk.org Signed-off-by: Mingjin Ye v3: * delete unused variable. --- drivers/net/ice/ice_rxtx.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index e6ddd2513d..c1cde65a39 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3643,6 +3643,22 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq) #define ICE_MIN_TSO_MSS 64 #define ICE_MAX_TSO_MSS 9728 #define ICE_MAX_TSO_FRAME_SIZE 262144 + +/*Check for emtpy mbuf*/ +static inline uint16_t +ice_check_emtpy_mbuf(struct rte_mbuf *tx_pkt) +{ + struct rte_mbuf *txd = tx_pkt; + + while (txd != NULL) { + if (txd->data_len == 0) + return -1; + txd = txd->next; + } + + return 0; +} + uint16_t ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -3689,6 +3705,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, rte_errno = -ret; return i; } + + if (ice_check_emtpy_mbuf(m) != 0) { + rte_errno = EINVAL; + PMD_DRV_LOG(ERR, "INVALID mbuf: last mbuf data_len=[0]"); + return i; + } } return i; }