From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3030445B68; Fri, 18 Oct 2024 11:19:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A800B40E26; Fri, 18 Oct 2024 11:18:33 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5332740E25 for ; Fri, 18 Oct 2024 11:18:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729243110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f1nZ4jiVjk2+L8Z6gZjfvfuma1KL6DkGIGvZoZ4dWcA=; b=eyhEoBrMZ/PErjHPdBUOoLFgPIDnV/rQ6jDA+JWbPb+AL+hWJNBjKGksJmr68EuUcRcKO3 bXTBqKfxHf9wMWphJS9dqUNMD/JE6t8/OkTRe0NGxo0YCr40UNkGVuBr9eTom1bB3gRXKu 0hBfvx6BrEQQbPFDcDXPTjJohWmi5xw= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-4OXjaldRMnaN6B86NITJLA-1; Fri, 18 Oct 2024 05:18:27 -0400 X-MC-Unique: 4OXjaldRMnaN6B86NITJLA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3E1F21955EA7; Fri, 18 Oct 2024 09:18:26 +0000 (UTC) Received: from ringo.redhat.com (unknown [10.39.208.23]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 49AAA19560AD; Fri, 18 Oct 2024 09:18:24 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org, Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH dpdk v4 13/17] hash: use IPv6 address structure Date: Fri, 18 Oct 2024 11:17:30 +0200 Message-ID: <20241018091734.64601-14-rjarry@redhat.com> In-Reply-To: <20241018091734.64601-1-rjarry@redhat.com> References: <20240821162516.610624-17-rjarry@redhat.com> <20241018091734.64601-1-rjarry@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Update rte_ipv6_tuple to use rte_ipv6_addr structures instead of uint8_t[16] arrays. Signed-off-by: Robin Jarry --- app/test/test_thash.c | 46 ++++++++++---------------- doc/guides/rel_notes/deprecation.rst | 2 -- doc/guides/rel_notes/release_24_11.rst | 2 ++ lib/hash/rte_thash.h | 20 +++++------ 4 files changed, 29 insertions(+), 41 deletions(-) diff --git a/app/test/test_thash.c b/app/test/test_thash.c index 952da6a52954..0ad6943cf839 100644 --- a/app/test/test_thash.c +++ b/app/test/test_thash.c @@ -25,8 +25,8 @@ struct test_thash_v4 { }; struct test_thash_v6 { - uint8_t dst_ip[16]; - uint8_t src_ip[16]; + struct rte_ipv6_addr dst_ip; + struct rte_ipv6_addr src_ip; uint16_t dst_port; uint16_t src_port; uint32_t hash_l3; @@ -49,25 +49,19 @@ struct test_thash_v4 v4_tbl[] = { struct test_thash_v6 v6_tbl[] = { /*3ffe:2501:200:3::1*/ -{{0x3f, 0xfe, 0x25, 0x01, 0x02, 0x00, 0x00, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,}, +{RTE_IPV6(0x3ffe, 0x2501, 0x0200, 0x0003, 0, 0, 0, 0x0001), /*3ffe:2501:200:1fff::7*/ -{0x3f, 0xfe, 0x25, 0x01, 0x02, 0x00, 0x1f, 0xff, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,}, +RTE_IPV6(0x3ffe, 0x2501, 0x0200, 0x1fff, 0, 0, 0, 0x0007), 1766, 2794, 0x2cc18cd5, 0x40207d3d}, /*ff02::1*/ -{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,}, +{RTE_IPV6(0xff02, 0, 0, 0, 0, 0, 0, 0x0001), /*3ffe:501:8::260:97ff:fe40:efab*/ -{0x3f, 0xfe, 0x05, 0x01, 0x00, 0x08, 0x00, 0x00, -0x02, 0x60, 0x97, 0xff, 0xfe, 0x40, 0xef, 0xab,}, +RTE_IPV6(0x3ffe, 0x0501, 0x0008, 0, 0x0260, 0x97ff, 0xfe40, 0xefab), 4739, 14230, 0x0f0c461c, 0xdde51bbf}, /*fe80::200:f8ff:fe21:67cf*/ -{{0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x00, 0xf8, 0xff, 0xfe, 0x21, 0x67, 0xcf,}, +{RTE_IPV6(0xfe80, 0, 0, 0, 0x0200, 0xf8ff, 0xfe21, 0x67cf), /*3ffe:1900:4545:3:200:f8ff:fe21:67cf*/ -{0x3f, 0xfe, 0x19, 0x00, 0x45, 0x45, 0x00, 0x03, -0x02, 0x00, 0xf8, 0xff, 0xfe, 0x21, 0x67, 0xcf,}, +RTE_IPV6(0x3ffe, 0x1900, 0x4545, 0x0003, 0x0200, 0xf8ff, 0xfe21, 0x67cf), 38024, 44251, 0x4b61e985, 0x02d1feef}, }; @@ -110,7 +104,7 @@ static const uint8_t big_rss_key[] = { static int test_toeplitz_hash_calc(void) { - uint32_t i, j; + uint32_t i; union rte_thash_tuple tuple; uint32_t rss_l3, rss_l3l4; uint8_t rss_key_be[RTE_DIM(default_rss_key)]; @@ -145,10 +139,8 @@ test_toeplitz_hash_calc(void) } for (i = 0; i < RTE_DIM(v6_tbl); i++) { /*Fill ipv6 hdr*/ - for (j = 0; j < RTE_DIM(ipv6_hdr.src_addr.a); j++) - ipv6_hdr.src_addr.a[j] = v6_tbl[i].src_ip[j]; - for (j = 0; j < RTE_DIM(ipv6_hdr.dst_addr.a); j++) - ipv6_hdr.dst_addr.a[j] = v6_tbl[i].dst_ip[j]; + ipv6_hdr.src_addr = v6_tbl[i].src_ip; + ipv6_hdr.dst_addr = v6_tbl[i].dst_ip; /*Load and convert ipv6 address into tuple*/ rte_thash_load_v6_addrs(&ipv6_hdr, &tuple); tuple.v6.sport = v6_tbl[i].src_port; @@ -176,7 +168,7 @@ test_toeplitz_hash_calc(void) static int test_toeplitz_hash_gfni(void) { - uint32_t i, j; + uint32_t i; union rte_thash_tuple tuple; uint32_t rss_l3, rss_l3l4; uint64_t rss_key_matrixes[RTE_DIM(default_rss_key)]; @@ -204,10 +196,8 @@ test_toeplitz_hash_gfni(void) } for (i = 0; i < RTE_DIM(v6_tbl); i++) { - for (j = 0; j < RTE_DIM(tuple.v6.src_addr); j++) - tuple.v6.src_addr[j] = v6_tbl[i].src_ip[j]; - for (j = 0; j < RTE_DIM(tuple.v6.dst_addr); j++) - tuple.v6.dst_addr[j] = v6_tbl[i].dst_ip[j]; + tuple.v6.src_addr = v6_tbl[i].src_ip; + tuple.v6.dst_addr = v6_tbl[i].dst_ip; tuple.v6.sport = rte_cpu_to_be_16(v6_tbl[i].dst_port); tuple.v6.dport = rte_cpu_to_be_16(v6_tbl[i].src_port); rss_l3 = rte_thash_gfni(rss_key_matrixes, (uint8_t *)&tuple, @@ -299,7 +289,7 @@ enum { static int test_toeplitz_hash_gfni_bulk(void) { - uint32_t i, j; + uint32_t i; union rte_thash_tuple tuple[2]; uint8_t *tuples[2]; uint32_t rss[2] = { 0 }; @@ -328,10 +318,8 @@ test_toeplitz_hash_gfni_bulk(void) rte_memcpy(tuples[0], &tuple[0], RTE_THASH_V4_L4_LEN * 4); /*Load IPv6 headers and copy it into the corresponding tuple*/ - for (j = 0; j < RTE_DIM(tuple[1].v6.src_addr); j++) - tuple[1].v6.src_addr[j] = v6_tbl[i].src_ip[j]; - for (j = 0; j < RTE_DIM(tuple[1].v6.dst_addr); j++) - tuple[1].v6.dst_addr[j] = v6_tbl[i].dst_ip[j]; + tuple[1].v6.src_addr = v6_tbl[i].src_ip; + tuple[1].v6.dst_addr = v6_tbl[i].dst_ip; tuple[1].v6.sport = rte_cpu_to_be_16(v6_tbl[i].dst_port); tuple[1].v6.dport = rte_cpu_to_be_16(v6_tbl[i].src_port); rte_memcpy(tuples[1], &tuple[1], RTE_THASH_V6_L4_LEN * 4); diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d67d63d37275..005f8c3e66a1 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -72,8 +72,6 @@ Deprecation Notices - ``struct rte_flow_tunnel`` gro - ``struct tcp6_flow_key`` - hash - - ``struct rte_ipv6_tuple`` * net, ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE`` is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``. diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 05212a4cc2b3..c59df2546a9d 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -295,6 +295,8 @@ API Changes - ``rte_fib6_add()`` - ``rte_fib6_delete()`` - ``rte_fib6_lookup_bulk()`` + hash + - ``struct rte_ipv6_tuple`` ipsec - ``struct rte_ipsec_sadv6_key`` lpm diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h index eab753a06f3d..e8fdb8953044 100644 --- a/lib/hash/rte_thash.h +++ b/lib/hash/rte_thash.h @@ -88,8 +88,8 @@ struct rte_ipv4_tuple { * ports/sctp_tag have to be CPU byte order */ struct rte_ipv6_tuple { - uint8_t src_addr[16]; - uint8_t dst_addr[16]; + struct rte_ipv6_addr src_addr; + struct rte_ipv6_addr dst_addr; union { struct { uint16_t dport; @@ -140,22 +140,22 @@ rte_thash_load_v6_addrs(const struct rte_ipv6_hdr *orig, { #ifdef RTE_ARCH_X86 __m128i ipv6 = _mm_loadu_si128((const __m128i *)&orig->src_addr); - *(__m128i *)targ->v6.src_addr = + *(__m128i *)&targ->v6.src_addr = _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask); ipv6 = _mm_loadu_si128((const __m128i *)&orig->dst_addr); - *(__m128i *)targ->v6.dst_addr = + *(__m128i *)&targ->v6.dst_addr = _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask); #elif defined(__ARM_NEON) - uint8x16_t ipv6 = vld1q_u8((uint8_t const *)&orig->src_addr); - vst1q_u8((uint8_t *)targ->v6.src_addr, vrev32q_u8(ipv6)); - ipv6 = vld1q_u8((uint8_t const *)&orig->dst_addr); - vst1q_u8((uint8_t *)targ->v6.dst_addr, vrev32q_u8(ipv6)); + uint8x16_t ipv6 = vld1q_u8(orig->src_addr.a); + vst1q_u8(targ->v6.src_addr.a, vrev32q_u8(ipv6)); + ipv6 = vld1q_u8(orig->dst_addr.a); + vst1q_u8(targ->v6.dst_addr.a, vrev32q_u8(ipv6)); #else int i; for (i = 0; i < 4; i++) { - *((uint32_t *)targ->v6.src_addr + i) = + *((uint32_t *)&targ->v6.src_addr + i) = rte_be_to_cpu_32(*((const uint32_t *)&orig->src_addr + i)); - *((uint32_t *)targ->v6.dst_addr + i) = + *((uint32_t *)&targ->v6.dst_addr + i) = rte_be_to_cpu_32(*((const uint32_t *)&orig->dst_addr + i)); } #endif -- 2.47.0