From patchwork Tue Mar 27 21:11:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Copot X-Patchwork-Id: 149034 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 57863B6EF1 for ; Wed, 28 Mar 2012 08:12:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756149Ab2C0VMP (ORCPT ); Tue, 27 Mar 2012 17:12:15 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:52788 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753633Ab2C0VMN (ORCPT ); Tue, 27 Mar 2012 17:12:13 -0400 Received: by wejx9 with SMTP id x9so220010wej.19 for ; Tue, 27 Mar 2012 14:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=HIaGuEAgASiN68PwLHCaiQ1SuYvnlBhxlv1mEbKPfhU=; b=kpzKekksZVlENeGAGa/wbsYoguuz1MkEw9dFdDgFn+pUlmM0bUjGQma9gG8J1eOc1C VM5WJlnsSmJHVSg9uJV20ktHavBYfBH67/XBifX2j0VpTx+cGBz78fQDsLx4D5nuqf5T IuxYH6CEppkgoFFjqrhbSsPkk3MFexBmWQe2YU40PniVZysJABVYq4nNK+P9Pn/jbWZm MYUBX/cWCr1Eka9nxMlNDRwUiwrC/IkLlMft0SjRe8J4+q6iBdZrhGr1XoK92wKYizz7 NdTFfZIQ5jzpdINge3NUYC2UG/Ym3WYXxtxsRJDoWIXbUrzpsfwGz/KYapFYbpD+qJla EVcg== Received: by 10.216.132.226 with SMTP id o76mr15536247wei.93.1332882731657; Tue, 27 Mar 2012 14:12:11 -0700 (PDT) Received: from ws.lan ([188.26.223.40]) by mx.google.com with ESMTPS id ex2sm3950748wib.8.2012.03.27.14.12.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Mar 2012 14:12:10 -0700 (PDT) From: Alexandru Copot To: davem@davemloft.net, eric.dumazet@gmail.com Cc: kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandru Copot , Daniel Baluta Subject: [PATCH] tcp: bind() use stronger condition for bind_conflict Date: Wed, 28 Mar 2012 00:11:52 +0300 Message-Id: <1332882712-10756-1-git-send-email-alex.mihai.c@gmail.com> X-Mailer: git-send-email 1.7.9.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We must try harder to get unique (addr, port) pairs when doing port autoselection for sockets with SO_REUSEADDR option set. We achieve this by adding a relaxation parameter to inet_csk_bind_conflict. When 'relax' parameter is off we return a conflict whenever the current searched pair (addr, port) is not unique. This tries to address the problems reported in patch: 8d238b25b1ec22a73b1c2206f111df2faaff8285 Revert "tcp: bind() fix when many ports are bound" Signed-off-by: Alexandru Copot Signed-off-by: Daniel Baluta --- include/net/inet6_connection_sock.h | 2 +- include/net/inet_connection_sock.h | 4 ++-- net/ipv4/inet_connection_sock.c | 17 +++++++++++++---- net/ipv6/inet6_connection_sock.c | 3 ++- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h index 3207e58..9d29ae2 100644 --- a/include/net/inet6_connection_sock.h +++ b/include/net/inet6_connection_sock.h @@ -23,7 +23,7 @@ struct sock; struct sockaddr; extern int inet6_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb); + const struct inet_bind_bucket *tb, int relax); extern struct dst_entry* inet6_csk_route_req(struct sock *sk, const struct request_sock *req); diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index dbf9aab..f05a032 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -60,7 +60,7 @@ struct inet_connection_sock_af_ops { #endif void (*addr2sockaddr)(struct sock *sk, struct sockaddr *); int (*bind_conflict)(const struct sock *sk, - const struct inet_bind_bucket *tb); + const struct inet_bind_bucket *tb, int relax); }; /** inet_connection_sock - INET connection oriented sock @@ -245,7 +245,7 @@ extern struct request_sock *inet_csk_search_req(const struct sock *sk, const __be32 raddr, const __be32 laddr); extern int inet_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb); + const struct inet_bind_bucket *tb, int relax); extern int inet_csk_get_port(struct sock *sk, unsigned short snum); extern struct dst_entry* inet_csk_route_req(struct sock *sk, diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 19d66ce..bf50e77 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -53,7 +53,7 @@ void inet_get_local_port_range(int *low, int *high) EXPORT_SYMBOL(inet_get_local_port_range); int inet_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb) + const struct inet_bind_bucket *tb, int relax) { struct sock *sk2; struct hlist_node *node; @@ -79,6 +79,13 @@ int inet_csk_bind_conflict(const struct sock *sk, sk2_rcv_saddr == sk_rcv_saddr(sk)) break; } + if (!relax && reuse && sk2->sk_reuse && + sk2->sk_state != TCP_LISTEN) { + const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); + if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) || + sk2_rcv_saddr == sk_rcv_saddr(sk)) + break; + } } } return node != NULL; @@ -122,12 +129,13 @@ again: (tb->num_owners < smallest_size || smallest_size == -1)) { smallest_size = tb->num_owners; smallest_rover = rover; - if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) { + if (atomic_read(&hashinfo->bsockets) > (high - low) + 1 && + !inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, 0)) { snum = smallest_rover; goto tb_found; } } - if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { + if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, 0)) { snum = rover; goto tb_found; } @@ -178,12 +186,13 @@ tb_found: goto success; } else { ret = 1; - if (inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { + if (inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, 1)) { if (sk->sk_reuse && sk->sk_state != TCP_LISTEN && smallest_size != -1 && --attempts >= 0) { spin_unlock(&head->lock); goto again; } + goto fail_unlock; } } diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 02dd203..dfc8bc3 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -28,7 +28,8 @@ #include int inet6_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb) + const struct inet_bind_bucket *tb, + int relax) { const struct sock *sk2; const struct hlist_node *node;