From patchwork Fri Jul 7 20:38:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129375 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6AF2642DFC; Fri, 7 Jul 2023 22:39:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41D9340FAE; Fri, 7 Jul 2023 22:39:14 +0200 (CEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mails.dpdk.org (Postfix) with ESMTP id 5E57B40E01 for ; Fri, 7 Jul 2023 22:39:13 +0200 (CEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-55b1238a024so1774197a12.0 for ; Fri, 07 Jul 2023 13:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762352; x=1691354352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vObgcPMDzvD/5VxKEhbH2z7+/u+sGbwSbqWVkuVmxZs=; b=2yjUSWaRDNHocDCo3iCc7nTvDv2mLQg2n1+h0IN8b9ZALKOqyvnV8I7S5Lfis/ZljH LSWEXOKFHVFqB6poiumq9ooBap68Nfeh3UrpmieJ7omlKG+biEk0y5YnlBXPLU6S3g90 qoxgGnPrjWXXiWqjNPlZmGtk+3jjwNssP8KojGB1LTQHsBKwNP46jAUPDLly3x949cpq 0GxIlYEAQ9vEmzWtCWhZFVLIdLGTemDSeVFK8+EesxFPTzkxC/DcRA3gX7+ckl2dOaHy yff9RKB+HHQz8CjY0iRkgfyi/U56uwn0lmk9t0OVgt4n1QQj4pKQxP7FdGRO+vNGtLyf cLQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762352; x=1691354352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vObgcPMDzvD/5VxKEhbH2z7+/u+sGbwSbqWVkuVmxZs=; b=OnnmN+3iG6Tu9N798ig2+CmFP9JSUVnnkmy38bHIcgcMc6T/U7qYV847SNnfgKdWm4 RTjopCvnRuA0dRdILrFnUPU7zI+r45HFmNukZKkYbAWYRmRGlTAeYZT1AJF74pzyZF52 YhIuSJgM/awIefdldXwkhe7/1QmY8AI7TAOfCsJAOJgaXi3lu+EA/LEHo3OaCtc/cBRS cd7HvlSWzlSNi+yPGZGF0J2era46GDF6sdh2vFnzjnx87PkMztds8GcgH7jfibZVQoqJ Vz56LWz/wCFFN4vX5QYdz7nVsf0nGQlmOGMCW5yVaK58K7poN0yotFtuvQolSGsEXuIA Oxbg== X-Gm-Message-State: ABy/qLaixL9SaHOBqCJePBomTPJkwhbho+jwLCUQ3HLfnBm/7PIQ6Y2s hBDcx/+oSh9NTnsPqZXwBnZC3rebO+YvGqnRZaCUZlkY X-Google-Smtp-Source: APBJJlH+CTfCvd/vhHFdwuCZ+cHAdhmznRtqKw1TjNCjQ38dJBdpDfZhRToEjbzDCKDstOpKEATkHg== X-Received: by 2002:a05:6a20:8f0c:b0:130:1542:2681 with SMTP id b12-20020a056a208f0c00b0013015422681mr7324386pzk.34.1688762352297; Fri, 07 Jul 2023 13:39:12 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v4 01/11] gro: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:38:58 -0700 Message-Id: <20230707203908.64371-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- lib/gro/gro_tcp.h | 4 ++-- lib/gro/gro_tcp4.c | 4 ++-- lib/gro/gro_tcp6.c | 4 ++-- lib/gro/gro_udp4.c | 4 ++-- lib/gro/gro_vxlan_tcp4.c | 4 ++-- lib/gro/gro_vxlan_udp4.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h index d926c4b8cc71..bbd2f9c16a00 100644 --- a/lib/gro/gro_tcp.h +++ b/lib/gro/gro_tcp.h @@ -150,8 +150,8 @@ check_seq_option(struct gro_tcp_item *item, struct rte_tcp_hdr *tcph_orig; uint16_t len, tcp_hl_orig; - iph_orig = (char *)(rte_pktmbuf_mtod(pkt_orig, char *) + - l2_offset + pkt_orig->l2_len); + iph_orig = rte_pktmbuf_mtod_offset(pkt_orig, char *, + l2_offset + pkt_orig->l2_len); tcph_orig = (struct rte_tcp_hdr *)(iph_orig + pkt_orig->l3_len); tcp_hl_orig = pkt_orig->l4_len; diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index 6645de592b63..d6c0f9182d45 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -223,8 +223,8 @@ update_header(struct gro_tcp_item *item) struct rte_ipv4_hdr *ipv4_hdr; struct rte_mbuf *pkt = item->firstseg; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len); } diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c index 5aa39801e132..6edfb6045cf6 100644 --- a/lib/gro/gro_tcp6.c +++ b/lib/gro/gro_tcp6.c @@ -118,8 +118,8 @@ update_header(struct gro_tcp_item *item) struct rte_ipv6_hdr *ipv6_hdr; struct rte_mbuf *pkt = item->firstseg; - ipv6_hdr = (struct rte_ipv6_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv6_hdr *, + pkt->l2_len); ipv6_hdr->payload_len = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len - pkt->l3_len); } diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index 42596d33b6dc..019e05bcdea5 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -179,8 +179,8 @@ update_header(struct gro_udp4_item *item) struct rte_mbuf *pkt = item->firstseg; uint16_t frag_offset; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len); diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index 6ab700192261..2752650389a4 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -263,8 +263,8 @@ update_vxlan_header(struct gro_vxlan_tcp4_item *item) /* Update the outer IPv4 header. */ len = pkt->pkt_len - pkt->outer_l2_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->outer_l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->outer_l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(len); /* Update the outer UDP header. */ diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index b78a7ae89eef..ca8cee270d3d 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -259,8 +259,8 @@ update_vxlan_header(struct gro_vxlan_udp4_item *item) /* Update the outer IPv4 header. */ len = pkt->pkt_len - pkt->outer_l2_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->outer_l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->outer_l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(len); /* Update the outer UDP header. */ From patchwork Fri Jul 7 20:38:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129376 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 75D7A42DFC; Fri, 7 Jul 2023 22:39:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61B0C4114A; Fri, 7 Jul 2023 22:39:15 +0200 (CEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id 4B6EA410F2 for ; Fri, 7 Jul 2023 22:39:14 +0200 (CEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b8bbcfd89aso13075165ad.1 for ; Fri, 07 Jul 2023 13:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762353; x=1691354353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fyd9fvDhmU+f9LsoJiKnaY2sIp+gPp8qyRItqoaA58Y=; b=ylfMHjzVK3TrytjCFjhnS1ELqj4CU+Vt7p2JG6DxHMB4SGOC7uXASzqLh6Pv0jdL48 EWn4n4Ufj5nE2+FNZ8kcsThjLAE0rcA0VRvcLMXkhHTV3r4IzdnZ/MBFvpVxDGxc4wdy zA1KtfMNJkC7cwvV2gkrFXkI7Hl8r/xAGjVEE08ACpHL+CCM0wOmgWzN0GAqIyt1Dvq8 OoNdA14S5EHa6KqvnLhoQkggY9okLpivG6AyoxHyGmC4f/KTmyYzfVKAll7Xs6eJk4/K o39LnSstouZg6S+SD8c6Xzexdu/Z6g8V/oMfH3uN3XMxY2z7hGSJJRZX4tFYsWemfMZ1 LhBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762353; x=1691354353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fyd9fvDhmU+f9LsoJiKnaY2sIp+gPp8qyRItqoaA58Y=; b=Tpqc5x942FDGnMYQC+P0Or1hDNKozTNf3D72GgytlC92OmmGzpbp+uo1Sekm/rnEZ3 aBoXe5DlKnfie89gakoVF06h4YngIPVU+9uY/qEqABcBbUa1Hkqn1NrNAeA/hBgWdYPe I0BC66cA1caXOYzpX7TVFzjZCoeeuTrK7sV8NUu9/RJol3kV7rx/u6sMjQCRHbl2hxb9 tIWzLSIJaK5VyDZVZdPYOAfuFLx/Hqm7d0MruplR5OdAhcTdL7vT6od1ZzGjlUQoc7x7 o9ILWeHEBuLDzpUURQcPH8EpOj3vnmogTeobq2TBYhEpOEWVu21gii5wQSVsU5VbrGri 3ixA== X-Gm-Message-State: ABy/qLZUCWeyv7GDXTulNP9EWJc7dQOePDCvJ0u+UL9gw98VNwmSI/bF 4wtRMVOmAz7OVIMmIBQmNXfUBzl9725yL7Vdc/UJF1Cf X-Google-Smtp-Source: APBJJlGLQ7VRw7GM56PlY6LmRuxTbMnXSX4FjhWYcrnEyjMybaHJlkZNGuA+B+tV016nkzJV9wTspg== X-Received: by 2002:a17:902:d4ce:b0:1ac:8be5:8787 with SMTP id o14-20020a170902d4ce00b001ac8be58787mr5626394plg.21.1688762353225; Fri, 07 Jul 2023 13:39:13 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v4 02/11] gso: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:38:59 -0700 Message-Id: <20230707203908.64371-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- lib/gso/gso_common.h | 12 ++++++------ lib/gso/gso_tcp4.c | 8 ++++---- lib/gso/gso_tunnel_tcp4.c | 12 ++++++------ lib/gso/gso_tunnel_udp4.c | 18 +++++++++--------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/gso/gso_common.h b/lib/gso/gso_common.h index 9456d596d3c5..4100765f2355 100644 --- a/lib/gso/gso_common.h +++ b/lib/gso/gso_common.h @@ -52,8 +52,8 @@ update_udp_header(struct rte_mbuf *pkt, uint16_t udp_offset) { struct rte_udp_hdr *udp_hdr; - udp_hdr = (struct rte_udp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - udp_offset); + udp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *, + udp_offset); udp_hdr->dgram_len = rte_cpu_to_be_16(pkt->pkt_len - udp_offset); } @@ -77,8 +77,8 @@ update_tcp_header(struct rte_mbuf *pkt, uint16_t l4_offset, uint32_t sent_seq, { struct rte_tcp_hdr *tcp_hdr; - tcp_hdr = (struct rte_tcp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l4_offset); + tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *, + l4_offset); tcp_hdr->sent_seq = rte_cpu_to_be_32(sent_seq); if (likely(non_tail)) tcp_hdr->tcp_flags &= (~(TCP_HDR_PSH_MASK | @@ -104,8 +104,8 @@ update_ipv4_header(struct rte_mbuf *pkt, uint16_t l3_offset, uint16_t id) { struct rte_ipv4_hdr *ipv4_hdr; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - l3_offset); ipv4_hdr->packet_id = rte_cpu_to_be_16(id); } diff --git a/lib/gso/gso_tcp4.c b/lib/gso/gso_tcp4.c index d31feaff95cd..e2ae4aaf6c5a 100644 --- a/lib/gso/gso_tcp4.c +++ b/lib/gso/gso_tcp4.c @@ -16,8 +16,8 @@ update_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, uint16_t l3_offset = pkt->l2_len; uint16_t l4_offset = l3_offset + pkt->l3_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); id = rte_be_to_cpu_16(ipv4_hdr->packet_id); sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); @@ -46,8 +46,8 @@ gso_tcp4_segment(struct rte_mbuf *pkt, int ret; /* Don't process the fragmented packet */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); frag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset); if (unlikely(IS_FRAGMENTED(frag_off))) { return 0; diff --git a/lib/gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c index 1a7ef30ddebf..3a9159774b27 100644 --- a/lib/gso/gso_tunnel_tcp4.c +++ b/lib/gso/gso_tunnel_tcp4.c @@ -23,13 +23,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, tcp_offset = inner_ipv4_offset + pkt->l3_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); @@ -65,8 +65,8 @@ gso_tunnel_tcp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. diff --git a/lib/gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c index 1fc7a8dbc5aa..4fb275484ca8 100644 --- a/lib/gso/gso_tunnel_udp4.c +++ b/lib/gso/gso_tunnel_udp4.c @@ -22,13 +22,13 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, inner_ipv4_offset = outer_udp_offset + pkt->l2_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tail_idx = nb_segs - 1; @@ -42,9 +42,9 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, * * Set IP fragment offset for inner IP header. */ - ipv4_hdr = (struct rte_ipv4_hdr *) - (rte_pktmbuf_mtod(segs[i], char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(segs[i], + struct rte_ipv4_hdr *, + inner_ipv4_offset); is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0; ipv4_hdr->fragment_offset = rte_cpu_to_be_16(frag_offset | is_mf); @@ -67,8 +67,8 @@ gso_tunnel_udp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. From patchwork Fri Jul 7 20:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129377 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EBD3F42DFC; Fri, 7 Jul 2023 22:39:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E861A41104; Fri, 7 Jul 2023 22:39:17 +0200 (CEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mails.dpdk.org (Postfix) with ESMTP id 4B90541101 for ; Fri, 7 Jul 2023 22:39:15 +0200 (CEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1b8a8154f9cso16168915ad.1 for ; Fri, 07 Jul 2023 13:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762354; x=1691354354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9JJH8wAjbmw9YwG+bgmj7mYrFRf9ITchTVYKBx8wiKk=; b=EBVVrYbmR3jslAth10RZs+Thie0RUSt+HzztZn9f7gyq7A2yZ0NTjT6z34dKoU9soj wfHDNgWkb+pNuDyLLqK7xJJEE0CB4mwiGe7KRYztPLDFhIOGTq1pukDquKVZqq4K4NJj 9a2wZK2qsXpGXp4CWlUhxQN70+XBOeGU5kgiTgAlnOJB5QAstUpiEVA4TkCCQ+g43B94 tSYEI7t9uCgu4KeHvIS6jzi5gDXwEB+DdNkmHAxx2c/d3x+ejIe51maZRTNJBFCwLChJ MSgzsdjyaHN5Cku6mlpyRZLuZaVSxOHOdWn3AgfaETLeu+iphbdscR5gzxZvr6hazweU tx2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762354; x=1691354354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9JJH8wAjbmw9YwG+bgmj7mYrFRf9ITchTVYKBx8wiKk=; b=e3vUXc+bOxxBicW/quX6O86kVgzpGahLNzPK6BFTo+43RtNQHzIcz6nVYXucv3lar6 FxqcRTAXDMADXu41PNrmikvdytH8Ve9ZAhqtKr5k4U2Y+bqnnOuXGU5G/jtyuTJQV4Bk RGI2g5k4N+sUJYUoAJWG8MIA8aa3Vae1UzQ487B5JXzCw54ygzb/ucmIi2wKXFtrJuu/ YYWli8RhfRWGTuPyH+rmQJtbDAOFYc3aT+BeYLQ+8CUKbO/VUHQy2MvjzakfZEfVmCob EUgphQlOYEZlLohOyflEc0VadMqx8YMUB7Wq6/DThcYadwlfEPiPJUVAGnETH+qoiKIn Fqyg== X-Gm-Message-State: ABy/qLbo1VJLljzOyrQQLUNnwbzza1gMy8XIrnjr2QznnQIQsBKvMXqT WoyAyxRA4s64COjdljIzCDbq+0C8GfqYgxambZw5ajNM X-Google-Smtp-Source: APBJJlFj79xT5bl3bKtCA8wLqruG6BBJV0JRWwF/bh2yGeMeUv0UbbL4knppSqFITcsFHKYqocBExQ== X-Received: by 2002:a17:902:a514:b0:1b1:99c9:8ce5 with SMTP id s20-20020a170902a51400b001b199c98ce5mr11522241plq.16.1688762354114; Fri, 07 Jul 2023 13:39:14 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v4 03/11] test: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:00 -0700 Message-Id: <20230707203908.64371-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- app/test/test_cryptodev.c | 66 +++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index fb2af40b99ee..c79681255106 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -3153,8 +3153,9 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) ut_params->op); ut_params->obuf = ut_params->op->sym->m_src; TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -3247,8 +3248,9 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) @@ -3337,8 +3339,9 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) ut_params->obuf = ut_params->op->sym->m_src; TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -3425,8 +3428,9 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata) ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) @@ -4879,8 +4883,9 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) tdata->validDataLenInBits.len, "ZUC Ciphertext data not as expected"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -4994,8 +4999,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata) tdata->validDataLenInBits.len, "SNOW 3G Ciphertext data not as expected"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -5163,9 +5169,9 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + (tdata->digest.offset_bytes == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5577,10 +5583,9 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod( - ut_params->obuf, uint8_t *) + - (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + (tdata->digest.offset_bytes == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5924,8 +5929,9 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata) ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *, tdata->validCipherOffsetInBits.len >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); const uint8_t *reference_ciphertext = tdata->ciphertext.data + (tdata->validCipherOffsetInBits.len >> 3); @@ -6344,8 +6350,9 @@ test_zuc_authentication(const struct wireless_test_data *tdata, ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); if (auth_op != RTE_CRYPTO_AUTH_OP_VERIFY) { /* Validate obuf */ @@ -6531,10 +6538,9 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod( - ut_params->obuf, uint8_t *) + - (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + (tdata->digest.offset_bytes == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -7959,9 +7965,9 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->ciphertext.data, tdata->ciphertext.len_bits >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + (tdata->digest_enc.offset == 0 ? - plaintext_pad_len : tdata->digest_enc.offset); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + (tdata->digest_enc.offset == 0 ? plaintext_pad_len : tdata->digest_enc.offset)); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); From patchwork Fri Jul 7 20:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129378 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4DF5142DFC; Fri, 7 Jul 2023 22:39:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2907B42D0E; Fri, 7 Jul 2023 22:39:19 +0200 (CEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 78968411F3 for ; Fri, 7 Jul 2023 22:39:16 +0200 (CEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1b9cd6a0051so1167225ad.1 for ; Fri, 07 Jul 2023 13:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762355; x=1691354355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AlLKomwYSQSLF+t+bBhNWFBQ+maS7GUN7rYNCJ7Iq7I=; b=CINj1QbqCPuBDmPAO9N1s6YuTWpBrxxKPWhhDY7micARu/3XrCImmQB+pvICMmwfbN +JV0nt6IcjTHx1DztEpgJTCR0oij92N4dzNZPToVup9Drd1eKHpqxxdk8pQRPtL8Qe7D AMv0gPz3TKt16q7oYk/4Q/88wxpyEu6R7q74TJAiLuQ9PjvNC1ooyKRCiwINDGzkB4iS rvOkcATBMrC7WOtdnfKACJ/4QffNRe1xnk/jISisLuw/Te68Uxf2dTuq6+rfxpwVbbNo Pd2/pzwpuHwMxcIf6hA4CIcOVw7woHauspj4epW6+X0rbTrO4955T2FaLuV0kxx7J5My 7JoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762355; x=1691354355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AlLKomwYSQSLF+t+bBhNWFBQ+maS7GUN7rYNCJ7Iq7I=; b=b66Z1d44SbEHbBaovYze+rCFshGdA/EwLWmGh7dNOP1oE32VdITqpW6igyPaxQHbLH D0R1SCLRJnx/vmQ5JLKDtYQjJ9vFTB75iHFXQoCEQLeqeafX+uOfgQs0+guDW9iCWGOI zHmbHK0TQ9ru7F9TnUYS3+LLOM9HyCybuaDwbNgSZchVx4QLvxVkgnJI4NCC/v3YC1CP E6o38SFnN/tmweNxyo6jNTEVKumn4ZpAvav6Ec94/d+fOJoll/cxT03CkCpsWDlFX1Z3 lhMSYj/ICo024REq+SZRbqDqyefUmOQCGLZxUvZcBkVsYx6385/S0TIsEnUjm+56nXeV SmDA== X-Gm-Message-State: ABy/qLYTzVvzxT/Zp0MngikFLn4UGE1FfO2BLOpvdh4MDobXdHAi2SEc QhN/a9ZrwkPH5XGOi1HkJt/SIFJVbLZk+fo5rGqgxziz X-Google-Smtp-Source: APBJJlEyKHm4O6bIxFp4Uopx8Ob595V/lOF+2ReP5a3eVSAObnFAYc0hdcmOBuf2BTwguKeD0EdTkw== X-Received: by 2002:a17:902:c20c:b0:1b0:6c3e:363 with SMTP id 12-20020a170902c20c00b001b06c3e0363mr5159643pll.0.1688762355342; Fri, 07 Jul 2023 13:39:15 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj , Kai Ji , Pablo de Lara Subject: [PATCH v4 04/11] drivers/crypto: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:01 -0700 Message-Id: <20230707203908.64371-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/crypto/caam_jr/caam_jr.c | 8 ++++---- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cnxk_se.h | 5 ++--- drivers/crypto/ipsec_mb/pmd_kasumi.c | 19 +++++++++++-------- drivers/crypto/ipsec_mb/pmd_snow3g.c | 4 ++-- drivers/crypto/ipsec_mb/pmd_zuc.c | 18 ++++++++++-------- drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 9 +++++---- drivers/crypto/qat/qat_sym.h | 9 +++++---- 8 files changed, 40 insertions(+), 34 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index b55258689b49..9c96fd21a48d 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -631,15 +631,15 @@ hw_poll_job_ring(struct sec_job_ring_t *job_ring, if (ctx->op->sym->m_dst) { /*TODO check for ip header or other*/ - ip4_hdr = (struct ip *) - rte_pktmbuf_mtod(ctx->op->sym->m_dst, char*); + ip4_hdr = rte_pktmbuf_mtod(ctx->op->sym->m_dst, + struct ip *); ctx->op->sym->m_dst->pkt_len = rte_be_to_cpu_16(ip4_hdr->ip_len); ctx->op->sym->m_dst->data_len = rte_be_to_cpu_16(ip4_hdr->ip_len); } else { - ip4_hdr = (struct ip *) - rte_pktmbuf_mtod(ctx->op->sym->m_src, char*); + ip4_hdr = rte_pktmbuf_mtod(ctx->op->sym->m_src, + struct ip *); ctx->op->sym->m_src->pkt_len = rte_be_to_cpu_16(ip4_hdr->ip_len); ctx->op->sym->m_src->data_len = diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 34d40b07d4c6..8b91d11b79cc 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -520,7 +520,7 @@ cn9k_cpt_sec_post_process(struct rte_crypto_op *cop, if (infl_req->op_flags & CPT_OP_FLAGS_IPSEC_DIR_INBOUND) { - hdr = (struct roc_ie_on_inb_hdr *)rte_pktmbuf_mtod(m, char *); + hdr = rte_pktmbuf_mtod(m, struct roc_ie_on_inb_hdr *); if (likely(m->next == NULL)) { ip = PLT_PTR_ADD(hdr, ROC_IE_ON_INB_RPTR_HDR); diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index 75c1dce231bf..1392af5833d1 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -2724,7 +2724,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, m = cpt_m_dst_get(cpt_op, m_src, m_dst); /* Digest immediately following data is best case */ - if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + mc_hash_off != + if (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != (uint8_t *)sym_op->aead.digest.data)) { flags |= ROC_SE_VALID_MAC_BUF; fc_params.mac_buf.size = sess->mac_len; @@ -2759,8 +2759,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, /* hmac immediately following data is best case */ if (!(op_minor & ROC_SE_FC_MINOR_OP_HMAC_FIRST) && - (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != + (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != (uint8_t *)sym_op->auth.digest.data))) { flags |= ROC_SE_VALID_MAC_BUF; fc_params.mac_buf.size = sess->mac_len; diff --git a/drivers/crypto/ipsec_mb/pmd_kasumi.c b/drivers/crypto/ipsec_mb/pmd_kasumi.c index 5db9c523cd9a..70536ec3dc2a 100644 --- a/drivers/crypto/ipsec_mb/pmd_kasumi.c +++ b/drivers/crypto/ipsec_mb/pmd_kasumi.c @@ -83,13 +83,16 @@ process_kasumi_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, uint32_t num_bytes[num_ops]; for (i = 0; i < num_ops; i++) { - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); dst[i] = ops[i]->sym->m_dst - ? rte_pktmbuf_mtod(ops[i]->sym->m_dst, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3) - : rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3); + ? rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)) + : rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); iv_ptr = rte_crypto_op_ctod_offset(ops[i], uint8_t *, session->cipher_iv_offset); iv[i] = *((uint64_t *)(iv_ptr)); @@ -155,8 +158,8 @@ process_kasumi_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits = ops[i]->sym->auth.data.length; - src = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->auth.data.offset >> 3); + src = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); /* Direction from next bit after end of message */ num_bytes = length_in_bits >> 3; diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c index e64df1a462e3..a96779f05942 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -248,8 +248,8 @@ process_snow3g_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits = ops[i]->sym->auth.data.length; - src = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->auth.data.offset >> 3); + src = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); iv = rte_crypto_op_ctod_offset(ops[i], uint8_t *, session->auth_iv_offset); diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c index 92fd9d180894..44781be1d107 100644 --- a/drivers/crypto/ipsec_mb/pmd_zuc.c +++ b/drivers/crypto/ipsec_mb/pmd_zuc.c @@ -107,13 +107,14 @@ process_zuc_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, } #endif - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); dst[i] = ops[i]->sym->m_dst ? - rte_pktmbuf_mtod(ops[i]->sym->m_dst, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3) : - rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3); + rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)) : + rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *, sess->cipher_iv_offset); num_bytes[i] = ops[i]->sym->cipher.data.length >> 3; @@ -159,8 +160,9 @@ process_zuc_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits[i] = ops[i]->sym->auth.data.length; - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->auth.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *, sess->auth_iv_offset); diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h index 1bafeb4a53e8..3e0dfea94c87 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h @@ -56,14 +56,15 @@ qat_bpicipher_preprocess(struct qat_sym_session *ctx, uint8_t *last_block, *dst, *iv; uint32_t last_block_offset = sym_op->cipher.data.offset + sym_op->cipher.data.length - last_block_len; - last_block = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_src, - uint8_t *, last_block_offset); + last_block = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, + last_block_offset); if (unlikely((sym_op->m_dst != NULL) && (sym_op->m_dst != sym_op->m_src))) /* out-of-place operation (OOP) */ - dst = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_dst, - uint8_t *, last_block_offset); + dst = rte_pktmbuf_mtod_offset(sym_op->m_dst, + uint8_t *, + last_block_offset); else dst = last_block; diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index 193281cd9135..d7ceb13b29cd 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -192,13 +192,14 @@ qat_bpicipher_postprocess(struct qat_sym_session *ctx, last_block_offset = sym_op->cipher.data.offset + sym_op->cipher.data.length - last_block_len; - last_block = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_src, - uint8_t *, last_block_offset); + last_block = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, + last_block_offset); if (unlikely(sym_op->m_dst != NULL)) /* out-of-place operation (OOP) */ - dst = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_dst, - uint8_t *, last_block_offset); + dst = rte_pktmbuf_mtod_offset(sym_op->m_dst, + uint8_t *, + last_block_offset); else dst = last_block; From patchwork Fri Jul 7 20:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129379 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A5B542DFC; Fri, 7 Jul 2023 22:39:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 585E742D13; Fri, 7 Jul 2023 22:39:20 +0200 (CEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id 5F85442C54 for ; Fri, 7 Jul 2023 22:39:17 +0200 (CEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b89e10d356so13725545ad.3 for ; Fri, 07 Jul 2023 13:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762356; x=1691354356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WCcu2dN6EjqUsiGoKbGVJPohYYLQcR8Owv9miQ51APU=; b=e5woK1SeTJCzVaa2ZYYU9e3gDXNH9ulFcuQ51oQx98jiFaT5QHfOXKmHDNK2khYRCG ZKIswHrq9Ryuht5F3szohOa88fjwoQaOc5RipExlqSQKn/mHEC9RH8ZVgUKhNEGLsxsz gWFbINDrMjsbdme7PJVmCecTCNltu6PwzDPlAIxPD9rJLRdjy3ki7qpe5Bn8Vm04xm1m 1Ejjz5F+BE1kdXX+tgqv5kRslYEc4lea+U3c1nEvahm9vHcLKTyWFf+T5a5L3CNMgdWh 7ISb45ZLeVv49A8zXh+aRtRnopK2TPK3NIQNtvHw8/zFkAyMiuX6on9pg4hBFJ5PooK1 rReg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762356; x=1691354356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WCcu2dN6EjqUsiGoKbGVJPohYYLQcR8Owv9miQ51APU=; b=eEFjoG9dLES01d5OGr2bAwb8fdfNUFE0bwV6WSbFowOrAnhHZiVPePRRXSEAz+ztmb sf75w/WtPlGwF4ZdsYsNqb2sYcySPEvwJ76Gk0F2AIVudHX2m2HJcR8qxCQPQo5Em1vM 8ka352jAnU1MbtspYDDP4BuoKxswn8TAEdOJdITRwP3l9ejM1uiLVl/g2A0ziPgjqnRI wfNGt5m386Riw9rH5oojft1ZT0LVTEta1Jez0pmfD0rA45Bku/pCf50ixN+SQhGNUyOx JAtAyyDgj3zX98BtxJT9sFhP6Opyc05qU9DNoZ4/UrGlPO4Hqd8Xy9rafK/ZUD1fiTpq bDKw== X-Gm-Message-State: ABy/qLYG0Rh7VBUzssXhe+vQrXDjrpruH6SfYHaF4bh5drygfVxq4CAE GIFTrOgYpTcVJZ6GU6+QPGLSnxbwmzpS1/1ogcCk4Omc X-Google-Smtp-Source: APBJJlGy4trhuPiFEbBFhcfqsQAS9VCSYs8ketdXaSCuM1Zlcwz3oZRGB/IL/uSBzyaqh8052AYQLQ== X-Received: by 2002:a17:902:d2cd:b0:1b2:5ee9:aa73 with SMTP id n13-20020a170902d2cd00b001b25ee9aa73mr6148904plc.62.1688762356320; Fri, 07 Jul 2023 13:39:16 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:15 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v4 05/11] net/nfp: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:02 -0700 Message-Id: <20230707203908.64371-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/net/nfp/flower/nfp_flower_cmsg.h | 3 ++- drivers/net/nfp/flower/nfp_flower_ctrl.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index f643d54d39a4..787a38dc9aa0 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -381,7 +381,8 @@ enum nfp_flower_cmsg_port_vnic_type { static inline char* nfp_flower_cmsg_get_data(struct rte_mbuf *m) { - return rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN; + return rte_pktmbuf_mtod_offset(m, char *, + 4 + 4 + NFP_FLOWER_CMSG_HLEN); } /* diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 4cb2c2f99e04..18823a97887d 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -389,7 +389,7 @@ nfp_flower_cmsg_rx_stats(struct nfp_flow_priv *flow_priv, uint32_t ctx_id; struct nfp_flower_stats_frame *stats; - msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN; + msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN); msg_len = mbuf->data_len - NFP_FLOWER_CMSG_HLEN; count = msg_len / sizeof(struct nfp_flower_stats_frame); @@ -412,7 +412,7 @@ nfp_flower_cmsg_rx_qos_stats(struct nfp_mtr_priv *mtr_priv, struct nfp_mtr *mtr; struct nfp_mtr_stats_reply *mtr_stats; - msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN; + msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN); mtr_stats = (struct nfp_mtr_stats_reply *)msg; profile_id = rte_be_to_cpu_32(mtr_stats->head.profile_id); From patchwork Fri Jul 7 20:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129380 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 281FF42DFC; Fri, 7 Jul 2023 22:39:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B6DC42D1D; Fri, 7 Jul 2023 22:39:21 +0200 (CEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id 330884014F for ; Fri, 7 Jul 2023 22:39:18 +0200 (CEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b89e10d356so13725605ad.3 for ; Fri, 07 Jul 2023 13:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762357; x=1691354357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NiQ2/UbcUn7iVszTHB7gbAqxzzP+TGnmFbwQRb5uaB0=; b=XJZz7bEn3dLb5tKI8yKWSTg0cC9G0sr2GifhF1CI17+9zljCCi6iqtmX7yfNfXR+Iq aU5qHuu0ZT+HUrm40bTDF4NF10Nz6L7W4rGrFd31l87jDtwj9IS0CyW9KuY4xbUHAVDB +WqVPl1Ww0JleaNq0fjgs2SdL32qBaFIZpi56G5Y3woHg2gSfaleTPSOmwfNvq/j+Pgm TFFDa7yQWJ/ag7zC8jI596F1fWfjz1WohZRJASnGeItknLYNpZwPN9HOyPfv0Rdr8eIY LIcSSC2xTu79gwVlDNDHRg+PW31qPtAh0ZiP9/BEJSFNS0CWVxKSB39mWH+wwJFX2pkA v7Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762357; x=1691354357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NiQ2/UbcUn7iVszTHB7gbAqxzzP+TGnmFbwQRb5uaB0=; b=jOdTOhdgN25Tf+sYFgN8LPb2jYrKwkwIn3HVkOehv7zhgq4cfnba88FfrfmPZ19bqR KuhFFU6ofgAFJ0qpNQxIi9F/ZGxGHaCX0vURD0QhYJUFkW9dnorXUR6fCeUbCKTb+ZMR C3zZjwkR+5HC35lQ6uafjEfoKfAgZALch31/QorUzQ+ydph1rAEWnv0fTJls2bZT98Mg JX7lQ/UqMHaBb6maTV1V/+ouEyLVjvhuEZcF66DaoZ9Go2jrI39TQRqt59baa7SVPEnr 4mcfiPqLlETNhWWjqlz79VN7dzJCEx0017HYuehDFoow5iyRe4tc2+8RkE/N05vwqgTp Rwgw== X-Gm-Message-State: ABy/qLayfJkEoPQIEgRpJ4ldtsj7AXrK1PpB6OjLFytEY3pJJpQm7E+E cWHnSXJyYRBvyRXhmogR0sbFBKszTxi7RXTBB+XJlY75 X-Google-Smtp-Source: APBJJlGdb60TimXK+dp9u6WZkKG9fkVq9H55NvNsmH2CoDOir1o+54QqwOKH0eERzVbyDKhndqCrgg== X-Received: by 2002:a17:902:9895:b0:1b6:89bf:4db7 with SMTP id s21-20020a170902989500b001b689bf4db7mr4704236plp.69.1688762357185; Fri, 07 Jul 2023 13:39:17 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 06/11] net/tap: use rte_pktmbuf_motd_offset Date: Fri, 7 Jul 2023 13:39:03 -0700 Message-Id: <20230707203908.64371-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index bf98f7555990..968a1b6b45df 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -672,8 +672,8 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, if (seg_len > l234_hlen) { iovecs[k].iov_len = seg_len - l234_hlen; iovecs[k].iov_base = - rte_pktmbuf_mtod(seg, char *) + - l234_hlen; + rte_pktmbuf_mtod_offset(seg, char *, + l234_hlen); tap_tx_l4_add_rcksum(iovecs[k].iov_base, iovecs[k].iov_len, l4_cksum, &l4_raw_cksum); From patchwork Fri Jul 7 20:39:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129381 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85E5242DFC; Fri, 7 Jul 2023 22:39:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 941E842D32; Fri, 7 Jul 2023 22:39:22 +0200 (CEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id 240AE42D0D for ; Fri, 7 Jul 2023 22:39:19 +0200 (CEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8ad8383faso15789885ad.0 for ; Fri, 07 Jul 2023 13:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762358; x=1691354358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OGSayFJofy8bhnDuu5frzEHVLNUTbgllxcszb5VKc10=; b=uk5WTEJpfkVt1SITk7jLjJ78IoXJCghjfjaXIqN3FLSLdOUNRaKDb5PxEordl2fhcl SviCGtzMEVsSh6VZOVMBAkP3S4rUYljN7G5v0WfA2G+/33QCwwyij/Li6DSM4cmkDOpi leRYinU+sUflKiMzw1iO0cwzkWfPMCg2Up/qUsF+C4q1MUr05MVIRN3ChuQroqT2PZCf 21vtkAZLOfKOkoZiX1CVrj5l3NSir79pdgm0BGtgjQ/vAZWhjxo3BjDs8j+tWwZAzZt5 Bqccsd47opE5xPVfb9BSrMN/kGkPwz/rnC2XbJ4dwW195vOK3ju1ZypC/pNnvz3NJjQC 1CSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762358; x=1691354358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OGSayFJofy8bhnDuu5frzEHVLNUTbgllxcszb5VKc10=; b=kh7Zqx6Q7aUBKl5Os7tkkF3sFWNtWVsy2eqgTDKzKfG2vPUtSoe1ZejOfgrGYvmqUY mpVUmZtktbkeFc7/fKunSOPhPgC6bD/FeaoHH1gm0fXhWRFp0EqRnuAEuVakWbdBvly+ /VxqmTPFPgH7iUOsoRBrz3ARhzM23pSXTmarDkx8j7w2B1lYp/zNv7kJDAhLjG1PZX5T OgGvG1wH6VYgwelmpLMXoJQcVtlpRyJxwuqhvhmMyzd0kBBBvICv2+Alh19ranXXxzGK YaGuGmV2xAiMO6OMr40HcJQTYdwnpEXy7fv4N/us0At2rEgfDL6fODHuDaO67rn6klzJ VxKg== X-Gm-Message-State: ABy/qLakTqEWbygopNBWCKQ4fib1ACDNGqPIWzze9t8DEbknTbSacmi8 YAgFCzRi+pUxxUoay9nG3dWGO6gCqvkxtQ1TXX7S9z5g X-Google-Smtp-Source: APBJJlFjCL8w3Tyytk6hqwoYeaajd0fGznHpBAcvWsSliApG+1/7DL1inzaNzMnt39QBg/+K17v7YA== X-Received: by 2002:a17:902:da8b:b0:1b8:6a47:705f with SMTP id j11-20020a170902da8b00b001b86a47705fmr6467266plx.69.1688762358089; Fri, 07 Jul 2023 13:39:18 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nicolas Chautru Subject: [PATCH v4 07/11] baseband/fpga: use rte_pktmbuf_offset Date: Fri, 7 Jul 2023 13:39:04 -0700 Message-Id: <20230707203908.64371-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c index f29565af8cca..465a65f3dca2 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -1543,8 +1543,7 @@ fpga_harq_write_loopback(struct fpga_queue *q, rte_bbdev_log(ERR, "HARQ in length > HARQ buffer size\n"); } - input = (uint64_t *)rte_pktmbuf_mtod_offset(harq_input, - uint8_t *, in_offset); + input = rte_pktmbuf_mtod_offset(harq_input, uint64_t *, in_offset); while (left_length > 0) { if (fpga_reg_read_8(q->d->mmio_base, @@ -1621,8 +1620,8 @@ fpga_harq_read_loopback(struct fpga_queue *q, } left_length = harq_in_length; - input = (uint64_t *)rte_pktmbuf_mtod_offset(harq_output, - uint8_t *, harq_out_offset); + input = rte_pktmbuf_mtod_offset(harq_output, uint64_t *, + harq_out_offset); while (left_length > 0) { fpga_reg_write_32(q->d->mmio_base, From patchwork Fri Jul 7 20:39:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129382 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4251742DFC; Fri, 7 Jul 2023 22:40:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 157F242D40; Fri, 7 Jul 2023 22:39:24 +0200 (CEST) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mails.dpdk.org (Postfix) with ESMTP id E6A9742D13 for ; Fri, 7 Jul 2023 22:39:19 +0200 (CEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-55b66ca1c80so1310157a12.0 for ; Fri, 07 Jul 2023 13:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762359; x=1691354359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tr60IFz06evUwuSm5/a873eV74kheh+Fl+sWvdw5isU=; b=IOZCUTcwkWyLQNBLfIapRslWLVsaJ7g8a3zVTaWjDsLApcnHXFUusp9xzLuoKc6+Wb KDyodAPuZpsSPYKXEJnlVLc/EIf7WXKzSY+0fPYLtMBnwyv1Gm1QN07zVu3SnQdjmr3d 9BQM5fPYCdSXu1HVLRklbPgWaOwPLtloEIjpTtD8JrbQa8peWCBM+aeRIxfdOpC/EDLN B14FAfemNPRcZmP/C9AfSz7oKXTswS7On2Wby1l3itjk8W+ki/II02BppRjTRxVY1+uD BHgsRqI6oSttzpkr4mE7nxWuugRo4z27U447mzJpcJ1Gz6VXb1WOKpVKa36r1D+DclVU HPKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762359; x=1691354359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tr60IFz06evUwuSm5/a873eV74kheh+Fl+sWvdw5isU=; b=fpAyQ2M6WQklh6+zt97u5vy89Qqmzm4imMk3VRccMAVeBuRJVDzh3bXgYN/2OgwgrQ mOEnxaxec8vJawi7R1NGRqkcwV5ms8ILONVA2d/PbDrY5YeBbJ5tgTxQ2dUcTG0R9Kak gzFzvnMvoPYZd86rDfwl/ar6mWXPqrWSTRDw+v9qfs0sZ7XjBBTPoR0uLULZrZOS+p13 YD2eiT2nT9BpNVxZ09MnYL97s3fa6KwjrDIOTtV6g6/kZwsAao+8hlwLGpRfvIH4bg1Z P7gsCpj60xMtJthFjvd7rLeJN2xtmNMZRjXRQMAtvmBWCKS4kxHqIx9MC7pYwqN2jNnS WKzQ== X-Gm-Message-State: ABy/qLbyX4GoEbHEUr7MCmntyiu4JuXCFMCFMC3HelkI+OQ2V5CdU5tC PfDzVI66j8DtudFMexaH1SLz/A0mQtSG7xmMUTrC2h/F X-Google-Smtp-Source: APBJJlE1+nzrR5e6U61yWJNGLAc0/63KredgJ3QSF5JGHGXrDKOBMVuOPeOIXX85eCLkjQ6OxxNxUw== X-Received: by 2002:a05:6a21:3386:b0:12e:4f6b:d27d with SMTP id yy6-20020a056a21338600b0012e4f6bd27dmr5774330pzb.33.1688762358900; Fri, 07 Jul 2023 13:39:18 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph Subject: [PATCH v4 08/11] cpt: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:05 -0700 Message-Id: <20230707203908.64371-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/common/cpt/cpt_ucode.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index b393be4cf661..87a3ac80b9da 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -3167,9 +3167,8 @@ fill_fc_params(struct rte_crypto_op *cop, m = m_src; /* hmac immediately following data is best case */ - if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != - (uint8_t *)sym_op->aead.digest.data)) { + if (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != + (uint8_t *)sym_op->aead.digest.data)) { flags |= VALID_MAC_BUF; fc_params.mac_buf.size = sess_misc->mac_len; fc_params.mac_buf.vaddr = @@ -3211,9 +3210,8 @@ fill_fc_params(struct rte_crypto_op *cop, /* hmac immediately following data is best case */ if (!ctx->dec_auth && !ctx->auth_enc && - (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != - (uint8_t *)sym_op->auth.digest.data))) { + (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != + (uint8_t *)sym_op->auth.digest.data))) { flags |= VALID_MAC_BUF; fc_params.mac_buf.size = sess_misc->mac_len; From patchwork Fri Jul 7 20:39:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129383 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA2CA42DFC; Fri, 7 Jul 2023 22:40:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 471CB42D42; Fri, 7 Jul 2023 22:39:25 +0200 (CEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id D330E42D17 for ; Fri, 7 Jul 2023 22:39:20 +0200 (CEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b89d47ffb6so12981115ad.2 for ; Fri, 07 Jul 2023 13:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=78HDkboHxTG/XRmT10zNrGhuzXGadIdppWfUSd5orjE=; b=2LkTg8MJWfcLVs9UFrXwkr2t2QLUCEW8Uj1gzdRBf1r/+A5JIyAkqngFFlj1EBfteq DH51ZUHjB0iipHNsmRqX3TvzlOkPoy4WyN2sqcQ4EX2e/4LSQzoTJKL3lrqmkjFyTmXe xzVkebiXtUPOIh8CJPxgob6hN5blQlUVU0TIFrML3BJtcVX1h08AuJnyv78VG8vb8kYL uXc6/6HIskyagseLMlxTZR39XDrGEfrNiRjdvwV0O1ogBdCDhoyo85GNhD9YHLXrFAyz vuWllO3eLxv48xhjyoEHtHf+6rTTHuHomRgvvlgJGhp97w3DLAYJqNedcKB8qh2o163u bfKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=78HDkboHxTG/XRmT10zNrGhuzXGadIdppWfUSd5orjE=; b=hD9on37MKN6KbL3af9LjZwlS2hpsUQb1LhRSIU28544UItSHdnzhvquXvWT4EcmmGB apx5+i6naFMaQQtnWYf14xnRaZ4qk+LHFJdQpd290nBz36O/B4mTKfBwSVNLnv8O4doU sPEHPrLqNdMBeq82rQWcQeHZ3N3t70RIrmcMzP3MX7TFY481helUcy5YiX/pDJVfjCk2 oQLXFnOKBoLtOxKdH8wRylPXLBCLgXNayUXaBRa6Ef8LdLbnJH/UXvDJQeKGU9jeXBke AKFuiHlbSaja/k+mvB0faLJ4iupCbGQncUw11safmx2Z+LoSeM3D9Ov8fJSnACDXsDUA tDtA== X-Gm-Message-State: ABy/qLbCCUKp8oVWAwaCFHIthOXRyQ8DQarot91b9yLWesLfTvh/iE7U 53G8MimLvqocWpseunfRL6OOKncmYkCbTAwO20rmMEoz X-Google-Smtp-Source: APBJJlEwWUGLK9O1JskI//qs1R6npCDIYsZW40Um/fjVNlBLqSCibCuoN0K7CymN00yoYgyzWxMbcA== X-Received: by 2002:a17:902:e891:b0:1b8:b3f9:58e5 with SMTP id w17-20020a170902e89100b001b8b3f958e5mr6656781plg.38.1688762359811; Fri, 07 Jul 2023 13:39:19 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang Subject: [PATCH v4 09/11] testpmd: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:06 -0700 Message-Id: <20230707203908.64371-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- app/test-pmd/ieee1588fwd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c index 386d9f10e642..3371771751dd 100644 --- a/app/test-pmd/ieee1588fwd.c +++ b/app/test-pmd/ieee1588fwd.c @@ -138,8 +138,8 @@ ieee1588_packet_fwd(struct fwd_stream *fs) * Check that the received PTP packet is a PTP V2 packet of type * PTP_SYNC_MESSAGE. */ - ptp_hdr = (struct ptpv2_msg *) (rte_pktmbuf_mtod(mb, char *) + - sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(mb, struct ptpv2_msg *, + sizeof(struct rte_ether_hdr)); if (ptp_hdr->version != 0x02) { printf("Port %u Received PTP V2 Ethernet frame with wrong PTP" " protocol version 0x%x (should be 0x02)\n", From patchwork Fri Jul 7 20:39:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129384 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AAEAC42DFC; Fri, 7 Jul 2023 22:40:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 639D842D4B; Fri, 7 Jul 2023 22:39:26 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id A17C742D2D for ; Fri, 7 Jul 2023 22:39:21 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b8b318c5a7so16071455ad.3 for ; Fri, 07 Jul 2023 13:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=i0aH8SN+fiL8m9lY9RYvPt+pm1xPMVcmwN6IqkzE53b2ozvl5rY/bfQpanNi1hYTWY Gc0GPVXZxxJE6iP+25YmikLCnd65Gc0K7fMHm/T07qMxmU5bdqM0uuQT1rLQpV3EHr2O FLkeV8q9qVk+sD1PSi1m9AA9GgT7GCAcql/GmR4tK+xlvhwSoOVGTZQc0PfXrKy/3fN8 W5mCg9pVFpmL0RwRvP+A9GNVga4myKeufWnUlUrHMujFrYRoyGM77KBXcvUwNkMnFNv3 yfIeJDK87Ib0kK+bO4qhWZotksIRa9+qUA1ZfRbb1gwiu5US+1eJ83h8BcXszVS2tFQ0 RQxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=cPmVvQm1yIFrDBxFbWxsOaYYxl2vGIOqZu/jKtmwoQpoaRcgvfznd4HH2jzMO9C3VI NuOUEPwheefefqiQoEZqejvXA993s8WN48VdsL3Aeel2KOArupKtdTIOPDsxJhAR/wwl fsSRZRbE5Go2H+dPZPnoofpJshxsNCv7U8DQ9da91QEjt+tjxQGK6iyDOVnZ0beJdlDZ s1Qakh9kyIxOHDm/JU/qitphCvTc1q4nmOEsEBvyGmw0fj/tcbcfJ0ygmhAzOnyLBKu6 72cV2TSthvySVWPKl3AlGr4gDhqtvvBIhnEOG1VEzKADWbEdcaSM8Ni57SL/b9a8JNZD Y0uw== X-Gm-Message-State: ABy/qLYXNNGAPZ5GP/ppcPCmfLLJLCES7cNAjBKtxJr+oCn7cXbzoVEy uc0r8eId0OnQGiD4EjYUtz5x5Hdo6qmZ6h2/lZ4ghK2O X-Google-Smtp-Source: APBJJlG7ENu8E/BdS7VtTlsd7gOTT3iFaQ+rwpOYEjJO0nEMtEX4KWd3vOTI5qOVb6/3aQEydm03Kg== X-Received: by 2002:a17:902:d395:b0:1b9:be2e:2b40 with SMTP id e21-20020a170902d39500b001b9be2e2b40mr3934537pld.50.1688762360715; Fri, 07 Jul 2023 13:39:20 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:20 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kirill Rybalchenko Subject: [PATCH v4 10/11] examples/ptpclient: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:07 -0700 Message-Id: <20230707203908.64371-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da64dfee..2535d848a1e9 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -354,8 +354,8 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) { struct ptp_header *ptp_hdr; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(ptp_data->m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(ptp_data->m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); ptp_data->seqID_SYNC = rte_be_to_cpu_16(ptp_hdr->seq_id); if (ptp_data->ptpset == 0) { @@ -397,15 +397,15 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) int ret; eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); if (memcmp(&ptp_data->master_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) != 0) return; ptp_data->seqID_FOLLOWUP = rte_be_to_cpu_16(ptp_hdr->seq_id); - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, sizeof(struct rte_ether_hdr)); origin_tstamp = &ptp_msg->follow_up.precise_origin_tstamp; @@ -537,8 +537,8 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) struct tstamp *rx_tstamp; uint16_t seq_id; - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + - sizeof(struct rte_ether_hdr)); + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, + sizeof(struct rte_ether_hdr)); seq_id = rte_be_to_cpu_16(ptp_msg->delay_resp.hdr.seq_id); if (memcmp(&ptp_data->client_clock_id, &ptp_msg->delay_resp.req_port_id.clock_id, @@ -585,8 +585,8 @@ parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) { if (eth_type == PTP_PROTOCOL) { ptp_data.m = m; ptp_data.portid = portid; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); switch (ptp_hdr->msg_type) { case SYNC: From patchwork Fri Jul 7 20:39:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129385 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5C5CF42DFC; Fri, 7 Jul 2023 22:40:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93A9742D52; Fri, 7 Jul 2023 22:39:27 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 8A86042D30 for ; Fri, 7 Jul 2023 22:39:22 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1b89cfb4571so15757695ad.3 for ; Fri, 07 Jul 2023 13:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762361; x=1691354361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wwS2rmOQ9nJLLKvDK9MXA/E8Oeyws+SFh/8bRR3Jcbs=; b=uP1h1dTdXXSrDotYVeuE/s3JimM3BrR5Bcp0myq0ncuqMBFPgWSHdaJU8TrvLVeX08 JZSQMBHwY/rCB1oyGnPemyXjQbbUkM9fDvqsK6MGqnd+EcS/R3v9iaUFL+/zH0znIFQp ccVfOC3vP5eMbjxQlsEbenTUD03hL5wT3+YeMgLFc8bjFkKrb0FUL8xLwO9694UM+KiK fjc9dMwe2iHtc7gz3N4XbYH051KyTPZC5bAt6wYVWC370fjWkLG6eRHPppLSJu5zDmrs CgezVhEI4qDoqvJLCcqYtl/DCzf+OGsR90He4zlBRrzvu78uxahfDBqpP66qnns2XXwY vaFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762361; x=1691354361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wwS2rmOQ9nJLLKvDK9MXA/E8Oeyws+SFh/8bRR3Jcbs=; b=ZrBrXlmNi5GBWK6jFdA4Rsay1MUhbraw1GSmbf8eZLM/rULEemW2yore5ooTB6SFKz QlI6G7SpvVNr/Cxmhi3X/OKXJqq6t/zjVxoHvY263wRqo0mq7W9fI3vgcO5Sfn9p5XQj rcAWL+57a82uHM8iPbFhZCjJzM7qDN0NMuxpk3gouiCsrNE2SE1AEekHEqzDg2mXvgYP bsai70x8izM9ybM3Z+c4dU1BK4bmatKS0f7Q3FKMEyXd00I2H/spHSB6Fs5/qek9/5mk FHGBFYui8nWdy3VOBgegl9Zxa2pnzgpI00I3EkP04ZKTJnXHKMbx+QsaBMcxkcWbugsZ wO1A== X-Gm-Message-State: ABy/qLYFCUIFJ8/jy85yeldxcGYu1lWxBeNC3ExcCK9QXbJ5smPWIjmm lir5vwygAgMLoWLspqHO/ykxZYJ2T1qBwdROwyIGimla X-Google-Smtp-Source: APBJJlFiHsUGqe9s0FBejyjR9Qvc7rC2egDCrKZjtO2iKfNe9BF9/zRX3bosQyC/+Y0GTqKKdRIcjw== X-Received: by 2002:a17:902:b691:b0:1b8:987f:3f34 with SMTP id c17-20020a170902b69100b001b8987f3f34mr5664266pls.25.1688762361545; Fri, 07 Jul 2023 13:39:21 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v4 11/11] examples/l2fwd-crypto: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:08 -0700 Message-Id: <20230707203908.64371-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- examples/l2fwd-crypto/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index efe7eea2a768..981b449710a7 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -410,8 +410,8 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, ipdata_offset = sizeof(struct rte_ether_hdr); - ip_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) + - ipdata_offset); + ip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, + ipdata_offset); ipdata_offset += (ip_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) * RTE_IPV4_IHL_MULTIPLIER; @@ -479,8 +479,9 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, op->sym->auth.digest.data = (uint8_t *)rte_pktmbuf_append(m, cparams->digest_length); } else { - op->sym->auth.digest.data = rte_pktmbuf_mtod(m, - uint8_t *) + ipdata_offset + data_len; + op->sym->auth.digest.data = rte_pktmbuf_mtod_offset(m, + uint8_t *, + ipdata_offset + data_len); } op->sym->auth.digest.phys_addr = rte_pktmbuf_iova_offset(m, @@ -540,8 +541,9 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, op->sym->aead.digest.data = (uint8_t *)rte_pktmbuf_append(m, cparams->digest_length); } else { - op->sym->aead.digest.data = rte_pktmbuf_mtod(m, - uint8_t *) + ipdata_offset + data_len; + op->sym->aead.digest.data = rte_pktmbuf_mtod_offset(m, + uint8_t *, + ipdata_offset + data_len); } op->sym->aead.digest.phys_addr = rte_pktmbuf_iova_offset(m, @@ -631,7 +633,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, struct rte_ipv4_hdr *ip_hdr; uint32_t ipdata_offset = sizeof(struct rte_ether_hdr); - ip_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) + + ip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, ipdata_offset); dst_port = l2fwd_dst_ports[portid];