From patchwork Thu Jul 6 17:59:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129351 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 785EB42DEC; Thu, 6 Jul 2023 19:59:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B46A642FF4; Thu, 6 Jul 2023 19:59:44 +0200 (CEST) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id 0B1BA40A79 for ; Thu, 6 Jul 2023 19:59:42 +0200 (CEST) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-262d33fa37cso605958a91.3 for ; Thu, 06 Jul 2023 10:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666382; x=1691258382; 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=uKIPVSHQOjG/aLU05G8kD/J+dkw9l+RFxXIKhjNDK+w=; b=SIV2QO3Hnp6uE7wEEXqBMzoN3TKVocVggJthHpNK+AdJsPAFs1w+cWYOjDh1vxbko6 T+4DmITnZ1NixppPXG43emXVNwvDHLRtJ7kdVpHxf1JWRtvkiIPQS4c06r1kA8dpxRDR h7bO4kApv94OuiC01Gv8/GE6rMFuDcH65tuj9cZrhcx2Y4nDrckML8bYUP90nrFtHNq8 dkuCaHYNr0X7qT1KIfVfUTSJ+KTEHDPz/XVKOtvMCza9QLuhgWE8DS37eTuD4ZHgEcGt W5mV1ss3sOI3nzOgpcsygVw5lexx8gvm2m5eFKDMMYGOEfcidDw426RcIOqzYLJMtPVY Eo6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666382; x=1691258382; 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=uKIPVSHQOjG/aLU05G8kD/J+dkw9l+RFxXIKhjNDK+w=; b=GR4jMQvAQ4tZb8REcn5+CbwKzhHX2PABhkv5OQr9dKfADgQFV3TDTjGhzu4E9W1FXi uw4nZMMdHoGutaLrG+lbu67Jq3krMsuouV8I38Q7oIVxxLpZ2VxMpoNB0OqxYu+fYwf+ bD4rjRiiSAzR4O9vJBAtIy6qjSj3XzuHS6TrsS+rT5AJtkWt7RdmnmoLNl5zlod8WwRq 5KDpZKMQ5+Z7SzFBgZrdoQ7eJBlsWggZvfLtu35pqyfB+9YydE8TUeCOzEBpeka6Aa47 j7FuOBcoNmS3w0LGTV8CC4bGM7jNru4a55piC/bBbRdhxVZEx9POzia/JjUt3rp3CZFf cmsA== X-Gm-Message-State: ABy/qLZYi+EX9Hr4uS9sZS7Tpv0zcLCjNnzCm0DiHyaxoDarRjruJ9+O bprbO5SxcOQJmRYT7xrNgJasE7fMxUMG2Grz6zY= X-Google-Smtp-Source: APBJJlGxzB8EBoc/yV8aQShCSDYZFeYJnm4hzkXktRw/mGobv23HpkCDFS2omAUNRpbO0Rkmy7a8Vw== X-Received: by 2002:a17:90b:1110:b0:263:72c5:9ac6 with SMTP id gi16-20020a17090b111000b0026372c59ac6mr1988145pjb.11.1688666381664; Thu, 06 Jul 2023 10:59:41 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:41 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v3 01/14] gro: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:25 -0700 Message-Id: <20230706175938.62721-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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_tcp.h | 2 +- lib/gro/gro_tcp4.c | 2 +- lib/gro/gro_udp4.c | 4 ++-- lib/gro/gro_vxlan_tcp4.c | 4 ++-- lib/gro/gro_vxlan_udp4.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h index d926c4b8cc71..2c825413c261 100644 --- a/lib/gro/gro_tcp.h +++ b/lib/gro/gro_tcp.h @@ -150,7 +150,7 @@ 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 *) + + 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..f8cd92950c63 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -223,7 +223,7 @@ 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 *) + + 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_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 Thu Jul 6 17:59:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129352 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 6285742DEC; Thu, 6 Jul 2023 19:59:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E054142FFC; Thu, 6 Jul 2023 19:59:45 +0200 (CEST) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by mails.dpdk.org (Postfix) with ESMTP id EDB0D42FDE for ; Thu, 6 Jul 2023 19:59:43 +0200 (CEST) Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-564e4656fecso696060eaf.0 for ; Thu, 06 Jul 2023 10:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666383; x=1691258383; 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=NriyQnf6xAIynagCTSXcqezfouPUSh3MeeaIoI8Ifofl+4SdJFHIp8vdLpwKc8HQYn gMcu/0oUNBnC3637f9wzcH4CKAFF3zBi3bfixcqPm1JZFrXWrIZ9UeLyeu9BPDxX9k2G 4qzLTEPoxSqM9LJCwputmFRqh1Av3QfA4kFyyL7fiNo4K9hycgzPbYRv3kwFw6tRx4/5 1ICuBfG8/WJ7FPRT9KBpErFwtWU6MOgg7Fd8XTOsEemiWFyDx5w6ifzX1cTnd9pYRmDm WTvM+EyHI6gQn5hkvDNI2ZziBDXQP8sZdN4fl13DRq0Qr5ogtDQrM7bW6lopemm9SV15 j7rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666383; x=1691258383; 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=Z4WEG9bgzJ+5Zr0nuT18RNOkRr7vH3BkHZOcvTeL6zarxeRdx+4M+Y56k6JYGhOYds 0OmcjMn0cLaxO+MR8czsUrYgMrB2hWZ9dz+G/JIh3JA5cSt1JsWEBmyXgKyhvE0qGITS UR69F9ttyqYZWH0Umc+Nr2VpsFA/efFLsioC6MPhm/HAdFC8wosX6D/+QQ+vBPTAO1iS k+qm2ZSQqbUpNpcK9XuQhQYoUVCjq17O96x0HuQjfuGHjClmZVhNmGVMFYqZDECRpPiE CQPRz14qG2sy4jlJ9ROnhF5fs9rU0fhA1z4L1aot9v7zozCmPjkL4zlMtmchlotbpV4B Kw+w== X-Gm-Message-State: ABy/qLb280Zwq8cYWLEYX2N0ooX5A40Gg0JtncsSNuTkSxRkY4aseBz2 S5+u/j23Gy/MDlGvcbtmyTkams4eTQ3TSdpOFIA= X-Google-Smtp-Source: APBJJlFBfjX1D42TxXv09VBcYKbMClFE+f9Q6QMxPg5svCOFeG5blrIG1thSDnWCP75n78qm2vGV3w== X-Received: by 2002:a05:6870:46a6:b0:1b0:649f:e68a with SMTP id a38-20020a05687046a600b001b0649fe68amr3219482oap.25.1688666382841; Thu, 06 Jul 2023 10:59:42 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:42 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v3 02/14] gso: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:26 -0700 Message-Id: <20230706175938.62721-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129353 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 0BAE642DEC; Thu, 6 Jul 2023 20:00:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E54540A79; Thu, 6 Jul 2023 19:59:47 +0200 (CEST) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by mails.dpdk.org (Postfix) with ESMTP id A9A2C42FF0 for ; Thu, 6 Jul 2023 19:59:44 +0200 (CEST) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6b8b6f7399aso840518a34.1 for ; Thu, 06 Jul 2023 10:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666383; x=1691258383; 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=ZdNwXcpq1tnyILecyCqAQWQaZKr3yAHsvhFVa5NZVpzXUFhJ2O9UTbK2ZZminK62rG 0Ctw/aWoINpVocqgktT3AlZa5aVkrPuu4PvfEm63fFkiPAOe6Y2J2EJAoYZdRyzL4dPI iaO7DepSaDBx6aY3pXezXwRBMDO/YeRWnka9muu12uQBS2Ks/OVfzK9bf2RMGZXtKNu1 e38YADi+ATOOrAg9IyxCCR8reykGOXT3HNwmCFn16rVGMZ/nDtzYEB/nHHGlHYzwmxEd +1Wb/Sxte+BG6lFnhJmtCUFqNEMEyfVHHMqZGMjfGHdtkrxwrRnoQA0MvfAwZNPxmk9z 2x4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666383; x=1691258383; 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=jdmfLQzJhlsNPrXQBSEthzum8ipWTFvI6c6KP9/Y57t0NYScZdVNzH+dZtQ65Oh/Co rPtvDc/TMdHEqqN1U4e8+BGnzEM/9MHlO6sH+t5ko7UKxQElk2MxkfJnMuDX18f249Or G96L1PanYeb4EDHSHLg/rSfDoS6R/5k4ccXEiri3L7MEWKLg6AzqrMT3WOAwQ99iT+NB 9DcWIuhGdshT6gKrJBGimot/WNfYEzaFvtybQZh2jyv1+mhk1nE68gVBJ9VEN7TT25ET YEVHAZ+34W50J1vcACaCFYnHYXPw8IU+wy/GW1tIB7ZTW2Akly7VcnK66Gq/5IHy5dvk O/Sw== X-Gm-Message-State: ABy/qLagS1mvZv/xrMzKYzRhRPbql++SwaY2mEGAnml68gDPHP93ExtO RY8OsTZxY/1rNyKfa+MTSKY8bak2viNHq1/RcGM= X-Google-Smtp-Source: APBJJlEHp2MLibcx2PvjlkDl0PHDeibKWwOOD1qIwEjZrOLjnE2/K3MrNs0pvCdgzfJ6FxQ9QLhdWw== X-Received: by 2002:a05:6870:8a06:b0:1b3:e225:7077 with SMTP id p6-20020a0568708a0600b001b3e2257077mr3569310oaq.34.1688666383734; Thu, 06 Jul 2023 10:59:43 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang Subject: [PATCH v3 03/14] testpmd: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:27 -0700 Message-Id: <20230706175938.62721-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129354 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 A8DDD42DEC; Thu, 6 Jul 2023 20:00:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C57442FF2; Thu, 6 Jul 2023 19:59:48 +0200 (CEST) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by mails.dpdk.org (Postfix) with ESMTP id 826BC42FF8 for ; Thu, 6 Jul 2023 19:59:45 +0200 (CEST) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3a36b309524so961572b6e.3 for ; Thu, 06 Jul 2023 10:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666384; x=1691258384; 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=rucvP5yxuNiVLQ0yHfEt7I2LvK/gRouxqlz9X3nrfj4=; b=LlBYPXOUxlIeKBIYD2jxBn6Ea0vfMDcjy1IVdHyfJkroGC/jojIBuPq1+WvnMnIcUc 4gFcbv+meZ0yoeqldeKfVQgr5z0ggh7wBSv962TVy2NoIaXCBv/ywPfSeOYQ4O6CCYsN bQt4jQL3irOjzwbgNHJknNyucJ/iiHx83kg5wjFTTehrXIFU/w7eJqjZWP+upiClQt87 BYwYyAJ646rWSZD1vSP7CGKq3xAanQZbvPcXocuHprnLTwlQh8TuFwtzWK7dbUMsmM4W r7dNEO6/+8AjZ+C7pjV29FKWnZDaatuOJTUUDq1Td/svaTgAfIbHnHVhp9DPWJVeUmcx coJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666384; x=1691258384; 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=rucvP5yxuNiVLQ0yHfEt7I2LvK/gRouxqlz9X3nrfj4=; b=jg5oBEv+APk+Ah+52ltf42eUV98NkBRFV+OxwLgQqC7KFfngOFpRsd6J9nwX+I2z9i ZiWnw6vCufS2iULW/09HR1lu2JBaN9Is/7u77HFPPtAUzFZhe67J248dqrDcYn9Dcbh+ u1xZLcqUsJ/YfGWqczfJWr+rDCbGn7nHdB3rsIsIRGMLa4/VMPkDf7JnmY9bgZ7kZ9Ux yYDD5DYvXJYt5scxHwh8HVNUgtxXd91A3YLsQ+YsZyDxLgFRnHU2rHiBY60HU0G11rNQ crWMj4M0fiuonxjDV/hveEyP+iMgDA6DvhdY6cGigTwX9yypDhIlBO8YT86mK0c7Un9q 3hwA== X-Gm-Message-State: ABy/qLahb4HBzPsRUY3bVExG8VSU4KcPAaRUSYJstkoEfT6UYlIpRcKL L0RA04iBKbBKj5tiicDMZpOGwvRrg3KxiGsa7J8= X-Google-Smtp-Source: APBJJlE3NaePwSwQNQbaiexpADnDWKBF/eAkNmfjVc43YsP6QSkbUqGebs0Dyq9oZtjDp7tiiYe0Vg== X-Received: by 2002:aca:916:0:b0:3a1:f0dc:def7 with SMTP id 22-20020aca0916000000b003a1f0dcdef7mr2374631oij.56.1688666384611; Thu, 06 Jul 2023 10:59:44 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:44 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v3 04/14] test: cryptodev use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:28 -0700 Message-Id: <20230706175938.62721-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 omitted 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 fb2af40b99ee..5072b3b6ece5 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 ? : plaintext_pad_len); 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 ? : plaintext_pad_len); 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 ? : plaintext_pad_len); 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 ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); From patchwork Thu Jul 6 17:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129355 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 6A3AB42DEC; Thu, 6 Jul 2023 20:00:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDFB843017; Thu, 6 Jul 2023 19:59:49 +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 04C7342FE6 for ; Thu, 6 Jul 2023 19:59:47 +0200 (CEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-55bac17b442so789723a12.3 for ; Thu, 06 Jul 2023 10:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666386; x=1691258386; 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=dn+v69CDJGRt47cESV3KXqciMreyAzXdMDg2appSOqeMVJpeApkuNPdwMgoPIFJd5C 5bqBwaKHMJu0BxOwX5tfMfPHRmmfDvaxTKCTlE9vfbhu4ySziifkrBta/SSn7o3E8X3a mIZn2XR0OE8zUbUtNY8UdQZH2xpjCX4GVQmwQ82xQw3iYWT9DdBGhk5AGpNek9uEzWnL JXwch0HPEtoPakMEJuECr8fWipHSHBDHwn0+aInmz9EDueQqUj4K7/Zoat4db7hXDRGG RX1U9VRqsNK2Zmb+jilW9pWyQ++QjIbZQNoUHw9Xl6nX3zZD0venGbGjTGbiby+wbIwX aBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666386; x=1691258386; 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=F6NTBIkl2AU6n7I0MojORZK7NJYGyoh9YzaTp1cGOf+Ggn5BD1l2L05e93PlIh01ZK /uSAhyAB2uPT/qKArdVuKF2s+kS0iVTKmg8gI6wiQX/m8yEEweEs6CLVPZEoMG4ZPqY/ hG28mtxgwOamo0AhFL0cwU1C8hZU+eVkGCKdol3stZlj/StidxYBpf7OavOOWnxc+S33 uyveRT1P8owlug5FBNz8z3crjsghV6PVi36EV/Fi8DR1UpnFHm0PjXFyqircmYu2HuY6 0t6LyQhnvdEdzDyU66u+sauxlUWordZ9c8IDuHzfV3CaI5JKIiFf9e/Obpl9PsanGSyX A6mw== X-Gm-Message-State: ABy/qLbJH3qmeN/MrnRxIPyjLl45LxamL0ftaGjkoTTddJ/PMUQgEfHK v3M/pQVJql3Yv9WSFs3YFIoUV7BtTMHEjz64rGU= X-Google-Smtp-Source: APBJJlFkduZSnAWQjEYxu8awfu4nGC7ma3t5gPJayDsxC5cd9+c+s8X6PmOQ9ug9w6KaDlqIanOHmg== X-Received: by 2002:a17:90a:4304:b0:263:f3ad:64b0 with SMTP id q4-20020a17090a430400b00263f3ad64b0mr2497468pjg.43.1688666385519; Thu, 06 Jul 2023 10:59:45 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:45 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang , Kirill Rybalchenko Subject: [PATCH v3 05/14] examples: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:29 -0700 Message-Id: <20230706175938.62721-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129356 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 D46B442DEC; Thu, 6 Jul 2023 20:00:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 068EA4301B; Thu, 6 Jul 2023 19:59:51 +0200 (CEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mails.dpdk.org (Postfix) with ESMTP id 6CE4742FE6 for ; Thu, 6 Jul 2023 19:59:47 +0200 (CEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-263121cd04eso609525a91.2 for ; Thu, 06 Jul 2023 10:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666386; x=1691258386; 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=3hePGT3pp+cDGNwaOlD/p6nO/m8CfpV78liYbV4NkQo=; b=g7PQ7Bcbz7BumR9Z6D8VvQA3MzE9jlTXSzfr6qYBJEjcGAWAZ+6zEvC0n93ihIBu4G cll7t/v42U21eHK/GjZIcYID5xjyTyfUpffLKdHX3qJ8OI2A+JSnrZUtmQjUgZ+dvzhG aEIhQSX+jEJ3zanb5AlXMmqLZbkBsFJoKhCq4YLWtOz67jg7x7rwN8YNm2yHkpbcxBSE IGLO+fEZos9Gqo28VSlepbIjEmnwWceOtB/084ePHnoQ+7QWzoJ+BH1pKcBFPE8gnsoU GwweXoh+FeXcVNl6N9MR43/GUNXRLsvwKus98NQnVtBgpOunhm1XmxVwDDgSMNuQHiFj woSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666386; x=1691258386; 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=3hePGT3pp+cDGNwaOlD/p6nO/m8CfpV78liYbV4NkQo=; b=btJ94CqjA52CbFKWvJ6JaMz1lpA0xKhuYtFbVMlT1pGI0sFMUA8MPnf9HE/quFsyVY 0cqpR0Gtuz8rGUFB4CmEXsI9zITA4HqUz0293mTBPMr4k10JglLSuBTK8iedPbV86hZe Kj1Es0gS3r8/MfIEaixgHTLHcjle295gcIsKylAGnMgwwsrnk8GQbdkDLnrwgdeupozm l+HslQVqoUeqrcK0klqjx0V3ACtHo5F36TWnycTcFB5L5imB7mla2FANIOWK/a+mkV+g HC7OZG8Xo2wNyCfnGSKb01wi/fn51aYk82QOYwTYIDOnuF4yx65ynZfBypBw3ibZQ2GY oEEQ== X-Gm-Message-State: ABy/qLbJNi9882EMkwntNcLAYVB0/zVtCeFJZPwfAFLBAzo4Y+k5yrZR z59bh7caMFsVDtxWd8lsjHR2qLic+tv/K7xp6Wk= X-Google-Smtp-Source: APBJJlEIg+CElD2pSD4RDZ4wRt6+8BIUWW3t0noM0KZ/WglSd8louMLfQUeeWz/MFg76pYyhEI6dLQ== X-Received: by 2002:a17:90a:86c8:b0:263:efca:8bcd with SMTP id y8-20020a17090a86c800b00263efca8bcdmr2028828pjv.2.1688666386405; Thu, 06 Jul 2023 10:59:46 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:45 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v3 06/14] net/tap: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:30 -0700 Message-Id: <20230706175938.62721-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 bf98f7555990..ebddbae9fe9f 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 Thu Jul 6 17:59:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129357 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 7ECA942DEC; Thu, 6 Jul 2023 20:00:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25A8643020; Thu, 6 Jul 2023 19:59:52 +0200 (CEST) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mails.dpdk.org (Postfix) with ESMTP id 5739643008 for ; Thu, 6 Jul 2023 19:59:48 +0200 (CEST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2633fe9b6c0so1562389a91.1 for ; Thu, 06 Jul 2023 10:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666387; x=1691258387; 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=UMFGeZyIqjmMsUR1iPkGsaQV2QX/lZtbXC8VJf5pxVo=; b=B6JqpLLahpVBXlFM5YabD5sI0gmwHe8zRivcbvgeP7sUtShpN9hInSV7oAUFbFrn/p rdGHP7v36ybw6EK67cuhjh4SY0S7U8v3iVMlmB9eJhqbweeYf3dIWvQ5hM+iO4AAN8ga /gYA7HIM+d0Kzn3cVjtTCy0yPrfViMWKUDPQuhwRFK2Rvnh9abYC1QoNIb6gmbdBCeyx uADWAYJMslA9Z9xAif4KqlkrNEHLDcQebR5XzWWp1kvScj/VhqFwrJp1yUvS5UOpnkGu dD2sAtRWvusQylSSXZPR1XWUiQodzahBZ5O9GRgXVBymTC2V1MathCuKiOa/CC/wHFzO 9FdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666387; x=1691258387; 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=UMFGeZyIqjmMsUR1iPkGsaQV2QX/lZtbXC8VJf5pxVo=; b=CRS/Rrz9wKDN2tSkPU/a6tqfhYKVwYL70XmZ+GHFY7t6poCY8n9RQutxRfPAZEZqS0 N8AmNy6y2xx5JDYd37bZiOBTykp95xB08K+jXE0xfrRjqjyMF2uxg0z5SpCdcoRrh1ZP SHFPiUiGeVmtsqZDOt52j79X4qU/zrP4qtku0ZZaJZbkeFdcOLCD9dBIQCMMNWKhz1T6 dmcFsyq1Kde0i5Pue+6RWsmqW41/Vp7qQhfXtpVvVf5+aWyoKis/9bygL1nBguLVlWMF Vts+NMFMnxD4WaFn7yNEgqrm7B3a34bZ+f6pa3Xj40ykc7knhXT9KQnpfLhW8E+mce7t O7BQ== X-Gm-Message-State: ABy/qLaT12PwvxbtCndM95Zk8NRVUJISBcnkPUqK5BGHows2g7gr+zjR I3aQUJAI14+ONq9ZPc2e4U8RS/wUaoHa0FwFGUg= X-Google-Smtp-Source: APBJJlFbz/n0FmNvuTnEfxDgTj+TK8VP2SwqbV55ph/4qhp0pU5XojMbyVRCRCR15s+qmg4Ykwigfg== X-Received: by 2002:a17:90a:8c01:b0:25c:18ad:6b82 with SMTP id a1-20020a17090a8c0100b0025c18ad6b82mr4154203pjo.21.1688666387288; Thu, 06 Jul 2023 10:59:47 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:46 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v3 07/14] net/nfp: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:31 -0700 Message-Id: <20230706175938.62721-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 --- 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 Thu Jul 6 17:59:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129358 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 5C58042DEC; Thu, 6 Jul 2023 20:00:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3394C43025; Thu, 6 Jul 2023 19:59:53 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id A839943013 for ; Thu, 6 Jul 2023 19:59:49 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2633fe9b6c0so1562399a91.1 for ; Thu, 06 Jul 2023 10:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666388; x=1691258388; 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=yFo23NqGGV1OFDtS9nAxYN+AigYTvhxy3IyacoRh6Xs=; b=SrMSMaRgjqeFIwS3xAJM/YMne13LILcc9Ms/7l361U1GSULnyRW4iUyc8rcGL0/nHa eT22nu+I4pKBC9RTyqHqZMh9IZco6sEHp63mIPikqGjBn6XtISaW8bFJath70+85xEr2 FBABjGUIqdrAkuJFWGL2DoWcYTp+8BNlAZUs9qLFljTAxdrvl9Hjwcyb/lJmt7O0h61k mOiRtrtpARVkUWfhw2RyEDUPzp9IYe6+2Gg1oWhGp1UlJBr/Dmk9sJje+U0AbdSeblD0 Hq1UahXHj3M0b//KtLXJpFlsGeelZzP44KB0ReJ/gsXmUcXNy9Jxm6ufU/IQKpkOl7zZ rQlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666388; x=1691258388; 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=yFo23NqGGV1OFDtS9nAxYN+AigYTvhxy3IyacoRh6Xs=; b=EvpbDUmLC+VwYi5XhjJVFqYX7CeAGzaUUaXT6HZf/xQiPdSIGmq0zRutFLpXp9n3RW 0FL1qyjkuJvjgfUPgBFiPDYmcxb2f8BYy2sMYrUaoD/g0Alf2bqujrFw3fKaDdpQeBRb wJoSshXDiI122la7yErWw3WRh13MjJE7vfDvj+EKyh1OSu/wJxT4BzInjOtnftE4YiKQ 99WD1Z4/KH6o7GUQDgRlSmgcj+yA8/kzlzGocQDYAhe7fau+e/LbE8BNatZ/vh7KNLcN izDUB/WhILX4FV5MWUZepHBcgA5oSfejGN+uXvUIZAYbkKcRq1nbQRJtaJLMa8KG6l8J YXEg== X-Gm-Message-State: ABy/qLZ2pMjPCi/AXgkySWM1Ld3rxq4KNVuKQU2O3vFFOxAKaoDXWcg3 kGUb0Dy5hMHwJ6JSswcl+lNZLTKiConJ67Z68Lg= X-Google-Smtp-Source: APBJJlHtd2jGwG1z7uvoqqiUbRPAFvxtxg81/CpyFMl14i94SIAkPCGXEd9v/XwDNekOFYfGsyUGtw== X-Received: by 2002:a17:90a:f40a:b0:263:f674:490e with SMTP id ch10-20020a17090af40a00b00263f674490emr7592288pjb.3.1688666388226; Thu, 06 Jul 2023 10:59:48 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji , Pablo de Lara Subject: [PATCH v3 08/14] crypto/ipsec_mb: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:32 -0700 Message-Id: <20230706175938.62721-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 --- 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 e64df1a462e3..90b8d80c2c56 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 Thu Jul 6 17:59:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129359 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 2B45642DEC; Thu, 6 Jul 2023 20:00:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 416D443023; Thu, 6 Jul 2023 19:59:54 +0200 (CEST) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mails.dpdk.org (Postfix) with ESMTP id 303014301E for ; Thu, 6 Jul 2023 19:59:51 +0200 (CEST) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-262cc036fa4so582190a91.3 for ; Thu, 06 Jul 2023 10:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666390; x=1691258390; 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=F69PS55Z8d+JCpBArBnlboybxsumWrIJT6EP0C7v0Ks=; b=GzdtKffSjiViqrEE88Qpl/WZ9AqMZl5gDasRPQblpARFimbwqjoTaOYcQOA3T1aeH8 Cruz3KVaETdUqqeQ4NWkWE96QMY6jElZ/zWTooTzzRRwI8hfi1DxsAjiFXWyUv3fXNbD uq/Rfk4kPJ53CC+oqhHyExQi0dKOaxyCGRiuYtv/TU/71C8thyer3a9qq4HsXgPGSKOR KTCLTDFzozoGEaJiSyxEMtMazZzLR4456lnPPOilbCr5BaOExhXd55mQGoOyUiK2lsFC 1lCIaEkEutmGWInXpV2ykmMMKSeIjYF8YUGIxocD31G/zPCy3ElTYj/zDDZTih9YOHpn aX+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666390; x=1691258390; 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=F69PS55Z8d+JCpBArBnlboybxsumWrIJT6EP0C7v0Ks=; b=kdBE3uyno/bz8guy4PboYwMkG5HbkFh6bvgqycxUR8QE63oCA37XGDTnDthflyhJNF RRWhZYVoiGiUXy8LhPdeIDzfl9xH3feTrQmjTp0xKNoWtcfpGJ1GfGFSA8wd9AEsvYCU UabluZyEDdg+F/IaI/V1sB4DfaQdG4BtFUcd2Uas5zQFSXUPLV43Cyfl4vFo4A5+EdlB Sv50wNvK2hjkCk8ozc722oXrcqAm8OmWr8nwEOrb8lfPZdvj05LJcv293N4JNe0bkcgC IZaYAxDkrS5F5reyAxNnrs2sYfIaPYR71kNtKhmdoWNv3VAUArDvCDoBReZjk1XO82Zr ac7Q== X-Gm-Message-State: ABy/qLbt/iFNpeXcf20JsJFVABzZLmbNRgFNVzMxV/aeQppo+WlZLLUq Htt1OP84cJq5+8qqOQ7F3/Rp42BQmCbvbkLB1wA= X-Google-Smtp-Source: APBJJlFW2p8lhCtQEFN96XThTmggsumcV17UIsXKDyfs4lLslT8KAShPq0/JiPDsAP9dpjVA1Tek4Q== X-Received: by 2002:a17:90a:7e8e:b0:264:a14:ce19 with SMTP id j14-20020a17090a7e8e00b002640a14ce19mr1883821pjl.20.1688666389955; Thu, 06 Jul 2023 10:59:49 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:48 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji Subject: [PATCH v3 09/14] crypto/qat: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:33 -0700 Message-Id: <20230706175938.62721-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 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 Thu Jul 6 17:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129360 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 B0B8642DEC; Thu, 6 Jul 2023 20:00:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05BFA43030; Thu, 6 Jul 2023 19:59:56 +0200 (CEST) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mails.dpdk.org (Postfix) with ESMTP id E2FCD42FFA for ; Thu, 6 Jul 2023 19:59:51 +0200 (CEST) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-55bac17b442so789799a12.3 for ; Thu, 06 Jul 2023 10:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666391; x=1691258391; 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=MBCfTzrQCaLhh1CsP3RNdM8gjnCX83G/7DXyKdl+zeA=; b=IVSdVn33kXt6oICLjc8vneD4HgysHz9OW+Rpo3PbmBdDoq/CuMfW9m1hekmswtJU7U jR5CGNWCL6Iw9YrBZCxPA6KGLn6pYcnjkY04DNeux6zm8/DkP9m4DUfTYt/1gXqaIkD0 xDysA62t+M0fIccFjEIiiyZXQf2kuSJRPHHCSVvvYWRGdbzJO8eLEizQir1jL3PIEIpb WpYGPRZIYssJls+V/o7iXRE7usDpGvYCQNPP7iQHvG5jf0OC3RsqD+za2DwS4HTNhjix Hfq32BOGoPVV360viELWoWwlTG5cxvCxb5LECMibbyv8lEBiCeJmiyjIjLnN8GZUN5EZ bqbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666391; x=1691258391; 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=MBCfTzrQCaLhh1CsP3RNdM8gjnCX83G/7DXyKdl+zeA=; b=PXBNoBTmTyT39AG7VqcMLGQzpJcn/QliyammRj6Ek8FAWutz4e3IVkN33UJQBB6yHM wz3PfYgf3aufy5rqOvWvY7+TKQtpXsQH9AZFplYKpZFluuwEKdcbAPMgziwagfuTiywt /p8S48oPIjGACvmtbSFE3kde6jabpPfZ2CtI3MdnfHJz3E8pWKoaMHjH0wmS5JPwauVR 8+LQOCCg3OaGbRFeU+BDPZF7gKVPmFF2WqS+nr3hmt3WGQJttiaXoMO6dQMrXArACpXh PCDAscfVaLMwZ08pn0blJnoQxPC1XT/Uy/uDnKIk/2Cwfmj7oFz+UoKAkcf3qiEWZgLn Na9Q== X-Gm-Message-State: ABy/qLanYg7Uz2Nt1/D33m6rbi4R/EufIZeFs3cEJIb8i9ZLL8fmWZNN XkUFyyI9fspQhp+8PoUuljCRsGiRbytYJxhYcGE= X-Google-Smtp-Source: APBJJlGqlggAScpIIKe4Fe9QptVtCzbMS781o1Ekox73Zc3I8aAwAFk9aRCRkwTBgJhLdIVERMPGeQ== X-Received: by 2002:a17:90b:390d:b0:262:f99b:a530 with SMTP id ob13-20020a17090b390d00b00262f99ba530mr2460735pjb.34.1688666390934; Thu, 06 Jul 2023 10:59:50 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj Subject: [PATCH v3 10/14] crypto/cnxk: use rte_ptkmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:34 -0700 Message-Id: <20230706175938.62721-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 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; From patchwork Thu Jul 6 17:59:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129361 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 D4E9E42DEC; Thu, 6 Jul 2023 20:01:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D75643035; Thu, 6 Jul 2023 19:59:57 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id BFF1643010 for ; Thu, 6 Jul 2023 19:59:52 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-263036d54b9so785476a91.0 for ; Thu, 06 Jul 2023 10:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666392; x=1691258392; 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=sTYsOswYbss6rQ2Op67E677JuvkEv+uHiezqbZf3rEm/7iFJfBsIDNXZTxGJ9VSkAF bFgT2MFvFg0YDsjvOb9JrcUtBM/i+WIFKdHHcJG1aHrSdPGVpD9/fA8FmUNr2+mqBFjt 0oXIraZK3jHd3S4Iri0ZlUwtG+daG8CMPFzTmoNMCCj5iicKOJCHixojjzaWe5FE2mz2 TWIZLKT5pz5SURo3E3UOW561SSjUUr6Knd6yAnzsvdtF2OXtytkLxS/RZV5rYG9gdHE6 C0bvW99VuGHmktokkW2xmRiKz/7sdX+mNtZsMDqE7HaHEV6waDmkneSWT3a4tNl2ieOu I9AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666392; x=1691258392; 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=AMap/1rhKsuw4NIFrxJngzuzo82i3Ob+bD2qZO6kM1jPof21uOtxEYEKAmmvLVhR6S JuLhWDnyjNKjZif/vEzG9dItUjIZWxaz4gblIrez+1JYHNVq5HWH+UNezzKVJu0ixDA9 8Y1wfRoXvpIvM62QGlZqutBIi13VHZTNL6D6zNYOO0FYt/XqJZRYVkjHu1a4XDRF2gD0 3nyydYShC7TNt6S7IIxJE5qQonDRU+3H/SCDZcdMpQ32Vb2j0p1lMBuku6i75KcgfFow T75qIOzr+a/OeklDU/8u7gpZ3nnzTL5itgxbvQ9BElB00L1z1aMLFnyex11/43xVxz5q nt8w== X-Gm-Message-State: ABy/qLaSbt6hj+v43pETWGH39luV4yQNQWzvxnwCFF/h6Vb4iX29Eb+T fpJpjqbanKjghYGVBB+PgzAqh9/S+7R1cMiTii8= X-Google-Smtp-Source: APBJJlEwBSDMK6Dqud5s8fELbr9EetjnzjCQYhhBwgfO0Zx32oKwDbcRDFQ+KyWFW2uIyZerzybYAQ== X-Received: by 2002:a17:90b:888:b0:262:fbb0:8737 with SMTP id bj8-20020a17090b088800b00262fbb08737mr2389998pjb.33.1688666391783; Thu, 06 Jul 2023 10:59:51 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph Subject: [PATCH v3 11/14] common/cpt: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:35 -0700 Message-Id: <20230706175938.62721-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129362 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 F1F2542DEC; Thu, 6 Jul 2023 20:01:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F88543038; Thu, 6 Jul 2023 19:59:58 +0200 (CEST) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id 9AA9D4300C for ; Thu, 6 Jul 2023 19:59:53 +0200 (CEST) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-26307d808a4so808102a91.1 for ; Thu, 06 Jul 2023 10:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666392; x=1691258392; 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=OGd8rUNV2H2pgcOKvXFybbnJbLTP3eZVVfKvpGhHXFkdCmC2M6hvYsXtPzmedlshwV 36ElHmWec0Q/JTanIXrj0Xg9sH48XG7I3DSkBxKG41Hg0RoWCUy1qrm9X/hQZZTLtWci ADJtxA5UBSRrPIcT4LGLrlgPVL4d4DrXD1MSEs9aeVrVOVpRk0UCzQhJVDUX4bnvb7fk lDDx5CT8/o0mFY06as8TZptbjMD+lC7FiHmH0UOksj66sil13iSd+IV5700WsQN22xvM gbHs0D4/5T2Hiv5SJdNuwVqAVR6vh31/MMAvzaXo5HBhgnBX7xCGSwbBWHi83kTaNlH6 RAQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666392; x=1691258392; 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=WXRVmWPFEJhBmUuFa1xkexG6ql6BIKL1g9MZpDQHHGq+lnnCNo8xrmtOaVf3xd/fYi pEFkxTnaeW2qdckbCs/6UDzUlOfE59o0h1D7qmo6SE+7grtmk7VxwgFAcXgo2BDOWzqq mXmGZg8S1XE7+iWt8+xc+IP+xpf3fxpL0WPodfTzaU64XTXOndTMv8ibVnPIIq4wOXA3 hYbEek/6B2lvfQhe3KOKWuDhLHAiiGlF/lQWjO0tctz2qDWXKxUh1FucZS4bJ9ly9Bmj UHayGP8XXvsLTg/nJFZse4gWt/30YUb6+CL1a2kyRK/mKZzYLAUZ3kq9X1q3w5YTGkNM P6wg== X-Gm-Message-State: ABy/qLaJjnE06woWppQfVIdPPGn3RxQHKOytmwk4qCRbtAKiZyKXUBbs zVAEq6djOU7C0/1B76tbrd4esvh5v1AzZvjRqM4= X-Google-Smtp-Source: APBJJlEEqA99ELYe4aZkTIKCTisvIEpLt3FlyR+3xQzDitWbVKglzk4HtVXaANK3a26XMmaUDh0RMw== X-Received: by 2002:a17:90b:3a83:b0:262:d6cb:3567 with SMTP id om3-20020a17090b3a8300b00262d6cb3567mr2524491pjb.26.1688666392630; Thu, 06 Jul 2023 10:59:52 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal Subject: [PATCH v3 12/14] crypto/caam_jr: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:36 -0700 Message-Id: <20230706175938.62721-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129363 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 4B79042DEC; Thu, 6 Jul 2023 20:01:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D6314303B; Thu, 6 Jul 2023 19:59:59 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 81D7943028 for ; Thu, 6 Jul 2023 19:59:54 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-262ea2ff59dso594729a91.0 for ; Thu, 06 Jul 2023 10:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666393; x=1691258393; 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=jdKXUUZqkShylWjI+LflLVhTcyr+e21pY47a2eZUq5xwMmsR0QUnhqeQkcWHEwZbmW Jrl7oKljnQBlf/UwfOk87IDDBuTJOhpJHWxUlOnFllV2Wsfm56R+10xuBinxScWyVpnc 54FJWByTYdArUy1O0lGxoSQABq71mulSNUw46VVsp/3durcQXPKphgBDtcQ9bK2DZKBe Lsx6Qtr7jlpgw1NIi1pFneIzEX3zU0czCP9jC4Vk7LN21BcVNAadgZ1NS0blr06EqvYx ChHcTAR0eeBdUIJqM0tLBFeuwnMcWNqcaUyUGYjcUmZdVCOtFxZZyol1DS1MrrfRP3ju GrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666393; x=1691258393; 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=GYefVT4RhOXzpFuTYEDYcRoF57kTjlxAEFR9ZHe1o6Zhlfdt1sYh7dNXsk7yUU7C21 M3GjFUDn4irZ6Mi3LoxUxcaHQl8OSpoDLXnELoruvnRjr0WEhEQaiWgaPMO1HjfIKwgc G+AOdefhXWp1K1UiYQf75oXL7nk/vSOWR+cGogOPqsuFayI7eRXToRPgsyVjsMDC+Uab nIcmRrAFjRPSwgS840s2ql8V9ktQ7auVhVs3cHwhBIaE9cC5/PYwNlPFciHVIgfD5u6W Xk3+u3Bpg/+a/OgBzFxo5VsmjFQyaqsiYHcqFqOO1Jk+9jWHctJw/48xE/zia4EelTnq 4gQg== X-Gm-Message-State: ABy/qLbB3Om1GFPvGJipnCPljDvtkJ3GvFcohcWoHqcKScUDLJqIbvVM ACIgtwcMWAWwSreLFzlV/uBS0NiGCzzuA2TJcoE= X-Google-Smtp-Source: APBJJlF56uertcHquZvLy7lyWhqwLovoOTc5Qjedb+2OxuU03o5r7b/1e8NDv36uDivN/XNsiMv/uQ== X-Received: by 2002:a17:90a:5317:b0:262:d2ca:e209 with SMTP id x23-20020a17090a531700b00262d2cae209mr1964781pjh.18.1688666393500; Thu, 06 Jul 2023 10:59:53 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v3 13/14] net/mlx4: use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:37 -0700 Message-Id: <20230706175938.62721-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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 Thu Jul 6 17:59:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129364 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 77F9642DEC; Thu, 6 Jul 2023 20:01:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DE314303E; Thu, 6 Jul 2023 20:00:00 +0200 (CEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mails.dpdk.org (Postfix) with ESMTP id 6060F43028 for ; Thu, 6 Jul 2023 19:59:55 +0200 (CEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-262ff3a4659so818695a91.0 for ; Thu, 06 Jul 2023 10:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666394; x=1691258394; 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=3SzPXN08+AD8B3+L2UCJPMNDSdvV++2a4vqtUTDcsZNZB8U6pbsRhdoa0kiS50TRte BmSzZL15V0hD/cdL+nV761ALCu4mF96Ki5K//697WEXAq1bPiMd2F2y1hCG637ttHKkI ENuYrzI36aSz9Jw2pqlK5IGBjgHIx41UIRvydcTVDndauQ6hrhlN0Iy3PrY2JO6xMDuJ xjJPOuX9Gn/Fq4ocizPglbhmvPQz12Z82tVIkt88FMphxeJfqSGV6cop3c8cI0OfXfN1 flFgKE3pOeO3grXeELINk66VWb3B4j6TJkvRUeNQJRtSdpZGoCluGrHNStK99/nbAcUs URsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666394; x=1691258394; 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=RW5nNoD8At+1wRDCVLnXqgWfEdQzmXgVMlJQOoLGaDHROo9oRO8EpvjNbSlGEPscHX osvI4CRKJPxhktYPWhFWlr9r80OmP8mHFn1NO8qZW4UBhqTXjRCsIrdluHMLo+80Yd4R 3i9c6WInnpU6MOpP+GA+2tkfEWOgPtKbh3MnN7EwONEsyXEhU+K/pn58EUfNgFCBJvBd qEj+svVZFGNSxmFZb9N2ys1QjL+jHURdV28FSt6B0DxR4g/mIOng8mLpEr1B/1c7mAzY exSr6+wUx7slFs48j76ARhzVQipHB3iarXmH27Xc+qUMLKSXmyS2kZd0hDeTbPO3AgHb MhxQ== X-Gm-Message-State: ABy/qLbx8oGHgTDymQGwwB8om9Fhq2VBEaVUlSj31NA8wY5YZxhf7TMz onWKNLwO2xSyVXEPkDd9P3f3QdSEHdFG5awYT/A= X-Google-Smtp-Source: APBJJlFT60qsuGXaG5mcMxvIFtaDq/Cd4vnstsO7D9+eA6bJXUHmvZfpyf/clbpevDl0S//mvVDX4g== X-Received: by 2002:a17:90a:b011:b0:263:4164:dfba with SMTP id x17-20020a17090ab01100b002634164dfbamr2404557pjq.6.1688666394399; Thu, 06 Jul 2023 10:59:54 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:54 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nicolas Chautru Subject: [PATCH v3 14/14] baseband/fpga_5gnr: use rte_pktmbu_mtod_offset Date: Thu, 6 Jul 2023 10:59:38 -0700 Message-Id: <20230706175938.62721-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-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,