Skip to contentSkip to conversation

FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 5.15-stable tree

PATCH [email protected] 2 participants 3 messages Aug 22, 2025

Subsystems (3)
Networking Stable branch Networking MPTCP
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 5d13349472ac8abcbcb94407969aa0fdc2e1f1be
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082230-dupe-going-e673@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 15 Aug 2025 19:28:22 +0200
Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call

sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.

Simplify the code by using a 'goto' statement to eliminate the duplication.

Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.

Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")
Cc [email protected]
Signed-off-by Geliang Tang <[email protected]>
Reviewed-by Matthieu Baerts (NGI0) <[email protected]>
Signed-off-by Matthieu Baerts (NGI0) <[email protected]>
Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open here
Signed-off-by Jakub Kicinski <[email protected]>
net/mptcp/pm.c +2 -3
index 420d416e2603..c5f6a53ce5f1 100644
@@ -353,9 +353,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
 		if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk)))
 			return false;
 
-		sk_reset_timer(sk, &add_entry->add_timer,
-			       jiffies + mptcp_get_add_addr_timeout(net));
-		return true;
+		goto reset_timer;
 	}
 
 	add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);

@@ -369,6 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
 	add_entry->retrans_times = 0;
 
 	timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0);
+reset_timer:
 	sk_reset_timer(sk, &add_entry->add_timer,
 		       jiffies + mptcp_get_add_addr_timeout(net));
maintainer
#1 lore raw

Hello,

Quoted 2 lines · On 22/08/2025 08:04, [email protected] wrote:

The patch below does not apply to the 5.15-stable tree.

Thank you for the notification!

(...)

Quoted 7 lines

From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 15 Aug 2025 19:28:22 +0200
Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call

sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.

Quoted 7 lines

Simplify the code by using a 'goto' statement to eliminate the duplication.

Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.

Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")

Sorry, I should have updated the "Fixes" tag: this patch is only needed for trees having commit 304ab97f4c7c ("mptcp: allow ADD_ADDR reissuance by userspace PMs"), so v5.19+.

So this patch is not needed in v5.15.

Cheers,
Matt

Signature · 1 line
Sponsored by the NGI0 Core fund.
author maintainer
#2 lore raw
Quoted 23 lines · Matthieu Baerts

Hello,

Quoted 2 lines · On 22/08/2025 08:04, [email protected] wrote:

The patch below does not apply to the 5.15-stable tree.

Thank you for the notification!

(...)

Quoted 13 lines

From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 15 Aug 2025 19:28:22 +0200
Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call

sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.

Simplify the code by using a 'goto' statement to eliminate the duplication.

Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.

Quoted 7 lines
Quoted 1 line
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")

Sorry, I should have updated the "Fixes" tag: this patch is only needed for trees having commit 304ab97f4c7c ("mptcp: allow ADD_ADDR reissuance by userspace PMs"), so v5.19+.

So this patch is not needed in v5.15.

Thanks for letting us know on this, and the other one.

greg k-h