[dpdk-stable] [PATCH] net/mlx5: fix multi segment packet send
Shahaf Shuler
shahafs at mellanox.com
Wed Jan 25 14:35:52 CET 2017
[ backported from upstream commit 786b5c2dac785fe2fdbd303c236edc9491c00e5e ]
Dseg pointer is not initialized when the first segment is inlined
causing a segmentation fault in such situation.
Fixes: 2a66cf378954 ("net/mlx5: support inline send")
Signed-off-by: Shahaf Shuler <shahafs at mellanox.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil at 6wind.com>
---
Strangely i didn't had any conflicts when applying this patch on top of 16.11 stable branch.
Please let me know if you have any.
---
drivers/net/mlx5/mlx5_rxtx.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 9b59801..eda88b6 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -488,7 +488,7 @@
/* Store the inlined packet size in the WQE. */
wqe->eseg.inline_hdr_sz = htons(pkt_inline_sz);
/*
- * 2 DWORDs consumed by the WQE header + 1 DSEG +
+ * 2 DWORDs consumed by the WQE header + ETH segment +
* the size of the inline part of the packet.
*/
ds = 2 + MLX5_WQE_DS(pkt_inline_sz - 2);
@@ -503,6 +503,10 @@
} else if (!segs_n) {
goto next_pkt;
} else {
+ /* dseg will be advance as part of next_seg */
+ dseg = (volatile rte_v128u32_t *)
+ ((uintptr_t)wqe +
+ ((ds - 1) * MLX5_WQE_DWORD_SIZE));
goto next_seg;
}
} else {
--
1.8.3.1
More information about the stable
mailing list