From nobody Mon Feb 9 17:23:33 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1060543jap; Wed, 17 Nov 2021 17:30:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZGLIxBH+oS+ZXO3Cqu0kwBICexQAymswhsZS75nUxKPKtlHeOrpMuZrkxwAPmxUJR5mKR X-Received: by 2002:ab0:35d2:: with SMTP id x18mr30312884uat.32.1637199024328; Wed, 17 Nov 2021 17:30:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637199024; cv=none; d=google.com; s=arc-20160816; b=lweWQGwyuxLec/t2pN+JqXjz7yoj3gVyGVJdfK8TnXYH5gvLCt42lD4OEYCHl7exu0 qBsjrILY8GyRpEZvDT4GzlFxRzDRTRiWjigV1ZVuxLpPsOGZ0Ihw8YrvTTlXGzCrwMWZ JPvOVRtT+bApHrRWCgMIE87ixI1t1d6lXUmEwUG0ab6A+iCkSqsp6/gmRAoDkWs0uYR8 Cl+foJXi7KI1yl4poVitwFo/Pc1u8MWY/4dnXC6J4EasnOok0C383IGlZ/9EEH2Gol1L kB5S4EcNVLnl+Y8u/0eLJ4AQuZYJZCp1Binb8ZItF6SaN4IogRwHskxbXsFKuR859ASz mecw== 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; bh=XsjB9ZJEfKCjqPGPEzpQGVtLo2EirTe/seK2RncbrYE=; b=uSK3UYxELh+4xcEqMA+TNXcPb0TTlrzPJnErIDj8CzdSkHZZ3BrYOyJeiyWSeTmTpL qXh8o8te1K7HZ3+dfK/7Aywq9O1izy+ngA/TMdN7zAWjJjlnGA0wFLRG9gpf7lsSdGSI 6tEhRJl/bNGeGfPRfYzV/XTu3zEuSa90qCusPoj+/+OGMfpOIRIqGSVWPwl62tPDXOjH fzukMOpjHJm3eOUavjFQW/Q2SND11rtVgIpovQgJ45kzH9mbcODTMvP7582/c1oaq/fB iXUUsQPtg/7mPzamtHIHkDhMSqyD8UBz3lj+031ItXiu9mJLPyRAEO2Qc9KJANaN12X4 EP7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2463-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2463-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id b10si3747386vst.140.2021.11.17.17.30.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Nov 2021 17:30:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2463-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2463-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2463-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 ewr.edge.kernel.org (Postfix) with ESMTPS id CC10E1C0F1A for ; Thu, 18 Nov 2021 01:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B41452C93; Thu, 18 Nov 2021 01:30:18 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 7AE4A2C83 for ; Thu, 18 Nov 2021 01:30:16 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="231577912" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="231577912" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 17:30:14 -0800 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="568294743" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.27.251]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 17:30:14 -0800 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH mptcp-next 2/6] mptcp: Add a member to mptcp_pm_data to track kernel vs userspace mode Date: Wed, 17 Nov 2021 17:30:01 -0800 Message-Id: <20211118013005.263660-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211118013005.263660-1-mathew.j.martineau@linux.intel.com> References: <20211118013005.263660-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" When adding support for netlink path management commands, the kernel needs to know whether paths are being controlled by the in-kernel path manager or a userspace PM. Signed-off-by: Mat Martineau --- net/mptcp/pm.c | 4 ++++ net/mptcp/protocol.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 467fbb2a4eba..3a3800771aca 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -373,6 +373,10 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) pm->subflows =3D 0; pm->rm_list_tx.nr =3D 0; pm->rm_list_rx.nr =3D 0; + WRITE_ONCE(pm->pm_type, MPTCP_PM_TYPE_KERNEL); + /* pm->work_pending must be only be set to 'true' when + * pm->pm_type is set to MPTCP_PM_TYPE_KERNEL + */ WRITE_ONCE(pm->work_pending, (!!mptcp_pm_get_local_addr_max(msk) && subflows_allowed) || !!mptcp_pm_get_add_addr_signal_max(msk)); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 092cb77a64d8..edaf0cc75474 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -178,6 +178,14 @@ enum mptcp_pm_status { MPTCP_PM_SUBFLOW_ESTABLISHED, }; =20 +enum mptcp_pm_type { + MPTCP_PM_TYPE_KERNEL =3D 0, + MPTCP_PM_TYPE_USERSPACE, + + __MPTCP_PM_TYPE_NR, + __MPTCP_PM_TYPE_MAX =3D __MPTCP_PM_TYPE_NR - 1, +}; + enum mptcp_addr_signal_status { MPTCP_ADD_ADDR_SIGNAL, MPTCP_ADD_ADDR_ECHO, @@ -200,6 +208,7 @@ struct mptcp_pm_data { u8 add_addr_signaled; u8 add_addr_accepted; u8 local_addr_used; + u8 pm_type; u8 subflows; u8 status; struct mptcp_rm_list rm_list_tx; --=20 2.34.0