From patchwork Fri May 5 17:48: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: 126704 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 C70BB42A49; Fri, 5 May 2023 19:48:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1206642D16; Fri, 5 May 2023 19:48:20 +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 CFC27410EA for ; Fri, 5 May 2023 19:48:18 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-64115eef620so21341675b3a.1 for ; Fri, 05 May 2023 10:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308898; x=1685900898; 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=bWEHFLLBDBOIt4PHuZJqxUE9ugw9AYJhgJLtG/LSQzx5JjgH6RFdLGcS2irDdzT+X9 3ZHi94Cq+/A+UoEZ3FwYZ8Ycw1E9O9aYDcLZlg+SFkFWM7EWrzuE/VBi32QJpTCGXfXB yMs0emMHaUiwMzRcl4Wrvv7QkcDIa5cnisrCWks0O9cONJPvt1Tg0rQhKdOETEv9W4uW hx5iwJ/vwoH5brRzyCtw1GvPifv258zTlW+N8b7lpk5FxSM3CdrdAUhxPTe2fS6znPsb +2+iLFJ49J/LRvACdAoWBDMiL7tlVQaF50ps6s2POWAXQm22sx9FQHqwqGb980QCLAKx r/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308898; x=1685900898; 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=Hwa3RHIn2JEcsSa0c5KvIPwgr1PP1mA0sCMdlfwl525ognbg5MMoJzIODWu48wFapQ kH+w6YDiuPiSvDb2QL10G+36VVDspWvCJVDsj0OCZS3wfT87/j12IXWbORsWCxINPg7R ls9SsCqg7GeraiCuJZCJ6Nm67zcFjKMfoVGnSw8FB7H9TCtyn7QIxTkgDUqnt2Y+lCp5 JYLdOnNuVN0XRHnxthTvl1IZ24DNHR5RPAFphv13EB5sB4csFM3HGiwdPUZqlsoHNlrA EQT/GqzxUxvV6PAtlGLAUdsQMMHla8um9KU+C7X14m/Nj3XcmvBKmXCOHkHj8sA/3zsc rwRA== X-Gm-Message-State: AC+VfDz+N80va2mAQsdnX+7TaOUDtV6hdCmfdnf38V8f9uNV9uZlyjAf R0BzVjST5HqS4EzfZKwKUSOZcvEThtMM/Q+by6PG3g== X-Google-Smtp-Source: ACHHUZ4cdIYhPGMLJ3n896SHA9iN+u/dwPxySUMAevcYILqEmIWSry8YZhIU+YQQA4lS05hVrJ2zCw== X-Received: by 2002:a05:6a20:1595:b0:f2:4c39:8028 with SMTP id h21-20020a056a20159500b000f24c398028mr3118425pzj.21.1683308897813; Fri, 05 May 2023 10:48:17 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH 01/14] gro: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:00 -0700 Message-Id: <20230505174813.133894-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48: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: 126705 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 C846842A49; Fri, 5 May 2023 19:48:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8180442D3A; Fri, 5 May 2023 19:48:21 +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 3746842D2D for ; Fri, 5 May 2023 19:48:20 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6434e263962so1631974b3a.2 for ; Fri, 05 May 2023 10:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308899; x=1685900899; 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=pi6dUg2Njb2tdcP0jpO095ZANmtm9co07iwCj9l7TUs=; b=JK/eIik4S7Bqp2RbbF+2slBUiZoauC3c4gd7ux4yCldKxBVAF3ZgC3ez/AdxFuAfRh HvvI8PaiSv6G+C4IB5KSAp13jOaBT1w0RPD6uR7VBqJsAxNk9eCpCZIpcH2G5b5qWuCz 6BwpeJ4RfAzvPZtGPHmaua+m3L9zhTyVSioiBpM1KTX+f/d6XboryeDCJuHeSWpF1Cc4 oIOaN6cBf1bYqkGUQ2lFCYz3DVbzBDwhJZnM3tI77CxSjuzw5T/3O5koXJwlwXKQ/zxj KO2WFDcUirLP/lI+3iW4J1hJ+7kMOkono/r9imfp4zz8jLBvAdEUA5yzQUvyxYwmUUqT cKUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308899; x=1685900899; 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=pi6dUg2Njb2tdcP0jpO095ZANmtm9co07iwCj9l7TUs=; b=Js+riJEGEh51DNgQhGdwB4qHgG6mVlArQLo1/nrsPaLL3ExhLkAMRQDiK2gEmlWVKy yZZclF/nSCfP7sFkyoocUiqQquMHWOZFg8qQDsRLqIyojVi2dfV+HE8wOQiSflPbjgZW F8FwPa/g/sBMu9k1QZoxn2j7yaUSkPBV0F12OFR21GXjajPXyAZAvNV1u/61RqVV/ei0 uoON/hUAIexX8PI5887JXpyQzXIyWidDmLP/qf1UZYuJEv7tMJ6E4BQWIJSgVl3VhW1O UucBaJsxG8bECtfqdPBeFf6Xv0NzBWl+T9cMkMR8Jr5J/lswuC5NknZ+T4aUZR4lIbkZ iSEQ== X-Gm-Message-State: AC+VfDyM4ncBf0cg+LjGqSP6+sGyJk8BRvq1yh00k1teDnmI8okS4yY0 yy/bFtbKEt27xjnrKYB9LNndBqkLetzsBFVXz7xsBQ== X-Google-Smtp-Source: ACHHUZ7E2RMsKG3chkHIwh3O3eHcTbu7+91O6KMSE6QLmRYfiyvby7mx9dp3rODyofRaZHmiAPnIrg== X-Received: by 2002:a05:6a00:a05:b0:63b:5496:7af5 with SMTP id p5-20020a056a000a0500b0063b54967af5mr3546035pfh.1.1683308898862; Fri, 05 May 2023 10:48:18 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH 02/14] gso: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:01 -0700 Message-Id: <20230505174813.133894-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 | 12 ++++++------ lib/gso/gso_tcp4.c | 8 ++++---- lib/gso/gso_tunnel_tcp4.c | 12 ++++++------ lib/gso/gso_tunnel_udp4.c | 18 +++++++++--------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/gso/gso_common.h b/lib/gso/gso_common.h index 9456d596d3c5..4100765f2355 100644 --- a/lib/gso/gso_common.h +++ b/lib/gso/gso_common.h @@ -52,8 +52,8 @@ update_udp_header(struct rte_mbuf *pkt, uint16_t udp_offset) { struct rte_udp_hdr *udp_hdr; - udp_hdr = (struct rte_udp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - udp_offset); + udp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *, + udp_offset); udp_hdr->dgram_len = rte_cpu_to_be_16(pkt->pkt_len - udp_offset); } @@ -77,8 +77,8 @@ update_tcp_header(struct rte_mbuf *pkt, uint16_t l4_offset, uint32_t sent_seq, { struct rte_tcp_hdr *tcp_hdr; - tcp_hdr = (struct rte_tcp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l4_offset); + tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *, + l4_offset); tcp_hdr->sent_seq = rte_cpu_to_be_32(sent_seq); if (likely(non_tail)) tcp_hdr->tcp_flags &= (~(TCP_HDR_PSH_MASK | @@ -104,8 +104,8 @@ update_ipv4_header(struct rte_mbuf *pkt, uint16_t l3_offset, uint16_t id) { struct rte_ipv4_hdr *ipv4_hdr; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - l3_offset); ipv4_hdr->packet_id = rte_cpu_to_be_16(id); } diff --git a/lib/gso/gso_tcp4.c b/lib/gso/gso_tcp4.c index d31feaff95cd..e2ae4aaf6c5a 100644 --- a/lib/gso/gso_tcp4.c +++ b/lib/gso/gso_tcp4.c @@ -16,8 +16,8 @@ update_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, uint16_t l3_offset = pkt->l2_len; uint16_t l4_offset = l3_offset + pkt->l3_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); id = rte_be_to_cpu_16(ipv4_hdr->packet_id); sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); @@ -46,8 +46,8 @@ gso_tcp4_segment(struct rte_mbuf *pkt, int ret; /* Don't process the fragmented packet */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); frag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset); if (unlikely(IS_FRAGMENTED(frag_off))) { return 0; diff --git a/lib/gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c index 1a7ef30ddebf..3a9159774b27 100644 --- a/lib/gso/gso_tunnel_tcp4.c +++ b/lib/gso/gso_tunnel_tcp4.c @@ -23,13 +23,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, tcp_offset = inner_ipv4_offset + pkt->l3_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); @@ -65,8 +65,8 @@ gso_tunnel_tcp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. diff --git a/lib/gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c index 1fc7a8dbc5aa..4fb275484ca8 100644 --- a/lib/gso/gso_tunnel_udp4.c +++ b/lib/gso/gso_tunnel_udp4.c @@ -22,13 +22,13 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, inner_ipv4_offset = outer_udp_offset + pkt->l2_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tail_idx = nb_segs - 1; @@ -42,9 +42,9 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, * * Set IP fragment offset for inner IP header. */ - ipv4_hdr = (struct rte_ipv4_hdr *) - (rte_pktmbuf_mtod(segs[i], char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(segs[i], + struct rte_ipv4_hdr *, + inner_ipv4_offset); is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0; ipv4_hdr->fragment_offset = rte_cpu_to_be_16(frag_offset | is_mf); @@ -67,8 +67,8 @@ gso_tunnel_udp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. From patchwork Fri May 5 17:48: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: 126706 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 CBA1B42A49; Fri, 5 May 2023 19:48:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92D1142D3E; Fri, 5 May 2023 19:48:22 +0200 (CEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mails.dpdk.org (Postfix) with ESMTP id 1803742D30 for ; Fri, 5 May 2023 19:48:21 +0200 (CEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-52c62a71541so1459386a12.3 for ; Fri, 05 May 2023 10:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308900; x=1685900900; 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=Wl7V025PblxpkCV4EaUhWjwG/0+zMD/aETzxvwBS+6YU4WDtmxwQ4SkCGt4Hvv1f9B rMtbOMG85VNmjgqYiPxqfe6xFY4P46xNgYDgdJWhzPgZCHJ4fJu4bBetB7ylMGp4zrJm w/II+1q0mIbdZonxhQAkF1dlWX9MWezk6yPkPrs4zL9B5IgHhLfDwRJj8zvAbteRIZ/j A5OpUD+EURbOdqiXhx89cBjD8e6bJpUae80dRjriqkHNeFnG+aXeaOTx4v8uOz4gHrNG yt49jRdnbXIuH/YP9KK37HgHwfSFzSS97SAe1Q7Oh0nDuW/eVocB5PzdwOYDZlxgbYKl oK6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308900; x=1685900900; 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=cxYMVD3QwJLiQw/DTdpi1Wfg0WmPUoxuLGm3lwv5AYG9oGyn3vcBwLSbgZRxJaNFru gqiYYKG/0daTwsQwgu4UOGOnaiGHJaBlGjaRULY3Ix8ghHARMJS7TSDzL+pb6qOzw8tk rSs6/1OZ/eYAGBNbfXh5Jnef69/hyttxBwlgoc5te+X3sdm8ZWTWv7BEro/s2o+BQ/oc wghkydj3Z/GGFLbjfAWgnXonwRyfy7XqZGt/6V8k6aAgwyidUU+8Bv4UfBm0DZEI5EK7 zRrY8JIDY7Iehij2Em4/6BWN8BFWrjeRRRcEs3Q6PSU5kuE/7wB950ryeACpVH3xm47P UK0w== X-Gm-Message-State: AC+VfDwe/v1fFiNFxeBygI3f8zlHPyFW+xuHCMfDC6dvse4W5nxWEtd4 qm2XhgOCsDfYp93xCvNHr6TOufAp7+VAd+FjusHL1g== X-Google-Smtp-Source: ACHHUZ6ZnANwVE0zEVYcLIh3YQU1EsQSMRdaY6uhTP+sMTNh48GtYCxTkqrFM4QWk40BAlPoUbnrRA== X-Received: by 2002:a05:6a20:3d1b:b0:ef:85a6:464b with SMTP id y27-20020a056a203d1b00b000ef85a6464bmr3102709pzi.14.1683308900068; Fri, 05 May 2023 10:48:20 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang Subject: [PATCH 03/14] testpmd: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:02 -0700 Message-Id: <20230505174813.133894-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48: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: 126707 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 7022E42A49; Fri, 5 May 2023 19:48:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9618242D44; Fri, 5 May 2023 19:48:23 +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 BF23F42D3C for ; Fri, 5 May 2023 19:48:21 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-64115eef620so21341940b3a.1 for ; Fri, 05 May 2023 10:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308901; x=1685900901; 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=L81AMxEdco4V829VZuJDkXKn++gij/EfI8CQq6w8ezE=; b=FAqdLuoCrzT8nk6UWPO+3hkmw6BM7UQKWCk8R06g/VznpsNicK2xliX6Nv6KWRTHMK kg5IpMTCp+PL5vSykgiIbyTsVfwN+Bhnm4eKfTS1SeScjZXRgNM51khm9d6m4xlsGS3K teic9/EH/S0mNZJsgGB/N9fpg4eghZTLLHMDfjhV/RZif1XcypRwwfIz4tDpGmdhcOCP XUDoSlQYnzdX83G2dh2DlJ+sLatVe+YEKknXeIC/slHPbWo8MnLqJsPmVVkA7dJkavJU tyX4PLe85gkgq3HBy3ZCQu5BJqo3Xg+jifIOI0iT9TO+SKFuWGjKBrB0GgKxaSbVZ+nY elIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308901; x=1685900901; 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=L81AMxEdco4V829VZuJDkXKn++gij/EfI8CQq6w8ezE=; b=MP0GFAQIBpH7VawNrx8i35XjmihMXc5ZyCBzk+v5CZ3qlm/nI9zU7INsHYQHceAn6O MkwmiV36+5B+kUx9URpeqMIqs2ouZJEBAcxWfKAr1jLLyaxLfwd6SYbyOjewo6i+hsKn e72JhpD2VTYhgJRtXzkZ5J8Jm+fImDNLxLbZkpM8m8tSPhWenFeDf9g/FUAFULiTtVoa JiBMi+Zvf7eU/1SagUJH+H2iPUCVwvIxZtmWAsMSJBg+aAMupvZrTvYIR9olrMSWqzMC O1ac9RgO7v8uwtpvLqBbj9GEcFe4Bq/Pt5tIRtPjBDr32++FbYcriSueeLtVLt8pwY4Q JgJQ== X-Gm-Message-State: AC+VfDzrHpGBkKlOypWU4SVeu5CO4qJhRcx6U3XGJ0zKBXrh23UHOt8A 4BuNKLfUZvs9sWJh4n+3cF0QkrIuOiEr8I3K8Bu1Vw== X-Google-Smtp-Source: ACHHUZ6B0KxhUYx5yxxpbCk6GJgxm8vsGo1hxAtWHv4ww0NopvQzLLX0HZi9qz9QJiBqpQkUYyZjNg== X-Received: by 2002:a05:6a00:3698:b0:643:6fd8:ea7a with SMTP id dw24-20020a056a00369800b006436fd8ea7amr7967412pfb.16.1683308901035; Fri, 05 May 2023 10:48:21 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:20 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH 04/14] test: cryptodev use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:03 -0700 Message-Id: <20230505174813.133894-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 genertged by cocci/mtod-offset.cocci. 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..2eebeaac9ef4 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 == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); 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 == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); 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 == 0 ? plaintext_pad_len : tdata->digest.offset_bytes)); 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 == 0 ? plaintext_pad_len : tdata->digest_enc.offset)); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); From patchwork Fri May 5 17:48:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126708 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 BBD1842A49; Fri, 5 May 2023 19:48:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB45C42D13; Fri, 5 May 2023 19:48:24 +0200 (CEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mails.dpdk.org (Postfix) with ESMTP id C3F3A42D40 for ; Fri, 5 May 2023 19:48:22 +0200 (CEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-52c62a71541so1459403a12.3 for ; Fri, 05 May 2023 10:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308902; x=1685900902; 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=L9SwaPV9q+mvhqLLqRd5j8QFudid4e+1slA/27Rk/LI=; b=IrVtLVasGuwqhx9YPgJiEH0VGhaIwKdy78JkdlS2NXJgdnPOkst3U7OEkKW4VPjQOe zeTuZECJROFR1lDKLZvQH1NZOC1RNwZrFQqjCjKx74jkYnE82VnZEX00ET29Rj9gDprp qQQ8w2dU/QYRXzInLlo/6rqc9kfgzBK7gGybiH/4spE/KQe2yohRep9THl1WxBLL14I5 UqwHJ3J0En0ePdlcbJBs9G6YN/uf2DRuxCJL2h7hre96g5P04gD6SMBemvYFdM+hCZOl +QSJrIOdVSapS12vi55ebar2xkJei4xbDMLj76jVkBWhuMC50KB7Kn/mXUqUjBpNutDJ XMWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308902; x=1685900902; 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=L9SwaPV9q+mvhqLLqRd5j8QFudid4e+1slA/27Rk/LI=; b=XOAN5WomaKz5BhT6enkOLovVdkNZRoIlminXLgeJGwLIHxpSpknsMutobkdDlNnzEq ff+BngdtGASeAj9JMli1yRBe6IMZVvnhHqYj+zJi/sJ9i09/c5Hi4FrIikVDg4pV8lbW Nq9eDYtCg7pbDeKW/FQ4Yg48TvWgLlTDLNsQMDN730wTcEYVx8S3Btg4Z7ffuCxTA60T 2FZ/gJH/n169gvPQCSHAvP1y5uRiotl/PTX1wi1gSgUsmm2o+EUbBbHrrObsvQNSYYiM JmznRMYW7FzV3QHxXokqkiDG9X00JxYv5JdT1mYqi6jsUzmQCHWrRcl7wNDVW13j542C hchQ== X-Gm-Message-State: AC+VfDzOvU0DXEn2CO0x6xi7js1//0nFzeKlDBc9rCP+VdcQ3/naKY91 I7ruIEdnDEyBmBg44rgEzxW9nEXbLpSwqh4D3wOYng== X-Google-Smtp-Source: ACHHUZ7+wbZ/Hh4ifc42kVobxYp6VmcId+AecSt7Q7QNS12RWpZ33JL7w011sKsLjcgZ8uxbKeH6bA== X-Received: by 2002:a05:6a20:1593:b0:f0:1d03:5fe7 with SMTP id h19-20020a056a20159300b000f01d035fe7mr3056660pzj.38.1683308902062; Fri, 05 May 2023 10:48:22 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang , Kirill Rybalchenko Subject: [PATCH 05/14] examples: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:04 -0700 Message-Id: <20230505174813.133894-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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..981b449710a7 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -410,8 +410,8 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, ipdata_offset = sizeof(struct rte_ether_hdr); - ip_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) + - ipdata_offset); + ip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, + ipdata_offset); ipdata_offset += (ip_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) * RTE_IPV4_IHL_MULTIPLIER; @@ -479,8 +479,9 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, op->sym->auth.digest.data = (uint8_t *)rte_pktmbuf_append(m, cparams->digest_length); } else { - op->sym->auth.digest.data = rte_pktmbuf_mtod(m, - uint8_t *) + ipdata_offset + data_len; + op->sym->auth.digest.data = rte_pktmbuf_mtod_offset(m, + uint8_t *, + ipdata_offset + data_len); } op->sym->auth.digest.phys_addr = rte_pktmbuf_iova_offset(m, @@ -540,8 +541,9 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, op->sym->aead.digest.data = (uint8_t *)rte_pktmbuf_append(m, cparams->digest_length); } else { - op->sym->aead.digest.data = rte_pktmbuf_mtod(m, - uint8_t *) + ipdata_offset + data_len; + op->sym->aead.digest.data = rte_pktmbuf_mtod_offset(m, + uint8_t *, + ipdata_offset + data_len); } op->sym->aead.digest.phys_addr = rte_pktmbuf_iova_offset(m, @@ -631,7 +633,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, struct rte_ipv4_hdr *ip_hdr; uint32_t ipdata_offset = sizeof(struct rte_ether_hdr); - ip_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(m, char *) + + ip_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, ipdata_offset); dst_port = l2fwd_dst_ports[portid]; diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da64dfee..2535d848a1e9 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -354,8 +354,8 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) { struct ptp_header *ptp_hdr; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(ptp_data->m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(ptp_data->m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); ptp_data->seqID_SYNC = rte_be_to_cpu_16(ptp_hdr->seq_id); if (ptp_data->ptpset == 0) { @@ -397,15 +397,15 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) int ret; eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); if (memcmp(&ptp_data->master_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) != 0) return; ptp_data->seqID_FOLLOWUP = rte_be_to_cpu_16(ptp_hdr->seq_id); - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, sizeof(struct rte_ether_hdr)); origin_tstamp = &ptp_msg->follow_up.precise_origin_tstamp; @@ -537,8 +537,8 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) struct tstamp *rx_tstamp; uint16_t seq_id; - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + - sizeof(struct rte_ether_hdr)); + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, + sizeof(struct rte_ether_hdr)); seq_id = rte_be_to_cpu_16(ptp_msg->delay_resp.hdr.seq_id); if (memcmp(&ptp_data->client_clock_id, &ptp_msg->delay_resp.req_port_id.clock_id, @@ -585,8 +585,8 @@ parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) { if (eth_type == PTP_PROTOCOL) { ptp_data.m = m; ptp_data.portid = portid; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); switch (ptp_hdr->msg_type) { case SYNC: From patchwork Fri May 5 17:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126709 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 D347C42A49; Fri, 5 May 2023 19:49:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A47542D35; Fri, 5 May 2023 19:48:26 +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 CF7BD42D47 for ; Fri, 5 May 2023 19:48:23 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6434e263962so1631995b3a.2 for ; Fri, 05 May 2023 10:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308903; x=1685900903; 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=m1xdRI4YnzaxwE/UjmHxTlgeTvrs0tnL1wva0sN/quz5n2FC4V8LdVi9UOBSzNzIz9 lQOEFO2o+HWhY9RFBKHMTcCfYZPEY1xv8ffg1UbleCquCB5Re83jXZEv569ChkPXMoOz 6lU/0CJcYF2iQcD72yoiqt5Nle9VqzMpE2PwonKY5XzG6OvsaIzwt98WDWp/mc3pD7ly /CHFFHkCR/Q60Kp8Evun0yjbPWLXXDOSd4aijm85wQRSj5LdhwLVt/ubxhVviOIMOOjL KhspmtBqMsXxhCqHXnTGJCjiBE4iwEVgrLqcCr+Fj5fcuYcdCuoUKtHMDI+jFakYDYrU Im6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308903; x=1685900903; 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=Nw11BDVltwegB4a5MV3hV7KfF9SiMC0H8jYTuNQn1qOItwkPmd/PcoCT4Gm/etWVAu pVFoaZMZfacj9kPRRT2aVwZXHzNfYSE2r4DIte1Cpw/EydRspov+ObLQp3sK4CqsUnMk HwDEzjlZ6LT9Vl4jfF9qS7ihQlyeAHfRFFFzFHy9KnL5h40dFt99je+ylI6r2uoWU6vn TtHexbUshHWyX5958dew0lnYqLc9EJHQ9gU2j0bBeG2QRRXAhrXjCGP4INQQmi++36sk cZfzZNK3EW96ZKm8NkOFeWCaVAsWAu8VD8FO+i4c/G3jK/dti3IBNjKjYFSRtjOPxmRm vJ/Q== X-Gm-Message-State: AC+VfDwUx2OdEqfoHdOpxEmPqGHFVn88UjPz7/VSCMWRBjQs/z31k0AD BjKTBRBeiMaZf3XXYDtWsPsbKx4ZD4dzdKVvLUy1sA== X-Google-Smtp-Source: ACHHUZ76rsn/5YJBe/r36K3UP9oUbOQxuH3CwEk80UORIqGFfP1TKZgbona80ugDAlfn6YsxZo9bdg== X-Received: by 2002:a05:6a00:17a5:b0:63b:1708:10aa with SMTP id s37-20020a056a0017a500b0063b170810aamr3540837pfg.34.1683308903084; Fri, 05 May 2023 10:48:23 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:22 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 06/14] net/tap: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:05 -0700 Message-Id: <20230505174813.133894-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126710 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 126DB42A49; Fri, 5 May 2023 19:49:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4970D42D5C; Fri, 5 May 2023 19:48:27 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 67DCF42D4B for ; Fri, 5 May 2023 19:48:25 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-643a1656b79so763835b3a.3 for ; Fri, 05 May 2023 10:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308904; x=1685900904; 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=tB0yBAZF1F4TQ+br375LdFfj7TlXtW6aZGw/PgHkuyXUBU3tXsut83Q6j1qAYxrvBx ZeuQrMZKV6DAff+jvLi5toIsAWLO0qgNBGFxJgkqZKi18ZC7DKVOVGjK7DU7DraBYH9/ QuWrWytk6DrZxXbyTUwAvc1Ty1LH/b3KeTnV39nz56TTyzsigYxr7hsSWr2DlWBZJvko O7DfKkp2dTejLJGT3MbtQFYoIFBtbqMYPvP1NAOEyhAkdAerUwmDvskE/fTS6U5hfjC4 m8qHFVXYZX+1sQf6nM43h1NCx9Z9h0flqmAE9W2Yq4PEygLOiWIgABiZyriP80GDOify rfnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308904; x=1685900904; 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=XR4dGnw6BhtpidnkReKmsXDyVgF57DbsZE+IBf7AowS3nv/88dHz4Cb+I1GZzyPBfS QnIVsUMhwTGwgXERNMcW9fyru4dscCMOip1faxz3yyJxTWTmmfQB+usnLh238vjy/V52 +C7H8Gcfg5f5wZ1fj2IpDWL8ysMd42HPNPgPyGIXMmJ6Pdw9DxXFjZlRh7OEggXLpoj7 piYICKKCjBc+eExj4sdpFWCkj7n+rYeeRgcqMlrQwIN11J7iAxI7Gy47Tz5RVdXtcipy eoaXPyCOJ4NeEd1VXtJmkvlCgcqLUFTFoPUX4RcWVJtzZdUpvOI9pzMOB0o+keqEty1u gvYg== X-Gm-Message-State: AC+VfDwTs4J99KKrEzVRga1abqT9aX2Np72/Iv1/emKu2SF327+w5TYU l3Ks33HOi0wG9ZKbnfKKQoWZ6M+mktw25AuducJc1w== X-Google-Smtp-Source: ACHHUZ4tuaX/MsRF8fkiVCn6xq4nXydCchwIpjwPmTbTPBo3tvu1b30BIzFwQqh4iT0N8ziXicVKCg== X-Received: by 2002:a05:6a00:179b:b0:63b:62d1:d868 with SMTP id s27-20020a056a00179b00b0063b62d1d868mr3573558pfg.8.1683308904417; Fri, 05 May 2023 10:48:24 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:23 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 07/14] net/nfp: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:06 -0700 Message-Id: <20230505174813.133894-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 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 Fri May 5 17:48:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126711 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 E42F642A49; Fri, 5 May 2023 19:49:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A73242D5E; Fri, 5 May 2023 19:48:28 +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 74A5D42D56 for ; Fri, 5 May 2023 19:48:26 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6439df6c268so798483b3a.0 for ; Fri, 05 May 2023 10:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308906; x=1685900906; 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=QyAcb+/FNo42NhkMF4xf2e96mfx1+o69kny/GCR6mh6D0sgpHK0w6HnLZXewx6vO7/ N78XCMdR+EZl9CFVqUTQd57IsoCA0lAf13poMCdUTHrqkW6Qbkh5P7umNM7yJW/f73gr w6eZGjWcjRj00kwHSEs5j6q9Dh2blNuU8QN7w7dz9G6ycDZBKqIlqGDN7ob+mYSaQrqX LHYsjIuKaXKYbmZc3kGNQh20iCqwRDLnCqWzceHJKYgYjLfMl5VsA9U/xN3Ov5/eDNaf fg3Cy95ujYFLV1mbGwAngZbd9GMPJ76uqWLsjgcywg1wzlptH78g6omrDpUehggzxtQz +yBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308906; x=1685900906; 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=Z22fBjG+vPQtPIMmJeHSr58wpVrxOc+dTOzeSh3As9kTE8rwD9jaENp61gH6RlkUr5 deULU5XUtt28qDDFqKPXEs4fLO3SxXWdsQv84gwrjMDS4Zmwchm7vWxvZ3Zr3YeylME6 V09VmWEdFcABFNE0Q7KtUnTyluvQ5tpjqrgpHG75i7s1UyZczcdHTcoBQ7iJqm85Dxfw UhXyWTYJIdDWG3+A+U4s4qKPDK5vPDQ/K1db0g/GuOd0QddAv5nTSEgZ6ys65wvQfFpJ HrD72dG/8JRssu6hoIykxEDm68I62IzIE+HfV9QEqMI4kEum6upDmjSNd/N9Yq6se6pF hFVA== X-Gm-Message-State: AC+VfDwUm89dYruc9lt07avQ+H0YV6ss0mRY8reSiIjqT2tmnudVRW7J pfN4IVcaqSpKAXYxUsgEN6KPw7H42/IN2DygVSrYkA== X-Google-Smtp-Source: ACHHUZ7sc9C3ef0c+8g3aHFxqV0hL+RMF9wgwXDxemrpw7Vh/BzrgyxTtUts5xNrh3PKkfithjsh3w== X-Received: by 2002:a05:6a00:10d2:b0:643:96bc:b292 with SMTP id d18-20020a056a0010d200b0064396bcb292mr3220169pfu.5.1683308905707; Fri, 05 May 2023 10:48:25 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji , Pablo de Lara Subject: [PATCH 08/14] crypto/ipsec_mb: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:07 -0700 Message-Id: <20230505174813.133894-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 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 Fri May 5 17:48:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126712 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 A90E442A49; Fri, 5 May 2023 19:49:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6604342D64; Fri, 5 May 2023 19:48:29 +0200 (CEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id B686E42D5E for ; Fri, 5 May 2023 19:48:27 +0200 (CEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-643465067d1so1639854b3a.0 for ; Fri, 05 May 2023 10:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308907; x=1685900907; 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=sVdSVc9Lr1RKk3G/PUZuBzpBmhzRs76cvI38GWqp5OSCtT9E9hjUdovOpI6GShpJ2O 0mQcI4wcRbiTh71u2Qn/QvI4cbXrDqbSmyGIokbSiGGTALUDOQqjyxtVqr9uiyMpCMkK 5Wtf+yf60jaTI+b/8blY5eY0LlvAsKRAMUH8uf7Q3TOzUiz+BSxFcG/Lz1U9pxvVdM44 4HXXGvWYTjYTC64/UIrnH2ytDZueQFM0qBOma/Yh0atI49qwXYGwpl4HGa6pIGnSzgSC sMxa9VwDqSLp8Jau8fM8iCUCv18wfsZW0s50YMvpuojiDMjL5DwUtjBKNQS82QIDv9I8 xvzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308907; x=1685900907; 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=DSz29sfmr2Umfk9Ts1rr4X+r180QsPDdrnNf1pjD3DCnh5lr61sgeh4LfsJhAmMobE g5k+ECWoPbWh3qkBO/X4b5D1AOrbBfHDcvHFGXM1DGoLJ1T5K8zoN/nIJqSi4jH19x/0 9puzR+66iK64JDmM38Qgg3TeRAs35urUkZpDK2wMD21SJEqBCflJFnW0JaZIhsK6NRKQ 05uT7ASqkJEoe+To51kLDR/ZnnT2m+SF81LCHtetQKcQqYivAxbqNScWJrGowVFuY9Tw d5oIeJp+t2HuWsQa3kDjEQtRT0t7+uVoYRu4iccHUYB4kNVwcQ4lQsZXqqRRlnCgXAtb 8q9g== X-Gm-Message-State: AC+VfDwU5THDxJzTP1rv2zjbGZPWfSBnOEjsiO9a3y8E3evNNui9Ufsz baTrG9aEERj/77p0wmCOTGn4QGxhZ1X4bDHBCyIzQg== X-Google-Smtp-Source: ACHHUZ4vs1C6s1/N8QI0NG/01HtKe3ebOOIqQNnK8Lf2FG/4DfQcKOqvWetb2aVnb5XnBrwpOsM+7Q== X-Received: by 2002:a05:6a21:168f:b0:ef:7d7b:433a with SMTP id np15-20020a056a21168f00b000ef7d7b433amr2284321pzb.47.1683308906720; Fri, 05 May 2023 10:48:26 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:26 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji Subject: [PATCH 09/14] crypto/qat: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:08 -0700 Message-Id: <20230505174813.133894-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126713 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 4515E42A49; Fri, 5 May 2023 19:49:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 970E542D6C; Fri, 5 May 2023 19:48:30 +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 95B4442D50 for ; Fri, 5 May 2023 19:48:28 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6434e263962so1632023b3a.2 for ; Fri, 05 May 2023 10:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308908; x=1685900908; 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=JvXhW5pyax5Vle/weAVnubeLfywciAgX4EA5hAUEwnW6178ekgO1qcBPLzR/7IZKBb 42ij7mdlkfQq/2qFaM5A2v9SirFpCV60Ew182Zb2PqDf7Dx8WhABNnMbEZI1SeSoRBtc fQd6jU6xOLeQ98DT19/vQbnUQJLRJnXECa/o3Dr7lh0HlXTv1WO1zlTbPeddEJm53oWB FQ7+scfKksG8kFEPc6etWhjlpfRT90q+zDn0Buw4kCTxaf1abiNpEevhcmcZUtS5zKBU fkulhnVG9LCF1wg8LnTa8nMX9fe4aUG4MW0qQZ7PkQGrDtbgX7BfpsWR75vKeWvZHx9h EvVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308908; x=1685900908; 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=gYF2NGFrkVeZRyM3tlRVSYF6uschiMqsgPly0HwPGfl5qjCgcXTFHrNkxF4LmeETnt kMvTIdfZSqrOzfl0W6nhpaY3vxpKckt1mHlNO3/8/WPOOm70eiQbOpcpJ3hjXlPJh0X2 n/CjR6bsoROZOujb4FlOv+LJ2a2/IgUSFfB3on9+yLScA3mUb0lD+iyZmhZxEJpUvGp3 9F7YEG4A6mk37CcKYvDG66rkdLnnmi3v9NokBqNH1CBrP3UimuY3rESeBPZkj+luHNE0 /R3iexc9kAlztTs0dIS+XLBNwJPyVMn5frVDTT2A5NL2JsI5NPGuZ2utPGwZ91mpB04L uxEw== X-Gm-Message-State: AC+VfDxntuDDdoYvMnKHxFTk6uT70auXsEOOC2rjnMYi9IIZqRIAxsi9 q/mzNy4mdS2BNTlQxQWWdhutb3jZJxsEdPT/xj3qAA== X-Google-Smtp-Source: ACHHUZ6q7Gl2QE0eXKb9J+lpMY4oJ5fr1hLBJSrUCQCFqmVF89hgKgssK3w8DXz8XFvMkHR3iZo0RQ== X-Received: by 2002:a05:6a00:803:b0:63d:3ae1:e3ba with SMTP id m3-20020a056a00080300b0063d3ae1e3bamr3411447pfk.6.1683308907918; Fri, 05 May 2023 10:48:27 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:27 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj Subject: [PATCH 10/14] crypto/cnxk: use rte_ptkmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:09 -0700 Message-Id: <20230505174813.133894-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126714 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 68ADC42A49; Fri, 5 May 2023 19:49:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1970642D84; Fri, 5 May 2023 19:48:32 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id EEDDC42D69 for ; Fri, 5 May 2023 19:48:29 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-64389a44895so1797990b3a.1 for ; Fri, 05 May 2023 10:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308909; x=1685900909; 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=DLoTBf8X9Pp0Zi5pqxDkGBdz9KaBqJP776V70MvTpsJdgk7sAmkrgkaSEk0IJ4N6NF eqX8c52ikydaTk9uMKrk65/jff9boxiSsJZgGIdMFXkZezfoxZs/dMlrcHmqF5oVHf6D O+90EY8VqOIJDk4UitXvfkVVOStUMGIKtzX0Y1xdS82fwPscrEngVUg42aJsKW0KOLvd lcSTEoIkErAyE93N6CqaJ+vRVGBYO9phlvtgrYuflqb+ILU3Jncial3GrBR7DoLFht89 nIfkV8tTPOZffpK594Psskh3hXaYAmOuocYnP+imEWNTFImhhyT+YkOsahtdlJFEOmmH zmyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308909; x=1685900909; 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=Zok9ZCTLqTUB5IeST/AmINN9s53kFsbzand1rRqOQmiGkd4SraBntVIgP43NUqwkaS K6E2pFvPIcNlpkpBgLMTzykPWsJlWbKbZZwz2a7X5ZcHIa0BX6Ep9I11DJ/ZMswF9bhV q/GbuCU1p1wGv6swRjtc7VoJgiihrl3p6WjVn07vvb8YU7BxdsWV2HZHn9/pZAWcns2n EFMJ9rYNCeFdMiLcERHGz8I0MomGl05cUtD1/EOgN4bB3qmQcoohZt8Npwd37uV2Z3RW PYhUqU5YqROfQoZNR0F1oux7baOlJHSd6xo1I0rpzIE4ZWFuMmLCqf+gNSWmmlt7W8pT 0e7Q== X-Gm-Message-State: AC+VfDzb7xUVPC9iakdd+EJ8N7kznrNA7r8F2fBzx0M8Yy3Und7D5Bow mLfiNvK1oo9c7M9E/UiACtF0LA/lok+O/+vTruDxPw== X-Google-Smtp-Source: ACHHUZ7taolrsvIRpyXuyx241H8cA86vZ85YwX70SsATZ6dr/u5Mfr/wlg0GxzC8jdQ6iRtvyrt1Nw== X-Received: by 2002:a05:6a20:1581:b0:f9:1f3e:cccb with SMTP id h1-20020a056a20158100b000f91f3ecccbmr3199247pzj.10.1683308908910; Fri, 05 May 2023 10:48:28 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph Subject: [PATCH 11/14] common/cpt: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:10 -0700 Message-Id: <20230505174813.133894-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126715 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 7319242A49; Fri, 5 May 2023 19:49:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2364442D8A; Fri, 5 May 2023 19:48:33 +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 1B27E42D77 for ; Fri, 5 May 2023 19:48:31 +0200 (CEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6436e075166so1627527b3a.0 for ; Fri, 05 May 2023 10:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308910; x=1685900910; 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=x2nNM1JCLTJ+wbZkYbta5z5lkosAfnUl9S9jqvJZeqFSkljkMkgpY0W6ty/a6nAdTQ JAXv5CG6KX7TQtW5pWsfnt/dn0WUSTI/GsOa6m+n2xTCYA5amplMtgM2My1KLZDDDLWV JOhTll5z4ct0yYznfA7QvFes0E0APSDCpXCrcsTO6HX9Ct8X0hBSPyjmB1maGG5v/PDY PfTBTkMeDvEXOVotbZgyNdEKrDGo/numVpQ0lbCelR+DZNc9wUTJjeyojuzlxA3MQbZQ DgWVmAwOFV5X5KbDtNO1U9ij7YuuT5uHQAqjPzQ3ig/Gzt401pjMELn/iSAgh5qxd+XA 5Jkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308910; x=1685900910; 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=hBKm4TRU4NPC6EupeVYP4/JY8JL1jiNqKnc+2IKS65ZJI6fh9fsRMcfJ+89LTWmiip X2f4Og7qN4ekyHr+sD6z/yVeQdI99csIL6511I/A+WoorT8ZbJ6vRs0gV8Yc146bB3OH 8Xn/7b5V2DKTj9A/k2qqFwpXw5wxUPcsJGYEF0HvxQ9c+8E3/SLQ3YH0DgsmTwaMVOEF Jwj5bl0qLTdkFgKegGaxVk9VTPaATtlJBnXGM2EwWtNxOqI9WcK0NOOG2CpgZxYNG5lv aSPJZpTFmo56x1fon1X1LEp+Boackvcc4WTb7mDcqu1NfHC4/COQnEHRuDRxpHUdJ611 kfvQ== X-Gm-Message-State: AC+VfDwaOMvYyVb0z71NxxFSa9xRw0D9PsOy4TiRfp0e7f7A5SL/PnjV KCfWPN9ZpRUWDc8gAJq7mqQ3pGLzyrvtrz+ZkjFCvg== X-Google-Smtp-Source: ACHHUZ6dNkrGtHzdtKi77hRif8KH0KNdmCFqIW95X9p1UpL4vLl5CxtnNMLbEkhIQaywB5Ze9YO2jg== X-Received: by 2002:a05:6a00:198d:b0:63f:1600:e711 with SMTP id d13-20020a056a00198d00b0063f1600e711mr3036191pfl.29.1683308910022; Fri, 05 May 2023 10:48:30 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal Subject: [PATCH 12/14] crypto/caam_jr: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:11 -0700 Message-Id: <20230505174813.133894-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Acked-by: Hemant Agrawal --- 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 Fri May 5 17:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126716 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 157CA42A49; Fri, 5 May 2023 19:49:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22D4142D93; Fri, 5 May 2023 19:48:34 +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 370C042D42 for ; Fri, 5 May 2023 19:48:32 +0200 (CEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6439e6f5a33so706775b3a.2 for ; Fri, 05 May 2023 10:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308911; x=1685900911; 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=wIJ799UPVG3MT5cjsd2jv+kxefAj7BOC0F1Dy3/brc+Y2z/pDPAVblZD5Bj4RrPWqk FDU7ytx+tkBU3sZF7QhlxaFpreDRBgkjZZ1K4Ffo16d2V64nLjkayspZhYIcsVsX2K8v /D7c65SrJme96e5WKHbu/i9Zee/8Rc7vLPujWex+ZvLizrNA43cOq4iIlK2SPmYD73Yc YEh8d64arUvUNnoKiBSEDhv/9+M14vVHSsTw0jMSH6icXzc8/lsMSfFevu+Kln7vh8l4 Rm1xlPmkIhHJ/cKcyRZstRoLVBWOT2Rt24gmkEsvMXJRqv679tG4YOfuzWZD/r34ZFgH /jBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308911; x=1685900911; 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=LZjHBau9mfwrToWbxeTtlNrI5pDtFE1YvtyMpmuTGqudwpKU6v0oWC+/7giEdNr4tG rZWWXcSwyJ+AkXqzHpB5V6u3a1dePp2Vg1F4t4vl5B7LxX5+Z8SCdT0IfDoJ56oddqLG Xy4krDTx5uGCuBsQ4ImoquaS94qAAA8W9z1E6CQm3c2C9E0JTnEYGs046ZhA+3KWFURY qy9x3bVK8ntBaZWq12AvDhyZdnQXBfIAdZxOqJWqAfZZoRQ7XbUZLRBJb42VNNd/McDn 4sqv/h9z6L2e/A/nWIBkFdYbk1ZL4EiHrjq5qHbwzs4u5Rt9rwiZJAeGD1MOGslnghOo BKTA== X-Gm-Message-State: AC+VfDzfB5pAojcUaq4kAmrCOHcf6nOUgUbo3llV05YO3NjC7TxqwIxJ kiSj+fpTCX9Ghz/baWcOIdRrbVGlV4wZ25V/PEPEyw== X-Google-Smtp-Source: ACHHUZ7q6IxAjrJ+5asTpQ1K3018Uw3JJkSlXQsghYUxRZJMBtfbvlXKm1Nx7x7Gu1vcgsPVSEt4yw== X-Received: by 2002:a05:6a00:1898:b0:643:5b68:a306 with SMTP id x24-20020a056a00189800b006435b68a306mr3853624pfh.17.1683308911220; Fri, 05 May 2023 10:48:31 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:30 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 13/14] net/mlx4: use rte_pktmbuf_mtod_offset Date: Fri, 5 May 2023 10:48:12 -0700 Message-Id: <20230505174813.133894-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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 Fri May 5 17:48:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 126717 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 3ECB342A49; Fri, 5 May 2023 19:49:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 257B642D9C; Fri, 5 May 2023 19:48:35 +0200 (CEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 6FC7042D8D for ; Fri, 5 May 2023 19:48:33 +0200 (CEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-64384c6797eso1794400b3a.2 for ; Fri, 05 May 2023 10:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683308912; x=1685900912; 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=O8KMnDEpWQt7pJx3yziS3MkQwwNg28z5GdVlcu4G7VtYjdb395lNKHNR7zfr/Gjknv GFTIlT0JZQkQx6Bzxynn0LLKDNV+U63cC33UnbKAEj5HhcFg5VRhCUANHsxWbhT/HDgs 9D9D4lDezvw5KKRC3iq/QDDPp/4B9i5A226M/swlc62tKIZi1KN7NEZap8jP7USuZiDN zmYC9crHRxj4Foqy6OtemddU6UJBbZ3k6+sqopOhEOidVwYXOBoLaXuZmP0311048Xbs y8QhGBCsiBLZTLC5TB+3ygpAjnzOf9gS9qrQLKXuE/mvhMRZUW7R5MsdEyng5qpIOSFY AdLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683308912; x=1685900912; 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=MbhPN/w0OVBta8mYUQHxqh71T6G3Go6SLm4QibAysc9wGZAtYAHdTJCp/oBTbcuc02 FWG/2Dx+xvebwzWRpN+qClmUpHLDqJE9gy4TBzS7OArFLDDc3AxABIV6/pNGTH9oZqVa C2rAeYzCEHF2usRF9qUgGhKAFP5/wzqRgPybup7apR3nd2dWApwIEgz9TzY60FqlC2my SOkI+ucd3/HGtakdMKu3l00n8fLQ3iyyVB/fzSf/yb3ZZ+0MJ/JBfF5JL1yrGj3FsFem IZAmOnTNa+2vAx3JgD7shLcdey4t7wiS9FrhszKeAQHaWBDorZWuUDmOiAWrJkEkdFf9 HIHA== X-Gm-Message-State: AC+VfDx1gdiJ2qwvnseqPl2hhGmiI98kYjQPBwRa/vCS25fBmnMXSr2r P8KPMwRVTQpxsTc2ugZRRbIY52zGLqunTloIhqqMag== X-Google-Smtp-Source: ACHHUZ6I9EWL2eUAInXPIiFBvNNX6mrxTlwH3yrCHtqyX8HblP2o+UGB5fzu09fFl8HSiiIkGRqQ/A== X-Received: by 2002:a05:6a00:23c3:b0:643:64fb:3b6a with SMTP id g3-20020a056a0023c300b0064364fb3b6amr3412974pfc.13.1683308912428; Fri, 05 May 2023 10:48:32 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a15-20020aa780cf000000b0063799398eb9sm1895707pfn.58.2023.05.05.10.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 10:48:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nicolas Chautru Subject: [PATCH 14/14] baseband/fpga_5gnr: use rte_pktmbu_mtod_offset Date: Fri, 5 May 2023 10:48:13 -0700 Message-Id: <20230505174813.133894-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505174813.133894-1-stephen@networkplumber.org> References: <20230505174813.133894-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,