d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pipeline: fix packet mirroring configuration

Browse Source 
Fix segmentation fault due to null pointer dereferencing inside the
"mirror" instruction when number of mirroring slots is set to 0. This
was taking place when the "mirror" instruction was used without the
mirror feature being properly configured, i.e. the API function
rte_swx_pipeline_mirroring_config was not called at initialization.

Fixes: dac0ecd909 ("pipeline: support packet mirroring")

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Cristian Dumitrescu 2022-06-13 18:28:34 +01:00 committed by Thomas Monjalon
parent 7342e61205
commit 0a00384a76
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pipeline/rte_swx_pipeline.c
View File

@ -612,9 +612,6 @@ mirroring_build(struct rte_swx_pipeline *p)
{
uint32_t i;
if (!p->n_mirroring_slots || !p->n_mirroring_sessions)
return 0;
for (i = 0; i < RTE_SWX_PIPELINE_THREADS_MAX; i++) {
struct thread *t = &p->threads[i];
@ -9772,6 +9769,8 @@ rte_swx_pipeline_config(struct rte_swx_pipeline **p, int numa_node)
TAILQ_INIT(&pipeline->metarrays);
pipeline->n_structs = 1; /* Struct 0 is reserved for action_data. */
pipeline->n_mirroring_slots = RTE_SWX_PACKET_MIRRORING_SLOTS_DEFAULT;
pipeline->n_mirroring_sessions = RTE_SWX_PACKET_MIRRORING_SESSIONS_DEFAULT;
pipeline->numa_node = numa_node;
status = port_in_types_register(pipeline);

10
lib/pipeline/rte_swx_pipeline.h
View File

@ -163,6 +163,16 @@ rte_swx_pipeline_port_out_config(struct rte_swx_pipeline *p,
* Packet mirroring
*/
/** Default number of packet mirroring slots. */
#ifndef RTE_SWX_PACKET_MIRRORING_SLOTS_DEFAULT
#define RTE_SWX_PACKET_MIRRORING_SLOTS_DEFAULT 4
#endif
/** Default maximum number of packet mirroring sessions. */
#ifndef RTE_SWX_PACKET_MIRRORING_SESSIONS_DEFAULT
#define RTE_SWX_PACKET_MIRRORING_SESSIONS_DEFAULT 64
#endif
/** Packet mirroring parameters. */
struct rte_swx_pipeline_mirroring_params {
/** Number of packet mirroring slots. */