From patchwork Wed Sep 2 14:05:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Froidcoeur X-Patchwork-Id: 310154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75657C433E2 for ; Wed, 2 Sep 2020 14:07:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47E792078E for ; Wed, 2 Sep 2020 14:07:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="nQ6hEv6x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726247AbgIBOGv (ORCPT ); Wed, 2 Sep 2020 10:06:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727939AbgIBOGP (ORCPT ); Wed, 2 Sep 2020 10:06:15 -0400 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9A04C06125C for ; Wed, 2 Sep 2020 07:05:58 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id w1so5050099edr.3 for ; Wed, 02 Sep 2020 07:05:58 -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:content-transfer-encoding; bh=XA0itvGjYnK8aMZ/ntGchSFuAR0+T8dcFyodHDzqDg8=; b=nQ6hEv6x3CgP/c/7ZY3BuX/W+S4e+0LoVre2WO7I5tvTN7UFjZJGVxy3ItMaqEPJKx FYrTFew0RDOtyngN5YD3aa52EQgSJFCMKrgT+9E1BHiNynx6afnvX0nuXVzVghGNKxJE mOFxIbdGP51unQsKVf5V9IlufPlSuItGwA5w/pfQLYyiXVSgxi5hvfXGM7hS/uMcujR5 LpdGr33xaKexkbOiVBE2sW6oYb08C96OFc/JS+gxPOWcH7OHep1ZKmupuN6VgZmWBxcR ONjtSTe/UvXaJROfkF+07LeYXG4axejMlSM1tZzR4ihocbnzfRmsi2R4plPwVB8dj8gy 3fwQ== 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:content-transfer-encoding; bh=XA0itvGjYnK8aMZ/ntGchSFuAR0+T8dcFyodHDzqDg8=; b=nd/9P1YWd2KXwmqjQOpPl6NmM7liymRXii6RkMEcogZoEeHPUgX4HpKBI+f00XfvIz 4UK8EQ8cYy7e6jIjZ1J/ZnPR4Oz10wp5cA9TBjJpfYnF1GGibKIgGkqCEXFNniU6wQYr TNJ0kCwKamI5bTu8JfTvwFZRqwtFpKfaNxxlRgbxlw+hEBGzDhffCuFpPgpXd49PqT8i Z5E1dx5Xj3bfZF/62jmY0sjU74kD19GlIw3/TdEp46+ovb0dyThCB1iq4RQ0KDDpMqKd QzXLebpJKLAILVJuyDRuX5dfMy6HFLpYqdaB6qm7f7yqDHzEW3lZxkxRLZ39vsK5KFwP BEMQ== X-Gm-Message-State: AOAM530+9PUqL8Uc7oLwMfETwJqubmY4r0U1+W9LNzejqHaoCOeA0Gha zjAx/y8lHwC6EZsddoZ/2J/PsQ== X-Google-Smtp-Source: ABdhPJy7R4U182YRDBG2sERiWglLUkFWprqYJKj0N+dXKaNcxbbuLY70iGi6rJY5Wdyej/Arwm0MjQ== X-Received: by 2002:aa7:d805:: with SMTP id v5mr226233edq.29.1599055557546; Wed, 02 Sep 2020 07:05:57 -0700 (PDT) Received: from tim.froidcoeur.net (ptr-7tznw14oqa3w7cibjsc.18120a2.ip6.access.telenet.be. [2a02:1811:50e:f0f0:8cba:3abe:17e1:aaec]) by smtp.gmail.com with ESMTPSA id r15sm4119296edv.94.2020.09.02.07.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 07:05:56 -0700 (PDT) From: Tim Froidcoeur To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, gregkh@linuxfoundation.org, matthieu.baerts@tessares.net, davem@davemloft.net, Tim Froidcoeur Subject: [PATCH 4.9 1/2] net: refactor bind_bucket fastreuse into helper Date: Wed, 2 Sep 2020 16:05:44 +0200 Message-Id: <20200902140545.867718-2-tim.froidcoeur@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200902140545.867718-1-tim.froidcoeur@tessares.net> References: <20200902140545.867718-1-tim.froidcoeur@tessares.net> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 62ffc589abb176821662efc4525ee4ac0b9c3894 ] 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 Signed-off-by: David S. Miller Signed-off-by: Tim Froidcoeur --- include/net/inet_connection_sock.h | 4 ++++ net/ipv4/inet_connection_sock.c | 37 ++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 146054ceea8e..5bb56ebf3c9f 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -319,5 +319,9 @@ 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); #endif /* _INET_CONNECTION_SOCK_H */ diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 1bcbb7399fe6..5a0352ccadd3 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -89,6 +89,28 @@ int inet_csk_bind_conflict(const struct sock *sk, } EXPORT_SYMBOL_GPL(inet_csk_bind_conflict); +void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, + struct sock *sk) +{ + kuid_t uid = sock_i_uid(sk); + bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN; + + if (!hlist_empty(&tb->owners)) { + if (!reuse) + tb->fastreuse = 0; + if (!sk->sk_reuseport || !uid_eq(tb->fastuid, uid)) + tb->fastreuseport = 0; + } else { + tb->fastreuse = reuse; + if (sk->sk_reuseport) { + tb->fastreuseport = 1; + tb->fastuid = uid; + } 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()) @@ -218,19 +240,10 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) } goto fail_unlock; } - if (!reuse) - tb->fastreuse = 0; - if (!sk->sk_reuseport || !uid_eq(tb->fastuid, uid)) - tb->fastreuseport = 0; - } else { - tb->fastreuse = reuse; - if (sk->sk_reuseport) { - tb->fastreuseport = 1; - tb->fastuid = uid; - } else { - tb->fastreuseport = 0; - } } + + inet_csk_update_fastreuse(tb, sk); + success: if (!inet_csk(sk)->icsk_bind_hash) inet_bind_hash(sk, tb, port); From patchwork Wed Sep 2 14:05:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Froidcoeur X-Patchwork-Id: 310153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F35DEC433E2 for ; Wed, 2 Sep 2020 14:07:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB913207D3 for ; Wed, 2 Sep 2020 14:07:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="FSIxk/zE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727952AbgIBOHf (ORCPT ); Wed, 2 Sep 2020 10:07:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727941AbgIBOGP (ORCPT ); Wed, 2 Sep 2020 10:06:15 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F003C06125F for ; Wed, 2 Sep 2020 07:06:00 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id i26so6791985ejb.12 for ; Wed, 02 Sep 2020 07:06:00 -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:content-transfer-encoding; bh=IVTgojsctywPYI2BEUQy4+C3blLe36Gj3Nv25ImuhV0=; b=FSIxk/zEZcpRBi4QeA27pDHb8zta0fipi9M8oPao1vJqAKMQ1Nl/wY9iDXfn1qg2Fn 3UzMUKmDfog2N0nFQFUL8HycGnQzav+odJ5MCnGUhFKd9cqqptqDs2imsEN+lhkdbZTY 8DUfRu8NVnHHcWzgCsG3q9M/qsy7Nor83MI52S49iunbpGDDKQKOgmlKaXPdapwOZiYv +30SxmXGZiQu7iHS91xxpfNmqBsUn45yyH69fICZeoJDP6QxBGSFjkVZDFsYOhDaS9i3 8loKeLHqNqi8NEveRFmFHKR36is9Pr11uHTNiAQLWDxhzlG+TnHfT5gLFW9PLeB3aatg M8MA== 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:content-transfer-encoding; bh=IVTgojsctywPYI2BEUQy4+C3blLe36Gj3Nv25ImuhV0=; b=APlouZh1NKS27oflr4u+c5gvWgEAUjcefMM8psivHnyPNnYDgXMjL6ywND/iNsoyG8 cFiYlbYyvz6B6CS5LmW05LndxIOzNrnxGpy70uGviEqSDFVwGCTHnDd23a+S1Sg5UlmA iSDnsoti0Y32wdGQCpMbaUpGOHt/mCnj1K0OhYjLMzXu8FRdT2SAoXA+6wktyJW67zpi slAcyF6ZFDrSOBG4R7rVS5NRjHHxE1WdIaPm6LAOZz+Ek5MukmtpbgzWC5Jlz1nicMVW W+EGh+mz4B/NlsVQK01pQFOJYxmEybG6wjKZbNPsXEB2amE1750pS/prkZlLPqkLCvKT 8vdw== X-Gm-Message-State: AOAM530VtOo7/7lQYQGgooz9q6P+GHouZHf83jt6//Dny5ZMevY78sJe KdQc9s2HLysClpgHGNXoKxop4A== X-Google-Smtp-Source: ABdhPJzvECs35eFjMsTYjZyxiCkatxfda7vl17SgvZwSIAVXMCxivw1u4HfLCZBNieZxqOzgVR4r9g== X-Received: by 2002:a17:906:5206:: with SMTP id g6mr199229ejm.292.1599055559289; Wed, 02 Sep 2020 07:05:59 -0700 (PDT) Received: from tim.froidcoeur.net (ptr-7tznw14oqa3w7cibjsc.18120a2.ip6.access.telenet.be. [2a02:1811:50e:f0f0:8cba:3abe:17e1:aaec]) by smtp.gmail.com with ESMTPSA id r15sm4119296edv.94.2020.09.02.07.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 07:05:58 -0700 (PDT) From: Tim Froidcoeur To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, gregkh@linuxfoundation.org, matthieu.baerts@tessares.net, davem@davemloft.net, Tim Froidcoeur Subject: [PATCH 4.9 2/2] net: initialize fastreuse on inet_inherit_port Date: Wed, 2 Sep 2020 16:05:45 +0200 Message-Id: <20200902140545.867718-3-tim.froidcoeur@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200902140545.867718-1-tim.froidcoeur@tessares.net> References: <20200902140545.867718-1-tim.froidcoeur@tessares.net> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit d76f3351cea2d927fdf70dd7c06898235035e84e ] 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 Signed-off-by: David S. Miller 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 4bf542f4d980..887633870763 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);