From: David S. Miller Date: Wed, 22 Jan 2014 02:05:12 +0000 (-0800) Subject: Merge branch 'gro_udp_encap' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70fccb7e34f029755a5371b6b786f8425c2f27a1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'gro_udp_encap' Or Gerlitz says: ==================== net: Add GRO support for UDP encapsulating protocols This series adds GRO handlers for protocols that do UDP encapsulation, with the intent of being able to coalesce packets which encapsulate packets belonging to the same TCP session. For GRO purposes, the destination UDP port takes the role of the ether type field in the ethernet header or the next protocol in the IP header. The UDP GRO handler will only attempt to coalesce packets whose destination port is registered to have gro handler. The patches done against net-next 75e4364f67 "net: stmmac: fix NULL pointer dereference in stmmac_get_tx_hwtstamp" Or. v4 --> v5 changes: - followed Eric's directives to avoid using atomic get/put ops on the udp gro receive and complete callbacks and instead keep the rcu_read_lock when calling the next handler on the chain. v3 --> v4 changes: - applied feedback from Tom on some micro-optimizations that save branches and goto directives in the udp gro logic - applied feedback from Eric on correct RCU programming for the add/remove flow of the upper protocols udp gro handlers v2 --> v3 changes: - moved to use linked list to store the udp gro handlers, this solves the problem of consuming 512KB of memory for the handlers. - use a mark on the skb GRO CB data to disallow running the udp gro_receive twice on a packet, this solves the problem of udp encapsulated packets whose inner VM packet is udp and happen to carry a port which has registered offloads - and flush it. - invoke the udp offload protocol registration and de-registration from the vxlan driver in a sleepable context ==================== Signed-off-by: David S. Miller --- 70fccb7e34f029755a5371b6b786f8425c2f27a1