From patchwork Thu Aug 6 06:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Froidcoeur X-Patchwork-Id: 1341480 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tessares.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=pqZPBAHq; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BMf6C2TdJz9sTX for ; Thu, 6 Aug 2020 16:41:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728369AbgHFGl1 (ORCPT ); Thu, 6 Aug 2020 02:41:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728271AbgHFGlS (ORCPT ); Thu, 6 Aug 2020 02:41:18 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EC45C061756 for ; Wed, 5 Aug 2020 23:41:17 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id m20so24830584eds.2 for ; Wed, 05 Aug 2020 23:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=jDUym0vWEpZIcMhWfa/K7V4V+Szd7ch6LROXk73w6hQ=; b=pqZPBAHqzO9t39KetthMni+h5xvguVJURtACJeU+jpTCCm8WNXLISsTFl6IJU4UsE8 IbGeGSfmTWa1ToeEM++ZFsGIz1zqBibaFyf0DLIZEnWfotWrOzcsFsofSH3JMTnajWPn v/IveldnQcEILJKt1tGvQNAuRILTDZs1731GsXtJjthZvgnwc7QhM+xbI2rlCUimaBVW 7USUMuOKkdQUGkeix6iSCVqDSTigP0hrf/NV0j1FsSt3ZA7zd75Ua9L5fNMbgHSitm6t l0P+qIibDQ55U0eXJ9ec0jNQQGAC78pKeh3Oc/ZC+Oy0wugXcpaZmsYaN4DTIZY32HGl ZMHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=jDUym0vWEpZIcMhWfa/K7V4V+Szd7ch6LROXk73w6hQ=; b=Shxao59ucRwdr/qSqnx+z++vi6E1dxqLY+wREt/oJEeFXNTxFGD/Aur7g9oFCd743t fGuhLzFMSNY1ho+bA9NQjIoDpsehx+idcY00uYsLyMRQqBPuGOwmb6Xw5bDcTKlvjSsG am2PLTvu43CE8vDCOgumSGn4ssxVWoGvXcLFVVWfbIyjtBnLCeNptoTIe7iPiIgXhlgS DvwDn1al9WuDkcVOJluo8hNi0Y01gU8qyxDpA08p+VIa7MMMMIZ4O7HpI1pK5lGtW7HI 1PGxS19eUgUu59bRzX2EKu0bt+dg79KTEnPmRGursm77Pc+ni3AVYoua8UVQXM7Qr3Fx YvEg== X-Gm-Message-State: AOAM530GrkbEtHvJt61KNd8oNWwJECVsU1wVI2I8II+fcm3TPCda3w78 Mwb6+0qeX9csdGbWEL28Bbs554X6I+nh+E6HTYn32XCHi9CysaurR8uzOWOQnqSxjSIAwE1MkeL oHv5MdHStCw== X-Google-Smtp-Source: ABdhPJzhboHOTfkuAM14VstGdrhfyo4qmphKKGc7ktZhyPZ8YfLSuytZrb9SO76LJ8TfitGybTBJDg== X-Received: by 2002:a50:fc0e:: with SMTP id i14mr2610860edr.346.1596696076367; Wed, 05 Aug 2020 23:41:16 -0700 (PDT) Received: from tim.froidcoeur.net (ptr-7tznw15pracyli75x11.18120a2.ip6.access.telenet.be. [2a02:1811:50e:f0f0:d05d:939:f42b:f575]) by smtp.gmail.com with ESMTPSA id h18sm2880984edw.56.2020.08.05.23.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 23:41:15 -0700 (PDT) From: Tim Froidcoeur To: "David S. Miller" , Jakub Kicinski , Alexey Kuznetsov , Hideaki YOSHIFUJI , Patrick McHardy , KOVACS Krisztian Cc: Tim Froidcoeur , Matthieu Baerts , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 1/2] net: refactor bind_bucket fastreuse into helper Date: Thu, 6 Aug 2020 08:41:07 +0200 Message-Id: <20200806064109.183059-2-tim.froidcoeur@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200806064109.183059-1-tim.froidcoeur@tessares.net> References: <20200806064109.183059-1-tim.froidcoeur@tessares.net> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Refactor the fastreuse update code in inet_csk_get_port into a small helper function that can be called from other places. Acked-by: Matthieu Baerts Signed-off-by: Tim Froidcoeur --- include/net/inet_connection_sock.h | 4 ++ net/ipv4/inet_connection_sock.c | 99 ++++++++++++++++-------------- 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index e5b388f5fa20..1d59bf55bb4d 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -316,6 +316,10 @@ int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname, int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname, char __user *optval, unsigned int optlen); +/* update the fast reuse flag when adding a socket */ +void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, + struct sock *sk); + struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu); #define TCP_PINGPONG_THRESH 3 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index afaf582a5aa9..3b46b1f6086e 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -266,7 +266,7 @@ inet_csk_find_open_port(struct sock *sk, struct inet_bind_bucket **tb_ret, int * static inline int sk_reuseport_match(struct inet_bind_bucket *tb, struct sock *sk) { - kuid_t uid = sock_i_uid(sk); + kuid_t uid = sock_i_uid((struct sock *)sk); if (tb->fastreuseport <= 0) return 0; @@ -296,6 +296,57 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb, ipv6_only_sock(sk), true, false); } +void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, + struct sock *sk) +{ + kuid_t uid = sock_i_uid((struct sock *)sk); + bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN; + + if (hlist_empty(&tb->owners)) { + tb->fastreuse = reuse; + if (sk->sk_reuseport) { + tb->fastreuseport = FASTREUSEPORT_ANY; + tb->fastuid = uid; + tb->fast_rcv_saddr = sk->sk_rcv_saddr; + tb->fast_ipv6_only = ipv6_only_sock(sk); + tb->fast_sk_family = sk->sk_family; +#if IS_ENABLED(CONFIG_IPV6) + tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr; +#endif + } else { + tb->fastreuseport = 0; + } + } else { + if (!reuse) + tb->fastreuse = 0; + if (sk->sk_reuseport) { + /* We didn't match or we don't have fastreuseport set on + * the tb, but we have sk_reuseport set on this socket + * and we know that there are no bind conflicts with + * this socket in this tb, so reset our tb's reuseport + * settings so that any subsequent sockets that match + * our current socket will be put on the fast path. + * + * If we reset we need to set FASTREUSEPORT_STRICT so we + * do extra checking for all subsequent sk_reuseport + * socks. + */ + if (!sk_reuseport_match(tb, sk)) { + tb->fastreuseport = FASTREUSEPORT_STRICT; + tb->fastuid = uid; + tb->fast_rcv_saddr = sk->sk_rcv_saddr; + tb->fast_ipv6_only = ipv6_only_sock(sk); + tb->fast_sk_family = sk->sk_family; +#if IS_ENABLED(CONFIG_IPV6) + tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr; +#endif + } + } else { + tb->fastreuseport = 0; + } + } +} + /* Obtain a reference to a local port for the given sock, * if snum is zero it means select any available local port. * We try to allocate an odd port (and leave even ports for connect()) @@ -308,7 +359,6 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) struct inet_bind_hashbucket *head; struct net *net = sock_net(sk); struct inet_bind_bucket *tb = NULL; - kuid_t uid = sock_i_uid(sk); int l3mdev; l3mdev = inet_sk_bound_l3mdev(sk); @@ -345,49 +395,8 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) goto fail_unlock; } success: - if (hlist_empty(&tb->owners)) { - tb->fastreuse = reuse; - if (sk->sk_reuseport) { - tb->fastreuseport = FASTREUSEPORT_ANY; - tb->fastuid = uid; - tb->fast_rcv_saddr = sk->sk_rcv_saddr; - tb->fast_ipv6_only = ipv6_only_sock(sk); - tb->fast_sk_family = sk->sk_family; -#if IS_ENABLED(CONFIG_IPV6) - tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr; -#endif - } else { - tb->fastreuseport = 0; - } - } else { - if (!reuse) - tb->fastreuse = 0; - if (sk->sk_reuseport) { - /* We didn't match or we don't have fastreuseport set on - * the tb, but we have sk_reuseport set on this socket - * and we know that there are no bind conflicts with - * this socket in this tb, so reset our tb's reuseport - * settings so that any subsequent sockets that match - * our current socket will be put on the fast path. - * - * If we reset we need to set FASTREUSEPORT_STRICT so we - * do extra checking for all subsequent sk_reuseport - * socks. - */ - if (!sk_reuseport_match(tb, sk)) { - tb->fastreuseport = FASTREUSEPORT_STRICT; - tb->fastuid = uid; - tb->fast_rcv_saddr = sk->sk_rcv_saddr; - tb->fast_ipv6_only = ipv6_only_sock(sk); - tb->fast_sk_family = sk->sk_family; -#if IS_ENABLED(CONFIG_IPV6) - tb->fast_v6_rcv_saddr = sk->sk_v6_rcv_saddr; -#endif - } - } else { - tb->fastreuseport = 0; - } - } + inet_csk_update_fastreuse(tb, sk); + if (!inet_csk(sk)->icsk_bind_hash) inet_bind_hash(sk, tb, port); WARN_ON(inet_csk(sk)->icsk_bind_hash != tb); From patchwork Thu Aug 6 06:41:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Froidcoeur X-Patchwork-Id: 1341479 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tessares.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=YeOG74L0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BMf5x4mHzz9sTS for ; Thu, 6 Aug 2020 16:41:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728330AbgHFGlY (ORCPT ); Thu, 6 Aug 2020 02:41:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728288AbgHFGlU (ORCPT ); Thu, 6 Aug 2020 02:41:20 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00352C06179F for ; Wed, 5 Aug 2020 23:41:19 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id b18so3178077edv.10 for ; Wed, 05 Aug 2020 23:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=PYSsCrOysop+Sh0mOiJ6j1B4kZ/DvpynNkFjKlnFTtk=; b=YeOG74L0CWaS4dyv69sqi18DDA3OmbSJyoz5z4Iq4BCQy6J6+W/uFDEvqWXdcSiz71 PiyO7Y5tjbvPnj+N6Pjgj5S1pO0tFgGm8tbES5Sbqdhc+FnQ2SpGND97Y8aCRgG0Z+Pm ikW3m6dkRbpl/6UHdMjBPF0LIkcV56pvKUZKug4Cp8tzUj//ZBPAy+G82GkCDz/ZiWuZ 51QykkaPw6YE0Cb86WxTqdCg5RJpm8zVY8XY1gBdDt17/pkwhWhY1w4f1VwMzp1spBwZ vHezw6durJEeSd72auOjwnRhClKF4yYcxJQ2tIX0aUcYI9qafsEM7TblIX4inpkT2+Cb KpVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=PYSsCrOysop+Sh0mOiJ6j1B4kZ/DvpynNkFjKlnFTtk=; b=Iei2wJ9vuroJjgv69xQsAUTwubHv3ngbeBEz3etfM37KbrfelDL8mpGqU8l8q0Slib 6BT/hUDP8evvhgAfaXeJ9hv72/qzJDppovLjO+Ni0kb7pAOW6u2iMn9zCdeyaAQwUIvg Uu5WzQUWw94ANpYoEt6SQtqLIHrv1gTyTiHpzlUqLaPaTLFLvuoV2S1xBU9+pK6Yooe3 xIPnadovrS2H/OSpKVIzbGrelARN1cymYhycHKsGlv7cBwavZpdo3uacStc9DWNnYWQ+ reYcYX8CXYbqluCQTWqTPiOQP87wNzq47HNCDyabOem8TkUevXXx2OMIPewQl+of/y1Z Xq8w== X-Gm-Message-State: AOAM530jwaG5eixpAoN/GXNNDkXAHEIpxY8lfAnuQmLBmSJGBHHzv44X LLQpUwHa9fLRbygYnBM+s+uA0wH3q6SIng2hjImQJ8tav1jvLQpEVqT7P2TxCiJZ/f4M2qx56UR ewf+UU+iy9g== X-Google-Smtp-Source: ABdhPJzfIEK9tWe/DKDr6hpoSUG7nnY0T65MTIA6Y1Po5B4MvXNS0VAdmc+Wmxzxpx2gXxEXqHr2gA== X-Received: by 2002:a05:6402:1f8:: with SMTP id i24mr2580851edy.251.1596696078742; Wed, 05 Aug 2020 23:41:18 -0700 (PDT) Received: from tim.froidcoeur.net (ptr-7tznw15pracyli75x11.18120a2.ip6.access.telenet.be. [2a02:1811:50e:f0f0:d05d:939:f42b:f575]) by smtp.gmail.com with ESMTPSA id h18sm2880984edw.56.2020.08.05.23.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 23:41:18 -0700 (PDT) From: Tim Froidcoeur To: "David S. Miller" , Jakub Kicinski , Alexey Kuznetsov , Hideaki YOSHIFUJI , KOVACS Krisztian , Patrick McHardy Cc: Tim Froidcoeur , Matthieu Baerts , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 2/2] net: initialize fastreuse on inet_inherit_port Date: Thu, 6 Aug 2020 08:41:08 +0200 Message-Id: <20200806064109.183059-3-tim.froidcoeur@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200806064109.183059-1-tim.froidcoeur@tessares.net> References: <20200806064109.183059-1-tim.froidcoeur@tessares.net> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the case of TPROXY, bind_conflict optimizations for SO_REUSEADDR or SO_REUSEPORT are broken, possibly resulting in O(n) instead of O(1) bind behaviour or in the incorrect reuse of a bind. the kernel keeps track for each bind_bucket if all sockets in the bind_bucket support SO_REUSEADDR or SO_REUSEPORT in two fastreuse flags. These flags allow skipping the costly bind_conflict check when possible (meaning when all sockets have the proper SO_REUSE option). For every socket added to a bind_bucket, these flags need to be updated. As soon as a socket that does not support reuse is added, the flag is set to false and will never go back to true, unless the bind_bucket is deleted. Note that there is no mechanism to re-evaluate these flags when a socket is removed (this might make sense when removing a socket that would not allow reuse; this leaves room for a future patch). For this optimization to work, it is mandatory that these flags are properly initialized and updated. When a child socket is created from a listen socket in __inet_inherit_port, the TPROXY case could create a new bind bucket without properly initializing these flags, thus preventing the optimization to work. Alternatively, a socket not allowing reuse could be added to an existing bind bucket without updating the flags, causing bind_conflict to never be called as it should. Call inet_csk_update_fastreuse when __inet_inherit_port decides to create a new bind_bucket or use a different bind_bucket than the one of the listen socket. Fixes: 093d282321da ("tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()") Acked-by: Matthieu Baerts Signed-off-by: Tim Froidcoeur --- net/ipv4/inet_hashtables.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 2bbaaf0c7176..006a34b18537 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -163,6 +163,7 @@ int __inet_inherit_port(const struct sock *sk, struct sock *child) return -ENOMEM; } } + inet_csk_update_fastreuse(tb, child); } inet_bind_hash(child, tb, port); spin_unlock(&head->lock);