From patchwork Fri Oct 18 16:17:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1999279 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RchOEW+x; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XVVH842ztz1xth for ; Sat, 19 Oct 2024 03:17:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4B5DE407AB; Fri, 18 Oct 2024 16:17:52 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id zew7BFQuOBXZ; Fri, 18 Oct 2024 16:17:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9C899406EF Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RchOEW+x Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9C899406EF; Fri, 18 Oct 2024 16:17:50 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7513EC08A6; Fri, 18 Oct 2024 16:17:50 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id BACC1C08A3 for ; Fri, 18 Oct 2024 16:17:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9427060808 for ; Fri, 18 Oct 2024 16:17:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id dFUMJUDjEsVU for ; Fri, 18 Oct 2024 16:17:47 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=david.marchand@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 513816060D Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 513816060D Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RchOEW+x Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 513816060D for ; Fri, 18 Oct 2024 16:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729268265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WEukiyqHsZmRHxlmauIhk3ftWaEKhv7FkPWYVnLElg=; b=RchOEW+xKpytIV/IAxEgD7loigmBhakIfOj7CLB1ZpP2Ap7JY6FbMJRNYI5/K87BQDkLBK Gc9YeT9HAr2vNLSg4pv+rQ0OU5aNYKv/d4KgUWDWwoFFk9VKn16iAg7G43ff7ONQ0DxPRe VBOl2k1GWyoSk45pT6jBoQbyAfvLExY= 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-371-9qZsrugYOFyvj41fkamzqA-1; Fri, 18 Oct 2024 12:17:44 -0400 X-MC-Unique: 9qZsrugYOFyvj41fkamzqA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 EF6F51955D48 for ; Fri, 18 Oct 2024 16:17:41 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.57]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 189F7300019D; Fri, 18 Oct 2024 16:17:39 +0000 (UTC) From: David Marchand To: dev@openvswitch.org Date: Fri, 18 Oct 2024 18:17:36 +0200 Message-ID: <20241018161736.1501475-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [dpdk-latest] netdev-offload-dpdk: Fix build with v24.11-rc1. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Following introduction of a IPv6 address structure and its use in the rte_ipv6_hdr struct referenced by rte_flow IPv6 object, adjust code manipulating IPv6 rules in the offload code. Link: https://git.dpdk.org/dpdk/commit/?id=89b5642d0d45 Signed-off-by: David Marchand Reviewed-by: Robin Jarry --- lib/netdev-offload-dpdk.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 1a6e100ffb..b820aa60e3 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -530,15 +530,15 @@ dump_flow_pattern(struct ds *s, if (!ipv6_mask) { ipv6_mask = &rte_flow_item_ipv6_mask; } - memcpy(&addr, ipv6_spec->hdr.src_addr, sizeof addr); - memcpy(&mask, ipv6_mask->hdr.src_addr, sizeof mask); + memcpy(&addr, &ipv6_spec->hdr.src_addr, sizeof addr); + memcpy(&mask, &ipv6_mask->hdr.src_addr, sizeof mask); ipv6_string_mapped(addr_str, &addr); ipv6_string_mapped(mask_str, &mask); DUMP_PATTERN_ITEM(mask, false, "src", "%s", addr_str, mask_str, ""); - memcpy(&addr, ipv6_spec->hdr.dst_addr, sizeof addr); - memcpy(&mask, ipv6_mask->hdr.dst_addr, sizeof mask); + memcpy(&addr, &ipv6_spec->hdr.dst_addr, sizeof addr); + memcpy(&mask, &ipv6_mask->hdr.dst_addr, sizeof mask); ipv6_string_mapped(addr_str, &addr); ipv6_string_mapped(mask_str, &mask); DUMP_PATTERN_ITEM(mask, false, "dst", "%s", @@ -695,10 +695,10 @@ dump_vxlan_encap(struct ds *s, const struct rte_flow_item *items) struct in6_addr addr; ds_put_cstr(s, "ip-src "); - memcpy(&addr, ipv6->hdr.src_addr, sizeof addr); + memcpy(&addr, &ipv6->hdr.src_addr, sizeof addr); ipv6_format_mapped(&addr, s); ds_put_cstr(s, " ip-dst "); - memcpy(&addr, ipv6->hdr.dst_addr, sizeof addr); + memcpy(&addr, &ipv6->hdr.dst_addr, sizeof addr); ipv6_format_mapped(&addr, s); ds_put_cstr(s, " "); } @@ -834,7 +834,7 @@ dump_flow_action(struct ds *s, struct ds *s_extra, struct in6_addr addr; ds_put_cstr(s, "ipv6_addr "); - memcpy(&addr, set_ipv6->ipv6_addr, sizeof addr); + memcpy(&addr, &set_ipv6->ipv6_addr, sizeof addr); ipv6_format_addr(&addr, s); ds_put_cstr(s, " "); } @@ -1210,18 +1210,18 @@ parse_tnl_ip_match(struct flow_patterns *patterns, spec->hdr.hop_limits = match->flow.tunnel.ip_ttl; spec->hdr.vtc_flow = htonl((uint32_t) match->flow.tunnel.ip_tos << RTE_IPV6_HDR_TC_SHIFT); - memcpy(spec->hdr.src_addr, &match->flow.tunnel.ipv6_src, + memcpy(&spec->hdr.src_addr, &match->flow.tunnel.ipv6_src, sizeof spec->hdr.src_addr); - memcpy(spec->hdr.dst_addr, &match->flow.tunnel.ipv6_dst, + memcpy(&spec->hdr.dst_addr, &match->flow.tunnel.ipv6_dst, sizeof spec->hdr.dst_addr); mask->hdr.proto = UINT8_MAX; mask->hdr.hop_limits = match->wc.masks.tunnel.ip_ttl; mask->hdr.vtc_flow = htonl((uint32_t) match->wc.masks.tunnel.ip_tos << RTE_IPV6_HDR_TC_SHIFT); - memcpy(mask->hdr.src_addr, &match->wc.masks.tunnel.ipv6_src, + memcpy(&mask->hdr.src_addr, &match->wc.masks.tunnel.ipv6_src, sizeof mask->hdr.src_addr); - memcpy(mask->hdr.dst_addr, &match->wc.masks.tunnel.ipv6_dst, + memcpy(&mask->hdr.dst_addr, &match->wc.masks.tunnel.ipv6_dst, sizeof mask->hdr.dst_addr); consumed_masks->tunnel.ip_tos = 0; @@ -1532,9 +1532,9 @@ parse_flow_match(struct netdev *netdev, spec->hdr.hop_limits = match->flow.nw_ttl; spec->hdr.vtc_flow = htonl((uint32_t) match->flow.nw_tos << RTE_IPV6_HDR_TC_SHIFT); - memcpy(spec->hdr.src_addr, &match->flow.ipv6_src, + memcpy(&spec->hdr.src_addr, &match->flow.ipv6_src, sizeof spec->hdr.src_addr); - memcpy(spec->hdr.dst_addr, &match->flow.ipv6_dst, + memcpy(&spec->hdr.dst_addr, &match->flow.ipv6_dst, sizeof spec->hdr.dst_addr); if ((match->wc.masks.nw_frag & FLOW_NW_FRAG_ANY) && (match->flow.nw_frag & FLOW_NW_FRAG_ANY)) { @@ -1545,9 +1545,9 @@ parse_flow_match(struct netdev *netdev, mask->hdr.hop_limits = match->wc.masks.nw_ttl; mask->hdr.vtc_flow = htonl((uint32_t) match->wc.masks.nw_tos << RTE_IPV6_HDR_TC_SHIFT); - memcpy(mask->hdr.src_addr, &match->wc.masks.ipv6_src, + memcpy(&mask->hdr.src_addr, &match->wc.masks.ipv6_src, sizeof mask->hdr.src_addr); - memcpy(mask->hdr.dst_addr, &match->wc.masks.ipv6_dst, + memcpy(&mask->hdr.dst_addr, &match->wc.masks.ipv6_dst, sizeof mask->hdr.dst_addr); consumed_masks->nw_ttl = 0;