From patchwork Tue Aug 11 18:33:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Froidcoeur X-Patchwork-Id: 1343410 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=eWrDxq9V; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BR1gX5bGpz9sTb for ; Wed, 12 Aug 2020 04:33:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726505AbgHKSdm (ORCPT ); Tue, 11 Aug 2020 14:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726412AbgHKSdk (ORCPT ); Tue, 11 Aug 2020 14:33:40 -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 92007C06174A for ; Tue, 11 Aug 2020 11:33:40 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id c16so14157850ejx.12 for ; Tue, 11 Aug 2020 11:33:40 -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=6zkxFcinTHfMj4khM7FG54F6j6yiMTxLIRNiVhh2gB0=; b=eWrDxq9VYfwkzuIUjkmxzVxBmNfzYehpg4Y5omNwtjIgzP3B1Q2SzSAckkSgVFPi3/ t+XmSk/bmitlZN4O83QIKiXXEQntfMF0Uf7eUr0CNuR0QsuLxlV5qwztSpUYq7N5xdv3 ndA2fBuC6AwKWZOLiYdTTeAY2KDUTiimGFbjqI4LJjoSJEyj4gZlj/5hsn6c7froMd2u hhAz9uFBwKWNgcSj+bQuyFIPppd8jY6HdU0IyTW5qIYzGFtXvVKIgHnvcPtkmuh16jDA BUqsona4W6fuQRZxkTyOb1i1P/IYue5RRoZDoZDyc8CnNWO7i9FZ5oXB7C0ycqukxoLU CWGA== 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=6zkxFcinTHfMj4khM7FG54F6j6yiMTxLIRNiVhh2gB0=; b=prZnzUDFI+MPXlT75Z1tvLBX3YHHRg+P1FMeKeKd0kX4QNL+CNyfA5AVlqBHdfEEJn HoKvBGX5zftlSqiUPXyjnB+mm44p/Z6yroBjqDzZWpjw06Qm0Qqjl9lYSuPShRUgpUc5 huZlX5XX5NAr5HY4YEBhqOG1IO5AcIQI4fH8jcfJzdraakQPtqGzP2WojhBKBxxWKdmR SMRsJIosuaKYw2lgT04toJPxvjfjVwbpMVTK7vp/QZL8XZS/VysngLoIyZw7lAAxP6Mw 2wtZ3WVqr5IfK6QwZKPYzG2hv6gBljDLN7pIKovDREGruQFlp1K3sII6FYNUi3rONMRZ tQzQ== X-Gm-Message-State: AOAM531hAWTjkneFTHv8piAR+OsWHGM5ax2tybuKtKcOpXhG8Kjrtx8B fkG2oQc8fpbHZAjEBd1Q2SUQ1A== X-Google-Smtp-Source: ABdhPJwQslCBRc/Fs/iAQs3vp3X+/u4tO3njIOup9obJt1YgQQCuCqG6EaaEBhM34ZN0f+dNUXyL4Q== X-Received: by 2002:a17:907:20e1:: with SMTP id rh1mr9323885ejb.106.1597170819141; Tue, 11 Aug 2020 11:33:39 -0700 (PDT) Received: from tim.froidcoeur.net (ptr-7tznw14xncxzsvibs41.18120a2.ip6.access.telenet.be. [2a02:1811:50e:f0f0:9d04:d01e:8e99:1111]) by smtp.gmail.com with ESMTPSA id ch24sm15350222ejb.7.2020.08.11.11.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 11:33:38 -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 v4 2/2] net: initialize fastreuse on inet_inherit_port Date: Tue, 11 Aug 2020 20:33:24 +0200 Message-Id: <20200811183325.42748-3-tim.froidcoeur@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200811183325.42748-1-tim.froidcoeur@tessares.net> References: <20200811183325.42748-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 4eb4cd8d20dd..239e54474b65 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);