From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5333C433EF for ; Wed, 25 May 2022 07:51:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235353AbiEYHvn (ORCPT ); Wed, 25 May 2022 03:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbiEYHvg (ORCPT ); Wed, 25 May 2022 03:51:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A18832AC6D; Wed, 25 May 2022 00:51:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5A2E4B81C95; Wed, 25 May 2022 07:51:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 863F4C34116; Wed, 25 May 2022 07:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1653465093; bh=B7jZfU7xnbYdmiqmnR6OSx/k5usfd6C6hfkEddKhG8I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EO8vfeD/bbajJYsszjLXknRwgKkyWnF2d86JWY7wa401Qvq3q+kT4J1xRosqHEInq VrSkTQotovBuBBWYKFsNb6j/WDxhjx3LvOuut/fLJDKBnJzM2yBy7/pnNpSwGAdh/E QIC3wn8L/w16G6d4/6oIgGkQSLWYstyJYbAxN5vk= Date: Wed, 25 May 2022 09:51:30 +0200 From: Greg Kroah-Hartman To: Mat Martineau Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Paolo Abeni , Jakub Kicinski , Sasha Levin , Matthieu Baerts Subject: Re: [PATCH 5.17 114/158] mptcp: strict local address ID selection Message-ID: References: <20220523165830.581652127@linuxfoundation.org> <20220523165849.851212488@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 23, 2022 at 08:51:52PM -0700, Mat Martineau wrote: > On Mon, 23 May 2022, Greg Kroah-Hartman wrote: > > > From: Paolo Abeni > > > > [ Upstream commit 4cf86ae84c718333928fd2d43168a1e359a28329 ] > > > > The address ID selection for MPJ subflows created in response > > to incoming ADD_ADDR option is currently unreliable: it happens > > at MPJ socket creation time, when the local address could be > > unknown. > > > > Additionally, if the no local endpoint is available for the local > > address, a new dummy endpoint is created, confusing the user-land. > > > > This change refactor the code to move the address ID selection inside > > the rebuild_header() helper, when the local address eventually > > selected by the route lookup is finally known. If the address used > > is not mapped by any endpoint - and thus can't be advertised/removed > > pick the id 0 instead of allocate a new endpoint. > > > > Signed-off-by: Paolo Abeni > > Signed-off-by: Mat Martineau > > Signed-off-by: Jakub Kicinski > > Signed-off-by: Sasha Levin > > --- > > net/mptcp/pm_netlink.c | 13 -------- > > net/mptcp/protocol.c | 3 ++ > > net/mptcp/protocol.h | 3 +- > > net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ > > 4 files changed, 63 insertions(+), 23 deletions(-) > > > > Greg, Sasha - > > Is it possible to drop this one patch? It makes one of the mptcp selftests > fail (mptcp_join.sh, "single address, backup"). Does that mean the backport is incorrect, or that the selftest is wrong? > Looks like this patch has been included in stable because of this single > hunk that helps "mptcp: Do TCP fallback on early DSS checksum failure" apply > cleanly: > > > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h > > index aec767ee047a..e4413b3e50c2 100644 > > --- a/net/mptcp/protocol.h > > +++ b/net/mptcp/protocol.h > > @@ -442,7 +442,8 @@ struct mptcp_subflow_context { > > rx_eof : 1, > > can_ack : 1, /* only after processing the remote a key */ > > disposable : 1, /* ctx can be free at ulp release time */ > > - stale : 1; /* unable to snd/rcv data, do not use for xmit */ > > + stale : 1, /* unable to snd/rcv data, do not use for xmit */ > > + local_id_valid : 1; /* local_id is correctly initialized */ > > enum mptcp_data_avail data_avail; > > u32 remote_nonce; > > u64 thmac; > > "mptcp: Do TCP fallback on early DSS checksum failure" also adds a bit to > that bitfield, but there is no functional dependency between the patches. > > If you need to drop the "mptcp: Do TCP fallback..." patch too, I can send a > backported version tomorrow that accounts for that bitfield change. Yes, I had to drop that second patch because of this. Both are now dropped from 5.15 and 5.17, can you provide a working backport? thanks, greg k-h