Skip to content

Commit 8f64c34

Browse files
shemmingertmonjalo
shemminger
authored and
tmonjalo
committed
gso: use mbuf API for offset addition
Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger <[email protected]> Acked-by: Chengwen Feng <[email protected]>
1 parent 63a98ff commit 8f64c34

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎lib/gso/gso_common.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ update_udp_header(struct rte_mbuf *pkt, uint16_t udp_offset)
5252
{
5353
struct rte_udp_hdr *udp_hdr;
5454

55-
udp_hdr = (struct rte_udp_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
56-
udp_offset);
55+
udp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *,
56+
udp_offset);
5757
udp_hdr->dgram_len = rte_cpu_to_be_16(pkt->pkt_len - udp_offset);
5858
}
5959

@@ -77,8 +77,8 @@ update_tcp_header(struct rte_mbuf *pkt, uint16_t l4_offset, uint32_t sent_seq,
7777
{
7878
struct rte_tcp_hdr *tcp_hdr;
7979

80-
tcp_hdr = (struct rte_tcp_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
81-
l4_offset);
80+
tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
81+
l4_offset);
8282
tcp_hdr->sent_seq = rte_cpu_to_be_32(sent_seq);
8383
if (likely(non_tail))
8484
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)
104104
{
105105
struct rte_ipv4_hdr *ipv4_hdr;
106106

107-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
108-
l3_offset);
107+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
108+
l3_offset);
109109
ipv4_hdr->total_length = rte_cpu_to_be_16(pkt->pkt_len - l3_offset);
110110
ipv4_hdr->packet_id = rte_cpu_to_be_16(id);
111111
}

‎lib/gso/gso_tcp4.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ update_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,
1616
uint16_t l3_offset = pkt->l2_len;
1717
uint16_t l4_offset = l3_offset + pkt->l3_len;
1818

19-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char*) +
20-
l3_offset);
19+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
20+
l3_offset);
2121
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
2222
id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
2323
sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
@@ -46,8 +46,8 @@ gso_tcp4_segment(struct rte_mbuf *pkt,
4646
int ret;
4747

4848
/* Don't process the fragmented packet */
49-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
50-
pkt->l2_len);
49+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
50+
pkt->l2_len);
5151
frag_off = rte_be_to_cpu_16(ipv4_hdr->fragment_offset);
5252
if (unlikely(IS_FRAGMENTED(frag_off))) {
5353
return 0;

‎lib/gso/gso_tunnel_tcp4.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ update_tunnel_ipv4_tcp_headers(struct rte_mbuf *pkt, uint8_t ipid_delta,
2323
tcp_offset = inner_ipv4_offset + pkt->l3_len;
2424

2525
/* Outer IPv4 header. */
26-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
27-
outer_ipv4_offset);
26+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
27+
outer_ipv4_offset);
2828
outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
2929

3030
/* Inner IPv4 header. */
31-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
32-
inner_ipv4_offset);
31+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
32+
inner_ipv4_offset);
3333
inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
3434

3535
tcp_hdr = (struct rte_tcp_hdr *)((char *)ipv4_hdr + pkt->l3_len);
@@ -65,8 +65,8 @@ gso_tunnel_tcp4_segment(struct rte_mbuf *pkt,
6565
int ret;
6666

6767
hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len;
68-
inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
69-
hdr_offset);
68+
inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
69+
hdr_offset);
7070
/*
7171
* Don't process the packet whose MF bit or offset in the inner
7272
* IPv4 header are non-zero.

‎lib/gso/gso_tunnel_udp4.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,
2222
inner_ipv4_offset = outer_udp_offset + pkt->l2_len;
2323

2424
/* Outer IPv4 header. */
25-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
26-
outer_ipv4_offset);
25+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
26+
outer_ipv4_offset);
2727
outer_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
2828

2929
/* Inner IPv4 header. */
30-
ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
31-
inner_ipv4_offset);
30+
ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
31+
inner_ipv4_offset);
3232
inner_id = rte_be_to_cpu_16(ipv4_hdr->packet_id);
3333

3434
tail_idx = nb_segs - 1;
@@ -42,9 +42,9 @@ update_tunnel_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs,
4242
*
4343
* Set IP fragment offset for inner IP header.
4444
*/
45-
ipv4_hdr = (struct rte_ipv4_hdr *)
46-
(rte_pktmbuf_mtod(segs[i], char *) +
47-
inner_ipv4_offset);
45+
ipv4_hdr = rte_pktmbuf_mtod_offset(segs[i],
46+
struct rte_ipv4_hdr *,
47+
inner_ipv4_offset);
4848
is_mf = i < tail_idx ? IPV4_HDR_MF_BIT : 0;
4949
ipv4_hdr->fragment_offset =
5050
rte_cpu_to_be_16(frag_offset | is_mf);
@@ -67,8 +67,8 @@ gso_tunnel_udp4_segment(struct rte_mbuf *pkt,
6767
int ret;
6868

6969
hdr_offset = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len;
70-
inner_ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt, char *) +
71-
hdr_offset);
70+
inner_ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
71+
hdr_offset);
7272
/*
7373
* Don't process the packet whose MF bit or offset in the inner
7474
* IPv4 header are non-zero.

0 commit comments

Comments
 (0)