Skip to content

Commit 5140a73

Browse files
author
Frantisek Hrbata
committed
Merge: CNB: net: add skb_[inner_]tcp_all_headers helpers
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1421 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2128182 Adding skb_[inner_]tcp_all_headers helpers Signed-off-by: Petr Oros <poros@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Approved-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
2 parents b30d572 + f1c3570 commit 5140a73

File tree

45 files changed

+115
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+115
-109
lines changed

‎drivers/infiniband/ulp/ipoib/ipoib_ib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb,
573573
unsigned int usable_sge = priv->max_send_sge - !!skb_headlen(skb);
574574

575575
if (skb_is_gso(skb)) {
576-
hlen = skb_transport_offset(skb) + tcp_hdrlen(skb);
576+
hlen = skb_tcp_all_headers(skb);
577577
phead = skb->data;
578578
if (unlikely(!skb_pull(skb, hlen))) {
579579
ipoib_warn(priv, "linear data too small\n");

‎drivers/net/ethernet/amd/xgbe/xgbe-drv.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,12 +1671,10 @@ static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet)
16711671
return ret;
16721672

16731673
if (XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, VXLAN)) {
1674-
packet->header_len = skb_inner_transport_offset(skb) +
1675-
inner_tcp_hdrlen(skb);
1674+
packet->header_len = skb_inner_tcp_all_headers(skb);
16761675
packet->tcp_header_len = inner_tcp_hdrlen(skb);
16771676
} else {
1678-
packet->header_len = skb_transport_offset(skb) +
1679-
tcp_hdrlen(skb);
1677+
packet->header_len = skb_tcp_all_headers(skb);
16801678
packet->tcp_header_len = tcp_hdrlen(skb);
16811679
}
16821680
packet->tcp_payload_len = skb->len - packet->header_len;

‎drivers/net/ethernet/atheros/atl1c/atl1c_main.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,7 +2072,7 @@ static u16 atl1c_cal_tpd_req(const struct sk_buff *skb)
20722072
tpd_req = skb_shinfo(skb)->nr_frags + 1;
20732073

20742074
if (skb_is_gso(skb)) {
2075-
proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
2075+
proto_hdr_len = skb_tcp_all_headers(skb);
20762076
if (proto_hdr_len < skb_headlen(skb))
20772077
tpd_req++;
20782078
if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
@@ -2107,7 +2107,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
21072107
if (real_len < skb->len)
21082108
pskb_trim(skb, real_len);
21092109

2110-
hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
2110+
hdr_len = skb_tcp_all_headers(skb);
21112111
if (unlikely(skb->len == hdr_len)) {
21122112
/* only xsum need */
21132113
if (netif_msg_tx_queued(adapter))
@@ -2132,7 +2132,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
21322132
*tpd = atl1c_get_tpd(adapter, queue);
21332133
ipv6_hdr(skb)->payload_len = 0;
21342134
/* check payload == 0 byte ? */
2135-
hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
2135+
hdr_len = skb_tcp_all_headers(skb);
21362136
if (unlikely(skb->len == hdr_len)) {
21372137
/* only xsum need */
21382138
if (netif_msg_tx_queued(adapter))
@@ -2219,7 +2219,8 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter,
22192219
tso = (tpd->word1 >> TPD_LSO_EN_SHIFT) & TPD_LSO_EN_MASK;
22202220
if (tso) {
22212221
/* TSO */
2222-
map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
2222+
hdr_len = skb_tcp_all_headers(skb);
2223+
map_len = hdr_len;
22232224
use_tpd = tpd;
22242225

22252226
buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);

‎drivers/net/ethernet/atheros/atl1e/atl1e_main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,8 +1609,7 @@ static u16 atl1e_cal_tdp_req(const struct sk_buff *skb)
16091609
if (skb_is_gso(skb)) {
16101610
if (skb->protocol == htons(ETH_P_IP) ||
16111611
(skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) {
1612-
proto_hdr_len = skb_transport_offset(skb) +
1613-
tcp_hdrlen(skb);
1612+
proto_hdr_len = skb_tcp_all_headers(skb);
16141613
if (proto_hdr_len < skb_headlen(skb)) {
16151614
tpd_req += ((skb_headlen(skb) - proto_hdr_len +
16161615
MAX_TX_BUF_LEN - 1) >>
@@ -1645,7 +1644,7 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,
16451644
if (real_len < skb->len)
16461645
pskb_trim(skb, real_len);
16471646

1648-
hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
1647+
hdr_len = skb_tcp_all_headers(skb);
16491648
if (unlikely(skb->len == hdr_len)) {
16501649
/* only xsum need */
16511650
netdev_warn(adapter->netdev,
@@ -1713,7 +1712,8 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter,
17131712
segment = (tpd->word3 >> TPD_SEGMENT_EN_SHIFT) & TPD_SEGMENT_EN_MASK;
17141713
if (segment) {
17151714
/* TSO */
1716-
map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
1715+
hdr_len = skb_tcp_all_headers(skb);
1716+
map_len = hdr_len;
17171717
use_tpd = tpd;
17181718

17191719
tx_buffer = atl1e_get_tx_buffer(adapter, use_tpd);

‎drivers/net/ethernet/atheros/atlx/atl1.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,7 +2115,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
21152115
ntohs(iph->tot_len));
21162116
if (real_len < skb->len)
21172117
pskb_trim(skb, real_len);
2118-
hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
2118+
hdr_len = skb_tcp_all_headers(skb);
21192119
if (skb->len == hdr_len) {
21202120
iph->check = 0;
21212121
tcp_hdr(skb)->check =
@@ -2206,7 +2206,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,
22062206
retval = (ptpd->word3 >> TPD_SEGMENT_EN_SHIFT) & TPD_SEGMENT_EN_MASK;
22072207
if (retval) {
22082208
/* TSO */
2209-
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
2209+
hdr_len = skb_tcp_all_headers(skb);
22102210
buffer_info->length = hdr_len;
22112211
page = virt_to_page(skb->data);
22122212
offset = offset_in_page(skb->data);
@@ -2367,8 +2367,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,
23672367
mss = skb_shinfo(skb)->gso_size;
23682368
if (mss) {
23692369
if (skb->protocol == htons(ETH_P_IP)) {
2370-
proto_hdr_len = (skb_transport_offset(skb) +
2371-
tcp_hdrlen(skb));
2370+
proto_hdr_len = skb_tcp_all_headers(skb);
23722371
if (unlikely(proto_hdr_len > len)) {
23732372
dev_kfree_skb_any(skb);
23742373
return NETDEV_TX_OK;

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3419,12 +3419,9 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
34193419

34203420
/* Headers length */
34213421
if (xmit_type & XMIT_GSO_ENC)
3422-
hlen = (int)(skb_inner_transport_header(skb) -
3423-
skb->data) +
3424-
inner_tcp_hdrlen(skb);
3422+
hlen = skb_inner_tcp_all_headers(skb);
34253423
else
3426-
hlen = (int)(skb_transport_header(skb) -
3427-
skb->data) + tcp_hdrlen(skb);
3424+
hlen = skb_tcp_all_headers(skb);
34283425

34293426
/* Amount of data (w/o headers) on linear part of SKB*/
34303427
first_bd_sz = skb_headlen(skb) - hlen;
@@ -3532,15 +3529,13 @@ static u8 bnx2x_set_pbd_csum_enc(struct bnx2x *bp, struct sk_buff *skb,
35323529
ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &
35333530
ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;
35343531

3535-
return skb_inner_transport_header(skb) +
3536-
inner_tcp_hdrlen(skb) - skb->data;
3532+
return skb_inner_tcp_all_headers(skb);
35373533
}
35383534

35393535
/* We support checksum offload for TCP and UDP only.
35403536
* No need to pass the UDP header length - it's a constant.
35413537
*/
3542-
return skb_inner_transport_header(skb) +
3543-
sizeof(struct udphdr) - skb->data;
3538+
return skb_inner_transport_offset(skb) + sizeof(struct udphdr);
35443539
}
35453540

35463541
/**
@@ -3566,12 +3561,12 @@ static u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
35663561
ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &
35673562
ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;
35683563

3569-
return skb_transport_header(skb) + tcp_hdrlen(skb) - skb->data;
3564+
return skb_tcp_all_headers(skb);
35703565
}
35713566
/* We support checksum offload for TCP and UDP only.
35723567
* No need to pass the UDP header length - it's a constant.
35733568
*/
3574-
return skb_transport_header(skb) + sizeof(struct udphdr) - skb->data;
3569+
return skb_transport_offset(skb) + sizeof(struct udphdr);
35753570
}
35763571

35773572
/* set FW indication according to inner or outer protocols if tunneled */

‎drivers/net/ethernet/broadcom/bnxt/bnxt.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
535535
u32 hdr_len;
536536

537537
if (skb->encapsulation)
538-
hdr_len = skb_inner_network_offset(skb) +
539-
skb_inner_network_header_len(skb) +
540-
inner_tcp_hdrlen(skb);
538+
hdr_len = skb_inner_tcp_all_headers(skb);
541539
else
542-
hdr_len = skb_transport_offset(skb) +
543-
tcp_hdrlen(skb);
540+
hdr_len = skb_tcp_all_headers(skb);
544541

545542
txbd1->tx_bd_hsize_lflags |= cpu_to_le32(TX_BD_FLAGS_LSO |
546543
TX_BD_FLAGS_T_IPID |

‎drivers/net/ethernet/broadcom/tg3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7944,7 +7944,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
79447944
iph = ip_hdr(skb);
79457945
tcp_opt_len = tcp_optlen(skb);
79467946

7947-
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb) - ETH_HLEN;
7947+
hdr_len = skb_tcp_all_headers(skb) - ETH_HLEN;
79487948

79497949
/* HW/FW can not correctly segment packets that have been
79507950
* vlan encapsulated.

‎drivers/net/ethernet/brocade/bna/bnad.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,8 +2823,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
28232823
BNAD_UPDATE_CTR(bnad, tx_skb_mss_too_long);
28242824
return -EINVAL;
28252825
}
2826-
if (unlikely((gso_size + skb_transport_offset(skb) +
2827-
tcp_hdrlen(skb)) >= skb->len)) {
2826+
if (unlikely((gso_size + skb_tcp_all_headers(skb)) >= skb->len)) {
28282827
txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);
28292828
txqent->hdr.wi.lso_mss = 0;
28302829
BNAD_UPDATE_CTR(bnad, tx_skb_tso_too_short);
@@ -2872,8 +2871,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
28722871
BNAD_UPDATE_CTR(bnad, tcpcsum_offload);
28732872

28742873
if (unlikely(skb_headlen(skb) <
2875-
skb_transport_offset(skb) +
2876-
tcp_hdrlen(skb))) {
2874+
skb_tcp_all_headers(skb))) {
28772875
BNAD_UPDATE_CTR(bnad, tx_skb_tcp_hdr);
28782876
return -EINVAL;
28792877
}

‎drivers/net/ethernet/cadence/macb_main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
21722172
/* only queue eth + ip headers separately for UDP */
21732173
hdrlen = skb_transport_offset(skb);
21742174
else
2175-
hdrlen = skb_transport_offset(skb) + tcp_hdrlen(skb);
2175+
hdrlen = skb_tcp_all_headers(skb);
21762176
if (skb_headlen(skb) < hdrlen) {
21772177
netdev_err(bp->dev, "Error - LSO headers fragmented!!!\n");
21782178
/* if this is required, would need to copy to single buffer */

0 commit comments

Comments
 (0)