From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0619D3FE1 for ; Thu, 9 Sep 2021 11:50:32 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id CCFA46134F; Thu, 9 Sep 2021 11:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188232; bh=Kw790umdX6yFtTkHkFCA1RpMD2ncwavpHbPzi7OuG+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7qwx8lv+oGrl5aAl2TbNxxw9m3Qy5IQyO/d6lwc0pjDMtIwGbSYzqvE5m+1PhlIO 97XiR2W3vraD8JT7V7jj6rWrdQFnBK65X14A7qcmUucrwGRTCHxAIMm1R+Nl8g8Zh1 201HunHIeKqDG7oCLGf49limrGkzCCPtToWWIPI4kwjb6G61+yUxPgvwByNWvnKarC j8nEv/37tW67CaAKRHI5YY9eOE8hrSVojKtly0ykxLy1P72nch7SbSokIzEPNCxBgn 1GeTAKkj88YSGsVCILwRvsmqQkb+d2URl0yUhiw2ZUCo+kP9GnGCeC6kFI22jqS/Yg HHx4gjHP4XCFg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yonglong Li , Geliang Tang , Mat Martineau , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, mptcp@lists.linux.dev Subject: [PATCH AUTOSEL 5.13 184/219] mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other Date: Thu, 9 Sep 2021 07:46:00 -0400 Message-Id: <20210909114635.143983-184-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114635.143983-1-sashal@kernel.org> References: <20210909114635.143983-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Yonglong Li [ Upstream commit 119c022096f5805680c79dfa74e15044c289856d ] ADD_ADDR shares pm.addr_signal with RM_ADDR, so after RM_ADDR/ADD_ADDR has done, we should not clean ADD_ADDR/RM_ADDR's addr_signal. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Yonglong Li Signed-off-by: Mat Martineau Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/mptcp/pm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 9d00fa6d22e9..feecc3485c68 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -253,6 +253,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, struct mptcp_addr_info *saddr, bool *echo, bool *port) { int ret = false; + u8 add_addr; spin_lock_bh(&msk->pm.lock); @@ -267,7 +268,11 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *saddr = msk->pm.local; - WRITE_ONCE(msk->pm.addr_signal, 0); + if (*echo) + add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO); + else + add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_SIGNAL); + WRITE_ONCE(msk->pm.addr_signal, add_addr); ret = true; out_unlock: @@ -279,6 +284,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, struct mptcp_rm_list *rm_list) { int ret = false, len; + u8 rm_addr; spin_lock_bh(&msk->pm.lock); @@ -286,16 +292,17 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_rm_signal(msk)) goto out_unlock; + rm_addr = msk->pm.addr_signal & ~BIT(MPTCP_RM_ADDR_SIGNAL); len = mptcp_rm_addr_len(&msk->pm.rm_list_tx); if (len < 0) { - WRITE_ONCE(msk->pm.addr_signal, 0); + WRITE_ONCE(msk->pm.addr_signal, rm_addr); goto out_unlock; } if (remaining < len) goto out_unlock; *rm_list = msk->pm.rm_list_tx; - WRITE_ONCE(msk->pm.addr_signal, 0); + WRITE_ONCE(msk->pm.addr_signal, rm_addr); ret = true; out_unlock: -- 2.30.2