From: Xiaoyu Min <jackmin@mellanox.com> To: Ajit Khaparde <ajit.khaparde@broadcom.com>, Somnath Kotur <somnath.kotur@broadcom.com> Cc: dev@dpdk.org, Xiaoyu Min <jackmin@nvidia.com> Subject: [dpdk-dev] [PATCH 3/5] net/bnxt: fix protocol size for VXLAN encap copy Date: Mon, 16 Nov 2020 15:55:16 +0800 Message-ID: <141eb0140301108b1320ecfd93c89e48b02cd546.1605493464.git.jackmin@nvidia.com> (raw) In-Reply-To: <cover.1605493464.git.jackmin@nvidia.com> From: Xiaoyu Min <jackmin@nvidia.com> The rte_flow_item_eth and rte_flow_item_vlan items are refined. The structs do not exactly represent the packet bits captured on the wire anymore so should only copy real header instead of the whole struct. Replace the rte_flow_item_* with the existing corresponding rte_*_hdr. Fixes: 09315fc83861 ("ethdev: add VLAN attributes to ethernet and VLAN items") Signed-off-by: Xiaoyu Min <jackmin@nvidia.com> --- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index a54c55c5f5..823eeb21b8 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -3,6 +3,7 @@ * All rights reserved. */ +#include <rte_vxlan.h> #include "bnxt.h" #include "ulp_template_db_enum.h" #include "ulp_template_struct.h" @@ -1548,7 +1549,7 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item, buff = &ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG]; ulp_encap_buffer_copy(buff, item->spec, - sizeof(struct rte_flow_item_vlan), + sizeof(struct rte_vlan_hdr), ULP_BUFFER_ALIGN_8_BYTE); if (!ulp_rte_item_skip_void(&item, 1)) @@ -1559,15 +1560,15 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item, if (item->type == RTE_FLOW_ITEM_TYPE_VLAN) { vlan_num++; memcpy(&ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG + - sizeof(struct rte_flow_item_vlan)], + sizeof(struct rte_vlan_hdr)], item->spec, - sizeof(struct rte_flow_item_vlan)); + sizeof(struct rte_vlan_hdr)); if (!ulp_rte_item_skip_void(&item, 1)) return BNXT_TF_RC_ERROR; } /* Update the vlan count and size of more than one */ if (vlan_num) { - vlan_size = vlan_num * sizeof(struct rte_flow_item_vlan); + vlan_size = vlan_num * sizeof(struct rte_vlan_hdr); vlan_num = tfp_cpu_to_be_32(vlan_num); memcpy(&ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_NUM], &vlan_num, @@ -1726,7 +1727,7 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item, BNXT_TF_DBG(ERR, "vxlan encap does not have vni\n"); return BNXT_TF_RC_ERROR; } - vxlan_size = sizeof(struct rte_flow_item_vxlan); + vxlan_size = sizeof(struct rte_vxlan_hdr); /* copy the vxlan details */ memcpy(&vxlan_spec, item->spec, vxlan_size); vxlan_spec.flags = 0x08; -- 2.25.1
next prev parent reply other threads:[~2020-11-16 7:56 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-16 7:55 [dpdk-dev] [PATCH 0/5] fix protocol size calculation Xiaoyu Min 2020-11-16 7:55 ` [dpdk-dev] [PATCH 1/5] net/mlx5: fix protocol size for raw encap judgement Xiaoyu Min 2020-11-17 13:25 ` Matan Azrad 2020-11-22 14:21 ` Thomas Monjalon 2020-11-22 15:32 ` Thomas Monjalon 2020-11-22 16:04 ` Matan Azrad 2020-11-23 7:54 ` Ori Kam 2020-11-23 8:12 ` Thomas Monjalon 2020-11-16 7:55 ` [dpdk-dev] [PATCH 2/5] app/flow-perf: fix protocol size for raw encap Xiaoyu Min 2020-11-16 7:55 ` Xiaoyu Min [this message] 2020-11-16 16:12 ` [dpdk-dev] [PATCH 3/5] net/bnxt: fix protocol size for VXLAN encap copy Ferruh Yigit 2020-11-18 0:34 ` Ajit Khaparde 2020-11-18 6:37 ` Andrew Rybchenko 2020-11-18 17:44 ` Ajit Khaparde 2020-11-16 7:55 ` [dpdk-dev] [PATCH 4/5] net/iavf: fix protocol size for virtchnl copy Xiaoyu Min 2020-11-16 16:23 ` Ferruh Yigit 2020-11-22 13:28 ` Jack Min 2020-11-22 14:15 ` Thomas Monjalon 2020-11-23 10:02 ` Ferruh Yigit 2020-11-23 10:49 ` Ferruh Yigit 2020-11-24 21:58 ` Thomas Monjalon 2020-11-27 1:17 ` Xing, Beilei 2020-11-16 7:55 ` [dpdk-dev] [PATCH 5/5] net/softnic: update headers size calculation Xiaoyu Min 2020-11-16 16:27 ` Ferruh Yigit 2020-11-16 19:09 ` Dekel Peled 2020-11-17 10:30 ` Ferruh Yigit 2020-11-17 12:41 ` Dekel Peled 2020-11-17 15:43 ` Singh, Jasvinder 2020-11-18 2:23 ` Zhou, JunX W 2020-11-22 16:11 ` [dpdk-dev] [PATCH 0/5] fix protocol " Thomas Monjalon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=141eb0140301108b1320ecfd93c89e48b02cd546.1605493464.git.jackmin@nvidia.com \ --to=jackmin@mellanox.com \ --cc=ajit.khaparde@broadcom.com \ --cc=dev@dpdk.org \ --cc=jackmin@nvidia.com \ --cc=somnath.kotur@broadcom.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git