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

Commit e3e92021 authored by Paolo Abeni's avatar Paolo Abeni Committed by Sean Tranchetti
Browse files

udp: add support for UDP_GRO cmsg 



When UDP GRO is enabled, the UDP_GRO cmsg will carry the ingress
datagram size. User-space can use such info to compute the original
packets layout.

Change-Id: Iccb86e8e681ad3080e73ac4c1077c27b531572ab
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git


Git-commit: bcd1665e3569b0a6f569514f023a41fc7df0b4a3
Signed-off-by: default avatarSean Tranchetti <stranche@codeaurora.org>
parent 9719a55e

include/linux/udp.h

+11 −0
Original line number Diff line number Diff line
@@ -121,6 +121,17 @@ static inline bool udp_get_no_check6_rx(struct sock *sk) 
	return udp_sk(sk)->no_check6_rx;

}



static inline void udp_cmsg_recv(struct msghdr *msg, struct sock *sk,

				 struct sk_buff *skb)

{

	int gso_size;



	if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) {

		gso_size = skb_shinfo(skb)->gso_size;

		put_cmsg(msg, SOL_UDP, UDP_GRO, sizeof(gso_size), &gso_size);

	}

}



#define udp_portaddr_for_each_entry(__sk, list) \

	hlist_for_each_entry(__sk, list, __sk_common.skc_portaddr_node)

net/ipv4/udp.c

+4 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,10 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, 
		memset(sin->sin_zero, 0, sizeof(sin->sin_zero));

		*addr_len = sizeof(*sin);

	}



	if (udp_sk(sk)->gro_enabled)

		udp_cmsg_recv(msg, sk, skb);



	if (inet->cmsg_flags)

		ip_cmsg_recv_offset(msg, sk, skb, sizeof(struct udphdr), off);

net/ipv6/udp.c

+3 −0
Original line number Diff line number Diff line
@@ -421,6 +421,9 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
		*addr_len = sizeof(*sin6);

	}



	if (udp_sk(sk)->gro_enabled)

		udp_cmsg_recv(msg, sk, skb);



	if (np->rxopt.all)

		ip6_datagram_recv_common_ctl(sk, msg, skb);