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 D88F545A78; Tue, 1 Oct 2024 10:19:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 949FD40A72; Tue, 1 Oct 2024 10:18:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6DEBB40DD3 for ; Tue, 1 Oct 2024 10:18:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727770694; 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=Qq+Q2Xq4WFoaPx3nLssEF9tct1wSFXiLy22GSM2o7As=; b=E4nHXXJvmhd9UAqkBcwCYNtZNQkrmZtGRemyZhFUrwUVEm5bjXxHzMqeokWlLDT5VauSTG Y0jFX5AguMQQYjsf3uVqSMUvs3JB/P3Z8dwcJ8i4XgFo0QQMtT6Mi6Xgl83/aYoD+IVrnb lKWwBcIWr0VqDHRFvuGLqNeoStoExxQ= Received: from mx-prod-mc-03.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-197-71IPDG5BN-uDHwY5nIl7mw-1; Tue, 01 Oct 2024 04:18:12 -0400 X-MC-Unique: 71IPDG5BN-uDHwY5nIl7mw-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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F2D741955DA6; Tue, 1 Oct 2024 08:18:11 +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 DA8F21979060; Tue, 1 Oct 2024 08:18:10 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org, Cristian Dumitrescu Subject: [PATCH dpdk v2 09/16] pipeline: use ipv6 addr struct Date: Tue, 1 Oct 2024 10:17:21 +0200 Message-ID: <20241001081728.301272-10-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_table_action_ipv6_header and rte_table_action_nat_params to use the recently added IPv6 address structure instead of uint8_t[16] arrays. Signed-off-by: Robin Jarry --- Notes: v2: updated changelog for 24.11 doc/guides/rel_notes/deprecation.rst | 2 -- doc/guides/rel_notes/release_24_11.rst | 2 ++ examples/ip_pipeline/cli.c | 12 ++++----- lib/pipeline/rte_table_action.c | 36 ++++++++++---------------- lib/pipeline/rte_table_action.h | 7 ++--- 5 files changed, 26 insertions(+), 33 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index c268c497834c..fcccb22593d8 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -76,8 +76,6 @@ Deprecation Notices - ``struct rte_ipv6_tuple`` ipsec - ``struct rte_ipsec_sadv6_key`` - pipeline - - ``struct rte_table_action_ipv6_header`` * 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 1d272982810c..3eb43ba8520f 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -91,6 +91,8 @@ API Changes ``uint8_t[16]`` parameters. * node: ``rte_node_ip6_route_add()`` was modified to use a ``struct rte_ipv6_addr`` instead of ``uint8_t[16]`` parameter. +* pipeline: ``rte_table_action_ipv6_header`` and ``rte_table_action_nat_params`` were modified to + use ``rte_ipv6_addr`` structures instead of ``uint8_t[16]`` fields. ABI Changes ----------- diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c index e8269ea90c11..66fdeac8f501 100644 --- a/examples/ip_pipeline/cli.c +++ b/examples/ip_pipeline/cli.c @@ -3540,8 +3540,8 @@ parse_table_action_encap(char **tokens, parser_read_uint8(&hop_limit, tokens[5])) return 0; - memcpy(a->encap.vxlan.ipv6.sa, sa.s6_addr, 16); - memcpy(a->encap.vxlan.ipv6.da, da.s6_addr, 16); + memcpy(&a->encap.vxlan.ipv6.sa, sa.s6_addr, 16); + memcpy(&a->encap.vxlan.ipv6.da, da.s6_addr, 16); a->encap.vxlan.ipv6.flow_label = flow_label; a->encap.vxlan.ipv6.dscp = dscp; a->encap.vxlan.ipv6.hop_limit = hop_limit; @@ -3615,7 +3615,7 @@ parse_table_action_nat(char **tokens, return 0; a->nat.ip_version = 0; - memcpy(a->nat.addr.ipv6, addr.s6_addr, 16); + memcpy(&a->nat.addr.ipv6, addr.s6_addr, 16); a->nat.port = port; a->action_mask |= 1 << RTE_TABLE_ACTION_NAT; return 4; @@ -4956,9 +4956,9 @@ table_rule_show(const char *pipeline_name, (uint32_t)a->encap.vxlan.ipv4.ttl); } else { fprintf(f, " ipv6 "); - ipv6_addr_show(f, a->encap.vxlan.ipv6.sa); + ipv6_addr_show(f, a->encap.vxlan.ipv6.sa.a); fprintf(f, " "); - ipv6_addr_show(f, a->encap.vxlan.ipv6.da); + ipv6_addr_show(f, a->encap.vxlan.ipv6.da.a); fprintf(f, " %u %u %u ", a->encap.vxlan.ipv6.flow_label, (uint32_t)a->encap.vxlan.ipv6.dscp, @@ -4980,7 +4980,7 @@ table_rule_show(const char *pipeline_name, if (a->nat.ip_version) ipv4_addr_show(f, a->nat.addr.ipv4); else - ipv6_addr_show(f, a->nat.addr.ipv6); + ipv6_addr_show(f, a->nat.addr.ipv6.a); fprintf(f, " %u ", (uint32_t)(a->nat.port)); } diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c index a04d5121e1f0..8479f984e4ea 100644 --- a/lib/pipeline/rte_table_action.c +++ b/lib/pipeline/rte_table_action.c @@ -872,12 +872,8 @@ encap_vxlan_apply(void *data, d->ipv6.payload_len = 0; /* not pre-computed */ d->ipv6.proto = IP_PROTO_UDP; d->ipv6.hop_limits = p->vxlan.ipv6.hop_limit; - memcpy(&d->ipv6.src_addr, - p->vxlan.ipv6.sa, - sizeof(p->vxlan.ipv6.sa)); - memcpy(&d->ipv6.dst_addr, - p->vxlan.ipv6.da, - sizeof(p->vxlan.ipv6.da)); + rte_ipv6_addr_cpy(&d->ipv6.src_addr, &p->vxlan.ipv6.sa); + rte_ipv6_addr_cpy(&d->ipv6.dst_addr, &p->vxlan.ipv6.da); /* UDP */ d->udp.src_port = rte_htons(p->vxlan.udp.sp); @@ -907,12 +903,8 @@ encap_vxlan_apply(void *data, d->ipv6.payload_len = 0; /* not pre-computed */ d->ipv6.proto = IP_PROTO_UDP; d->ipv6.hop_limits = p->vxlan.ipv6.hop_limit; - memcpy(&d->ipv6.src_addr, - p->vxlan.ipv6.sa, - sizeof(p->vxlan.ipv6.sa)); - memcpy(&d->ipv6.dst_addr, - p->vxlan.ipv6.da, - sizeof(p->vxlan.ipv6.da)); + rte_ipv6_addr_cpy(&d->ipv6.src_addr, &p->vxlan.ipv6.sa); + rte_ipv6_addr_cpy(&d->ipv6.dst_addr, &p->vxlan.ipv6.da); /* UDP */ d->udp.src_port = rte_htons(p->vxlan.udp.sp); @@ -1211,7 +1203,7 @@ struct nat_ipv4_data { } __rte_packed; struct nat_ipv6_data { - uint8_t addr[16]; + struct rte_ipv6_addr addr; uint16_t port; } __rte_packed; @@ -1258,7 +1250,7 @@ nat_apply(void *data, } else { struct nat_ipv6_data *d = data; - memcpy(d->addr, p->addr.ipv6, sizeof(d->addr)); + rte_ipv6_addr_cpy(&d->addr, &p->addr.ipv6); d->port = rte_htons(p->port); } @@ -1438,11 +1430,11 @@ pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip, tcp_cksum = nat_ipv6_tcp_udp_checksum_update(tcp->cksum, (uint16_t *)&ip->src_addr, - (uint16_t *)data->addr, + (uint16_t *)&data->addr, tcp->src_port, data->port); - rte_memcpy(&ip->src_addr, data->addr, 16); + rte_ipv6_addr_cpy(&ip->src_addr, &data->addr); tcp->src_port = data->port; tcp->cksum = tcp_cksum; } else { @@ -1451,11 +1443,11 @@ pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip, udp_cksum = nat_ipv6_tcp_udp_checksum_update(udp->dgram_cksum, (uint16_t *)&ip->src_addr, - (uint16_t *)data->addr, + (uint16_t *)&data->addr, udp->src_port, data->port); - rte_memcpy(&ip->src_addr, data->addr, 16); + rte_ipv6_addr_cpy(&ip->src_addr, &data->addr); udp->src_port = data->port; udp->dgram_cksum = udp_cksum; } @@ -1466,11 +1458,11 @@ pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip, tcp_cksum = nat_ipv6_tcp_udp_checksum_update(tcp->cksum, (uint16_t *)&ip->dst_addr, - (uint16_t *)data->addr, + (uint16_t *)&data->addr, tcp->dst_port, data->port); - rte_memcpy(&ip->dst_addr, data->addr, 16); + rte_ipv6_addr_cpy(&ip->dst_addr, &data->addr); tcp->dst_port = data->port; tcp->cksum = tcp_cksum; } else { @@ -1479,11 +1471,11 @@ pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip, udp_cksum = nat_ipv6_tcp_udp_checksum_update(udp->dgram_cksum, (uint16_t *)&ip->dst_addr.a, - (uint16_t *)data->addr, + (uint16_t *)&data->addr, udp->dst_port, data->port); - rte_memcpy(&ip->dst_addr, data->addr, 16); + rte_ipv6_addr_cpy(&ip->dst_addr, &data->addr); udp->dst_port = data->port; udp->dgram_cksum = udp_cksum; } diff --git a/lib/pipeline/rte_table_action.h b/lib/pipeline/rte_table_action.h index 5dffbeb70031..b119ac03dc6e 100644 --- a/lib/pipeline/rte_table_action.h +++ b/lib/pipeline/rte_table_action.h @@ -60,6 +60,7 @@ extern "C" { #include #include +#include #include #include @@ -419,8 +420,8 @@ struct rte_table_action_ipv4_header { /** Pre-computed IPv6 header fields for encapsulation action. */ struct rte_table_action_ipv6_header { - uint8_t sa[16]; /**< Source address. */ - uint8_t da[16]; /**< Destination address. */ + struct rte_ipv6_addr sa; /**< Source address. */ + struct rte_ipv6_addr da; /**< Destination address. */ uint32_t flow_label; /**< Flow label. */ uint8_t dscp; /**< DiffServ Code Point (DSCP). */ uint8_t hop_limit; /**< Hop Limit (HL). */ @@ -597,7 +598,7 @@ struct rte_table_action_nat_params { uint32_t ipv4; /** IPv6 address; only valid when *ip_version* is set to 0. */ - uint8_t ipv6[16]; + struct rte_ipv6_addr ipv6; } addr; /** Port. */ -- 2.46.1