From patchwork Fri May 7 15:44:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 51934 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C1F05B7D28 for ; Sat, 8 May 2010 01:45:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756709Ab0EGPo6 (ORCPT ); Fri, 7 May 2010 11:44:58 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:60766 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755840Ab0EGPo4 (ORCPT ); Fri, 7 May 2010 11:44:56 -0400 Received: by bwz19 with SMTP id 19so661070bwz.21 for ; Fri, 07 May 2010 08:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=ajjYrJFujBFaxfsaUZ3geNaxgaPpnzvs35p5fwY6c94=; b=VxuOrqs9ULcW2cnD2yj17s/ByOTHSh7ItQnD/y1lr+gj3tHCqy36cZJM3eFX9Ccxkn nM1lqhSU4z7ZouRcEmM3Oey6IwSK8jU13ZoHcCjp+KX2QWdB7gY57PfttO3mXZI2U26z wlVmWkksvXprYuYeRLYaek3NF3Ak7uOO5O4x8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=x9UZk+IyC/wzSx6Z7eVRyAVxyW/+Ok5N4k3ngTt4nZx4kdX9SmHEiIZXqCZ000jy86 c471sUib5vVrQUTpqulpNzjb+TO7vYp+x3x9+namPbQG+hIMKRpQzfsnZC6Wr0+/lLZ3 Ye5NNVI8v8/aPEpvbJE6WomRLb/wFNj3uU9+A= Received: by 10.204.21.20 with SMTP id h20mr235555bkb.149.1273247094091; Fri, 07 May 2010 08:44:54 -0700 (PDT) Received: from [127.0.0.1] (gw1.cosmosbay.com [212.99.114.194]) by mx.google.com with ESMTPS id 15sm759444bwz.4.2010.05.07.08.44.52 (version=SSLv3 cipher=RC4-MD5); Fri, 07 May 2010 08:44:53 -0700 (PDT) Subject: Re: TCP-MD5 checksum failure on x86_64 SMP From: Eric Dumazet To: Bhaskar Dutta Cc: Stephen Hemminger , Ben Hutchings , netdev@vger.kernel.org, David Miller In-Reply-To: <1273245486.2261.76.camel@edumazet-laptop> References: <20100504101301.5f4dd9c2@nehalam> <1273085598.2367.233.camel@edumazet-laptop> <1273210774.2222.45.camel@edumazet-laptop> <1273219222.2261.11.camel@edumazet-laptop> <1273225039.2261.32.camel@edumazet-laptop> <1273245486.2261.76.camel@edumazet-laptop> Date: Fri, 07 May 2010 17:44:50 +0200 Message-ID: <1273247090.2261.81.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Le vendredi 07 mai 2010 à 17:18 +0200, Eric Dumazet a écrit : > OK, I found the second problem. > > if/when IP route cache is invalidated, ip_queue_xmit() has to refetch a > route and calls sk_setup_caps(sk, &rt->u.dst), destroying the > > sk->sk_route_caps &= ~NETIF_F_GSO_MASK > > that MD5 desesperatly try to make all over its way (from > tcp_transmit_skb() for example) > > So we send few bad packets, and everything is fine when > tcp_transmit_skb() is called again. > > You get many errors on remote peer if you do > > ip route flush cache > I am testing following patch : include/net/sock.h | 8 ++++++++ net/core/sock.c | 1 + net/ipv4/tcp_ipv4.c | 6 +++--- net/ipv4/tcp_output.c | 2 +- net/ipv6/tcp_ipv6.c | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/sock.h b/include/net/sock.h index 1ad6435..abfadfe 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -177,6 +177,7 @@ struct sock_common { * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) + * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) * @sk_gso_max_size: Maximum GSO segment size to build * @sk_lingertime: %SO_LINGER l_linger setting @@ -276,6 +277,7 @@ struct sock { int sk_forward_alloc; gfp_t sk_allocation; int sk_route_caps; + int sk_route_nocaps; int sk_gso_type; unsigned int sk_gso_max_size; int sk_rcvlowat; @@ -1257,6 +1259,12 @@ static inline int sk_can_gso(const struct sock *sk) extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst); +static inline void sk_nocaps_add(struct sock *sk, int flags) +{ + sk->sk_route_nocaps |= flags; + sk->sk_route_caps &= ~flags; +} + static inline int skb_copy_to_page(struct sock *sk, char __user *from, struct sk_buff *skb, struct page *page, int off, int copy) diff --git a/net/core/sock.c b/net/core/sock.c index c5812bb..5056a6a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1227,6 +1227,7 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst) sk->sk_route_caps = dst->dev->features; if (sk->sk_route_caps & NETIF_F_GSO) sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE; + sk->sk_route_caps &= ~sk->sk_route_nocaps; if (sk_can_gso(sk)) { if (dst->header_len) { sk->sk_route_caps &= ~NETIF_F_GSO_MASK; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 3c23e70..f1a1dd9 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -894,7 +894,7 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, kfree(newkey); return -ENOMEM; } - sk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(sk, NETIF_F_GSO_MASK); } if (tcp_alloc_md5sig_pool(sk) == NULL) { kfree(newkey); @@ -1024,7 +1024,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval, return -EINVAL; tp->md5sig_info = p; - sk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(sk, NETIF_F_GSO_MASK); } newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, sk->sk_allocation); @@ -1465,7 +1465,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, if (newkey != NULL) tcp_v4_md5_do_add(newsk, newinet->inet_daddr, newkey, key->keylen); - newsk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(newsk, NETIF_F_GSO_MASK); } #endif diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 0dda86e..0193a39 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -872,7 +872,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, #ifdef CONFIG_TCP_MD5SIG /* Calculate the MD5 hash, as we have all we need now */ if (md5) { - sk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(sk, NETIF_F_GSO_MASK); tp->af_specific->calc_md5_hash(opts.hash_location, md5, sk, NULL, skb); } diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 075f540..bf34893 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -600,7 +600,7 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer, kfree(newkey); return -ENOMEM; } - sk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(sk, NETIF_F_GSO_MASK); } if (tcp_alloc_md5sig_pool(sk) == NULL) { kfree(newkey); @@ -737,7 +737,7 @@ static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval, return -ENOMEM; tp->md5sig_info = p; - sk->sk_route_caps &= ~NETIF_F_GSO_MASK; + sk_nocaps_add(sk, NETIF_F_GSO_MASK); } newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);