From patchwork Fri Oct 29 03:26:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yangxingwu X-Patchwork-Id: 1547773 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=pnVPSE1j; dkim-atps=neutral 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=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HgSWk269Lz9sRN for ; Fri, 29 Oct 2021 14:26:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231679AbhJ2D2v (ORCPT ); Thu, 28 Oct 2021 23:28:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231611AbhJ2D2u (ORCPT ); Thu, 28 Oct 2021 23:28:50 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B743DC061570; Thu, 28 Oct 2021 20:26:22 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id n36-20020a17090a5aa700b0019fa884ab85so9523210pji.5; Thu, 28 Oct 2021 20:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LtgP/cUoxxhvYcfdihWX13hRZAIDcFCne2uXGpi/AnA=; b=pnVPSE1jjdTlHf5q+/QOUvnEnDh/dyo56Nltoztkn7rp+u2qIthB4nz3zQts+FpEaC ztX77ZUZG39hwxvuBeOUVCq5ol3T6+oOYJa8bHnbXZE2cWTGG1Qf0O0YXl73KaFpu0iQ CQXkjEnU7IFLnvn1f+Ij2haWAY7oY5krONTZ2Xss/PowjeSm5Eo0LA9lKrxzzz6qm9qz X7/4eE9kpYZ+AKwDk8M+IgYdSOGwXG1VqZ6gjFdouNpSWYHLJ8iiRXPGpy33W6w4GqTc D3PDOZdA/hsQZ5Em7wFXVcQrmlWHF8ctOokrHC4PdaoO1KdkhrtW38ry8HxfVeJYrwJg f9kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LtgP/cUoxxhvYcfdihWX13hRZAIDcFCne2uXGpi/AnA=; b=I7pmpnRpcbiLr4ny7QEwmHvANP+IDEsffW16VZOsaUAXPXx4LmxNmRvbZ4ChnZePhK M0jCHw1k7SJWtm9LQ/b1lrVzPbZqfFRjwF5hXjeVys4T76SisAE7I0pPeNBxKO0esp0x KR8/CeHGS+tKx51pVsm/Bi85DKBS8Bd32cQcfv/CDe2RK//1QwgSvrb6hIze6pvZgQSB kVmJUqHb+fy8yjKizt5AK550yJ1dFqsioLj6UBrLoxZSo8NAGzA+1a7LTB0mxsPjxnvU eKMv7RNNhI+/eKkAH0v91nVy+7jCbccuWAG1pNqCm65zUw3QvkyTkveYLoEDv6whqPkA gO1g== X-Gm-Message-State: AOAM5322MpDhDjPJmeVug8ZxYRT20Np/7IzuMReo6AxuTvzWHjGkS0E0 YaIfsoqxmZMcHAe7kpCeo/Y= X-Google-Smtp-Source: ABdhPJx9XgkGtE7qaUfO6vkh3qBVQlAF06dNogc1Z+fyPegLEQQNp04S/8BzTa1IelY1NsXFX41OOg== X-Received: by 2002:a17:902:bd96:b0:140:4a2b:c3ee with SMTP id q22-20020a170902bd9600b001404a2bc3eemr7549951pls.8.1635477982228; Thu, 28 Oct 2021 20:26:22 -0700 (PDT) Received: from ubuntu-hirsute.. ([154.86.159.245]) by smtp.gmail.com with ESMTPSA id v2sm3940400pga.57.2021.10.28.20.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 20:26:21 -0700 (PDT) From: yangxingwu To: horms@verge.net.au Cc: ja@ssi.bg, pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, corbet@lwn.net, xingwu.yang@gmail.com, legend050709@qq.com Subject: [PATCH v2] ipvs: Fix reuse connection if RS weight is 0 Date: Fri, 29 Oct 2021 11:26:04 +0800 Message-Id: <20211029032604.5432-1-xingwu.yang@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Since commit dc7b3eb900aa ("ipvs: Fix reuse connection if real server is dead"), new connections to dead servers are redistributed immediately to new servers. Then commit d752c3645717 ("ipvs: allow rescheduling of new connections when port reuse is detected") disable expire_nodest_conn if conn_reuse_mode is 0. And new connection may be distributed to a real server with weight 0. Co-developed-by: Chuanqi Liu Signed-off-by: Chuanqi Liu Signed-off-by: yangxingwu --- Documentation/networking/ipvs-sysctl.rst | 3 +-- net/netfilter/ipvs/ip_vs_core.c | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/networking/ipvs-sysctl.rst b/Documentation/networking/ipvs-sysctl.rst index 2afccc63856e..1cfbf1add2fc 100644 --- a/Documentation/networking/ipvs-sysctl.rst +++ b/Documentation/networking/ipvs-sysctl.rst @@ -37,8 +37,7 @@ conn_reuse_mode - INTEGER 0: disable any special handling on port reuse. The new connection will be delivered to the same real server that was - servicing the previous connection. This will effectively - disable expire_nodest_conn. + servicing the previous connection. bit 1: enable rescheduling of new connections when it is safe. That is, whenever expire_nodest_conn and for TCP sockets, when diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 128690c512df..374f4b0b7080 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -2042,14 +2042,15 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int ipvs, af, skb, &iph); conn_reuse_mode = sysctl_conn_reuse_mode(ipvs); - if (conn_reuse_mode && !iph.fragoffs && is_new_conn(skb, &iph) && cp) { + if (!iph.fragoffs && is_new_conn(skb, &iph) && cp) { bool old_ct = false, resched = false; if (unlikely(sysctl_expire_nodest_conn(ipvs)) && cp->dest && - unlikely(!atomic_read(&cp->dest->weight))) { + unlikely(!atomic_read(&cp->dest->weight)) && !cp->control) { resched = true; old_ct = ip_vs_conn_uses_old_conntrack(cp, skb); - } else if (is_new_conn_expected(cp, conn_reuse_mode)) { + } else if (conn_reuse_mode && + is_new_conn_expected(cp, conn_reuse_mode)) { old_ct = ip_vs_conn_uses_old_conntrack(cp, skb); if (!atomic_read(&cp->n_control)) { resched = true;