redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: use skb_is_gso_sctp() instead of open-coding 

As well as the basic conversion, I noticed that a lot of the
SCTP code checks gso_type without first checking skb_is_gso()
so I have added that where appropriate.

Also, document the helper.

Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Daniel Axtens 2018-03-09 14:06:09 +11:00 committed by David S. Miller
parent ca0edb131b
commit 1dd27cde30
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/networking/segmentation-offloads.txt
View File

@ -155,7 +155,10 @@ Therefore, any code in the core networking stack must be aware of the
possibility that gso_size will be GSO_BY_FRAGS and handle that case possibility that gso_size will be GSO_BY_FRAGS and handle that case
appropriately. appropriately.
There are a couple of helpers to make this easier: There are some helpers to make this easier:
- skb_is_gso(skb) && skb_is_gso_sctp(skb) is the best way to see if
an skb is an SCTP GSO skb.
- For size checks, the skb_gso_validate_*_len family of helpers correctly - For size checks, the skb_gso_validate_*_len family of helpers correctly
considers GSO_BY_FRAGS. considers GSO_BY_FRAGS.

2
net/core/skbuff.c
View File

@ -4904,7 +4904,7 @@ static unsigned int skb_gso_transport_seglen(const struct sk_buff *skb)
thlen += inner_tcp_hdrlen(skb); thlen += inner_tcp_hdrlen(skb);
} else if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) { } else if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {
thlen = tcp_hdrlen(skb); thlen = tcp_hdrlen(skb);
} else if (unlikely(shinfo->gso_type & SKB_GSO_SCTP)) { } else if (unlikely(skb_is_gso_sctp(skb))) {
thlen = sizeof(struct sctphdr); thlen = sizeof(struct sctphdr);
} }
/* UFO sets gso_size to the size of the fragmentation /* UFO sets gso_size to the size of the fragmentation

2
net/sched/act_csum.c
View File

@ -350,7 +350,7 @@ static int tcf_csum_sctp(struct sk_buff *skb, unsigned int ihl,
{ {
struct sctphdr *sctph; struct sctphdr *sctph;
if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_SCTP) if (skb_is_gso(skb) && skb_is_gso_sctp(skb))
return 1; return 1;
sctph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*sctph)); sctph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*sctph));

8
net/sctp/input.c
View File

@ -106,6 +106,7 @@ int sctp_rcv(struct sk_buff *skb)
int family; int family;
struct sctp_af *af; struct sctp_af *af;
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
bool is_gso = skb_is_gso(skb) && skb_is_gso_sctp(skb);
if (skb->pkt_type != PACKET_HOST) if (skb->pkt_type != PACKET_HOST)
goto discard_it; goto discard_it;
@ -123,8 +124,7 @@ int sctp_rcv(struct sk_buff *skb)
* it's better to just linearize it otherwise crc computing * it's better to just linearize it otherwise crc computing
* takes longer. * takes longer.
*/ */
if ((!(skb_shinfo(skb)->gso_type & SKB_GSO_SCTP) && if ((!is_gso && skb_linearize(skb)) ||
skb_linearize(skb)) ||
!pskb_may_pull(skb, sizeof(struct sctphdr))) !pskb_may_pull(skb, sizeof(struct sctphdr)))
goto discard_it; goto discard_it;
@ -135,7 +135,7 @@ int sctp_rcv(struct sk_buff *skb)
if (skb_csum_unnecessary(skb)) if (skb_csum_unnecessary(skb))
__skb_decr_checksum_unnecessary(skb); __skb_decr_checksum_unnecessary(skb);
else if (!sctp_checksum_disable && else if (!sctp_checksum_disable &&
!(skb_shinfo(skb)->gso_type & SKB_GSO_SCTP) && !is_gso &&
sctp_rcv_checksum(net, skb) < 0) sctp_rcv_checksum(net, skb) < 0)
goto discard_it; goto discard_it;
skb->csum_valid = 1; skb->csum_valid = 1;
@ -1218,7 +1218,7 @@ static struct sctp_association *__sctp_rcv_lookup_harder(struct net *net,
* issue as packets hitting this are mostly INIT or INIT-ACK and * issue as packets hitting this are mostly INIT or INIT-ACK and
* those cannot be on GSO-style anyway. * those cannot be on GSO-style anyway.
*/ */
if ((skb_shinfo(skb)->gso_type & SKB_GSO_SCTP) == SKB_GSO_SCTP) if (skb_is_gso(skb) && skb_is_gso_sctp(skb))
return NULL; return NULL;
ch = (struct sctp_chunkhdr *)skb->data; ch = (struct sctp_chunkhdr *)skb->data;

2
net/sctp/inqueue.c
View File

@ -170,7 +170,7 @@ next_chunk:
chunk = list_entry(entry, struct sctp_chunk, list); chunk = list_entry(entry, struct sctp_chunk, list);
if ((skb_shinfo(chunk->skb)->gso_type & SKB_GSO_SCTP) == SKB_GSO_SCTP) { if (skb_is_gso(chunk->skb) && skb_is_gso_sctp(chunk->skb)) {
/* GSO-marked skbs but without frags, handle /* GSO-marked skbs but without frags, handle
* them normally * them normally
*/ */

2
net/sctp/offload.c
View File

@ -45,7 +45,7 @@ static struct sk_buff *sctp_gso_segment(struct sk_buff *skb,
struct sk_buff *segs = ERR_PTR(-EINVAL); struct sk_buff *segs = ERR_PTR(-EINVAL);
struct sctphdr *sh; struct sctphdr *sh;
if (!(skb_shinfo(skb)->gso_type & SKB_GSO_SCTP)) if (!skb_is_gso_sctp(skb))
goto out; goto out;
sh = sctp_hdr(skb); sh = sctp_hdr(skb);