From nobody Thu Sep 18 08:18:37 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp1319176pis; Wed, 27 Apr 2022 15:50:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbxWx2by6FmGBUK/3/D7KeSOuTyeGKKWB5aGDM5uvLrFOuqDzr8uNaAcfZiX0vZVuVlyLg X-Received: by 2002:a17:90b:4d0c:b0:1d9:aee3:fac1 with SMTP id mw12-20020a17090b4d0c00b001d9aee3fac1mr12413056pjb.15.1651099820790; Wed, 27 Apr 2022 15:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651099820; cv=none; d=google.com; s=arc-20160816; b=YGOIzYg2a1ZWHMBr+Poa9SM1jETFWYy1S+VG675ZKMbF7/oQH/XWDllqnBSu3+QW4O a06D9tiw2jPXlrLJrowED04EABIc9FgxRuCQo3uk/uM5tIM+GTiNXgGgq83B3Hfspyqc AsYb+0zeY8Gq2gGCilcXtiComDPK61HPtp5vnHKQUiMHp3rUFH+aPQyWTpKF/qrmPCvf kPH/PozaiOmvhmf7JhkgJrIxbpQQlaYNojxT6quNKw83NXYEBgCmgeCXmaPZdV6VcU06 y7g6ftvGjDsKfFXeg3tJHM0g6QX4YMVrtX+RcuarkrO4c+KLOWmJjDKTZ7kywgHtB00F 8zkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=xfq54P0MqBPdU5rUTdYO152YCdQlF7x1owIVsHVRf2Y=; b=CsVZ/dPwutYQfO/rFTHwZ5rjRyu08T1rHpaDGoQmTKwFc8Pm+Tl2i9h+Vn/BqlUXxB rJDxs1CPe9QLprd+rU73p/vxH4Bq7KZo8h8jRVg9LxxruRgt3PnG8Vqbjh3uTvbVyNd3 Cwk1aa9TMRL1WGxZgar8aROBpfgvvbgjj7MGwng2qAf5Kdxxt5gAUZzjEMsMH2tvJ6WW e/KqFtZT+JVGloyLAyW3r54G4eAucPB1vz3RM+F5mY9t8P11r7mV0ogpPFZUFfkk1hq5 uuR68JVXCutHSfy3N8uCgBA3JTRF5c5W+GNB8riZXjmX6tFu/RFBSAES/diG24HO2vqO /34g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nzU6YTpg; spf=pass (google.com: domain of mptcp+bounces-4938-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4938-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x1-20020a17090a0bc100b001bd14e01fb4si6207333pjd.162.2022.04.27.15.50.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 15:50:20 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4938-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nzU6YTpg; spf=pass (google.com: domain of mptcp+bounces-4938-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4938-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 34912280C3D for ; Wed, 27 Apr 2022 22:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 246997F8; Wed, 27 Apr 2022 22:50:16 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 EA86A7FA for ; Wed, 27 Apr 2022 22:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651099814; x=1682635814; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=og/Cz3rjL7z/H2kolHeUQ9uzXf19AIIeepdKPwATYKk=; b=nzU6YTpgxAZcsInzB5YOADuEj1vVSfICsvobB7mDGsicko9SazdsaCUk 7icBytc1n2XpwZRQ3MNitlQEAY4rqrZOtlbGz2J6aD9daY3WWh/g9XHpg mUOCmwDiEn4S1T6lZuonmEyNfMp29MeWKZCZEe66MZC6gNX1x4bfvG0ml 1SaLlZ51vTeceN++lQp5PZKH2WlvAfg8SWn9fouYyIO/UA4qjjPNn+AfE O7TQu7FuMHFskC+tQKs8PyOniFC0NJzJEpf8KgQNWn5oUZYV8nwCXLw9t 76X/AibrdzQJflhBzsQ6gHgBiu8WugsjfGqVXUDB5TIu7urqcsOWPfgnj g==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="291252893" X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="291252893" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 15:50:11 -0700 X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="731049120" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.233.139]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 15:50:10 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net-next 4/6] mptcp: Make kernel path manager check for userspace-managed sockets Date: Wed, 27 Apr 2022 15:50:00 -0700 Message-Id: <20220427225002.231996-5-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220427225002.231996-1-mathew.j.martineau@linux.intel.com> References: <20220427225002.231996-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Userspace-managed sockets should not have their subflows or advertisements changed by the kernel path manager. v3: Use helper function for PM mode (Paolo Abeni) Acked-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index bbbbfb421eec..473e5aa7baf4 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1220,7 +1220,8 @@ static int mptcp_nl_add_subflow_or_signal_addr(struct= net *net) while ((msk =3D mptcp_token_iter_next(net, &s_slot, &s_num)) !=3D NULL) { struct sock *sk =3D (struct sock *)msk; =20 - if (!READ_ONCE(msk->fully_established)) + if (!READ_ONCE(msk->fully_established) || + mptcp_pm_is_userspace(msk)) goto next; =20 lock_sock(sk); @@ -1363,6 +1364,9 @@ static int mptcp_nl_remove_subflow_and_signal_addr(st= ruct net *net, struct sock *sk =3D (struct sock *)msk; bool remove_subflow; =20 + if (mptcp_pm_is_userspace(msk)) + goto next; + if (list_empty(&msk->conn_list)) { mptcp_pm_remove_anno_addr(msk, addr, false); goto next; @@ -1397,7 +1401,7 @@ static int mptcp_nl_remove_id_zero_address(struct net= *net, struct sock *sk =3D (struct sock *)msk; struct mptcp_addr_info msk_local; =20 - if (list_empty(&msk->conn_list)) + if (list_empty(&msk->conn_list) || mptcp_pm_is_userspace(msk)) goto next; =20 local_address((struct sock_common *)msk, &msk_local); @@ -1504,9 +1508,11 @@ static void mptcp_nl_remove_addrs_list(struct net *n= et, while ((msk =3D mptcp_token_iter_next(net, &s_slot, &s_num)) !=3D NULL) { struct sock *sk =3D (struct sock *)msk; =20 - lock_sock(sk); - mptcp_pm_remove_addrs_and_subflows(msk, rm_list); - release_sock(sk); + if (!mptcp_pm_is_userspace(msk)) { + lock_sock(sk); + mptcp_pm_remove_addrs_and_subflows(msk, rm_list); + release_sock(sk); + } =20 sock_put(sk); cond_resched(); @@ -1779,7 +1785,7 @@ static int mptcp_nl_set_flags(struct net *net, while ((msk =3D mptcp_token_iter_next(net, &s_slot, &s_num)) !=3D NULL) { struct sock *sk =3D (struct sock *)msk; =20 - if (list_empty(&msk->conn_list)) + if (list_empty(&msk->conn_list) || mptcp_pm_is_userspace(msk)) goto next; =20 lock_sock(sk); --=20 2.36.0