From d9e597141fd3a69278c31b1daf6da7ce54de3b8e Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Thu, 24 Feb 2022 09:02:14 +0200 Subject: [PATCH] app/testpmd: fix raw encap of GENEVE option The structure "rte_flow_item_geneve_opt" is not a protocol header of geneve tunnel option from rfc8926. The field "data" is a pointer which points to the actual variable-length option data. So the structure is not packed. There is 4 bytes hole before the pointer in a 64-bit system. The option header is just 4 bytes. When using offsetof() to get the fixed part's size of option header, the wrong value 8 was got. When constructing the encap header, a wrong size and offset was used due to this hole. With this commit, the fixed part's size is calculated explicitly based on all fields. Fixes: 55c074f3ba1d ("app/testpmd: support GENEVE option item") Cc: stable@dpdk.org Signed-off-by: Bing Zhao Reviewed-by: Viacheslav Ovsiienko --- app/test-pmd/cmdline_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index b5f1191e55..4f7a9f17f9 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -10966,7 +10966,8 @@ cmd_set_raw_parsed(const struct buffer *in) case RTE_FLOW_ITEM_TYPE_GENEVE_OPT: opt = (const struct rte_flow_item_geneve_opt *) item->spec; - size = offsetof(struct rte_flow_item_geneve_opt, data); + size = offsetof(struct rte_flow_item_geneve_opt, + option_len) + sizeof(uint8_t); if (opt->option_len && opt->data) { *total_size += opt->option_len * sizeof(uint32_t); -- 2.39.5