From nobody Mon Feb 9 09:32:47 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:27c:0:0:0:0 with SMTP id x28csp886024jaq; Wed, 6 Oct 2021 17:00:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBj7xNKqretIC17lUXs2RXjBkH+AluAAGF6FpKjsqsXyqS5gje1TrwVnwFxHQFMfYnfACt X-Received: by 2002:a17:90a:b288:: with SMTP id c8mr1175035pjr.67.1633564808229; Wed, 06 Oct 2021 17:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633564808; cv=none; d=google.com; s=arc-20160816; b=L6i9a7RVACBtqUdgild48ojG9BdrmPwQerSkzrFKXEUvk4She/QqHK5mEy1eoRsR8R dv4jx9tjbMCODviIzKDxpoCzuoelBLz7HfE/7/Rv/T76wqQklQLnFCeCWg/BwrBXGSCo LO7YFksY92aJ0+OhPyRnkdScQb4t/sbHZ+anb8EkDhVxoUeQXw6HYirshDGIwWfQgAZU vCLVFVdQ15ehCRauiSk/NqRORx+r29jh1RNJkuEoQW4QWFxzaCtVhuCER1LJ/bEtDvfG zOIzjwLA849aUJnzt6K7Pjfaocp8A0JcdnJODs5/KTbGsG0LTyo7tbBSu2H8/Pn3MinF ks9A== 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=RASE1wiG6Kirultj4S0eNHrWZxVd8HWk6mOEqiZj76U=; b=dvPoUCNtvf6cyWcqHyVI/4RSaloue3DMTZvgGYGhDG5RuFd7YheBncPYJvJgNHo4Uc cNqMvx3jotYZgGpf81BsCfRUcwkOB64aOX1Xcws3snIT1Cj46XiA0RsN/ghygtFBXuKr LD3lbU5NoqjbfYNqZTS6+TL+Jf5ZRGAbve7AK126lU3oHwcTK/3fZh4Tyx+YKyYVTji3 jun8PugvZxifD75ZInZluZjfHNnbnncLo7cLLzwU1GXqA93j89EPRaBRRx0iZde2Bija tJuPd3vinEpQp66hlycW/J0Khmtu/B1ycQCwXxwDQryOve6hHqUFV8gkpCFLmBezSR1o d9rA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2114-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2114-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id 143si15098084pga.139.2021.10.06.17.00.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 17:00:08 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2114-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2114-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2114-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 682FD3E03AB for ; Thu, 7 Oct 2021 00:00:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AE0272C93; Thu, 7 Oct 2021 00:00:06 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 0DA5B2C81 for ; Thu, 7 Oct 2021 00:00:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="226439235" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="226439235" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 16:59:59 -0700 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="560351278" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.0.106]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 16:59:58 -0700 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau , kishen.maloor@intel.com Subject: [RFC PATCH 2/6] mptcp: Bypass kernel PM when userspace PM is enabled Date: Wed, 6 Oct 2021 16:59:49 -0700 Message-Id: <20211006235953.212243-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211006235953.212243-1-mathew.j.martineau@linux.intel.com> References: <20211006235953.212243-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 a MPTCP connection is managed by a userspace PM, bypass the kernel PM for incoming advertisements and subflow events. Netlink events are still sent to userspace. Signed-off-by: Mat Martineau --- net/mptcp/pm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 79aafcb51756..3fa3c0faed48 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -136,7 +136,7 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk,= const struct sock *ssk, * racing paths - accept() and check_fully_established() * be sure to serve this event only once. */ - if (READ_ONCE(pm->work_pending) && + if (READ_ONCE(pm->work_pending) && !READ_ONCE(pm->userspace) && !(msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED))) mptcp_pm_schedule_work(msk, MPTCP_PM_ESTABLISHED); =20 @@ -161,7 +161,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *ms= k) =20 pr_debug("msk=3D%p", msk); =20 - if (!READ_ONCE(pm->work_pending)) + if (!READ_ONCE(pm->work_pending) || READ_ONCE(pm->userspace)) return; =20 spin_lock_bh(&pm->lock); @@ -187,6 +187,9 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, =20 mptcp_event_addr_announced(msk, addr); =20 + if (READ_ONCE(pm->userspace)) + return; + spin_lock_bh(&pm->lock); =20 if (!READ_ONCE(pm->accept_addr)) { @@ -206,6 +209,9 @@ void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, =20 pr_debug("msk=3D%p", msk); =20 + if (READ_ONCE(pm->userspace)) + return; + spin_lock_bh(&pm->lock); =20 if (mptcp_lookup_anno_list_by_saddr(msk, addr) && READ_ONCE(pm->work_pend= ing)) @@ -233,6 +239,9 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, for (i =3D 0; i < rm_list->nr; i++) mptcp_event_addr_removed(msk, rm_list->ids[i]); =20 + if (READ_ONCE(pm->userspace)) + return; + spin_lock_bh(&pm->lock); mptcp_pm_schedule_work(msk, MPTCP_PM_RM_ADDR_RECEIVED); pm->rm_list_rx =3D *rm_list; --=20 2.33.0