Hi Greg, On 12/08/2024 14:39, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > The patch below does not apply to the 5.10-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 <stable@xxxxxxxxxxxxxxx>. > > 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.10.y > git checkout FETCH_HEAD > git cherry-pick -x cd7c957f936f8cb80d03e5152f4013aae65bd986 > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024081248-exposable-uniformed-75e0@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. > > Possible dependencies: > > cd7c957f936f ("mptcp: pm: don't try to create sf if alloc failed") > c95eb32ced82 ("mptcp: pm: reduce indentation blocks") > 528cb5f2a1e8 ("mptcp: pass addr to mptcp_pm_alloc_anno_list") > 77e4b94a3de6 ("mptcp: update userspace pm infos") > 24430f8bf516 ("mptcp: add address into userspace pm list") > fb00ee4f3343 ("mptcp: netlink: respect v4/v6-only sockets") > 80638684e840 ("mptcp: get sk from msk directly") > 5ccecaec5c1e ("mptcp: fix locking in mptcp_nl_cmd_sf_destroy()") > 76a13b315709 ("mptcp: invoke MP_FAIL response when needed") > d9fb797046c5 ("mptcp: Do not traverse the subflow connection list without lock") > d42f9e4e2384 ("mptcp: Check for orphaned subflow before handling MP_FAIL timer") > d7e6f5836038 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From cd7c957f936f8cb80d03e5152f4013aae65bd986 Mon Sep 17 00:00:00 2001 > From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx> > Date: Wed, 31 Jul 2024 13:05:56 +0200 > Subject: [PATCH] mptcp: pm: don't try to create sf if alloc failed > > It sounds better to avoid wasting cycles and / or put extreme memory > pressure on the system by trying to create new subflows if it was not > possible to add a new item in the announce list. I think it is better not to backport this patch to v5.10: the dependencies list is quite big, and the fix is probably not worth it: in case of memory pressure, we don't try to do more actions (because they will fail as well). Cheers, Matt -- Sponsored by the NGI0 Core fund.
