From patchwork Tue Aug 22 01:13:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yuying" X-Patchwork-Id: 131804 X-Patchwork-Delegate: ferruh.yigit@amd.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 9965D42608; Thu, 21 Sep 2023 19:10:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C5924013F; Thu, 21 Sep 2023 19:10:13 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 7D262400D7; Thu, 21 Sep 2023 19:10:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695316212; x=1726852212; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=e3ngruMce7NCIYAHMV0QUvzSjWwIdHuLBoU0IXgv+1A=; b=cynTs/UPccxvL6xDCSoBQU4M1q0YOJ3KJyMjhB1/h5yfRoYtCMgNT1Td Qne3LBr0GtHXqSzOgOTOZEUciVIFDDTSmreQfeNZaQgOH61UZs4d3/n+f Z/FIwwK7XzDN/WowwhWqTEfjLtRm+VMR7wRNvCm86TTLPc6gaehKIFTBH jDEohfe/f2THbEzQDkKZ3FnD900W9zTU9DXDYcN4SaLxUGBTs3267+ZPq OT+G4jqB6VLgS4ZNXmrhlLYMTk50+UggopUN72Fg0+QdVmvyG3ywhs7vQ Bye33EnIjkhS08+xGBIbI+EoHNYrsd9zy0cD1wR7LF5UOWXPZ5SDdKnDh w==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="359975104" X-IronPort-AV: E=Sophos;i="6.03,166,1694761200"; d="scan'208";a="359975104" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2023 10:09:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="870902114" X-IronPort-AV: E=Sophos;i="6.03,166,1694761200"; d="scan'208";a="870902114" Received: from dpdk-pengyuan-mev.sh.intel.com ([10.67.119.128]) by orsmga004.jf.intel.com with ESMTP; 21 Sep 2023 10:09:28 -0700 From: "Zhang, Yuying" To: yuying.zhang@intel.com, dev@dpdk.org, orika@nvidia.com, aman.deep.singh@intel.com Cc: stable@dpdk.org Subject: [PATCH v1] app/testpmd: refine encap content Date: Tue, 22 Aug 2023 01:13:06 +0000 Message-Id: <20230822011306.19616-1-yuying.zhang@intel.com> X-Mailer: git-send-email 2.25.1 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 From: Yuying Zhang Refine vxlan encap content of all protocol headers. Fixes: 1960be7d32f8 ("app/testpmd: add VXLAN encap/decap") Cc: stable@dpdk.org Signed-off-by: Yuying Zhang --- app/test-pmd/cmdline_flow.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 95c0a19beb..a488864e2b 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -8523,7 +8523,7 @@ parse_setup_vxlan_encap_data(struct action_vxlan_encap_data *action_vxlan_encap_ .type = RTE_FLOW_ITEM_TYPE_END, }, }, - .item_eth.hdr.ether_type = 0, + .item_eth.hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), .item_vlan = { .hdr.vlan_tci = vxlan_encap_conf.vlan_tci, .hdr.eth_proto = 0, @@ -8531,24 +8531,32 @@ parse_setup_vxlan_encap_data(struct action_vxlan_encap_data *action_vxlan_encap_ .item_ipv4.hdr = { .src_addr = vxlan_encap_conf.ipv4_src, .dst_addr = vxlan_encap_conf.ipv4_dst, + .version_ihl = RTE_IPV4_VHL_DEF, + .next_proto_id = IPPROTO_UDP, + .time_to_live = IPDEFTTL, + .hdr_checksum = rte_cpu_to_be_16(1), }, .item_udp.hdr = { .src_port = vxlan_encap_conf.udp_src, .dst_port = vxlan_encap_conf.udp_dst, + .dgram_cksum = RTE_BE16(0x01), }, - .item_vxlan.hdr.flags = 0, + .item_vxlan.hdr.flags = 0x08, }; memcpy(action_vxlan_encap_data->item_eth.hdr.dst_addr.addr_bytes, vxlan_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(action_vxlan_encap_data->item_eth.hdr.src_addr.addr_bytes, vxlan_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); if (!vxlan_encap_conf.select_ipv4) { + action_vxlan_encap_data->item_eth.type = RTE_BE16(RTE_ETHER_TYPE_IPV6); memcpy(&action_vxlan_encap_data->item_ipv6.hdr.src_addr, &vxlan_encap_conf.ipv6_src, sizeof(vxlan_encap_conf.ipv6_src)); memcpy(&action_vxlan_encap_data->item_ipv6.hdr.dst_addr, &vxlan_encap_conf.ipv6_dst, sizeof(vxlan_encap_conf.ipv6_dst)); + action_vxlan_encap_data->item_ipv6.hdr.proto = IPPROTO_UDP; + action_vxlan_encap_data->item_ipv6.hdr.hop_limits = IPDEFTTL; action_vxlan_encap_data->items[2] = (struct rte_flow_item){ .type = RTE_FLOW_ITEM_TYPE_IPV6, .spec = &action_vxlan_encap_data->item_ipv6,