Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de960aa9 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

net: add and use skb_gso_transport_seglen() 



This moves part of Eric Dumazets skb_gso_seglen helper from tbf sched to
skbuff core so it may be reused by upcoming ip forwarding path patch.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77d143de

include/linux/skbuff.h

+1 −0
Original line number Diff line number Diff line
@@ -2456,6 +2456,7 @@ void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, 
void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len);

int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen);

void skb_scrub_packet(struct sk_buff *skb, bool xnet);

unsigned int skb_gso_transport_seglen(const struct sk_buff *skb);

struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features);



struct skb_checksum_ops {

net/core/skbuff.c

+25 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#include <linux/in.h>

#include <linux/inet.h>

#include <linux/slab.h>

#include <linux/tcp.h>

#include <linux/udp.h>

#include <linux/netdevice.h>

#ifdef CONFIG_NET_CLS_ACT

#include <net/pkt_sched.h>
@@ -3916,3 +3918,26 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) 
	nf_reset_trace(skb);

}

EXPORT_SYMBOL_GPL(skb_scrub_packet);



/**

 * skb_gso_transport_seglen - Return length of individual segments of a gso packet

 *

 * @skb: GSO skb

 *

 * skb_gso_transport_seglen is used to determine the real size of the

 * individual segments, including Layer4 headers (TCP/UDP).

 *

 * The MAC/L2 or network (IP, IPv6) headers are not accounted for.

 */

unsigned int skb_gso_transport_seglen(const struct sk_buff *skb)

{

	const struct skb_shared_info *shinfo = skb_shinfo(skb);

	unsigned int hdr_len;



	if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))

		hdr_len = tcp_hdrlen(skb);

	else

		hdr_len = sizeof(struct udphdr);

	return hdr_len + shinfo->gso_size;

}

EXPORT_SYMBOL_GPL(skb_gso_transport_seglen);

net/sched/sch_tbf.c

+3 −10
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <net/netlink.h>

#include <net/sch_generic.h>

#include <net/pkt_sched.h>

#include <net/tcp.h>





/*	Simple Token Bucket Filter.
@@ -148,16 +147,10 @@ static u64 psched_ns_t2l(const struct psched_ratecfg *r, 
 * Return length of individual segments of a gso packet,

 * including all headers (MAC, IP, TCP/UDP)

 */

static unsigned int skb_gso_seglen(const struct sk_buff *skb)

static unsigned int skb_gso_mac_seglen(const struct sk_buff *skb)

{

	unsigned int hdr_len = skb_transport_header(skb) - skb_mac_header(skb);

	const struct skb_shared_info *shinfo = skb_shinfo(skb);



	if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))

		hdr_len += tcp_hdrlen(skb);

	else

		hdr_len += sizeof(struct udphdr);

	return hdr_len + shinfo->gso_size;

	return hdr_len + skb_gso_transport_seglen(skb);

}



/* GSO packet is too big, segment it so that tbf can transmit
@@ -202,7 +195,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	int ret;



	if (qdisc_pkt_len(skb) > q->max_size) {

		if (skb_is_gso(skb) && skb_gso_seglen(skb) <= q->max_size)

		if (skb_is_gso(skb) && skb_gso_mac_seglen(skb) <= q->max_size)

			return tbf_segment(skb, sch);

		return qdisc_reshape_fail(skb, sch);

	}