From patchwork Mon Mar 15 14:28:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1453306 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=j+8JdVqA; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dzf1R5vnfz9t6g for ; Tue, 16 Mar 2021 01:28:59 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 38803100EBBC4; Mon, 15 Mar 2021 07:28:56 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::62f; helo=mail-pl1-x62f.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 93CA5100EBBC1 for ; Mon, 15 Mar 2021 07:28:54 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id 30so10836967ple.4 for ; Mon, 15 Mar 2021 07:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xqYRW4Gh4dv+X1CNQandy2j/2SJqOZrnzefnECbZRtc=; b=j+8JdVqAc20ESgMVSFcN+suxhGfgztp2FUyRWm5l/GNxVLHMmdzkQH41WwM/gARAIA qodgjGPZWzhzDjhUrAo98dBWQVtMvFewVi2AFFkFH14SqGOCU2Q/H9hyEMnnw3NztLUH /fu62goRLlAxZgUK4+LKgrCxW82p7XiLowpwZZu3FXH842NLiD83qSOknY4FKRAJ8PSV 8t9udAJhahrVc0gve7hGFWbYVrVO7E5J7eZ0s7AynPzHSpYbztRan7I6BRcdQLxeh/Ls 2DlbkGmcl5I2P52WZwT0uBSc6tgv4odXvY2PX9WCwL+o5wJs7oML4wXs/OodlOopMLLQ mysQ== 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:mime-version :content-transfer-encoding; bh=xqYRW4Gh4dv+X1CNQandy2j/2SJqOZrnzefnECbZRtc=; b=qsDn5FtqhHCRnDTQdZwP3FH9lVa9VbJE7vAd0g57lKlIiFMs3zH9kAktVc8b2cHcjD N4TJGKL8FKhE9cyXVq9akJBvglBZ0xx8RjFRCF0zstAseHcDpakzHYrrL3nL7WqUdrGW M5DAriMqfClu3qZbqtBtk5VH+EH7qlXqY1IloL6grygNNV3rTYPo1jjy8Pv87oW4AS5o tOZl2wOGLlPi/B21GKxcbq6F88EycOGAhkn1aA8XP2lZp/Euyq+jroOmUPhlxcvdEbCr v7k9Kk5VvMoeFIWY1NBpukfrPNVvJRiIVu0SwSpyStxENc+z2ZGoRKJKFk9c2RZk/0bM 39FQ== X-Gm-Message-State: AOAM533fGIWNXZkktJqZSl7IrgKE/nwAXVtysCDXIbxkZoG/fsATDY6e 1Gk+MCv7DiDIUhx7+1sWZdPEk/xGC9hYjQ== X-Google-Smtp-Source: ABdhPJwKjmeLSGI/X8Kwv38Q28shZQIarkVYpmsyVncneMMnRsg/fDEcpf6cCqt6hlNzE9JAq5xn1g== X-Received: by 2002:a17:90a:a584:: with SMTP id b4mr13077390pjq.186.1615818533691; Mon, 15 Mar 2021 07:28:53 -0700 (PDT) Received: from localhost ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id ms21sm11773566pjb.5.2021.03.15.07.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 07:28:52 -0700 (PDT) From: Geliang Tang To: mptcp@lists.01.org Date: Mon, 15 Mar 2021 22:28:48 +0800 Message-Id: <1bab2d6ccf0f6d8212af7f9e6f8349b0c0926bbb.1615818221.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Message-ID-Hash: CC5QBUMS4N6MOS6VX4336WENLFOLHVGH X-Message-ID-Hash: CC5QBUMS4N6MOS6VX4336WENLFOLHVGH X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH mptcp-next] mptcp: send ack for rm_addr List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch changes the sending ACK conditions for the ADD_ADDR, send an ACK packet for RM_ADDR too. Note: - Insert this commit between "mptcp: move to next addr when subflow creation fail" and "selftests: mptcp: signal addresses testcases". - Apply the patch 'Squash to "mptcp: remove id 0 address"' first. - tag: export/20210315T064655. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/173 Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 15 +++++++++------ net/mptcp/protocol.h | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 966942d1013f..efa7deb96139 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -53,6 +53,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ msk->pm.rm_list_tx = *rm_list; rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL); WRITE_ONCE(msk->pm.addr_signal, rm_addr); + mptcp_pm_nl_add_addr_send_ack(msk); return 0; } diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 6bb6117bf2f7..71ba203bfc5f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -56,8 +56,6 @@ struct pm_nl_pernet { #define MPTCP_PM_ADDR_MAX 8 #define ADD_ADDR_RETRANS_MAX 3 -static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk); - static bool addresses_equal(const struct mptcp_addr_info *a, struct mptcp_addr_info *b, bool use_port) { @@ -524,14 +522,15 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) mptcp_pm_nl_add_addr_send_ack(msk); } -static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) +void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow; msk_owned_by_me(msk); lockdep_assert_held(&msk->pm.lock); - if (!mptcp_pm_should_add_signal(msk)) + if (!mptcp_pm_should_add_signal(msk) && + !mptcp_pm_should_rm_signal(msk)) return; __mptcp_flush_join_list(msk); @@ -541,9 +540,11 @@ static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) u8 add_addr; spin_unlock_bh(&msk->pm.lock); - pr_debug("send ack for add_addr%s%s", + pr_debug("send ack for %s%s%s%s", + mptcp_pm_should_add_signal(msk) ? "add_addr" : "", mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "", - mptcp_pm_should_add_signal_port(msk) ? " [port]" : ""); + mptcp_pm_should_add_signal_port(msk) ? " [port]" : "", + mptcp_pm_should_rm_signal(msk) ? "rm_addr" : ""); lock_sock(ssk); tcp_send_ack(ssk); @@ -555,6 +556,8 @@ static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) add_addr &= ~BIT(MPTCP_ADD_ADDR_IPV6); if (mptcp_pm_should_add_signal_port(msk)) add_addr &= ~BIT(MPTCP_ADD_ADDR_PORT); + if (mptcp_pm_should_rm_signal(msk)) + add_addr &= ~BIT(MPTCP_RM_ADDR_SIGNAL); WRITE_ONCE(msk->pm.addr_signal, add_addr); } } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a0e301ae56b0..34fddb1fcd1e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -667,6 +667,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, struct mptcp_addr_info *addr); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); +void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk); void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);