* [PATCH v2 1/7] udp: Generic functions to set checksum
@ 2014-06-02 4:00 Tom Herbert
2014-06-02 23:43 ` Cong Wang
0 siblings, 1 reply; 3+ messages in thread
From: Tom Herbert @ 2014-06-02 4:00 UTC (permalink / raw)
To: davem, netdev
Added udp_set_csum and udp6_set_csum functions to set UDP checksums
in packets. These are for simple UDP packets such as those that might
be created in UDP tunnels.
Signed-off-by: Tom Herbert <therbert@google.com>
---
include/net/ip6_checksum.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
include/net/udp.h | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h
index 8ac5c21..ad3ca05 100644
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
@@ -82,5 +82,50 @@ static inline void tcp_v6_send_check(struct sock *sk, struct sk_buff *skb)
}
#endif
+static inline __sum16 udp_v6_check(int len,
+ const struct in6_addr *saddr,
+ const struct in6_addr *daddr,
+ __wsum base)
+{
+ return csum_ipv6_magic(saddr, daddr, len, IPPROTO_UDP, base);
+}
+
+
+/* Function to set UDP checksum for an IPv6 UDP packet. This is intended
+ * for the simple case like when setting the checksum for a UDP tunnel.
+ */
+static inline void udp6_set_csum(struct sock *sk, struct sk_buff *skb,
+ const struct in6_addr *saddr,
+ const struct in6_addr *daddr, int len)
+{
+ struct udphdr *uh = udp_hdr(skb);
+
+ if (udp_get_no_check6_tx(sk))
+ uh->check = 0;
+ else if (skb_is_gso(skb))
+ uh->check = ~udp_v6_check(len, saddr, daddr, 0);
+ else if (skb_dst(skb) && skb_dst(skb)->dev &&
+ (skb_dst(skb)->dev->features & NETIF_F_IPV6_CSUM)) {
+
+ BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
+
+ skb->ip_summed = CHECKSUM_PARTIAL;
+ skb->csum_start = skb_transport_header(skb) - skb->head;
+ skb->csum_offset = offsetof(struct udphdr, check);
+ uh->check = ~udp_v6_check(len, saddr, daddr, 0);
+ } else {
+ __wsum csum;
+
+ BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
+
+ uh->check = 0;
+ csum = skb_checksum(skb, 0, len, 0);
+ uh->check = udp_v6_check(len, saddr, daddr, csum);
+ if (uh->check == 0)
+ uh->check = CSUM_MANGLED_0;
+
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ }
+}
int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto);
#endif
diff --git a/include/net/udp.h b/include/net/udp.h
index 5eb8687..a8a6d69 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -147,6 +147,48 @@ static inline __wsum udp_csum(struct sk_buff *skb)
return csum;
}
+static inline __sum16 udp_v4_check(int len, __be32 saddr,
+ __be32 daddr, __wsum base)
+{
+ return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_UDP, base);
+}
+
+/* Function to set UDP checksum for an IPv4 UDP packet. This is intended
+ * for the simple case like when setting the checksum for a UDP tunnel.
+ */
+static inline void udp_set_csum(struct sock *sk, struct sk_buff *skb,
+ __be32 saddr, __be32 daddr, int len)
+{
+ struct udphdr *uh = udp_hdr(skb);
+
+ if (sk->sk_no_check_tx)
+ uh->check = 0;
+ else if (skb_is_gso(skb))
+ uh->check = ~udp_v4_check(len, saddr, daddr, 0);
+ else if (skb_dst(skb) && skb_dst(skb)->dev &&
+ (skb_dst(skb)->dev->features & NETIF_F_V4_CSUM)) {
+
+ BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
+
+ skb->ip_summed = CHECKSUM_PARTIAL;
+ skb->csum_start = skb_transport_header(skb) - skb->head;
+ skb->csum_offset = offsetof(struct udphdr, check);
+ uh->check = ~udp_v4_check(len, saddr, daddr, 0);
+ } else {
+ __wsum csum;
+
+ BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
+
+ uh->check = 0;
+ csum = skb_checksum(skb, 0, len, 0);
+ uh->check = udp_v4_check(len, saddr, daddr, csum);
+ if (uh->check == 0)
+ uh->check = CSUM_MANGLED_0;
+
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ }
+}
+
/* hash routines shared between UDPv4/6 and UDP-Litev4/6 */
static inline void udp_lib_hash(struct sock *sk)
{
--
1.9.1.423.g4596e3a
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/7] udp: Generic functions to set checksum
2014-06-02 4:00 [PATCH v2 1/7] udp: Generic functions to set checksum Tom Herbert
@ 2014-06-02 23:43 ` Cong Wang
2014-06-04 22:16 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2014-06-02 23:43 UTC (permalink / raw)
To: Tom Herbert; +Cc: David Miller, netdev
On Sun, Jun 1, 2014 at 9:00 PM, Tom Herbert <therbert@google.com> wrote:
> +
> +
> +/* Function to set UDP checksum for an IPv6 UDP packet. This is intended
> + * for the simple case like when setting the checksum for a UDP tunnel.
> + */
> +static inline void udp6_set_csum(struct sock *sk, struct sk_buff *skb,
> + const struct in6_addr *saddr,
> + const struct in6_addr *daddr, int len)
> +{
I think this function might be too big to be inlined.
Ditto for udp_set_csum().
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/7] udp: Generic functions to set checksum
2014-06-02 23:43 ` Cong Wang
@ 2014-06-04 22:16 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2014-06-04 22:16 UTC (permalink / raw)
To: cwang; +Cc: therbert, netdev
From: Cong Wang <cwang@twopensource.com>
Date: Mon, 2 Jun 2014 16:43:04 -0700
> On Sun, Jun 1, 2014 at 9:00 PM, Tom Herbert <therbert@google.com> wrote:
>> +
>> +
>> +/* Function to set UDP checksum for an IPv6 UDP packet. This is intended
>> + * for the simple case like when setting the checksum for a UDP tunnel.
>> + */
>> +static inline void udp6_set_csum(struct sock *sk, struct sk_buff *skb,
>> + const struct in6_addr *saddr,
>> + const struct in6_addr *daddr, int len)
>> +{
>
> I think this function might be too big to be inlined.
>
> Ditto for udp_set_csum().
Agreed, Tom please put these into a *.c file and export them.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-04 22:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-02 4:00 [PATCH v2 1/7] udp: Generic functions to set checksum Tom Herbert
2014-06-02 23:43 ` Cong Wang
2014-06-04 22:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).