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 B7C5D45A78; Tue, 1 Oct 2024 10:19:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CBBFF40E17; Tue, 1 Oct 2024 10:18:32 +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 F0D8B40B9C for ; Tue, 1 Oct 2024 10:18:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727770708; 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=o79p4i6EasMwTlctYszlsCIBq1DoT0ZnQENxM2z+zBo=; b=fXoOgWVbRJR6zos7BIVggaRg1iV6JML3yJM+Lmu6tZZeukZn8SUo+RHaGqJFMRzSuc3oBp Iz3gyW+rMX/i4hkmbrsaR+b7q7NzFCERlAFsi/1e6hIxjmVdUviachSaV8dKRa2YyaPP9b UkzjZpkzW5eFcDR70Ir00kySMyylAzs= 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-226-ETMFVZo4M2elXQhtw05LTA-1; Tue, 01 Oct 2024 04:18:23 -0400 X-MC-Unique: ETMFVZo4M2elXQhtw05LTA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.15]) (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 CE01219626DE; Tue, 1 Oct 2024 08:18:21 +0000 (UTC) Received: from ringo.redhat.com (unknown [10.39.208.33]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6CB341979060; Tue, 1 Oct 2024 08:18:19 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org, Wisam Jaddo , Potnuri Bharat Teja , Chaoyong He , Ori Kam , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH dpdk v2 13/16] rte_flow: use ipv6 addr struct Date: Tue, 1 Oct 2024 10:17:25 +0200 Message-ID: <20241001081728.301272-14-rjarry@redhat.com> In-Reply-To: <20241001081728.301272-1-rjarry@redhat.com> References: <20240821162516.610624-17-rjarry@redhat.com> <20241001081728.301272-1-rjarry@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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_flow_tunnel, rte_flow_action_set_ipv6, rte_flow_item_icmp6_nd_na and rte_flow_item_icmp6_nd_ns to use the recently introduced IPv6 address structure instead of uint8_t[16] arrays. Update all code accordingly. Signed-off-by: Robin Jarry --- Notes: v2: updated changelog for 24.11 app/test-flow-perf/actions_gen.c | 4 ++-- doc/guides/rel_notes/deprecation.rst | 10 ---------- doc/guides/rel_notes/release_24_11.rst | 2 ++ drivers/net/cxgbe/cxgbe_flow.c | 4 ++-- drivers/net/nfp/flower/nfp_flower_flow.c | 2 +- lib/ethdev/rte_flow.h | 16 +++++++++------- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/app/test-flow-perf/actions_gen.c b/app/test-flow-perf/actions_gen.c index b5336e83ff9f..54fcbacb98ce 100644 --- a/app/test-flow-perf/actions_gen.c +++ b/app/test-flow-perf/actions_gen.c @@ -304,7 +304,7 @@ add_set_src_ipv6(struct rte_flow_action *actions, /* IPv6 value to set is random each time */ for (i = 0; i < 16; i++) { - set_ipv6[para.core_idx].ipv6_addr[i] = ipv6 & 0xff; + set_ipv6[para.core_idx].ipv6_addr.a[i] = ipv6 & 0xff; ipv6 = ipv6 >> 8; } @@ -327,7 +327,7 @@ add_set_dst_ipv6(struct rte_flow_action *actions, /* IPv6 value to set is random each time */ for (i = 0; i < 16; i++) { - set_ipv6[para.core_idx].ipv6_addr[i] = ipv6 & 0xff; + set_ipv6[para.core_idx].ipv6_addr.a[i] = ipv6 & 0xff; ipv6 = ipv6 >> 8; } diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index f384a4b414c9..7b77987bffa2 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -61,16 +61,6 @@ Deprecation Notices us extending existing enum/define. One solution can be using a fixed size array instead of ``.*MAX.*`` value. -* net: A new IPv6 address structure will be introduced in DPDK 24.11. - It will replace all ad-hoc ``uint8_t[16]`` arrays in all public APIs and structures. - The following libraries and symbols are expected to be affected: - - ethdev - - ``struct rte_flow_item_icmp6_nd_ns`` - - ``struct rte_flow_item_icmp6_nd_na`` - - ``struct rte_flow_action_set_ipv6`` - - ``struct rte_flow_tunnel`` - * net, ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE`` is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``. The struct ``rte_flow_item_vxlan_gpe`` and its mask ``rte_flow_item_vxlan_gpe_mask`` diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index d6d75033bf8f..db9da2eb7ef8 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -99,6 +99,8 @@ API Changes ``uint8_t[16]`` fields. * gro: ``tcp6_flow_key`` was modified to use ``rte_ipv6_addr`` structures instead of ``uint8_t[16]`` fields. +* ethdev: ``rte_flow_*`` structures were modified to use ``rte_ipv6_addr`` structures instead of + ``uint8_t[16]`` fields. ABI Changes ----------- diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index 37c566b131e9..00c55af4bcc6 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -680,7 +680,7 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a, "found."); ipv6 = (const struct rte_flow_action_set_ipv6 *)a->conf; - memcpy(fs->nat_fip, ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr)); + memcpy(fs->nat_fip, &ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr)); *nmode |= 1 << 0; break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: @@ -693,7 +693,7 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a, "found."); ipv6 = (const struct rte_flow_action_set_ipv6 *)a->conf; - memcpy(fs->nat_lip, ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr)); + memcpy(fs->nat_lip, &ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr)); *nmode |= 1 << 1; break; case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 3f597d394b24..6db1fb141d3e 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -2978,7 +2978,7 @@ nfp_flow_action_set_ipv6(char *act_data, set_ip->reserved = 0; for (i = 0; i < 4; i++) { - rte_memcpy(&tmp, &set_ipv6->ipv6_addr[i * 4], 4); + rte_memcpy(&tmp, &set_ipv6->ipv6_addr.a[i * 4], 4); set_ip->ipv6[i].exact = tmp; set_ip->ipv6[i].mask = RTE_BE32(0xffffffff); } diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b3ede7ccdaef..628292c1df07 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -1505,16 +1505,17 @@ struct rte_flow_item_icmp6_nd_ns { uint8_t code; /**< ICMPv6 code, normally 0. */ rte_be16_t checksum; /**< ICMPv6 checksum. */ rte_be32_t reserved; /**< Reserved, normally 0. */ - uint8_t target_addr[16]; /**< Target address. */ + struct rte_ipv6_addr target_addr; /**< Target address. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_ICMP6_ND_NS. */ #ifndef __cplusplus static const struct rte_flow_item_icmp6_nd_ns rte_flow_item_icmp6_nd_ns_mask = { - .target_addr = + .target_addr = { "\xff\xff\xff\xff\xff\xff\xff\xff" "\xff\xff\xff\xff\xff\xff\xff\xff", + } }; #endif @@ -1532,16 +1533,17 @@ struct rte_flow_item_icmp6_nd_na { * reserved (29b). */ rte_be32_t rso_reserved; - uint8_t target_addr[16]; /**< Target address. */ + struct rte_ipv6_addr target_addr; /**< Target address. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_ICMP6_ND_NA. */ #ifndef __cplusplus static const struct rte_flow_item_icmp6_nd_na rte_flow_item_icmp6_nd_na_mask = { - .target_addr = + .target_addr = { "\xff\xff\xff\xff\xff\xff\xff\xff" "\xff\xff\xff\xff\xff\xff\xff\xff", + } }; #endif @@ -3812,7 +3814,7 @@ struct rte_flow_action_set_ipv4 { * specified outermost IPv6 header. */ struct rte_flow_action_set_ipv6 { - uint8_t ipv6_addr[16]; + struct rte_ipv6_addr ipv6_addr; }; /** @@ -5196,8 +5198,8 @@ struct rte_flow_tunnel { rte_be32_t dst_addr; /**< IPv4 destination address. */ } ipv4; struct { - uint8_t src_addr[16]; /**< IPv6 source address. */ - uint8_t dst_addr[16]; /**< IPv6 destination address. */ + struct rte_ipv6_addr src_addr; /**< IPv6 source address. */ + struct rte_ipv6_addr dst_addr; /**< IPv6 destination address. */ } ipv6; }; rte_be16_t tp_src; /**< Tunnel port source. */ -- 2.46.1