From patchwork Sat May 6 16:03:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126730 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 2608442A7F; Sat, 6 May 2023 18:04:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9122D42D1A; Sat, 6 May 2023 18:04:09 +0200 (CEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id 67170406B8 for ; Sat, 6 May 2023 18:04:08 +0200 (CEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6439df6c268so1340632b3a.0 for ; Sat, 06 May 2023 09:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389047; x=1685981047; 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=S/fBocBp4c6TNBaX8tRmecKLA8o4i54C4sI6m9zFMbM=; b=UV479DoY+iO3J2m5G7TiVnglczSHjqimslEM6IWWVEAV64STi3SJ8h0PTgldo5l4pb G/9zfiWZDQ2lvdKu3m1EHr15HMa2MKDWJ9I0JzCVv/m4R7MKjjcMce1mj3eMGscz94sR codKmMrQOP9gLzE6O8YT2rSJvxKYfxEdMfdlG+JYcAr2JKrsO7QU8W5i28fMDvnP3ebB 98NJe7hAgyjjuAvsxlLNPSfvXClFy9TbPGs5HhrRBiO23hfuCWAvOG3Y1rLkitmKdRx/ dWxP2ZF9UdaVLYygiSjtMnFT3SBrh+dtJa3lK2UNlx53gFsphytFFqKBJ+DoG56nDelF kaJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389047; x=1685981047; 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=S/fBocBp4c6TNBaX8tRmecKLA8o4i54C4sI6m9zFMbM=; b=iewCqrYfFLVTGeU+kfcVfA/EQhUiojuNyBZPrXHoQNbwKf6ZxefhgxFs1mRiLo0XTh jlkLEZXSoYE8fmqWEMHPXeQMAMOjr1iKnqQ2nbhyBKL0Tp4dUTEwMmHTAlwe516dAXtz eciVBYXiZr1mKXCHDwDr1NyYa2zJPyxQD8vbuZeyCHsp1XSUVgKOQ8IBaSR/ML/HQhTA 8eem0L31mi/Ww/T4rrc1tZM/mqf+qAmQt/mZfgrnTa7/5lBlOWmyZjR3/XhGgYmWCVLz Z3zUYHebACMLTu9Bow+DiCTQi32I5tSM0ekcG3fTmW5XS1dR5pW1urqzIT0amdC47+HB UPrA== X-Gm-Message-State: AC+VfDwBE9bHoF4psn8Dqe2RUfKuhTNc/Jfw7g/ceQ+Ub6Q5P1WuHVty 2B4fHRdhNm90hlANtQcb9AfaXTnfC27PXnkJ85aYQQ== X-Google-Smtp-Source: ACHHUZ5kP8WLGA8rxG9fonfZf4i/3zMOYRkOcCQvvJrzt2OOZJv4SwNzYd6NfnfDtJmJXHjGjDxgQw== X-Received: by 2002:aa7:8882:0:b0:643:5da1:d527 with SMTP id z2-20020aa78882000000b006435da1d527mr7900753pfe.27.1683389047335; Sat, 06 May 2023 09:04:07 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v2 01/14] gro: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:50 -0700 Message-Id: <20230506160404.7423-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Use rte_pktmbuf_mtod_offset. Change was automatically generated by cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger --- lib/gro/gro_tcp4.c | 4 ++-- lib/gro/gro_tcp4.h | 4 ++-- lib/gro/gro_udp4.c | 4 ++-- lib/gro/gro_vxlan_tcp4.c | 4 ++-- lib/gro/gro_vxlan_udp4.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index 0014096e6332..6f8466e70211 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -182,8 +182,8 @@ update_header(struct gro_tcp4_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_tcp4.h b/lib/gro/gro_tcp4.h index 212f97a0427c..c76f1f5686d1 100644 --- a/lib/gro/gro_tcp4.h +++ b/lib/gro/gro_tcp4.h @@ -272,8 +272,8 @@ check_seq_option(struct gro_tcp4_item *item, struct rte_tcp_hdr *tcph_orig; uint16_t len, tcp_hl_orig; - iph_orig = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt_orig, char *) + - l2_offset + pkt_orig->l2_len); + iph_orig = rte_pktmbuf_mtod_offset(pkt_orig, struct rte_ipv4_hdr *, + l2_offset + pkt_orig->l2_len); tcph_orig = (struct rte_tcp_hdr *)((char *)iph_orig + pkt_orig->l3_len); tcp_hl_orig = pkt_orig->l4_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 3be4deb7c76f..b93a02c149cc 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -269,8 +269,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 Sat May 6 16:03:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126731 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 66CE642A7F; Sat, 6 May 2023 18:04:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C29CC42D30; Sat, 6 May 2023 18:04:10 +0200 (CEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 5D876410F2 for ; Sat, 6 May 2023 18:04:09 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6435bbedb4fso3274540b3a.3 for ; Sat, 06 May 2023 09:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389048; x=1685981048; 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=pjILH4AiGDn0Lfou7F5lFka4+BFnorNOyV3RWNdCnVM=; b=dgH3GWUGSIyzk+jbHQfJG9eJuK41D8mF7rqQJLYWk6g41zym7K83jb5e9HYjiShymN jK0eoZMOZIuS/4ybA0D1mqrUAohDhPXpkoKu3h6UdW1bUvp/QxDooZ1g9GhNZfGoWPsu UznuJ8Ov0garRAEIDM5QNpEnGqDhod0lt9xEomGb6FZ8mGLfbm5Jx4U4yX+Jnc89tBOh nUUMswfG5LvS82RhvDVe3vqJfXwnXYcnB0g9IdFRyTx4l25drobrTRmF6Vr1ODZ5BCDE o3e5kzKISmYtVfdY+qaFocEegevhPTmAsm6cKNC8NlNWbHdIg75TnKI/U07QXCfWUc1E AwFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389048; x=1685981048; 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=pjILH4AiGDn0Lfou7F5lFka4+BFnorNOyV3RWNdCnVM=; b=exyKt2mMhMxJXljQnico/XqV8LMYZ/wv8dYRZ9br+GW+CAhVehf6L7pYQpZc3SgIfc mTg1ZNjrwSUR/oFOY8NeDvHO4X2/0LUUOYQILPtsP+RweLkICH/TCWI3cYyHXkTVupWd JmOrxp3ZwCXKmtaP8wv348NQOUsrdjOr9DBa8gYIXuc6HTopvC+QMojsatjzts1mFuSc rki/njnIMWON2tWt0SigJqFdul6E40ehnTrL8aZhtJlzhUBwKpc4VCGHfTZ87gioeXD2 V8pJGqMX/pKegwjem+M7WKI7Yp/Sn+tZjBS4f7ZYq508I+S+LsxJS5KRDufjBzVy+XRi Ii2Q== X-Gm-Message-State: AC+VfDyzt1hYtgzUlkenq/BWr/aH+IyTReJY5q8I5pMna4Xwdhraf060 3RW7Z2Sugwek5WsPVw86UxaLZKY3Ne3UKboKqQjx2w== X-Google-Smtp-Source: ACHHUZ4GXU5B4VBS5q/P913Zgo7iQYtv5A+HM07sXpsH+H0k6KkEcJzP07PjrW0N/wH/JdpY28wlTg== X-Received: by 2002:a05:6a00:2d9a:b0:641:d9b:a458 with SMTP id fb26-20020a056a002d9a00b006410d9ba458mr7570128pfb.18.1683389048334; Sat, 06 May 2023 09:04:08 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v2 02/14] gso: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:51 -0700 Message-Id: <20230506160404.7423-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Use the rte_pktmbuf_mtod_offset macro. Change was automatically generated by cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger --- lib/gso/gso_common.h | 11 +++++------ lib/gso/gso_tcp4.c | 8 ++++---- lib/gso/gso_tunnel_tcp4.c | 12 ++++++------ lib/gso/gso_tunnel_udp4.c | 18 +++++++++--------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/lib/gso/gso_common.h b/lib/gso/gso_common.h index 9456d596d3c5..8987e368605c 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,7 @@ 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 +103,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 Sat May 6 16:03:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126732 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 C728B42A7F; Sat, 6 May 2023 18:04:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F420340DFD; Sat, 6 May 2023 18:04:11 +0200 (CEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mails.dpdk.org (Postfix) with ESMTP id 6597D42D2D for ; Sat, 6 May 2023 18:04:10 +0200 (CEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6439bbc93b6so1660987b3a.1 for ; Sat, 06 May 2023 09:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389049; x=1685981049; 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=aedscfCbmPzx3Lu1G1eN9fqAHaQkapvwXdXunHPn+Nc=; b=OGsUgjcneHcaBEykD+x4w1mKkFlzFct/3A5qqVIY13Ij/7kUS8F9Iv0rhTKe+qDDPS y8W2ZaTAjV991p39IG/LUHME/snPY8kCxhYDAm1+4Nkke95ROcAVJp/4XaYkiMM4CG0S xcq0UMVTdIITjzpIAWEN7Xppjw/NQS/F+O9RjywVFp38G3IpV43SS9vMTx47COyR+iP+ mRGzY3yqdrpT6hTo1KIcZts4oKXU3DOkTncu4DXAilGwL7hiLP2CvyLClSg8JjezfhZJ FluZ7jPh5LbFpktmmFByRDXDQuNtb4I64UsrwBmoQuXayAyTn6XirnEsnyceAcRbf0hX 0vag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389049; x=1685981049; 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=aedscfCbmPzx3Lu1G1eN9fqAHaQkapvwXdXunHPn+Nc=; b=C+gGirudg4kw0SRlG4UgcQKSdYQZxlydHFYRPiwPK/fakAHxL0Edl86wanfbzn3PXH TH7guZvrxL/2RGitfoZ3QUH5Ve/FbpCbDGK4iGzq0+aOUli0b9VBWoir8XzDAITtUxPr KroqJLOE+b+I8KpNkwBuD4B6Ir3w8cafgFmQjTxX/lFcf/VKtirXVTPWUZpBG6L6TWFI BWam6Olv7oTAmWIlXknnbTFeTypgaQILozXkbrzMrSTO+P0Oiql0J/GpaCyTgQxtkQF+ RONp8cMvi9u7s49+T1OtqF9NS9iOjbEYNIsfKdvafEkVcuJ4KwSDOS0m7VDfl309TM+p ekcw== X-Gm-Message-State: AC+VfDzswCIvzIWpGmFnZAv8M4vJzHJPEHVYkvNuXf8BW6mV/7Psztdt dn89wIOfVc/QqetK9xt0mB+ZnkOIibRhNOm8vUzJPw== X-Google-Smtp-Source: ACHHUZ5Y98ZPWfr28Avc7+cba7xbR4P5o4hD8hgvjT2oqcuq5ZmmEq+ctPddXhVAHWpUcZIeiVaKTA== X-Received: by 2002:a05:6a00:1414:b0:63a:8533:d6a7 with SMTP id l20-20020a056a00141400b0063a8533d6a7mr7405329pfu.9.1683389049322; Sat, 06 May 2023 09:04:09 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang Subject: [PATCH v2 03/14] testpmd: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:52 -0700 Message-Id: <20230506160404.7423-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Use helper macro. 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 Sat May 6 16:03:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126733 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 4060042A7F; Sat, 6 May 2023 18:04:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F60442D41; Sat, 6 May 2023 18:04:13 +0200 (CEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 9839742D35 for ; Sat, 6 May 2023 18:04:11 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-64388cf3263so2110846b3a.3 for ; Sat, 06 May 2023 09:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389050; x=1685981050; 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=obfMzlWi3rDn2TWW4nI66lcFKACyZD5u0VfdfRYEOtY=; b=b/YpGyWkGPJK0JNV+0mrMI/8mquTnJc5rS6S1ZcYk1IP0FnEZn6ELjaIeLW+aqjTwI MiabzY4i6XQeKBfV1CUHRd2pem8BZzZh1V/xrRN1+Su8EeniTOwys4MXJEHBfqW2M8hT 4NKRIG96P2n2S0X/cPiSTb5VHo/MX/wm+znQYbKvRK5BGxnEbLZfupnF+vUKGaQvou7G 05+9WY1AWovM+TH/MMwPoO5BLypHizlMFGpN/k7ovy+usHjkZSG6f+hg2VhS7XHQp/Nz fBrt+cUIZ0Y4V8YT+ROtOUQCDEyCRuCeuml7UYnvktNPIUrQYgIHwKsR78grJwRcw+NY 3R5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389050; x=1685981050; 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=obfMzlWi3rDn2TWW4nI66lcFKACyZD5u0VfdfRYEOtY=; b=LRs1f/E0AcP0LyKA3caV8Pca7sVyopjKFVMswlHKkHhF0NLK+0wv9mQOD88uK8IVuA DyAwUExrlXfGlYwqbRLMTYwRhenuhjqFSPNlM8S8tfgiTRzv3Mu07WMygVFc2qdwtCCz o+sgl7ogySlwI/t4QVlZhVGa20xqcf/LyZ1tN8lS2PeJz6qju1fBNhM1NzS1Q6unNbIm ie4f5EZhuu0agAJXKtozUdzB2C1xpBB1U1ecWAugx6UXh+wU/I1ssDqXtzPZHSzZEFJg msVZ8osSKXy54A85nT2v/gA2VryqKaFDfJpsYGhgVDYmuuXdYvt2lOIMWecjKqeTLEzu to4g== X-Gm-Message-State: AC+VfDyJNLXSS8tBWM37ft8RAYJfGTudHDA6ah1bF3dfgEzoVq4nTQup HtYqGw2GjlBKGTbZSU/dtIhzDN5qB9rwK3fPV9AtKg== X-Google-Smtp-Source: ACHHUZ6AueJVxwHeWmOvDm3DN3nSQaUnql1RAuFq132iROONeSYTKyu+WW5sQQTtwKXuLrNrLu84Zg== X-Received: by 2002:a05:6a21:3296:b0:f5:9975:5044 with SMTP id yt22-20020a056a21329600b000f599755044mr6760884pzb.4.1683389050285; Sat, 06 May 2023 09:04:10 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v2 04/14] test: cryptodev use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:53 -0700 Message-Id: <20230506160404.7423-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Based off patch generated by cocci/mtod-offset.cocci. With some cleanup to shorten lines by using conditional with ommited operand. 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 9c670e9a3554..b4cddcd55f59 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -3151,8 +3151,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( @@ -3243,8 +3244,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) @@ -3331,8 +3333,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( @@ -3417,8 +3420,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) @@ -4851,8 +4855,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( @@ -4963,8 +4968,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( @@ -5129,9 +5135,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 ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5537,10 +5543,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 ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5878,8 +5883,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); @@ -6292,8 +6298,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 */ @@ -6476,10 +6483,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 ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -7897,9 +7903,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 ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); From patchwork Sat May 6 16:03:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126734 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 7E29F42A7F; Sat, 6 May 2023 18:04:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A7D6C42D47; Sat, 6 May 2023 18:04:14 +0200 (CEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id 7042542D37 for ; Sat, 6 May 2023 18:04:12 +0200 (CEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-643a1fed360so1142287b3a.3 for ; Sat, 06 May 2023 09:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389051; x=1685981051; 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=8qVC3bA2BibKgFfmQilRnT4WLw2Cs5kUTFiZdVZhDJc=; b=Tv2ZozIJKz4/3+QqAPQfeT+Nc4sVGZER2+MHs/lyxeKwFVTOKRzkB//831rXUUmsCX /ytixhTeWO7OT6kA8uGytFZgP+rrPgSxsx8dLLYxr9sRzR1cn26CwDznhDgd2VAI7TtL PBQtzPgeWiAUAzOUpe9ElWJhj/TzNRtTQ2lM1nnEDQ61JPCkoMr1KAlDAYKO6HU/q59v 7SiAENXQwfCzA7S3KGgwx4WB4lcwI+osIuJ1hpE1Z5iGth0d8Hm1qiZkfIg5Uo3c2gJA Ug1dCsORjilGjUv/e06yaJj4BNy4fh1jqztT8PSlAbMpmJ00k8UdKhnpn9nBoZWVFFel 6WJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389051; x=1685981051; 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=8qVC3bA2BibKgFfmQilRnT4WLw2Cs5kUTFiZdVZhDJc=; b=J2hYp0kgt4LrcOuQProFCKg+XCyrgHW9/x0/X5Dfm9C5e3MdxuB3rDCJJQmSbhF+yq KKOKfDfLzXY7+rYeFw9dsE3hFhCICIUO7SCXImyrX9zLaP6P30WOVq+jGT8FhpmSQEk4 QyWPRI1+1WawWvQ0gS8v2oQRd6DJv90SBvk4RfvDORZkrnBG+MBNqegonFFnde8Fkpzf aEXHmHT1ysi8JqY5C24MYjWzmfxJLdg6OeYOI1PseZnMsuavqbVy007j82l2hHYfS4AS BhaK20mBPfFZiGkXhaQ105OViKdqtAlpmogrFsoKxbONSJ0ib/7Na9ap7qHc+pZ0vjea B7RA== X-Gm-Message-State: AC+VfDylWeICLmwBusTBhGBFcvzp0lvw70zrKTD4IrNDDkq3nFcH2lR+ BIxUbxHZgepdZ+Z9r9FeWb8rT0G9duKG433o1JJlmg== X-Google-Smtp-Source: ACHHUZ5av/q1cZnOsd87LS0IWiVwkzpXOyvBRaQaCm/dy+I4GPFG9Afsu/AktMq6/mPu+zHakKp8TA== X-Received: by 2002:a05:6a00:1514:b0:643:b6a9:b8d8 with SMTP id q20-20020a056a00151400b00643b6a9b8d8mr3086435pfu.23.1683389051406; Sat, 06 May 2023 09:04:11 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang , Kirill Rybalchenko Subject: [PATCH v2 05/14] examples: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:54 -0700 Message-Id: <20230506160404.7423-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Automatically generated from cocci/mtod-offset.cocci Signed-off-by: Stephen Hemminger --- examples/l2fwd-crypto/main.c | 16 +++++++++------- examples/ptpclient/ptpclient.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index efe7eea2a768..403ed6b44de9 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]; 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 Sat May 6 16:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126735 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 2CF5542A7F; Sat, 6 May 2023 18:04:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFDA142D4B; Sat, 6 May 2023 18:04:15 +0200 (CEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 390B242D3F for ; Sat, 6 May 2023 18:04:13 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-64395e2a715so2857138b3a.3 for ; Sat, 06 May 2023 09:04:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389052; x=1685981052; 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=SeOAZhzQjRLj9aQLEa2ZWOBMHe7LQzkaSzddGQuZmwQ=; b=Q65WntDrc8lUZzMCmOEKArR5IohGq1G/beSCWOIUId2ppNMqdP6XTaWDXvvFG0OQYH fDzitNLwLiA/eiwz62KmixEpjjn68Xi4QXhOAx+3DFtsY3aEk3Po5DmObRhY1PG1foIy 7UCT+T/yzoZBkAM2SPUGRVREd/cAJJJjz0hqz0tJN+o3vee9pEpRs3jNhWBKNmqB7jvo 7KqpwRPOw+4YIHCYGiic+b4mBXFTQIu95a9XVlesTRNEumqSuK96diCjtItAttNwTru1 Cjk/9jqzOuxcNcYcLaeZaWjIUvdmqAc8m76h2wim1RtIar6q1HI7DEQMEyT798uR/dcL ZgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389052; x=1685981052; 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=SeOAZhzQjRLj9aQLEa2ZWOBMHe7LQzkaSzddGQuZmwQ=; b=GvCwU5ljGL9dcxuRULLEuik23JyOAZ9rvBOg8lyaGdK1wiyDUgX7TAu+QCgUC8JjWB aH3thICnkIfZl50PH0+Q/en+9SACYWiXUQoJXfrTIeruc4dweljLlLYcIOJ93Nt+eW57 IeGc9NLqbY6MQ5paOhI7S/3mi/73Jx4Ih+++x3ZQ5RB77pn9r3RNMVniokX7VFWU9RvP +a4SSpFBSzW/ccdnxshMub9nzM7FWK9vXyDpW/evACYleVwFlRCplK9uAz8HywQcV1Y7 25o98dO1A3K+DTRbIVMOTOJVBcRnMQ+VGwBEyeLGkrzhnezjc+mpBUo4xbtnYCFl1mTp maxw== X-Gm-Message-State: AC+VfDw+poLkJJTqgVqLExnty6qwJ5HGK+Etc0H6l/Ydh88DQShOPZ3H RUFVkAPZl9zx0MGsrHb/wjr4EF8vDVKswTd2+q7OKw== X-Google-Smtp-Source: ACHHUZ52SdZwjkuv6pLV+kAR1DhyU2SxVwPVPmUsCHiwgnqusehMLe7PPC1Hf7qgcR+U2/q/Botutg== X-Received: by 2002:a05:6a00:c85:b0:643:89b5:37e9 with SMTP id a5-20020a056a000c8500b0064389b537e9mr7115535pfv.21.1683389052240; Sat, 06 May 2023 09:04:12 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 06/14] net/tap: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:55 -0700 Message-Id: <20230506160404.7423-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Automatically generated by cocci/mbuf-offset.cocci Signed-off-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 089ac202fad2..ca2c8da5c289 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -672,8 +672,7 @@ 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 Sat May 6 16:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126736 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 D320842A7F; Sat, 6 May 2023 18:05:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBACA42D51; Sat, 6 May 2023 18:04:16 +0200 (CEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id 2129D42D46 for ; Sat, 6 May 2023 18:04:14 +0200 (CEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6439b410679so1577560b3a.0 for ; Sat, 06 May 2023 09:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389053; x=1685981053; 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=f30oB7hKdjlkAy9sB1je40tEolfEvq0+c5JesXfei3Q=; b=BYu1ac4+n+3q/eaIYDFlazWZAXx0xLVJiPEbhgF1KW2/Vj+dP7yoWiIcsL1Ikg8dTG 2FZWf3XD1Y1qiJU44lzXOiMAiKOnI7An24C/0QzIlBFqHUQT0mc7WUbXI1lwgswpsGKY Lh49uk/lMVYEVLdYP0N/rcmjccjQ5r6xleg0FvzLH70DjUifzxuP7Eqh3D538jRfMqMy R4pCtO+DZcPtuh4WlzJ+YthlcaFf5/gNu3wfJZOb+N/SUkIhsNioUAaIC/s/IwcnyBN9 2JW2i4sxro1S6cw2jEe0OYFrKbTZm3EjpM/Czb6BlIv6ZUMl+HdRsNKBbe1Zgn4HtWVX eMKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389053; x=1685981053; 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=f30oB7hKdjlkAy9sB1je40tEolfEvq0+c5JesXfei3Q=; b=PFdyn1oKhx7Dc6SY6h+7l+PPbMQWSiWa2t/5qnkBtc40ovK3L9RLuQU+aQyVaSw8K0 VFNaO/DCYOSD/OArT0JreYk7FI3f1iV/RNmrvBOQLwKjcgbKSLatBcJVXScmdDKXKWvJ MrYwjlFE42sjfi9VyiIt4F2AFTX/dEbEYIajX+GnI6kVXlyHFunZnytipSyPnnKwqLm8 27ZtCguCbAf7JOzZ9yE00ov3RwxQZuR/zgeQhimdOPFI1J6XDyloo9B75Dm0RspYVvMs +0ldtPHDgLXbbpGLRmGgQsa2uWfoTZPH0uKPxutORz2Qx/M7it7tzy4K/Ga31lVZI2TM MI3g== X-Gm-Message-State: AC+VfDy0z5hyKF5PxDlrPcCNx/xRRNYEwbBDU6k+UndmmHrKDgsAH6jY e/2SUxDWFjrmYaKTiugt32Z7dzLm1ME6OyyNkJ8sVg== X-Google-Smtp-Source: ACHHUZ5l/J1PV1Cwb60W1nrAuGNnxTF99HRLeWZufLu1NgVeFeSnS6DeGy+GYtSXC75yd7/7sWVX2A== X-Received: by 2002:a05:6a20:938b:b0:d9:6650:ef14 with SMTP id x11-20020a056a20938b00b000d96650ef14mr6559414pzh.31.1683389053128; Sat, 06 May 2023 09:04:13 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v2 07/14] net/nfp: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:56 -0700 Message-Id: <20230506160404.7423-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Automatically generated by cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger Reviewed-by: Niklas Söderlund --- 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 96e080a8e956..5ae0e8be1d67 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -380,7 +380,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 3e083d948edf..9a8e464a1d18 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -234,7 +234,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); @@ -257,7 +257,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 Sat May 6 16:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126737 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 6FA9642A7F; Sat, 6 May 2023 18:05:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 118E242D3A; Sat, 6 May 2023 18:04:18 +0200 (CEST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mails.dpdk.org (Postfix) with ESMTP id 2E0C242D49 for ; Sat, 6 May 2023 18:04:15 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-644d9bf05b7so72317b3a.3 for ; Sat, 06 May 2023 09:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389054; x=1685981054; 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=QvRhXk3rillMcSGpDtB3lskZp5ZIwq//FgzWohZ426M=; b=hUMwvzgE+TKxPCddFleXjj94e4NhFc7LfO+H8Gq9Y+MNB95VTTNOdrDOozv/MBMBu1 ZOdD+WJgWlR5hN8BhdQTR5+GFsZskwGONWox0Hzda0oEgsbk7ftYRRNwRB1z0tFjvE0I Q6k2mWvx7Nv3lyVfhF4vebg8ei4rEAsKbCg3ONGHep/9O7PqcKcDMtZS+kUEXLTYTTmn r2jJ3dHJt5GA3lc+NDZwXPldYReUpMbXwl4zrBgQTBU07gjwOga7yxnLaFb67pajt1eG p4SmPIn9fwQS2wXl44DVGsinXE0W4DQuTsSlSErquB2RED2KnbC0kyOfgDkFCIYNwDxy zJXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389054; x=1685981054; 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=QvRhXk3rillMcSGpDtB3lskZp5ZIwq//FgzWohZ426M=; b=RytdY8zPQJ254L9e7wWU0aE67CWzs1br6Fp4ArW2R/EqfAsxDKC/WmRpzTWDwLFMZe VBl2EJ26edWtw1cB4Cqsqtq0Fu36EXVSqckjE8G3i9MMPdmmi3ek6OcbrGAbZp9ELBKX VjF4Pgqv6/iDUH+ua0q0oCORLjIPBVKIQlepSVuvBXS6KRO82Muh7icwtcD19wl71BND c03VulFgSv39MHc/KQ7GECXP1UGfD7Mbl2/KbQ+jESS6vaLjbocIvOGPZ4rETg2quy1i ndrfjeSOxHJbjqZo6651Vif6csXpV0sogiSuU1Xf49NjXq5bboyUVaAcVn54GPZBYsEn ALAA== X-Gm-Message-State: AC+VfDz1CovbAxjwXafa71llib3rGTAtM39ie/tyKIPWWFDppkjsz8rr oE9KiL0IqpGWQTbu6fGUFLlBqPzPc/QQFXAz/SlXkA== X-Google-Smtp-Source: ACHHUZ6CqmF3OWJzj1N0nucr4dhTtWMaabsEI8IKmhthEztmXjz2h4LJNBe97woGya2pK3LoWA21gQ== X-Received: by 2002:aa7:88c4:0:b0:643:958e:f75 with SMTP id k4-20020aa788c4000000b00643958e0f75mr6887212pff.31.1683389054096; Sat, 06 May 2023 09:04:14 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji , Pablo de Lara Subject: [PATCH v2 08/14] crypto/ipsec_mb: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:57 -0700 Message-Id: <20230506160404.7423-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Initial patch generated with cocci/mtod-offset. Additional manual cleanups to indentation and remove unnecessary parenthesis. Signed-off-by: Stephen Hemminger Acked-by: Pablo de Lara --- drivers/crypto/ipsec_mb/pmd_kasumi.c | 16 ++++++------- drivers/crypto/ipsec_mb/pmd_snow3g.c | 35 +++++++++++----------------- drivers/crypto/ipsec_mb/pmd_zuc.c | 16 ++++++------- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_kasumi.c b/drivers/crypto/ipsec_mb/pmd_kasumi.c index 5db9c523cd9a..5b1694276468 100644 --- a/drivers/crypto/ipsec_mb/pmd_kasumi.c +++ b/drivers/crypto/ipsec_mb/pmd_kasumi.c @@ -83,13 +83,13 @@ 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 +155,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 8ed069f42860..f6e51916e1fd 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -111,14 +111,12 @@ process_snow3g_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, cipher_off = ops[i]->sym->cipher.data.offset >> 3; cipher_len = ops[i]->sym->cipher.data.length >> 3; - src[i] = rte_pktmbuf_mtod_offset( - ops[i]->sym->m_src, uint8_t *, cipher_off); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, cipher_off); /* If out-of-place operation */ if (ops[i]->sym->m_dst && ops[i]->sym->m_src != ops[i]->sym->m_dst) { - dst[i] = rte_pktmbuf_mtod_offset( - ops[i]->sym->m_dst, uint8_t *, cipher_off); + dst[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, uint8_t *, cipher_off); /* In case of out-of-place, auth-cipher operation * with partial encryption of the digest, copy @@ -133,16 +131,14 @@ process_snow3g_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, cipher_off - cipher_len; if (unencrypted_bytes > 0) rte_memcpy( - rte_pktmbuf_mtod_offset( - ops[i]->sym->m_dst, uint8_t *, + rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, uint8_t *, cipher_off + cipher_len), - rte_pktmbuf_mtod_offset( - ops[i]->sym->m_src, uint8_t *, + rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, cipher_off + cipher_len), unencrypted_bytes); } else - dst[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, - uint8_t *, cipher_off); + dst[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + cipher_off); iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *, session->cipher_iv_offset); @@ -205,13 +201,11 @@ process_snow3g_cipher_op_bit(struct ipsec_mb_qp *qp, (length_in_bits >> 3); if (unencrypted_bytes > 0) rte_memcpy( - rte_pktmbuf_mtod_offset( - op->sym->m_dst, uint8_t *, - (length_in_bits >> 3)), - rte_pktmbuf_mtod_offset( - op->sym->m_src, uint8_t *, - (length_in_bits >> 3)), - unencrypted_bytes); + rte_pktmbuf_mtod_offset(op->sym->m_dst, uint8_t *, + length_in_bits >> 3), + rte_pktmbuf_mtod_offset(op->sym->m_src, uint8_t *, + length_in_bits >> 3), + unencrypted_bytes); iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->cipher_iv_offset); @@ -248,8 +242,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); @@ -261,8 +255,7 @@ process_snow3g_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, session->op == IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY) && ops[i]->sym->m_dst != NULL) - src = rte_pktmbuf_mtod_offset( - ops[i]->sym->m_dst, uint8_t *, + src = rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, uint8_t *, ops[i]->sym->auth.data.offset >> 3); IMB_SNOW3G_F9_1_BUFFER(qp->mb_mgr, diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c index 92fd9d180894..65b00e80390e 100644 --- a/drivers/crypto/ipsec_mb/pmd_zuc.c +++ b/drivers/crypto/ipsec_mb/pmd_zuc.c @@ -107,13 +107,13 @@ 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 +159,8 @@ 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); From patchwork Sat May 6 16:03: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: 126738 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 56E7F42A7F; Sat, 6 May 2023 18:05:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37BE542D59; Sat, 6 May 2023 18:04:19 +0200 (CEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id AAA4342D3C for ; Sat, 6 May 2023 18:04:15 +0200 (CEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6439b410679so1577585b3a.0 for ; Sat, 06 May 2023 09:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389055; x=1685981055; 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=DjRUxZ+S3HnN8jLdZvI3rO4HDvVxrsWc87ZDnfZ/sxU=; b=FjO+g4m+7C2TugdlutIv8rRFKwRO4wAl1qr92yytw7gjWF216npuZe7bWAZXEtXlRd EGbeNmIEtbEi3P2Pt9Uv/BPuKAuxeQPP1lFigreOEtlokVGKq9Lo8hpi0JYRHyhA/v26 F79+uQd9FwXjpyxRgqSnpeQsbbLybrq+t2JANGf9BmfLLOhgX2MzLzGr09kzb8uyZL+f j0OjtUMom97FKtcazZ41UDdqtlfU+aTpC1h/FY6tTEIILhowatjDdN83EZLH/q+sfmza PBl8GNETZBCsm9dK9fEAUglCIIwV/0V3oYgpRf4vM7A4TSkJb6SkmbtkyzuT1r8WnCYm ljqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389055; x=1685981055; 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=DjRUxZ+S3HnN8jLdZvI3rO4HDvVxrsWc87ZDnfZ/sxU=; b=C7Ta5uQlBnvbNRrXfRZGeH8HJcpyhBb/Yj6iyXmfoRdxe++T/ocBAtUtYq767H99Pu StNdlh4Y+XQx0cbAb8So5esb87zUW+imuKxmMePSBlmNpR9Ns4Zs97IsjaqotsFVfxMa 4NeF9XugWvWvBtBXzWywXtLdM/qNilJoXcVM4C11cwZnzo4F7ugP+uMcU8r8/MoEjUTL j+snKvx0itY3EjEyiUoEvv8NZpz2u+7mBMmB/cRibkTJU8OgoGn0c7uXsg3bkCflQGtH xDXqVHliY3DonsLKDbBhPxxdUesK7akrhhPafR5VkNUt+s4NcGL0Y+d+vFjO17HTj8Gi 0FvA== X-Gm-Message-State: AC+VfDwR367HkoyTAwmTKKoAvwKTs+jAVLLJAU3TPlMDTUEKGQtuyY5g 4tnlKuwjwpJx1ql5zT9wksRce0ulziJ6DKtF612CNw== X-Google-Smtp-Source: ACHHUZ6Eii60bxREz4V7V9yS9AWPCAqZCSwCunajH3ANv58boAGmcVEcX1c6PbPMASs1VcjGTTiGEg== X-Received: by 2002:a05:6a21:33a8:b0:f1:c0a1:803f with SMTP id yy40-20020a056a2133a800b000f1c0a1803fmr6064518pzb.45.1683389054966; Sat, 06 May 2023 09:04:14 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji Subject: [PATCH v2 09/14] crypto/qat: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:58 -0700 Message-Id: <20230506160404.7423-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Auto generated with cocci/mtod-offset.cocci Signed-off-by: Stephen Hemminger --- drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 9 +++++---- drivers/crypto/qat/qat_sym.h | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h index 524c291340da..11f468a9fdc0 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 9a4251e08b47..615e92f01803 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -181,13 +181,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 Sat May 6 16:03: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: 126739 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 66A7D42A7F; Sat, 6 May 2023 18:05:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5E4842D69; Sat, 6 May 2023 18:04:20 +0200 (CEST) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mails.dpdk.org (Postfix) with ESMTP id EBD3E42D52 for ; Sat, 6 May 2023 18:04:16 +0200 (CEST) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-51f6461af24so2014105a12.2 for ; Sat, 06 May 2023 09:04:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389056; x=1685981056; 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=3JNbmOj/kxR6KK8Mmve538lK6RzM1/W7f2cVClHKagI=; b=n+jOyAaVE2qfOPlWXkfQpeE8Ew2hZ6PdBpx4SBIzjMoUqnIEcyIC68DL8VXE561+9D MTE4Ilk2p7W0V7RmIphvkQVKnzks0yAtq09gKIUq7Vi6FBblSo3AbMDpP7AEKWPjJ60U LM6/fG/xohuvgHD9ftnKGwykWIQ0nIWXi2GezogxhF2VRIp+px2rgN35kS6OFSbwXybj vjY+KwzMEobIRhHRPmnmRzKfOvrEb1wbQuoQJX0dFNFTvMKXWVzFGFRCDkPFDmshWG3i ws7Y874Ej5sqrhnQGC42xIYPHREpFgURlC7yC+rb6ewV7oqXFv+SFgnh/rTyFyyosrSc gA0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389056; x=1685981056; 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=3JNbmOj/kxR6KK8Mmve538lK6RzM1/W7f2cVClHKagI=; b=EWbH1ry1ZvLBYlc/D3pTGFX/F3F+7umMEVaisykIvq3Zwo1nArfbZMXk9EJR93Cjr7 GmfHggqgY23zm7RYdgOtYgY0iNwqKzpArWPQpxijUhCR6XhPBkiKuDRYCde5FWp1YUwW eis8NdzXFW67mODNZk/fqa31x6pi5qinz2C9SBqk0KxQ94u6Y1h6HCpxIPMqkZ1gxGUS 33uSkg2oLJ5VkCJjzvDCkHKZ8kgXKbBnhvBy2fd9n5ImatccUZFJpQC1NFtfd7vDJFY5 VORWLjrRAfcbspImBwYxIkSCqFWJfRvZH4oi3dr1ndGGvuHpuvDuuPe0efaT5e9W5sKs f26w== X-Gm-Message-State: AC+VfDzYY8WOvCh1jITPYiLdkZJs2cvV+yn6ESVQlAqxQMhGxVncajAJ BQaDEcq2INkqiCW/8EL+c7Hx6P+TIV8C58zfZqlT6Q== X-Google-Smtp-Source: ACHHUZ4Da4VkXvYkknudpiu/DWbKiCJBBbNhnAu0+WddE/vflFdl014JmmeYElwZ1DPufW07gl2bNQ== X-Received: by 2002:a05:6a20:7d9d:b0:ff:7e58:c232 with SMTP id v29-20020a056a207d9d00b000ff7e58c232mr2908550pzj.39.1683389055912; Sat, 06 May 2023 09:04:15 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:15 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj Subject: [PATCH v2 10/14] crypto/cnxk: use rte_ptkmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:59 -0700 Message-Id: <20230506160404.7423-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Autogenerated with cocci/mtod-offset.cocci Signed-off-by: Stephen Hemminger --- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cnxk_se.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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 69cd343eea1b..d493e1b1880c 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -2275,7 +2275,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; @@ -2310,8 +2310,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; From patchwork Sat May 6 16:04: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: 126740 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 2758542A7F; Sat, 6 May 2023 18:05:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D212B42D75; Sat, 6 May 2023 18:04:21 +0200 (CEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mails.dpdk.org (Postfix) with ESMTP id CB44742D3A for ; Sat, 6 May 2023 18:04:17 +0200 (CEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-64115e652eeso25832922b3a.0 for ; Sat, 06 May 2023 09:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389057; x=1685981057; 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=uHOl7ikZRiwr8EvfJO8zGAtsJN8FkKXOFy50FiXm9zE=; b=UDZvKN8FkZ7GSa6ZCZEkqofwMryc5TSy0QzCRUY/F/aMS3w2iD0GDKm0ovjQByuPxa W5gquxm7EJL5/avknRlJ6tt+vYyn+wMsGY3NSPMmlyd4jucotM/1XHL0az/Rj39UMSMM tTyeXh0xOCLaC5s416l4UKWXG3oABkjsvBl5pce6XSePN2+50/q5eg8YhxgydWXLnCjB wpQvpxHK5+GNopk1mYb3qiDOBfvY4H4aW+htJD15JrktSWk/b8y3TMwhn96pvSZYipry ULjv4dqKJ9FnvTiyFYI7f5ZSTsplZz8pMEi9stZv6T69YlUxgH+XaJFu5PSAdj4NaSMN 7CpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389057; x=1685981057; 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=uHOl7ikZRiwr8EvfJO8zGAtsJN8FkKXOFy50FiXm9zE=; b=ho+tb894Iy71NxnkVi15Ns9HaAh7zgxRAFBDnhoV+PKV6IMWb0SkBckkRXWuPTVa1u uNIveixsJfjE8JxWssX+e0SPrAW49e6e+CFLt3lI/HWSQfTpdfK/pKtFTVNpyqihkd4r lcr2yaWgNfCR3gj89/8alwclPdZCgyyN0Y+wgVFKpfc9NbRgAhU469MsLZlMq/MgsvTX fEe3FVARC1o4wdIRfitHf5LtPhbJG/aaVoRpvgaug4y3w3UWTvTgz0eESQ2zQdzj5zmB h2uXaBbh6aRF0LztkIKEMcvFWPEksC5u9t84V/w8qh6XUxmjtxyGsoGw7oLDR3wm8fWm JTqA== X-Gm-Message-State: AC+VfDyRlQQW6Ojyh9CI+QAGhIdBy8zdKNxe8YGJdHJ6dUUQSVBHk0/Q pshg5ACuVVFCKFheU6mUJ7fpwNshl9yu06hXzDNqqw== X-Google-Smtp-Source: ACHHUZ4D078WkHWbybJ+mwTSjDTsB/VazFxqLyBNDES874Ccq8d1nupng2Z2Ih8osW/ulhmUNgURbw== X-Received: by 2002:a05:6a20:144f:b0:ef:8de0:6a5 with SMTP id a15-20020a056a20144f00b000ef8de006a5mr6244963pzi.3.1683389056818; Sat, 06 May 2023 09:04:16 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph Subject: [PATCH v2 11/14] common/cpt: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:04:00 -0700 Message-Id: <20230506160404.7423-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Autogenerated with cocci/mtod-offset.cocci 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 Sat May 6 16:04: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: 126741 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 8539C42A7F; Sat, 6 May 2023 18:05:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD80442D7E; Sat, 6 May 2023 18:04:22 +0200 (CEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 7C78F42D53 for ; Sat, 6 May 2023 18:04:18 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-64395e2a715so2857219b3a.3 for ; Sat, 06 May 2023 09:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389058; x=1685981058; 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=YUaoAaCW8daqnEr+cyLfMieQl56BBtKQiVUj96MeO14=; b=rGii1DYJOPSByciL9VGDTiVFe+/frdt+Pr9jAc4n7AL+ZbQetiQImDsxkJZsqcwGvZ NKlYSIh/VnHp3USGMjwqWJWBz9Ys2dPgtDMljJvrcTgMaG/j3xA8ao9aOj+F0C/VZDkZ VUoUb0so7gGMx3fBRmPtHZg4Xn2L87iuvs0FonxAFwKkWKENObxkLwJ4kchPictuSpUo xY4XTEZUyhTC64f3sxerdV4/GtoTJqlzLUq6TvhKFvY/j+ABzrCXX1stKkDSGacS8pLr otrdB6laigpVsyZsggca/OVCCeMKhO5egLt/1AXif/48o2IL1UKoQqzjCMJFmaUOoRCQ kyqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389058; x=1685981058; 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=YUaoAaCW8daqnEr+cyLfMieQl56BBtKQiVUj96MeO14=; b=eMzZMhkCIkmXYAjPzKg6HNVAtGnPlpVZxpOVlQmZl9v5XzeIw1J4l9+cCVK3nrtmh+ 9SyiUmUifhkKWHne5YmR2DH7qP7PF1N1aBA2dMIVt9L+xBG0aNfxmk1EEd1D56DSZCcJ CY8W8XBB49eDZBD2ofel3apXJq6auGTEqRDsPDfFZslLpTRePDi2n4jAsyRFv/Abt9Yw 9fFD0KskayrOVRL5TmS2kqK8EMvwhBe0Ba/jRWOyYfdT+nZyiutPZyOJea3LJXkDdcRw +o4IB3CtDigORbq7qbM8wwEi4k1A/BlzuMknnKRYf1s362oRAikTNq0OOUixP/uBUdua StWw== X-Gm-Message-State: AC+VfDxWgnGDKOnFv6LabhwR3yeFbMXBdXxORcSi3t1nGSnTfCTAWIRC xSXOIhPHj8aFP1Ws45CijNzM5ES8zB+Lo3xbG8PTnQ== X-Google-Smtp-Source: ACHHUZ7WVEZmPJCpZ+CT+kEjrwBfFbqUN6HR5aphEU6Mq4fh0LsJmVR6FYQgE2Z+d6DkNWVv6xKkZA== X-Received: by 2002:a05:6a00:1346:b0:63b:4313:f8b5 with SMTP id k6-20020a056a00134600b0063b4313f8b5mr6012449pfu.23.1683389057857; Sat, 06 May 2023 09:04:17 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal Subject: [PATCH v2 12/14] crypto/caam_jr: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:04:01 -0700 Message-Id: <20230506160404.7423-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Autogenerated with cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger --- drivers/crypto/caam_jr/caam_jr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 = From patchwork Sat May 6 16:04: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: 126742 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 3265242A7F; Sat, 6 May 2023 18:05:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F347042D86; Sat, 6 May 2023 18:04:23 +0200 (CEST) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mails.dpdk.org (Postfix) with ESMTP id C88B442D5C for ; Sat, 6 May 2023 18:04:19 +0200 (CEST) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-643465067d1so2236781b3a.0 for ; Sat, 06 May 2023 09:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389059; x=1685981059; 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=c7hMjFUgvLlGADQuxfUFNFeFE+jghejYvfFzJc9Wwy0=; b=ba9PDKu/0eiVcJm2ORl0yiKq+iAAGPGE8IVUujNzm7GSXfEMttPs87ZYOt29gxF0vE FqreOB5m1+hjIX/qUDxfBP+/gaEzlJQLZs78TBIRpRyXm4b/zwkJoULYsk39juAs60tI 9AIx+pWnrW0mILxnhnSkXmSH/+oY7kg3LzSizqt5RO2a2jpEdnmzyic4U20/j6iXgVG3 mVBENL9WUWKjtsocnoTd9E5jYe+fwKy6RIILa8RxGoanHBhRHGCUKUBiTU9Ywz9k35qZ 6J9Q5Qzm9BGZJIWRVoO+jygofhe9890PVRdOAGhCbW0znMrNkGm6b/cqZ/Eak1GrM2KM 4pDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389059; x=1685981059; 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=c7hMjFUgvLlGADQuxfUFNFeFE+jghejYvfFzJc9Wwy0=; b=g07rpZ3K/W7beYv1aE/NlyvTBpdv+slbA9eJhB1t3+fOa9Wn2cUco+USqQWt/uhdlE rWUxNQN0ngmVk2MVkLS/OTu9PTFHwtu6Zgmn5ELTi3gymYgRJjoeH5PlEIFuyjw7nQVK n5PTR80t7bzxirqwrC2v8Bm52DZZvtgh1WDACnCxnj3TJyLxlZuo16GescsbpeQFbPo/ bKMRbOVY8IuvkJZMwVUsTLT4LjJ9hmHzsIe3tCBidf2brC5Q8g4xJBSI5Zl78YYa7eU2 A/X9Ny0Di7cUt1MIAT3snFvOxCh8/uRON66z77JQHYjLXdm1O5/V8s67voHy+DPMi+Au wosg== X-Gm-Message-State: AC+VfDyaAcxFDb5U2bOg1fwzzBYIBw+23HUnj+jJux+TH/vDuztdgtqE +qHR0vdaxbOzsv7X4W2Sz4ZdFCE3eFtyq7+CSWQUUg== X-Google-Smtp-Source: ACHHUZ5yOdLwfuyY2FNvc5fT6czr8aoErvvW2mIwCJCK8mjLOzgxiug8qyVQPSRxBdA3kY7xfzf+Wg== X-Received: by 2002:a05:6a20:4429:b0:ff:d488:2945 with SMTP id ce41-20020a056a20442900b000ffd4882945mr922281pzb.23.1683389058771; Sat, 06 May 2023 09:04:18 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v2 13/14] net/mlx4: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:04:02 -0700 Message-Id: <20230506160404.7423-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Autogenerated with cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger --- drivers/net/mlx4/mlx4_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c index 059e432a63fc..d5feeb7f7e6d 100644 --- a/drivers/net/mlx4/mlx4_rxtx.c +++ b/drivers/net/mlx4/mlx4_rxtx.c @@ -1014,9 +1014,9 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) * loopback in eSwitch, so that VFs and PF can * communicate with each other. */ - srcrb.flags16[0] = *(rte_pktmbuf_mtod(buf, uint16_t *)); - ctrl->imm = *(rte_pktmbuf_mtod_offset(buf, uint32_t *, - sizeof(uint16_t))); + srcrb.flags16[0] = *rte_pktmbuf_mtod(buf, uint16_t *); + ctrl->imm = *rte_pktmbuf_mtod_offset(buf, uint32_t *, + sizeof(uint16_t)); } else { ctrl->imm = 0; } From patchwork Sat May 6 16:04: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: 126743 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 E288042A7F; Sat, 6 May 2023 18:05:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1041E42D8B; Sat, 6 May 2023 18:04:25 +0200 (CEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id 07D7042D6D for ; Sat, 6 May 2023 18:04:21 +0200 (CEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6434e65d808so3205962b3a.3 for ; Sat, 06 May 2023 09:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389060; x=1685981060; 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=eYZLqmcMVIp38tew4idulcq334VF68FwI/kUdGxlXDY=; b=yw35XVwV4E1+CpJbivb1y0b3tDAMsBj4I4Ak+4Q6pvHpeRyLtaYSK3sKW0cqzmkmbS eZD0S3ytGUKCnDp1fknryPzO1TNjuzH67qhr1JPG2ryVQyYjvbB7SaAfonz/KL7afGwW faot6SGksOj/30C/Q6aqt3J1Uwfdx4G7S5bOT4tHjpWx6L9gG6h8+BkEC4C8Xy7jOpop gieBh8JvXmdXFgForXttiMO6zydKmivUWrEzZWUUWo5HStL3QOy+Vaipu+y+pWBmXApk LaoqKCP7TZEP0iu5HMowifEwAibIH1AGb6nia1inIbY/JAM+JRLc3dYrMKt2F9Us3naR 74xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389060; x=1685981060; 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=eYZLqmcMVIp38tew4idulcq334VF68FwI/kUdGxlXDY=; b=ADthwUvL1Rj6omu20H2c7AWYF+u37FT2e7GX3XEZbjt2NxnE20PQSb2d//7kUTH8n3 TFSf05Ntl+1WwqzEpNqucUs/3dfY3LSMU5zbbNL/5vk/nRtwDhd1pQg3WDSYnBZDyXt8 aVAdQMLeuQK3Ybfkm6SgxgUcE/6Jir++NWzA5biTZJ+xaYhgMsTYglYCjrb1uXf0auv2 lEjSxsN2VDlKuyH05tz4Q93cgqUuESpZ3Ol9M3NI85YJXrPGIUVpSJCrr3a5L8ncJra9 BKTsnFofunCqKVc6iYG5Fsh1J7J30GI5zY51XruzDVxFfmyNtaCZa3lHdT++h+8mRKcM cpgQ== X-Gm-Message-State: AC+VfDwMJ/ELT3VSCMHwad+EF76179+psoWC5wbzcKS7G/S0s536H7m0 zL7XD6nSaZ/xjt/ijuZJ4WMjkosr24fDTwsXnQY+sA== X-Google-Smtp-Source: ACHHUZ6mSwKBzsBnIh1zwLLVjKIujdqmUiaSLshHZsYxlRIEEMCsA2TjQnpona0eSYQrbVLwufZgDw== X-Received: by 2002:a05:6a00:1701:b0:643:950b:d9cc with SMTP id h1-20020a056a00170100b00643950bd9ccmr6687167pfc.34.1683389059981; Sat, 06 May 2023 09:04:19 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nicolas Chautru Subject: [PATCH v2 14/14] baseband/fpga_5gnr: use rte_pktmbu_mtod_offset Date: Sat, 6 May 2023 09:04:03 -0700 Message-Id: <20230506160404.7423-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-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 Autogenerated with cocci/mtod-offset.cocci. 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,