From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66CE642A7F; Sat, 6 May 2023 18:04:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C29CC42D30; Sat, 6 May 2023 18:04:10 +0200 (CEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 5D876410F2 for ; Sat, 6 May 2023 18:04:09 +0200 (CEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6435bbedb4fso3274540b3a.3 for ; Sat, 06 May 2023 09:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1683389048; x=1685981048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pjILH4AiGDn0Lfou7F5lFka4+BFnorNOyV3RWNdCnVM=; b=dgH3GWUGSIyzk+jbHQfJG9eJuK41D8mF7rqQJLYWk6g41zym7K83jb5e9HYjiShymN jK0eoZMOZIuS/4ybA0D1mqrUAohDhPXpkoKu3h6UdW1bUvp/QxDooZ1g9GhNZfGoWPsu UznuJ8Ov0garRAEIDM5QNpEnGqDhod0lt9xEomGb6FZ8mGLfbm5Jx4U4yX+Jnc89tBOh nUUMswfG5LvS82RhvDVe3vqJfXwnXYcnB0g9IdFRyTx4l25drobrTRmF6Vr1ODZ5BCDE o3e5kzKISmYtVfdY+qaFocEegevhPTmAsm6cKNC8NlNWbHdIg75TnKI/U07QXCfWUc1E AwFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683389048; x=1685981048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pjILH4AiGDn0Lfou7F5lFka4+BFnorNOyV3RWNdCnVM=; b=exyKt2mMhMxJXljQnico/XqV8LMYZ/wv8dYRZ9br+GW+CAhVehf6L7pYQpZc3SgIfc mTg1ZNjrwSUR/oFOY8NeDvHO4X2/0LUUOYQILPtsP+RweLkICH/TCWI3cYyHXkTVupWd JmOrxp3ZwCXKmtaP8wv348NQOUsrdjOr9DBa8gYIXuc6HTopvC+QMojsatjzts1mFuSc rki/njnIMWON2tWt0SigJqFdul6E40ehnTrL8aZhtJlzhUBwKpc4VCGHfTZ87gioeXD2 V8pJGqMX/pKegwjem+M7WKI7Yp/Sn+tZjBS4f7ZYq508I+S+LsxJS5KRDufjBzVy+XRi Ii2Q== X-Gm-Message-State: AC+VfDyzt1hYtgzUlkenq/BWr/aH+IyTReJY5q8I5pMna4Xwdhraf060 3RW7Z2Sugwek5WsPVw86UxaLZKY3Ne3UKboKqQjx2w== X-Google-Smtp-Source: ACHHUZ4GXU5B4VBS5q/P913Zgo7iQYtv5A+HM07sXpsH+H0k6KkEcJzP07PjrW0N/wH/JdpY28wlTg== X-Received: by 2002:a05:6a00:2d9a:b0:641:d9b:a458 with SMTP id fb26-20020a056a002d9a00b006410d9ba458mr7570128pfb.18.1683389048334; Sat, 06 May 2023 09:04:08 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id e14-20020a62ee0e000000b006436ffa3dc4sm3369890pfi.24.2023.05.06.09.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 09:04:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu Subject: [PATCH v2 02/14] gso: use rte_pktmbuf_mtod_offset Date: Sat, 6 May 2023 09:03:51 -0700 Message-Id: <20230506160404.7423-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506160404.7423-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230506160404.7423-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use the rte_pktmbuf_mtod_offset macro. Change was automatically generated by cocci/mtod-offset.cocci. Signed-off-by: Stephen Hemminger --- lib/gso/gso_common.h | 11 +++++------ lib/gso/gso_tcp4.c | 8 ++++---- lib/gso/gso_tunnel_tcp4.c | 12 ++++++------ lib/gso/gso_tunnel_udp4.c | 18 +++++++++--------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/lib/gso/gso_common.h b/lib/gso/gso_common.h index 9456d596d3c5..8987e368605c 100644 --- a/lib/gso/gso_common.h +++ b/lib/gso/gso_common.h @@ -52,8 +52,8 @@ update_udp_header(struct rte_mbuf *pkt, uint16_t udp_offset) { struct rte_udp_hdr *udp_hdr; - udp_hdr = (struct rte_udp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - udp_offset); + udp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *, + udp_offset); udp_hdr->dgram_len = rte_cpu_to_be_16(pkt->pkt_len - udp_offset); } @@ -77,8 +77,7 @@ update_tcp_header(struct rte_mbuf *pkt, uint16_t l4_offset, uint32_t sent_seq, { struct rte_tcp_hdr *tcp_hdr; - tcp_hdr = (struct rte_tcp_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l4_offset); + tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *, l4_offset); tcp_hdr->sent_seq = rte_cpu_to_be_32(sent_seq); if (likely(non_tail)) tcp_hdr->tcp_flags &= (~(TCP_HDR_PSH_MASK | @@ -104,8 +103,8 @@ update_ipv4_header(struct rte_mbuf *pkt, uint16_t l3_offset, uint16_t id) { struct rte_ipv4_hdr *ipv4_hdr; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - l3_offset); ipv4_hdr->packet_id = rte_cpu_to_be_16(id); } diff --git a/lib/gso/gso_tcp4.c b/lib/gso/gso_tcp4.c index d31feaff95cd..e2ae4aaf6c5a 100644 --- a/lib/gso/gso_tcp4.c +++ b/lib/gso/gso_tcp4.c @@ -16,8 +16,8 @@ update_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, uint16_t l3_offset = pkt->l2_len; uint16_t l4_offset = l3_offset + pkt->l3_len; - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) + - l3_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + l3_offset); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); id = rte_be_to_cpu_16(ipv4_hdr->packet_id); sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); @@ -46,8 +46,8 @@ gso_tcp4_segment(struct rte_mbuf *pkt, int ret; /* Don't process the fragmented packet */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - pkt->l2_len); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + pkt->l2_len); frag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset); if (unlikely(IS_FRAGMENTED(frag_off))) { return 0; diff --git a/lib/gso/gso_tunnel_tcp4.c b/lib/gso/gso_tunnel_tcp4.c index 1a7ef30ddebf..3a9159774b27 100644 --- a/lib/gso/gso_tunnel_tcp4.c +++ b/lib/gso/gso_tunnel_tcp4.c @@ -23,13 +23,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta, tcp_offset = inner_ipv4_offset + pkt->l3_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len); @@ -65,8 +65,8 @@ gso_tunnel_tcp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. diff --git a/lib/gso/gso_tunnel_udp4.c b/lib/gso/gso_tunnel_udp4.c index 1fc7a8dbc5aa..4fb275484ca8 100644 --- a/lib/gso/gso_tunnel_udp4.c +++ b/lib/gso/gso_tunnel_udp4.c @@ -22,13 +22,13 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, inner_ipv4_offset = outer_udp_offset + pkt->l2_len; /* Outer IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - outer_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + outer_ipv4_offset); outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); /* Inner IPv4 header. */ - ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + inner_ipv4_offset); inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); tail_idx = nb_segs - 1; @@ -42,9 +42,9 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, * * Set IP fragment offset for inner IP header. */ - ipv4_hdr = (struct rte_ipv4_hdr *) - (rte_pktmbuf_mtod(segs[i], char *) + - inner_ipv4_offset); + ipv4_hdr = rte_pktmbuf_mtod_offset(segs[i], + struct rte_ipv4_hdr *, + inner_ipv4_offset); is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0; ipv4_hdr->fragment_offset = rte_cpu_to_be_16(frag_offset | is_mf); @@ -67,8 +67,8 @@ gso_tunnel_udp4_segment(struct rte_mbuf *pkt, int ret; hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len; - inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) + - hdr_offset); + inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *, + hdr_offset); /* * Don't process the packet whose MF bit or offset in the inner * IPv4 header are non-zero. -- 2.39.2