From patchwork Sat Jul 8 01:57: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: 129387 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 4356242DFC; Sat, 8 Jul 2023 03:57:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC6604114A; Sat, 8 Jul 2023 03:57:24 +0200 (CEST) Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by mails.dpdk.org (Postfix) with ESMTP id C4BCB40A8A for ; Sat, 8 Jul 2023 03:57:22 +0200 (CEST) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6b8decf09e1so2352213a34.0 for ; Fri, 07 Jul 2023 18:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781442; x=1691373442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vObgcPMDzvD/5VxKEhbH2z7+/u+sGbwSbqWVkuVmxZs=; b=omB4hFpJpoydz8FPWHufWc0tyBRatRl+4+2eJunbN6Lp6le8XOvOvvvYVf0+raOjvG hbn/j14vvbRarELKDg/MEDkt8OPOyx61PGClBYnILqvhDmK7ueo2fT02mBxiypCgywmG FUgfnTHEFvP6B+P2RU/LFAMTa07feszIrqe6wvWwXl2oe1be1ktXRxcfLthHBclcAxEf LlAtsttRankVFS+OASfOq95fabNHwsxFa9Z1qdopM6iz6im+1tnzMEkmd/SWWrdk8lPk L6sCPdyR008a7Isr61rkIJo0v67StL9Cu+J81duFiEpKDW6C8B9P6JnV4nP91Q7A7+ZH Fw/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781442; x=1691373442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vObgcPMDzvD/5VxKEhbH2z7+/u+sGbwSbqWVkuVmxZs=; b=icxspRize6OdMcK9LMfkvi/b2SYXQ0tAerlxpDo7Xys0OtQPpey1CbGJUjdeoCbvOT BZghnfuaYQEgUVC+6c13UqsSFtqDMbLJVXckvfCJtlw4M74UNJxvBcpdiQpDvkr2ZeP4 +o5VPRHytQEovQvKGTZNlSV+KH5qJ2j+e4HqIGEyJtf1pwQsJbHNkBxbMD6Do08KIbwd /d8Q40VwyAKhzuosuDKpMznI+wrM6hKXQHlQGcZPQlZJ6d53O4xuw0qtWeexeFytJ+e5 fIiqHJYNa1X+fySEmQWAYKtJTcFMVprTvl9cM2KxJ+FGx/LLam4hppoEZSNKu1s2A2o2 ndtg== X-Gm-Message-State: ABy/qLbabSjRjc4A5s0k/d4FRKA38JOBf4+Rk3XSgMB0IEuw4Gx7ny/g HANfXJKRVBS7+5xREV403QQSdn72ETKyi7aOssGBzrfA X-Google-Smtp-Source: APBJJlEb+y7OZxiifhbmLaOK6vuwHkFtmLmd+Q5SHHAJfHRqV5uaRWhgw7STF2e4z/q30bNHATaTIA== X-Received: by 2002:a05:6870:79e:b0:1b0:22b3:25ff with SMTP id en30-20020a056870079e00b001b022b325ffmr7603997oab.47.1688781441763; Fri, 07 Jul 2023 18:57:21 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v5 01/11] gro: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:08 -0700 Message-Id: <20230708015718.75565-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- lib/gro/gro_tcp.h | 4 ++-- lib/gro/gro_tcp4.c | 4 ++-- lib/gro/gro_tcp6.c | 4 ++-- lib/gro/gro_udp4.c | 4 ++-- lib/gro/gro_vxlan_tcp4.c | 4 ++-- lib/gro/gro_vxlan_udp4.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h index d926c4b8cc71..bbd2f9c16a00 100644 --- a/lib/gro/gro_tcp.h +++ b/lib/gro/gro_tcp.h @@ -150,8 +150,8 @@ check_seq_option(struct gro_tcp_item *item, struct rte_tcp_hdr *tcph_orig; uint16_t len, tcp_hl_orig; - iph_orig = (char *)(rte_pktmbuf_mtod(pkt_orig, char *) + - l2_offset + pkt_orig->l2_len); + iph_orig = rte_pktmbuf_mtod_offset(pkt_orig, char *, + l2_offset + pkt_orig->l2_len); tcph_orig = (struct rte_tcp_hdr *)(iph_orig + pkt_orig->l3_len); tcp_hl_orig = pkt_orig->l4_len; diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index 6645de592b63..d6c0f9182d45 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -223,8 +223,8 @@ update_header(struct gro_tcp_item *item) struct rte_ipv4_hdr *ipv4_hdr; struct rte_mbuf *pkt = item->firstseg; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len); } diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c index 5aa39801e132..6edfb6045cf6 100644 --- a/lib/gro/gro_tcp6.c +++ b/lib/gro/gro_tcp6.c @@ -118,8 +118,8 @@ update_header(struct gro_tcp_item *item) struct rte_ipv6_hdr *ipv6_hdr; struct rte_mbuf *pkt = item->firstseg; - ipv6_hdr = (struct rte_ipv6_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv6_hdr *, + pkt->l2_len); ipv6_hdr->payload_len = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len - pkt->l3_len); } diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index 42596d33b6dc..019e05bcdea5 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -179,8 +179,8 @@ update_header(struct gro_udp4_item *item) struct rte_mbuf *pkt = item->firstseg; uint16_t frag_offset; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - pkt->l2_len); diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index 6ab700192261..2752650389a4 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -263,8 +263,8 @@ update_vxlan_header(struct gro_vxlan_tcp4_item *item) /* Update the outer IPv4 header. */ len = pkt->pkt_len - pkt->outer_l2_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->outer_l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->outer_l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(len); /* Update the outer UDP header. */ diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index b78a7ae89eef..ca8cee270d3d 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -259,8 +259,8 @@ update_vxlan_header(struct gro_vxlan_udp4_item *item) /* Update the outer IPv4 header. */ len = pkt->pkt_len - pkt->outer_l2_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->outer_l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->outer_l2_len); ipv4_hdr->total_length = rte_cpu_to_be_16(len); /* Update the outer UDP header. */ From patchwork Sat Jul 8 01:57: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: 129388 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 662FE42DFC; Sat, 8 Jul 2023 03:57:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EA9042BAC; Sat, 8 Jul 2023 03:57:26 +0200 (CEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id DD5DE40A8A for ; Sat, 8 Jul 2023 03:57:23 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b8b318c5cfso17069925ad.1 for ; Fri, 07 Jul 2023 18:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781443; x=1691373443; 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=JBBc8zBeAQW55C07Hl1ShZznD9LZV1/3U+mjyj9dXDs=; b=ZeXT65do+8Vn3oRwTchkUS2Znuh1FMSheokDVf44dV1G6P9wlQ8N3Rsw7cr5iQbrMo fJuGTLIVsr4v0sxnL34hytO0t8p+nvGEZbBFmgrSI1Lq+KKRiwK1KQ7Rmg7wBWgiXUl5 6R33aaYKupadSPQtLsRy9WLVrEZyoGM9pPdY/zvoWMj+pe2a2KaM7YwuAjR8heKjCS5N rYdEBFsbi/FACYSHRRiR3LfJqf92LS8KA/aaLjf1Z/FKe23B2GwBVJNKZPlUv+b7X04i /UpwNq5l4I+rbeycpYPF0cxUXGg2RbI227WF7VFJVhFURvmcrSRQfzd0So5/bEAbxRjZ A7gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781443; x=1691373443; 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=JBBc8zBeAQW55C07Hl1ShZznD9LZV1/3U+mjyj9dXDs=; b=EVVzuFa9Mw1MfNNR1ww9BeeiwTYr8dF3rOYPZWpUNODrvyB1KXaQEd99zz060X45hM orJABMF83bcmZ4b0du5I2Vacq2ppGYz4Lj4iwIL89+X15nRy35AEbWYEVJ290gNOn9IF oBxH2ibKgmDbcHxfcB0KLLKaUWUGtotdyLb3u8ArEQaMHKC4nxKEMsPhJ7TOtOUTdtCM qelDpJkVDHc2JGg1AA2eFnKVa+rYj22YLBlTw6M4G20P1VuhomoNDbeYEXGb5qRENzS7 QbuRB7bP1yBngjC9FiE8325Nt7XaM5ZyfqP8dl/2af0X7CS10J5tnxCcOOmRD5UYVzIf wKsg== X-Gm-Message-State: ABy/qLZeAwkGXGummrum3gYOq78IP3vCxTb1VzVTXeG4g6Tz/fnzF1n1 bl0d3YL8QAhXb43CW+AYQeW2NKXbLBvd+8wHoTUY2T+9 X-Google-Smtp-Source: APBJJlH3tHq5lv/FWiNgFNaF3cp/JrdT5RoGkv0tpVyGclNr2wf7iiemHBXivalyQ3eNTleBTVmIvQ== X-Received: by 2002:a17:903:447:b0:1b8:a31b:ac85 with SMTP id iw7-20020a170903044700b001b8a31bac85mr5943962plb.41.1688781442586; Fri, 07 Jul 2023 18:57:22 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:22 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v5 02/11] gso: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:09 -0700 Message-Id: <20230708015718.75565-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- lib/gso/gso_common.h | 12 ++++++------ lib/gso/gso_tcp4.c | 8 ++++---- lib/gso/gso_tunnel_tcp4.c | 12 ++++++------ lib/gso/gso_tunnel_udp4.c | 18 +++++++++--------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/gso/gso_common.h b/lib/gso/gso_common.h index 9456d596d3c5..d1c1b73091e2 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 Sat Jul 8 01:57: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: 129389 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 04EFF42DFC; Sat, 8 Jul 2023 03:57:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CF8442BFE; Sat, 8 Jul 2023 03:57:27 +0200 (CEST) Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) by mails.dpdk.org (Postfix) with ESMTP id 9C4164111C for ; Sat, 8 Jul 2023 03:57:24 +0200 (CEST) Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-1b3ff2460ecso2415672fac.0 for ; Fri, 07 Jul 2023 18:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781443; x=1691373443; 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=pVMuYYiXPDWiOv2Z+Jz+R2cT4LitVH5X/rhmxyaEYlY=; b=yg93lInOtp1UxZt3JcpLufzyi8JWatlNnw07rxGbb6DVTUg+5qveqUgakELOhLbSNL KEe26FJAAxKc0H0uqlnEoIo0QilviNKh+1sEyAspZ0WU2g63WfpRmmES2fET6QT3/mco Uvlie9jD/7mg0mTBU8QP8f2qYb1NuhVvLg7eBJ5peqxlvwm2hZLGLcKBh7pef0Rr46Y9 MhfP9LiZ+c1mVgmrbWBAZPbVgsFhQKhaqrafnEDmExL0iw42pQacQAYO51SWrdK8+8PL bBlou6Nw7JdZxv670uv5mN1d3EaOr8oDDf7CmA/CGCFuwYDoiutwEo+fpL3AfQZw23lH GacA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781443; x=1691373443; 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=pVMuYYiXPDWiOv2Z+Jz+R2cT4LitVH5X/rhmxyaEYlY=; b=Xy1hO/YKmdNxGjKT2ine/oZpkmfE/X1TIiR/OgyIrJ8SUsKBLCSVoM3yhAtAFSJyjT hIPTZzcz4JpTkUfILM6S9zEpa+NDlna6axO0HqYTBbg6gZQZlfThsBM4uCeQ0HtrfZhP lNLLPM+gB4nBU0iA4vp7n3Vsq5rqbD8lWRypvRtz5JocOOY08oVxOhUIpfOeTd2jh4x6 KiL5OQAR58M4JrSiLG8NIYKsNk6MvLlkmdvA1E0+HdHqVCTY94sQ25ivRjBJwrwuGYfm KQPyvOLa58K6/Bv6FPtS/7BgelxD603Ue0Z0C1f+MWtPQSbipOqe2SO15UQlDSgOOtDi rVtQ== X-Gm-Message-State: ABy/qLZzGZiw/s6by6idJghOng+ZBLorKg91ElaN5qkI0YV2s4Gg2aPc CtcCooKkilykfcmo/LXYrMPeGzkmu+wN6D80EHoQRkJJ X-Google-Smtp-Source: APBJJlF5SYQ6RsDbDV3xcUHjog1jhgCCLr7xQ6gwYyQzbKLu3OuDZh+u6viZp5o9Ttv6/ALGvULKvg== X-Received: by 2002:a05:6870:e410:b0:1b4:624a:105b with SMTP id n16-20020a056870e41000b001b4624a105bmr2843735oag.10.1688781443697; Fri, 07 Jul 2023 18:57:23 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:23 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v5 03/11] test/crypto_dev: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:10 -0700 Message-Id: <20230708015718.75565-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- app/test/test_cryptodev.c | 83 +++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index fb2af40b99ee..549afe252d54 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( @@ -5020,6 +5026,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, unsigned int plaintext_len; unsigned int ciphertext_pad_len; unsigned int ciphertext_len; + unsigned int digest_offset; struct rte_cryptodev_info dev_info; @@ -5163,9 +5170,12 @@ 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); + if (tdata->digest.offset_bytes == 0) + digest_offset = plaintext_pad_len; + else + digest_offset = tdata->digest.offset_bytes; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, digest_offset); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5432,6 +5442,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata, unsigned int plaintext_len; unsigned int ciphertext_pad_len; unsigned int ciphertext_len; + unsigned int digest_offset; struct rte_cryptodev_info dev_info; @@ -5577,10 +5588,12 @@ 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); + if (tdata->digest.offset_bytes == 0) + digest_offset = plaintext_pad_len; + else + digest_offset = tdata->digest.offset_bytes; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, digest_offset); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5924,8 +5937,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 +6358,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 */ @@ -6380,6 +6395,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, unsigned int plaintext_len; unsigned int ciphertext_pad_len; unsigned int ciphertext_len; + unsigned int digest_offset; struct rte_cryptodev_info dev_info; @@ -6531,10 +6547,12 @@ 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); + if (tdata->digest.offset_bytes == 0) + digest_offset = plaintext_pad_len; + else + digest_offset = tdata->digest.offset_bytes; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, digest_offset); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -7819,6 +7837,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, unsigned int plaintext_len; unsigned int ciphertext_pad_len; unsigned int ciphertext_len; + unsigned int digest_offset; struct rte_cryptodev_info dev_info; struct rte_crypto_op *op; @@ -7959,9 +7978,13 @@ 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); + if (tdata->digest_enc.offset == 0) + digest_offset = plaintext_pad_len; + else + digest_offset = tdata->digest_enc.offset; + + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, digest_offset); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); From patchwork Sat Jul 8 01:57: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: 129390 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 E6D2942DFC; Sat, 8 Jul 2023 03:57:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5E6842D20; Sat, 8 Jul 2023 03:57:28 +0200 (CEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mails.dpdk.org (Postfix) with ESMTP id D0C79427F5 for ; Sat, 8 Jul 2023 03:57:25 +0200 (CEST) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2632336f75fso1765606a91.3 for ; Fri, 07 Jul 2023 18:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781445; x=1691373445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AlLKomwYSQSLF+t+bBhNWFBQ+maS7GUN7rYNCJ7Iq7I=; b=oiskkT0VOJhG1oEzMrq5c4noMKDOpbUeBEybjH4/z2LKHHQUvJ/+5LnNBS9ihdglP4 3+8pXL/LVUCNORA/nslY22/r74vP9OJT6BslArjq+gsw0CljaXHlKIpuEvdfoBd+qxZB WuF46tqt1EPL6dm+njv1UgLMOWWKekFjjXB6fqE6PRJjHjeYXj3xsyJgUU1rLdEC+rNW 08NgCfDhAu7YY9l6f1Hd4RbLAjl42Xyp4lX4pL0ESKSdmqDUBwRHC0P57D/zn17N127k uNfEGLN76aYBRbJrACJ8MovOjhFvQTi1+zyRC7xIeyzHKTpN4J2z+GVfxAASmA5sx3iq yEtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781445; x=1691373445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AlLKomwYSQSLF+t+bBhNWFBQ+maS7GUN7rYNCJ7Iq7I=; b=mHvHgVgr9RouzdoYKy4ZfXixIi4UIMn8fRRXeHssCoQw0WISucaI+k0ncoxmoQjmR/ xJkB5gUJlwt88VBXJrd54G/LgGjW6kAD/ffUGPiDeWqJ8DrOGi/Y347rlDq+naOo3jwR X0Mdxz7fpKSfC0PpC99sgzLZUl/NNMETL7Ztu+4tBtRkOsFTQAXPGjCD9NbkEUuqJo0U oQ3T+4mnorxdI40DLWt7XZ1ambY9JdAEyFafegYiDoY9i4htsj9LryCNM8sp+1L1Z4sk Z1VeWG8q28b/I7HTmIIQslqvuT7IeU4t0qP3nMosWnmWknezUKY0bnfiN8XYSObn34na b5rQ== X-Gm-Message-State: ABy/qLZ2hDoGz4PZ9C7da2ZfDohYUwFsxilonN0xhpWu4A0rbDR1lzIW 3XwhJSpk1KEawENRDGzTGMXU5jB6zA55TChEXtBoZXBm X-Google-Smtp-Source: APBJJlHlPHnVbxwbTiAUj0T2jvJxxNHSzX0ZxGqMWFfTHWrs5kh5oXPeJUDeP4JXzn1W2/Mmnht3eA== X-Received: by 2002:a17:90b:34e:b0:262:ffc4:be7 with SMTP id fh14-20020a17090b034e00b00262ffc40be7mr6462874pjb.37.1688781444682; Fri, 07 Jul 2023 18:57:24 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj , Kai Ji , Pablo de Lara Subject: [PATCH v5 04/11] drivers/crypto: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:11 -0700 Message-Id: <20230708015718.75565-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger Acked-by: Anoob Joseph Acked-by: Hemant Agrawal --- drivers/crypto/caam_jr/caam_jr.c | 8 ++++---- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cnxk_se.h | 5 ++--- drivers/crypto/ipsec_mb/pmd_kasumi.c | 19 +++++++++++-------- drivers/crypto/ipsec_mb/pmd_snow3g.c | 4 ++-- drivers/crypto/ipsec_mb/pmd_zuc.c | 18 ++++++++++-------- drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 9 +++++---- drivers/crypto/qat/qat_sym.h | 9 +++++---- 8 files changed, 40 insertions(+), 34 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index b55258689b49..9c96fd21a48d 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -631,15 +631,15 @@ hw_poll_job_ring(struct sec_job_ring_t *job_ring, if (ctx->op->sym->m_dst) { /*TODO check for ip header or other*/ - ip4_hdr = (struct ip *) - rte_pktmbuf_mtod(ctx->op->sym->m_dst, char*); + ip4_hdr = rte_pktmbuf_mtod(ctx->op->sym->m_dst, + struct ip *); ctx->op->sym->m_dst->pkt_len = rte_be_to_cpu_16(ip4_hdr->ip_len); ctx->op->sym->m_dst->data_len = rte_be_to_cpu_16(ip4_hdr->ip_len); } else { - ip4_hdr = (struct ip *) - rte_pktmbuf_mtod(ctx->op->sym->m_src, char*); + ip4_hdr = rte_pktmbuf_mtod(ctx->op->sym->m_src, + struct ip *); ctx->op->sym->m_src->pkt_len = rte_be_to_cpu_16(ip4_hdr->ip_len); ctx->op->sym->m_src->data_len = diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 34d40b07d4c6..8b91d11b79cc 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -520,7 +520,7 @@ cn9k_cpt_sec_post_process(struct rte_crypto_op *cop, if (infl_req->op_flags & CPT_OP_FLAGS_IPSEC_DIR_INBOUND) { - hdr = (struct roc_ie_on_inb_hdr *)rte_pktmbuf_mtod(m, char *); + hdr = rte_pktmbuf_mtod(m, struct roc_ie_on_inb_hdr *); if (likely(m->next == NULL)) { ip = PLT_PTR_ADD(hdr, ROC_IE_ON_INB_RPTR_HDR); diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index 75c1dce231bf..1392af5833d1 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -2724,7 +2724,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, m = cpt_m_dst_get(cpt_op, m_src, m_dst); /* Digest immediately following data is best case */ - if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + mc_hash_off != + if (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != (uint8_t *)sym_op->aead.digest.data)) { flags |= ROC_SE_VALID_MAC_BUF; fc_params.mac_buf.size = sess->mac_len; @@ -2759,8 +2759,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, /* hmac immediately following data is best case */ if (!(op_minor & ROC_SE_FC_MINOR_OP_HMAC_FIRST) && - (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != + (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != (uint8_t *)sym_op->auth.digest.data))) { flags |= ROC_SE_VALID_MAC_BUF; fc_params.mac_buf.size = sess->mac_len; diff --git a/drivers/crypto/ipsec_mb/pmd_kasumi.c b/drivers/crypto/ipsec_mb/pmd_kasumi.c index 5db9c523cd9a..70536ec3dc2a 100644 --- a/drivers/crypto/ipsec_mb/pmd_kasumi.c +++ b/drivers/crypto/ipsec_mb/pmd_kasumi.c @@ -83,13 +83,16 @@ process_kasumi_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, uint32_t num_bytes[num_ops]; for (i = 0; i < num_ops; i++) { - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); dst[i] = ops[i]->sym->m_dst - ? rte_pktmbuf_mtod(ops[i]->sym->m_dst, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3) - : rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->cipher.data.offset >> 3); + ? rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)) + : rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); iv_ptr = rte_crypto_op_ctod_offset(ops[i], uint8_t *, session->cipher_iv_offset); iv[i] = *((uint64_t *)(iv_ptr)); @@ -155,8 +158,8 @@ process_kasumi_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits = ops[i]->sym->auth.data.length; - src = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) - + (ops[i]->sym->auth.data.offset >> 3); + src = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); /* Direction from next bit after end of message */ num_bytes = length_in_bits >> 3; diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c index e64df1a462e3..a96779f05942 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -248,8 +248,8 @@ process_snow3g_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits = ops[i]->sym->auth.data.length; - src = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->auth.data.offset >> 3); + src = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); iv = rte_crypto_op_ctod_offset(ops[i], uint8_t *, session->auth_iv_offset); diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c index 92fd9d180894..44781be1d107 100644 --- a/drivers/crypto/ipsec_mb/pmd_zuc.c +++ b/drivers/crypto/ipsec_mb/pmd_zuc.c @@ -107,13 +107,14 @@ process_zuc_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, } #endif - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); dst[i] = ops[i]->sym->m_dst ? - rte_pktmbuf_mtod(ops[i]->sym->m_dst, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3) : - rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->cipher.data.offset >> 3); + rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst, uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)) : + rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *, + (ops[i]->sym->cipher.data.offset >> 3)); iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *, sess->cipher_iv_offset); num_bytes[i] = ops[i]->sym->cipher.data.length >> 3; @@ -159,8 +160,9 @@ process_zuc_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops, length_in_bits[i] = ops[i]->sym->auth.data.length; - src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) + - (ops[i]->sym->auth.data.offset >> 3); + src[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, + uint8_t *, + (ops[i]->sym->auth.data.offset >> 3)); iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *, sess->auth_iv_offset); diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h index 1bafeb4a53e8..3e0dfea94c87 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h @@ -56,14 +56,15 @@ qat_bpicipher_preprocess(struct qat_sym_session *ctx, uint8_t *last_block, *dst, *iv; uint32_t last_block_offset = sym_op->cipher.data.offset + sym_op->cipher.data.length - last_block_len; - last_block = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_src, - uint8_t *, last_block_offset); + last_block = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, + last_block_offset); if (unlikely((sym_op->m_dst != NULL) && (sym_op->m_dst != sym_op->m_src))) /* out-of-place operation (OOP) */ - dst = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_dst, - uint8_t *, last_block_offset); + dst = rte_pktmbuf_mtod_offset(sym_op->m_dst, + uint8_t *, + last_block_offset); else dst = last_block; diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index 193281cd9135..d7ceb13b29cd 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -192,13 +192,14 @@ qat_bpicipher_postprocess(struct qat_sym_session *ctx, last_block_offset = sym_op->cipher.data.offset + sym_op->cipher.data.length - last_block_len; - last_block = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_src, - uint8_t *, last_block_offset); + last_block = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *, + last_block_offset); if (unlikely(sym_op->m_dst != NULL)) /* out-of-place operation (OOP) */ - dst = (uint8_t *) rte_pktmbuf_mtod_offset(sym_op->m_dst, - uint8_t *, last_block_offset); + dst = rte_pktmbuf_mtod_offset(sym_op->m_dst, + uint8_t *, + last_block_offset); else dst = last_block; From patchwork Sat Jul 8 01:57:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129391 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 74E7442DFC; Sat, 8 Jul 2023 03:57:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA6CA42D30; Sat, 8 Jul 2023 03:57:29 +0200 (CEST) Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by mails.dpdk.org (Postfix) with ESMTP id 81A2440DDB for ; Sat, 8 Jul 2023 03:57:26 +0200 (CEST) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-1b3c503af99so2335757fac.0 for ; Fri, 07 Jul 2023 18:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781445; x=1691373445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WCcu2dN6EjqUsiGoKbGVJPohYYLQcR8Owv9miQ51APU=; b=2E4Dh83pVtq2rX+AejtPXEIf4J/O9gycPzBINKT9LpYvzhlVl+nfHBVhXEDww5h6F6 0I54ofuLWeuU1tbXUcPVlarxOrYGaVnQkRsvboxUlNUy3GQiW1vors9+5B8GuQy+pQdm S3HDaP49HExQD41jR5EM1OHbXeiLZZwQ6vFDVU8uqJ9JqZLXg408NijnheNodeeLQ+kj rNSFpAJ6hRC9l1hNLPmyhtHhM3xNMDmCAmThCQmvxihR9GJMU9UMTL5KTacHvs+Tseu1 UkhFUnGYX7U3JYOIv0JyKt3JP9UE/iYqEQCB/5d0aBnGMGw1LsgwM27EGGXm/0hTB/gb +OuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781445; x=1691373445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WCcu2dN6EjqUsiGoKbGVJPohYYLQcR8Owv9miQ51APU=; b=YsbFlOxyCXtZkEcWIY5frn9/hWTtwvvKiR6RTxQ5oJtoB+GwCGAaVbCWh/mLRkrH0l EZL1tuUZUW4Pq71qzFzY3Cvx9tOg/z7/XgPfNzigDmS/Lr+HdKg+rdMPt7x+J9o5mJZL 6ab+HzltECIgbVIoCFbfLiyQ+FeHOFp1v0H960IGVaQ+BvP3Z7gFRt2ZKGEW7VN1VBCD 4IApXAStJXWD0UNL0SYTBD9YcROGHvrCCBMon+3IwzxNWvucU5BcLKQI4WjhetxoaxCb sUginkP3rST5Vov8gBkNI46thdxhkIRNQPzG0Q+DibksQVpb9ELlSq8G+tm1uZIfPLnW QYaQ== X-Gm-Message-State: ABy/qLYNJpFy9zNRPQ8qx5ZRhpVqFGKLyA7G8rbUWifkdaG6kj1vJKhl t1AxrqMK/XA+bnGSSy3M38rmTqUcBdhxnHNmINDImxx5 X-Google-Smtp-Source: APBJJlG/pcGjJeyrElNKYic5qPRRtzSLE6iHgbCoNuNtYBEo8ZEcxd0Wy76D2jmyXTXiRggwNESMMg== X-Received: by 2002:a05:6870:438f:b0:1b0:25b4:4b77 with SMTP id r15-20020a056870438f00b001b025b44b77mr8156666oah.14.1688781445594; Fri, 07 Jul 2023 18:57:25 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:25 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chaoyong He , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v5 05/11] net/nfp: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:12 -0700 Message-Id: <20230708015718.75565-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower_cmsg.h | 3 ++- drivers/net/nfp/flower/nfp_flower_ctrl.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 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 Sat Jul 8 01:57: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: 129392 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 92D7142DFC; Sat, 8 Jul 2023 03:57:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CD8C42D32; Sat, 8 Jul 2023 03:57:31 +0200 (CEST) Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) by mails.dpdk.org (Postfix) with ESMTP id 420B542B8C for ; Sat, 8 Jul 2023 03:57:28 +0200 (CEST) Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-1b0719dd966so2525075fac.1 for ; Fri, 07 Jul 2023 18:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781447; x=1691373447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NiQ2/UbcUn7iVszTHB7gbAqxzzP+TGnmFbwQRb5uaB0=; b=4NgJchL2ClErtHBhm73XOGdYI1nVbsRgUne50Z/pMscrMHe3DM7dDgg8yHp3wBGGiF xMf3YdiTX2EM4L/6DC8Zj0XiGAwPQhUt/dc9d0TdvLjbkeDN+sKLi3E5kGrtSb4JGhmg ztCQHq0RVXRx0SwkYU/+dDe0cicjOJ2zCdS0/3gUA5FNR+PY7R5pcFEk5bNEsTgvQFWD 3jwj1DjHwYwgKs4Y1/oDehuMKlEGD912OuWARSMVYLR3BMUh0cdR+JOA2a5BuyyQ1MLn m1QBqd4tFT9/CKBiGyaKgKRSkzP2QkE/VqNPnrpt7pwW2ro8rhiAmsfcyL5pjeY5Hjq7 HjOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781447; x=1691373447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NiQ2/UbcUn7iVszTHB7gbAqxzzP+TGnmFbwQRb5uaB0=; b=AbsT0mUXfjPCL8SywfzycnUTP8MY60UH0piQEIl5uJUmz1MlI7OWI/vNs4M6U+xnDq fn0o8wOiTY1tVbCjjiBc/gct0eGtZQ/MEu5G9ntRi0Emima2Qd9UC7QJhHbeWHSEyvXk 5DuOLZ8/6TF2STwce9LX5NEMqgLfcJd34NYBZ7uBMQHH57WRAFcm4K5aoYA0GsOedi3p r6B6HwGglOJdjZcifYbLHwei3N9+gbEbWLjruZrhiYC0l+IyW5satIhTDSy7tSnSc1b0 WpOHOsKPnDQyPWaur+8VAKdskgapMXy6gor/MZ6fj9r9pTm/VI4donrlFq9PP9v9+yLO ctIA== X-Gm-Message-State: ABy/qLZOV0O43WODaEd4CTIJ+Yn4mrMtr+fjcSlIOuW7mx1OuqRbWSa/ HijszXToW1yLtxl2C551VFlCYlCETipu7Ci0IC/xXcHw X-Google-Smtp-Source: APBJJlFIPhxEJPSSYiPxonVyh01IG/PUFRUyTCe7He5E/+SaipAOGl/6YkrlmEWg2A4paB+N0GoRLg== X-Received: by 2002:a05:6870:3453:b0:1a2:8f84:31ec with SMTP id i19-20020a056870345300b001a28f8431ecmr7895501oah.31.1688781447412; Fri, 07 Jul 2023 18:57:27 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:27 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v5 06/11] net/tap: use rte_pktmbuf_motd_offset Date: Fri, 7 Jul 2023 18:57:13 -0700 Message-Id: <20230708015718.75565-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index bf98f7555990..968a1b6b45df 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -672,8 +672,8 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, if (seg_len > l234_hlen) { iovecs[k].iov_len = seg_len - l234_hlen; iovecs[k].iov_base = - rte_pktmbuf_mtod(seg, char *) + - l234_hlen; + rte_pktmbuf_mtod_offset(seg, char *, + l234_hlen); tap_tx_l4_add_rcksum(iovecs[k].iov_base, iovecs[k].iov_len, l4_cksum, &l4_raw_cksum); From patchwork Sat Jul 8 01:57:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129393 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 4828242DFC; Sat, 8 Jul 2023 03:58:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43FAA42D16; Sat, 8 Jul 2023 03:57:32 +0200 (CEST) Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by mails.dpdk.org (Postfix) with ESMTP id 2485A42D2C for ; Sat, 8 Jul 2023 03:57:29 +0200 (CEST) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-1b3c503af99so2335771fac.0 for ; Fri, 07 Jul 2023 18:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781448; x=1691373448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OGSayFJofy8bhnDuu5frzEHVLNUTbgllxcszb5VKc10=; b=Z/cTid9fLOcguvPhS70j2jRlScukIk6/DY9hcbF4aTwtmlXXiDjHSFNBKqG2cXiVKD 1hHYxR697IQNxEE5tzXzxfsU5pxEI9EGl8KEEI2rSlx6+NAkfgjBUwZpDELKQ/6UNtIB 6n5zKtjeiJc6J49FyVQaPMW1IUR3UVDSDU+khr2dzo/zep74PmYOONWyy2dc0cXVa102 +CRD4jqvhDYK/awdFrpIvKayKFNoxUFSKyrwwNi+zocVAHumG0uTrE3Qez03wi6tU18q wSCfjqrQpRnAVTIvRquqJI2vdbBDdQ2onP1tg+uIQaMRobKDvoRs6i47kS2SatfPmSEr Ohmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781448; x=1691373448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OGSayFJofy8bhnDuu5frzEHVLNUTbgllxcszb5VKc10=; b=kHMzkH7kLWxDven2AupvdgRgGSwsb/MMIrjtCTvVSVwQHgwLr1Emx7kH8fkSZb0gTN D0JFa30S+JVx1Cklflzl9p60Dq5H7zYJmlbSvyUbQyGDohHOUu/QOEJeSI7pd/iEwjzN awqj5wJRtIDgEreA7kBxdK1A+oAYwBQF6QK9WjOhmYblFUgbgQLMs6fm04jTY/fMJHvz GKyamD6Xo8zTaXiQx5KDM0eH9MHPInEYt0lywvBzYY8LKZxDNdA+EnYRNoxBlxCFPYuL 5MIq/pwXnCrO/ZACTBAyjTErpQ2uEpPlo7bg0ckstZVCiDoi77/qoNnKVboMMZsKz3B2 yGWw== X-Gm-Message-State: ABy/qLZG+UO16RVpcH9lnrZc9oMh9sXELXO+Em6AzgTM6x59YTcsxPKc Aao9x+zkC3AgQJjrtXvN5TuY28lvRJ2IEHsIjwwc6pQF X-Google-Smtp-Source: APBJJlEJexG8MG13pg5Eecx3YSuxRCpfJ4LZz26R7oFr7aP62lB/KnMEekViHiCLurufIYmAio119w== X-Received: by 2002:a05:6870:20b:b0:1b4:7411:df6e with SMTP id j11-20020a056870020b00b001b47411df6emr113251oad.15.1688781448275; Fri, 07 Jul 2023 18:57:28 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:27 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nicolas Chautru Subject: [PATCH v5 07/11] baseband/fpga: use rte_pktmbuf_offset Date: Fri, 7 Jul 2023 18:57:14 -0700 Message-Id: <20230708015718.75565-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c index f29565af8cca..465a65f3dca2 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -1543,8 +1543,7 @@ fpga_harq_write_loopback(struct fpga_queue *q, rte_bbdev_log(ERR, "HARQ in length > HARQ buffer size\n"); } - input = (uint64_t *)rte_pktmbuf_mtod_offset(harq_input, - uint8_t *, in_offset); + input = rte_pktmbuf_mtod_offset(harq_input, uint64_t *, in_offset); while (left_length > 0) { if (fpga_reg_read_8(q->d->mmio_base, @@ -1621,8 +1620,8 @@ fpga_harq_read_loopback(struct fpga_queue *q, } left_length = harq_in_length; - input = (uint64_t *)rte_pktmbuf_mtod_offset(harq_output, - uint8_t *, harq_out_offset); + input = rte_pktmbuf_mtod_offset(harq_output, uint64_t *, + harq_out_offset); while (left_length > 0) { fpga_reg_write_32(q->d->mmio_base, From patchwork Sat Jul 8 01:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129394 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 2454342DFC; Sat, 8 Jul 2023 03:58:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7E7D42D43; Sat, 8 Jul 2023 03:57:33 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 43CAC42D10 for ; Sat, 8 Jul 2023 03:57:30 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1b8ad8383faso17235475ad.0 for ; Fri, 07 Jul 2023 18:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781449; x=1691373449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tr60IFz06evUwuSm5/a873eV74kheh+Fl+sWvdw5isU=; b=av+HRK6SUvgYXf/6g6WFpUnqbuXKKS7fSQq1VhcU9SMPXVqKj7MxA+gAIOXyZC/5Aj ziYqADwys7hbyWlxrWiZOWmhPyJNZU/gu+jY41p6jbp7A6PzLo6PR5yqnA6VEsWMfwwC SYUPx/HVEI/UojkwlJjQ4H3mxvvEwWrNKOQh8NlHXLl5t6/n/DzUw7B64xvbBtMWJrA3 S4OAwu2bWpuykfhJ3p5upsoyrqE/j84Y0LpTSetQehoNxHswvxE1JvtbAOAYOFDHSVzK HDHFyTKwKVYkBBrodkh6ha8jr/KihHDQLz88vkgz3JVqNxA2JNqW/kc8CIgzu63CaNw+ TOLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781449; x=1691373449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tr60IFz06evUwuSm5/a873eV74kheh+Fl+sWvdw5isU=; b=GUkwEY7QjiVIeIw0wAvewe+7IVEr3kY5kxDC0ftxD/PFUnMeFUOXXlNbJ9O1vAkjRL l0ouwzXmLxw4IleZIIKhVmFTwAr0EwpK0e36js9+ACTNw4KLY3kCXbRt8c8X54FnEInE QE+dBAW3gHN30SQEPI7nDY8f74+YTJXfzwdBq82Jq798T7KqKC57oPtLOJx5Dw62PNcg wRVn5FUC6bMwFpTiNDDE+v6KeTfPn7GTxc5X2XCQQWqvAQcU8xf0kcP+eJ1rLLkco+qE GxBIYBXnRFphawTs+KARtOjejtKOIKFv8GI9tNU62kFyUvB9l/Q7rt2wQLeuG6BG7Ddn NlhQ== X-Gm-Message-State: ABy/qLY79tdW3Dtr0T/eN/PIyW4o9mEUdKoOygzonh0A30lXxpJ66C6E 4kjf8Me307l14UX2MUQhcujKBWZDf6xF8MIPQ3/VqH5j X-Google-Smtp-Source: APBJJlGLHw9FpELQQ0wO9vwFXfM0cZ4ss737AnG1ZmESNE4rMhiGN6Lw99d+qlE7pDjqg9zYbWlE2A== X-Received: by 2002:a17:902:b20b:b0:1b1:9233:bbf5 with SMTP id t11-20020a170902b20b00b001b19233bbf5mr6162075plr.57.1688781449193; Fri, 07 Jul 2023 18:57:29 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph Subject: [PATCH v5 08/11] cpt: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:15 -0700 Message-Id: <20230708015718.75565-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger Acked-by: Anoob Joseph --- drivers/common/cpt/cpt_ucode.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index b393be4cf661..87a3ac80b9da 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -3167,9 +3167,8 @@ fill_fc_params(struct rte_crypto_op *cop, m = m_src; /* hmac immediately following data is best case */ - if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != - (uint8_t *)sym_op->aead.digest.data)) { + if (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != + (uint8_t *)sym_op->aead.digest.data)) { flags |= VALID_MAC_BUF; fc_params.mac_buf.size = sess_misc->mac_len; fc_params.mac_buf.vaddr = @@ -3211,9 +3210,8 @@ fill_fc_params(struct rte_crypto_op *cop, /* hmac immediately following data is best case */ if (!ctx->dec_auth && !ctx->auth_enc && - (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != - (uint8_t *)sym_op->auth.digest.data))) { + (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) != + (uint8_t *)sym_op->auth.digest.data))) { flags |= VALID_MAC_BUF; fc_params.mac_buf.size = sess_misc->mac_len; From patchwork Sat Jul 8 01:57:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129395 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 9F14042DFC; Sat, 8 Jul 2023 03:58:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8A0F42D47; Sat, 8 Jul 2023 03:57:34 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 2E33B42D36 for ; Sat, 8 Jul 2023 03:57:31 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1b7e66ff65fso17714825ad.0 for ; Fri, 07 Jul 2023 18:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781450; x=1691373450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=78HDkboHxTG/XRmT10zNrGhuzXGadIdppWfUSd5orjE=; b=ii3i5NGEL+zoD9f+pA+xbab3/kdNLIHWYFLQWSgYKRAYrt+gJrse5UWwkA9Cpil+yk oamEd62uW0QIq40vEgKvzsgenWYWbbG4xj38rmyS2d3tt6gJKP/m6Dow/V9wk5MUZVJP lCMojUzPPodAEqbrEV3UtzmFAwhXmOpHti9fTa2VcU2CUwHtgLnc1txuVE35uxUcZGVA IVCvccJulviBClSLFbgtJn/ZyGhx+6ZTwwHaKaNvuYVTQwlo88+V8Ef+ogxAiakH5Kgh 5xntgnQSdk8DOEEK0MPHHuq5iimNnDVE6XEsX6dcxFVCS+GU2F1+i7rKjN9sKuLcatgr 1YUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781450; x=1691373450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=78HDkboHxTG/XRmT10zNrGhuzXGadIdppWfUSd5orjE=; b=QP7JYWXjDs/rK40c6lLywq5PueRouLn1pqRKUZ6mBcdRjEpHd1Snrd0gw4DPlzpp/v U8F7Fxx7Vm0MFTfycUjGIzG5//2exmqwd1ojsh6X38wRdBfnFyIvXxC9+dLNc6ujeP1G Rmf4P/RGVYEqiVqmkAgzXmz+8jt4Xnd75JgqjSuSWgmqpYcJL4MnV88NygWUF7MsPQOV Jdoxa5/UzRIbUAhkYIyha/MD52qMhTvKYFl8AtiDpnDV0R+X1p/Uay34W3OIMOCyrw4x +Qc7lWEMwxieBthxyETVdkv/UeeYQOVkavElBkOLr+XrTXqECPq64FN9y5fPSx1tR/44 16MA== X-Gm-Message-State: ABy/qLYWxBDRNr5g0J9lShMmQe5Pr2oXy4wdjqKrdyuYaKFfS4+SR9E+ lbWHtH3kRDHRYoSSqJ43+U+MSBI/9H4SgScCr4w46+cM X-Google-Smtp-Source: APBJJlH/0euE0zlCiCaG9k7HJb+c9B8SXHSaRmpZWXJsUmm0RkrTksBlD97vxQt1KL+501fAfaQxeQ== X-Received: by 2002:a17:902:d395:b0:1b9:be2e:2b40 with SMTP id e21-20020a170902d39500b001b9be2e2b40mr4570154pld.50.1688781450091; Fri, 07 Jul 2023 18:57:30 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:29 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang Subject: [PATCH v5 09/11] testpmd: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:16 -0700 Message-Id: <20230708015718.75565-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- app/test-pmd/ieee1588fwd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c index 386d9f10e642..3371771751dd 100644 --- a/app/test-pmd/ieee1588fwd.c +++ b/app/test-pmd/ieee1588fwd.c @@ -138,8 +138,8 @@ ieee1588_packet_fwd(struct fwd_stream *fs) * Check that the received PTP packet is a PTP V2 packet of type * PTP_SYNC_MESSAGE. */ - ptp_hdr = (struct ptpv2_msg *) (rte_pktmbuf_mtod(mb, char *) + - sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(mb, struct ptpv2_msg *, + sizeof(struct rte_ether_hdr)); if (ptp_hdr->version != 0x02) { printf("Port %u Received PTP V2 Ethernet frame with wrong PTP" " protocol version 0x%x (should be 0x02)\n", From patchwork Sat Jul 8 01:57:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129396 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 E7F5442DFC; Sat, 8 Jul 2023 03:58:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BEE642D4F; Sat, 8 Jul 2023 03:57:36 +0200 (CEST) Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by mails.dpdk.org (Postfix) with ESMTP id CBC5842D37 for ; Sat, 8 Jul 2023 03:57:31 +0200 (CEST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1b059dd7c0cso2503488fac.0 for ; Fri, 07 Jul 2023 18:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781451; x=1691373451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=jXPFaR9tUzvzqlOh90TT2unIIS1BWbgC4whEpTzD574Zz+gPqiYxAM6S2Ymv91nulb lvSnHPqrBOKmBXZ2SZ1qPz18Q9Jpb2oU/YjhIe9Mj9vvdSOGRSlZZJLhmfME1Qudl8ZY FGeukxVo7SOMXc3jAcyuxBXcluJfepPT8uHOS5rFl/h0ZXX0iSTTilusKXt6F2FP3BL8 yoRcVt3Ae6oSR9B0Pmi5d2E5fAXrRwU0hsTflXHWR7mjGQ6AIv5oWKn6LASm2OrV83Ne qWFyM0zi3H0uWVU83UJKNGqRMoH8TN7vde3zVY8L0IzuYu7cDMOgGFE4f0VHQVjWYVyX dXbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781451; x=1691373451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=fnzva9NTfmMUiPeg+3NNv0edWrXwZF3K9aIh+j6nn5LxAOdG8zmt7OPSVfFVj/naMG xaxa+x0jfO4IeWSkhA2w/+MM7XdTjNn1keXC22paCQGaCyV9B7vo3VJPksyw1dqcoCPH D3PnYsbLfTX/ZkhEufYd9/hf+myCt/kxGQhVmxC92bV54NxgKpA8zLo3D/oc/mtIt2Zj MjOTenPzTDNHczZVnFfDZ0R6BYhO1LapgQUmTFnVgtxMts9c/IqoUfKvhPSiY0Yswx88 y9dCh9LTs5T2sXLznbDqTgMrZfUiOepKisFzvek1IAoTMTb7iVZKz2SyCeWvyxqHrfQH u4NA== X-Gm-Message-State: ABy/qLbU3hp1yTqX8R6KaLz5HYIFhOoc8xZdU9Z9VHZbXezpGVJBLH8g C8Oe8GqXf9cczaQGrMuvRQ3Zjw5xrj+RkEeqF6wKmCau X-Google-Smtp-Source: APBJJlGlmL7V4pqzb7XKqcGxOjshGY4o91UpS3P+qHV/sZvlR4DvJG/aSoh/RKGWa05g3Qc6FC0SEw== X-Received: by 2002:a05:6870:1702:b0:1b3:ce91:ba64 with SMTP id h2-20020a056870170200b001b3ce91ba64mr8533445oae.59.1688781450982; Fri, 07 Jul 2023 18:57:30 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:30 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kirill Rybalchenko Subject: [PATCH v5 10/11] examples/ptpclient: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:17 -0700 Message-Id: <20230708015718.75565-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da64dfee..2535d848a1e9 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -354,8 +354,8 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) { struct ptp_header *ptp_hdr; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(ptp_data->m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(ptp_data->m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); ptp_data->seqID_SYNC = rte_be_to_cpu_16(ptp_hdr->seq_id); if (ptp_data->ptpset == 0) { @@ -397,15 +397,15 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) int ret; eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); if (memcmp(&ptp_data->master_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) != 0) return; ptp_data->seqID_FOLLOWUP = rte_be_to_cpu_16(ptp_hdr->seq_id); - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, sizeof(struct rte_ether_hdr)); origin_tstamp = &ptp_msg->follow_up.precise_origin_tstamp; @@ -537,8 +537,8 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) struct tstamp *rx_tstamp; uint16_t seq_id; - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + - sizeof(struct rte_ether_hdr)); + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, + sizeof(struct rte_ether_hdr)); seq_id = rte_be_to_cpu_16(ptp_msg->delay_resp.hdr.seq_id); if (memcmp(&ptp_data->client_clock_id, &ptp_msg->delay_resp.req_port_id.clock_id, @@ -585,8 +585,8 @@ parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) { if (eth_type == PTP_PROTOCOL) { ptp_data.m = m; ptp_data.portid = portid; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); switch (ptp_hdr->msg_type) { case SYNC: From patchwork Sat Jul 8 01:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129397 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 3FE1042DFC; Sat, 8 Jul 2023 03:58:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C8A342D50; Sat, 8 Jul 2023 03:57:37 +0200 (CEST) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mails.dpdk.org (Postfix) with ESMTP id B30EF42D39 for ; Sat, 8 Jul 2023 03:57:32 +0200 (CEST) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-5634db21a78so1921329eaf.0 for ; Fri, 07 Jul 2023 18:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688781452; x=1691373452; 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=39Ya5+TNd9mvRLympPVI5q7OCnpOPGc//DlPeojc5cI=; b=XbRXcw4W40Jp3HwvZOZMJP1MEMEslmf75XeaAkGZQAGU7eVLa7p6YRgnW9WDE7QEXR VQfSmG4kxIg82u02I9ddIZ6aqTyDlfTxuM9AzJf4I8g/sIv058wAgmoRV/xIQZd6nfUg /u7kD+qOcOw2OGxbUL1Zpsrkuu1cArRXQ2Xx8vivbWCacDik8ALmGX3LXNAm5/rXImvc 8WNfiKHW6JADR/o1qqBdtFauNo7EkIJGl3wK3rB8QpW+z7r0xJRFznc42v+WTo/+JXjO gPhz/LcdCDdxM0B6+D+7wVINvgYQemZ6AC6CnjOJqqnmmNtQ/EzZtjN3tUSIPJpynElC h8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688781452; x=1691373452; 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=39Ya5+TNd9mvRLympPVI5q7OCnpOPGc//DlPeojc5cI=; b=IuZvdKvxITkssl+NkvhNBo2WWRH6g7J2yB1716yqyxePjRKAbiPs/v7Ws6mmYyShnM S/mLbbSHUTSBF60YqdbKJ6rrtxHbUbn3hJK2iQJdRQJADpfL89UCwj9pB2ZcRCqH3c2D fIHATw1bqTXR0f4eHHxapPbqGQBM4+KKmArz0DidudHqVZ6fcjUTPHgjGEfMKOiUhksg I2/AkTO9+Vpa4vDrDmq94XA17WTUy3Pg9FiMz630PqmGPA+vXb3E0esrR/bu8qr3ekD5 1VjCCN1vUJb35m/q9u9EnmJLl6p6L0PvuEKO9F65tQ7g28/P3dcHIQshcUqOks6FZfNk Oygg== X-Gm-Message-State: ABy/qLYTJPTpI5qj3PM48cB+iqWAqa8dEMuMnOtBSDdu3yb/onCl4Nk8 pim3qSZCoQMpVWa1Z5Qc8xFIuUb7GNdDph22w91Fukxr X-Google-Smtp-Source: APBJJlExrVBsHGVobFkMNWbughIoC0j+bO8DeSxJ+2t1Gkqo2YPSPR3En8MzSzqdqIRkp7moKlnm6Q== X-Received: by 2002:a05:6870:c18d:b0:1b3:f370:79c7 with SMTP id h13-20020a056870c18d00b001b3f37079c7mr8467000oad.37.1688781451797; Fri, 07 Jul 2023 18:57:31 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a035800b00263f5ac814esm2260269pjf.38.2023.07.07.18.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:57:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v5 11/11] examples/l2fwd-crypto: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:18 -0700 Message-Id: <20230708015718.75565-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- examples/l2fwd-crypto/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index efe7eea2a768..19db0a280bf0 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,8 @@ 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 +540,8 @@ 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 +631,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];