net: dsa: no longer clone skb in core driver

[linux-2.6-microblaze.git] / include / net / udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index a132a02..360df45 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -329,6 +329,8 @@ struct sock *__udp6_lib_lookup(struct net *net,
                               struct sk_buff *skb);
 struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,
                                 __be16 sport, __be16 dport);
+int udp_read_sock(struct sock *sk, read_descriptor_t *desc,
+                 sk_read_actor_t recv_actor);
 
 /* UDP uses skb->dev_scratch to cache as much information as possible and avoid
  * possibly multiple cache miss on dequeue()
@@ -515,9 +517,33 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk,
        return segs;
 }
 
-#ifdef CONFIG_BPF_STREAM_PARSER
+static inline void udp_post_segment_fix_csum(struct sk_buff *skb)
+{
+       /* UDP-lite can't land here - no GRO */
+       WARN_ON_ONCE(UDP_SKB_CB(skb)->partial_cov);
+
+       /* UDP packets generated with UDP_SEGMENT and traversing:
+        *
+        * UDP tunnel(xmit) -> veth (segmentation) -> veth (gro) -> UDP tunnel (rx)
+        *
+        * can reach an UDP socket with CHECKSUM_NONE, because
+        * __iptunnel_pull_header() converts CHECKSUM_PARTIAL into NONE.
+        * SKB_GSO_UDP_L4 or SKB_GSO_FRAGLIST packets with no UDP tunnel will
+        * have a valid checksum, as the GRO engine validates the UDP csum
+        * before the aggregation and nobody strips such info in between.
+        * Instead of adding another check in the tunnel fastpath, we can force
+        * a valid csum after the segmentation.
+        * Additionally fixup the UDP CB.
+        */
+       UDP_SKB_CB(skb)->cscov = skb->len;
+       if (skb->ip_summed == CHECKSUM_NONE && !skb->csum_valid)
+               skb->csum_valid = 1;
+}
+
+#ifdef CONFIG_BPF_SYSCALL
 struct sk_psock;
 struct proto *udp_bpf_get_proto(struct sock *sk, struct sk_psock *psock);
-#endif /* BPF_STREAM_PARSER */
+int udp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);
+#endif
 
 #endif /* _UDP_H */