diff mbox series

net: fix IPv4 compat and mapped checks

Message ID 20250224144725.271975-2-rjarry@redhat.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers
Series net: fix IPv4 compat and mapped checks |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-unit-arm64-testing pending Testing pending
ci/iol-sample-apps-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-marvell-Functional success Functional Testing PASS

Commit Message

Robin Jarry Feb. 24, 2025, 2:47 p.m. UTC 
The RFC states that the first 96 bits should be compared, not the first
32 bits.

Add unit tests to ensure this works.

Cc: stable@dpdk.org
Fixes: 3d6d85f58c1c ("net: add utilities for well known IPv6 address types")
Reported-by: Junxiao Shi <sunnylandh@gmail.com>
Closes: https://bugs.dpdk.org/show_bug.cgi?id=1664
Signed-off-by: Robin Jarry <rjarry@redhat.com>
---
 app/test/test_net_ip6.c | 26 ++++++++++++++++++++++++++
 lib/net/rte_ip6.h       |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/app/test/test_net_ip6.c b/app/test/test_net_ip6.c
index 9cc10b1f714f..cfc550940306 100644
--- a/app/test/test_net_ip6.c
+++ b/app/test/test_net_ip6.c
@@ -99,6 +99,8 @@  test_ipv6_addr_kind(void)
 	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&zero_addr), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&zero_addr), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&zero_addr), "");
+	TEST_ASSERT(rte_ipv6_addr_is_v4compat(&zero_addr), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&zero_addr), "");
 
 	const struct rte_ipv6_addr ucast =
 		RTE_IPV6(0x2a01, 0xcb00, 0x0254, 0x3300, 0x6239, 0xe1f4, 0x7a0b, 0x2371);
@@ -106,18 +108,24 @@  test_ipv6_addr_kind(void)
 	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&ucast), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&ucast), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&ucast), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4compat(&ucast), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&ucast), "");
 
 	const struct rte_ipv6_addr mcast = RTE_IPV6(0xff01, 0, 0, 0, 0, 0, 0, 1);
 	TEST_ASSERT(!rte_ipv6_addr_is_unspec(&mcast), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&mcast), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&mcast), "");
 	TEST_ASSERT(rte_ipv6_addr_is_mcast(&mcast), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4compat(&mcast), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&mcast), "");
 
 	const struct rte_ipv6_addr lo = RTE_IPV6_ADDR_LOOPBACK;
 	TEST_ASSERT(!rte_ipv6_addr_is_unspec(&lo), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&lo), "");
 	TEST_ASSERT(rte_ipv6_addr_is_loopback(&lo), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&lo), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4compat(&lo), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&lo), "");
 
 	const struct rte_ipv6_addr local =
 		RTE_IPV6(0xfe80, 0, 0, 0, 0x5a84, 0xc52c, 0x6aef, 0x4639);
@@ -125,6 +133,24 @@  test_ipv6_addr_kind(void)
 	TEST_ASSERT(rte_ipv6_addr_is_linklocal(&local), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&local), "");
 	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&local), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4compat(&local), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&local), "");
+
+	const struct rte_ipv6_addr v4compat = RTE_IPV6(0, 0, 0, 0, 0, 0, 0xc0a8, 0x0001);
+	TEST_ASSERT(!rte_ipv6_addr_is_unspec(&v4compat), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&v4compat), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&v4compat), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&v4compat), "");
+	TEST_ASSERT(rte_ipv6_addr_is_v4compat(&v4compat), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4mapped(&v4compat), "");
+
+	const struct rte_ipv6_addr v4mapped = RTE_IPV6(0, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0001);
+	TEST_ASSERT(!rte_ipv6_addr_is_unspec(&v4mapped), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&v4mapped), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_loopback(&v4mapped), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_mcast(&v4mapped), "");
+	TEST_ASSERT(!rte_ipv6_addr_is_v4compat(&v4mapped), "");
+	TEST_ASSERT(rte_ipv6_addr_is_v4mapped(&v4mapped), "");
 
 	return TEST_SUCCESS;
 }
diff --git a/lib/net/rte_ip6.h b/lib/net/rte_ip6.h
index 92558a124a00..98bcac3f4dff 100644
--- a/lib/net/rte_ip6.h
+++ b/lib/net/rte_ip6.h
@@ -307,7 +307,7 @@  static inline bool
 rte_ipv6_addr_is_v4compat(const struct rte_ipv6_addr *ip)
 {
 	const struct rte_ipv6_addr unspec = RTE_IPV6_ADDR_UNSPEC;
-	return rte_ipv6_addr_eq_prefix(ip, &unspec, 32) && !rte_ipv6_addr_is_loopback(ip);
+	return rte_ipv6_addr_eq_prefix(ip, &unspec, 96) && !rte_ipv6_addr_is_loopback(ip);
 }
 
 #define RTE_IPV6_ADDR_PREFIX_V4MAPPED RTE_IPV6(0, 0, 0, 0, 0, 0xffff, 0, 0)
@@ -325,7 +325,7 @@  static inline bool
 rte_ipv6_addr_is_v4mapped(const struct rte_ipv6_addr *ip)
 {
 	const struct rte_ipv6_addr prefix = RTE_IPV6_ADDR_PREFIX_V4MAPPED;
-	return rte_ipv6_addr_eq_prefix(ip, &prefix, 32);
+	return rte_ipv6_addr_eq_prefix(ip, &prefix, 96);
 }
 
 /**