From 775be5b5399da981100f77988b100613ce44a9d5 Mon Sep 17 00:00:00 2001 From: Cristian Dumitrescu Date: Wed, 27 Apr 2022 22:56:52 +0100 Subject: [PATCH] pipeline: fix emit instruction for invalid headers Fix the emit instruction for the pathological case of all headers to be emitted being invalid. In this case, the for loop was essentially skipped and the last emitted header (or an invalid memory location) getting corrupted by setting its size to 0 through the assignment to ho->n_bytes right after the for loop. Fixes: d60dbdc88a3e ("pipeline: create inline functions for emit instruction") Cc: stable@dpdk.org Signed-off-by: Cristian Dumitrescu Signed-off-by: Venkata Suresh Kumar P Signed-off-by: Yogesh Jangra --- lib/pipeline/rte_swx_pipeline_internal.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index da3e88bfa8..8d932993fe 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -1840,9 +1840,9 @@ __instr_hdr_emit_many_exec(struct rte_swx_pipeline *p __rte_unused, { uint64_t valid_headers = t->valid_headers; uint32_t n_headers_out = t->n_headers_out; - struct header_out_runtime *ho = &t->headers_out[n_headers_out - 1]; + struct header_out_runtime *ho = NULL; uint8_t *ho_ptr = NULL; - uint32_t ho_nbytes = 0, first = 1, i; + uint32_t ho_nbytes = 0, i; for (i = 0; i < n_emit; i++) { uint32_t header_id = ip->io.hdr.header_id[i]; @@ -1854,18 +1854,21 @@ __instr_hdr_emit_many_exec(struct rte_swx_pipeline *p __rte_unused, uint8_t *hi_ptr = t->structs[struct_id]; - if (!MASK64_BIT_GET(valid_headers, header_id)) + if (!MASK64_BIT_GET(valid_headers, header_id)) { + TRACE("[Thread %2u]: emit header %u (invalid)\n", + p->thread_id, + header_id); + continue; + } - TRACE("[Thread %2u]: emit header %u\n", + TRACE("[Thread %2u]: emit header %u (valid)\n", p->thread_id, header_id); /* Headers. */ - if (first) { - first = 0; - - if (!t->n_headers_out) { + if (!ho) { + if (!n_headers_out) { ho = &t->headers_out[0]; ho->ptr0 = hi_ptr0; @@ -1878,6 +1881,8 @@ __instr_hdr_emit_many_exec(struct rte_swx_pipeline *p __rte_unused, continue; } else { + ho = &t->headers_out[n_headers_out - 1]; + ho_ptr = ho->ptr; ho_nbytes = ho->n_bytes; } @@ -1899,7 +1904,8 @@ __instr_hdr_emit_many_exec(struct rte_swx_pipeline *p __rte_unused, } } - ho->n_bytes = ho_nbytes; + if (ho) + ho->n_bytes = ho_nbytes; t->n_headers_out = n_headers_out; } -- 2.39.5