From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5820B42528; Wed, 6 Sep 2023 11:35:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C90D40A6E; Wed, 6 Sep 2023 11:34:52 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 8CD4D409FA; Wed, 6 Sep 2023 11:34:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693992890; x=1725528890; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8MYoGPxd+kw5nNghlTl3WRiwXiRybRKIj03aPEizVFs=; b=N2oimSvMv4DC8rp46f2Kl54ZB2yIXbfoKbRbrk8P4Zo+Gtr4Kpotnmqs 4wbrYYoGzm8TEcBRiROc5mi5+cVc5JfWkAQZ8s9tfjRd2qeWDGjPjRZtt /SrbhifvoftI+vF23dftbAQY73ZdBqjxtcsjlvRj1IPvwCEjXbfW51wSX 5aCyLLP2byCIUGcBhrpcwlmu3xYb7gixa8LtBaOqFHZqpSS69jQ4gN1+N AKwly/44oPwuacifecvjVQBkmSGy8Q/LeEi95oTaBa71yk+RZHLTPp7HC g585z1HPSOtE9WrC1HJ7nM/nzYdthOkveBL8jfwHOiKq22kcZq5oO8o1S g==; X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="375919416" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="375919416" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2023 02:34:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="884623230" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="884623230" Received: from dpdk-wenjing-02.sh.intel.com ([10.67.119.75]) by fmsmga001.fm.intel.com with ESMTP; 06 Sep 2023 02:34:37 -0700 From: Wenjing Qiao To: yuying.zhang@intel.com, dev@dpdk.org, qi.z.zhang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com Cc: mingxia.liu@intel.com, stable@dpdk.org Subject: [PATCH v3 9/9] app/test-pmd: refine encap content Date: Wed, 6 Sep 2023 09:34:07 +0000 Message-Id: <20230906093407.3635038-10-wenjing.qiao@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906093407.3635038-1-wenjing.qiao@intel.com> References: <20230901113158.1654044-1-yuying.zhang@intel.com> <20230906093407.3635038-1-wenjing.qiao@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 94827bcc4a..b6cc0d9620 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -8514,7 +8514,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, @@ -8522,24 +8522,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, -- 2.34.1