From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39388A04E6; Sat, 31 Oct 2020 04:36:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1C509CA48; Sat, 31 Oct 2020 04:35:31 +0100 (CET) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by dpdk.org (Postfix) with ESMTP id C21A3CA30; Sat, 31 Oct 2020 04:35:28 +0100 (CET) Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CNPvY3h63z15Pmm; Sat, 31 Oct 2020 11:35:21 +0800 (CST) Received: from tester.localdomain (10.175.119.39) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Sat, 31 Oct 2020 11:35:10 +0800 From: Xiaoyun wang To: CC: , , , , , , , Xiaoyun wang Date: Sat, 31 Oct 2020 11:38:35 +0800 Message-ID: <39bc11d96f40e26afc0d1799def59003b697987a.1604115055.git.cloud.wangxiaoyun@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.119.39] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v1 1/2] net/hinic: fix outer_l3_len parse error X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes outer_l3_len parse error when PKT_TX_OUTER_IP_CKSUM is not set, which does not affect checksum function, just be consistent with mbuf meta information description. Fixes: 8c8b61234ffd ("net/hinic: refactor checksum functions") Cc: stable@dpdk.org Signed-off-by: Xiaoyun wang --- drivers/net/hinic/hinic_pmd_tx.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c index 2dd4fe1..125627e 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c @@ -779,26 +779,25 @@ static inline void hinic_analyze_tx_info(struct rte_mbuf *mbuf, { struct rte_ether_hdr *eth_hdr; struct rte_vlan_hdr *vlan_hdr; - struct rte_ipv4_hdr *ip4h; - u16 pkt_type; - u8 *hdr; + struct rte_ipv4_hdr *ipv4_hdr; + u16 eth_type; - hdr = (u8 *)rte_pktmbuf_mtod(mbuf, u8*); - eth_hdr = (struct rte_ether_hdr *)hdr; - pkt_type = rte_be_to_cpu_16(eth_hdr->ether_type); + eth_hdr = rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *); + eth_type = rte_be_to_cpu_16(eth_hdr->ether_type); - if (pkt_type == RTE_ETHER_TYPE_VLAN) { + if (eth_type == RTE_ETHER_TYPE_VLAN) { off_info->outer_l2_len = ETHER_LEN_WITH_VLAN; - vlan_hdr = (struct rte_vlan_hdr *)(hdr + 1); - pkt_type = rte_be_to_cpu_16(vlan_hdr->eth_proto); + vlan_hdr = (struct rte_vlan_hdr *)(eth_hdr + 1); + eth_type = rte_be_to_cpu_16(vlan_hdr->eth_proto); } else { off_info->outer_l2_len = ETHER_LEN_NO_VLAN; } - if (pkt_type == RTE_ETHER_TYPE_IPV4) { - ip4h = (struct rte_ipv4_hdr *)(hdr + off_info->outer_l2_len); - off_info->outer_l3_len = rte_ipv4_hdr_len(ip4h); - } else if (pkt_type == RTE_ETHER_TYPE_IPV6) { + if (eth_type == RTE_ETHER_TYPE_IPV4) { + ipv4_hdr = rte_pktmbuf_mtod_offset(mbuf, struct rte_ipv4_hdr *, + off_info->outer_l2_len); + off_info->outer_l3_len = rte_ipv4_hdr_len(ipv4_hdr); + } else if (eth_type == RTE_ETHER_TYPE_IPV6) { /* not support ipv6 extension header */ off_info->outer_l3_len = sizeof(struct rte_ipv6_hdr); } -- 1.8.3.1