From 3edf8754d8d46394da06de6bc678bd3125b5a3c1 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Tue, 3 Nov 2015 20:13:48 +0000 Subject: [PATCH] examples/l3fwd: fix crash with IPv6 Lookup burst size was changed for exact match from 4 to 8, for both ipv4 and ipv6, but actually only 4 keys were being looked up for ipv6, instead of 8, causing random segmentation faults. Fixes: 80fcb4d4 ("examples/l3fwd: increase lookup burst size to 8") Signed-off-by: Pablo de Lara Acked-by: Reshma Pattan --- doc/guides/rel_notes/release_2_2.rst | 2 ++ examples/l3fwd/main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index efa38d3f60..34237b9dca 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -239,6 +239,8 @@ Libraries Examples ~~~~~~~~ +* **l3fwd: Fixed crash with IPv6.** + * **vhost_xen: Fixed compile error.** diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 9a7fd8c7a3..91a0f58c8e 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -1005,7 +1005,7 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint8_t portid, struct lcore_conf * const void *key_array[8] = {&key[0], &key[1], &key[2], &key[3], &key[4], &key[5], &key[6], &key[7]}; - rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 4, ret); + rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 8, ret); dst_port[0] = (uint8_t) ((ret[0] < 0) ? portid:ipv6_l3fwd_out_if[ret[0]]); dst_port[1] = (uint8_t) ((ret[1] < 0) ? portid:ipv6_l3fwd_out_if[ret[1]]); dst_port[2] = (uint8_t) ((ret[2] < 0) ? portid:ipv6_l3fwd_out_if[ret[2]]); -- 2.20.1