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 x28csp885950jaq; Wed, 6 Oct 2021 17:00:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyBh88eSxt9fk9lk/dvEThLsWakDi2YonKENLStPNobh0FXvOI0YLF9WzAJ+tk1eQ9FZGa X-Received: by 2002:a37:44d7:: with SMTP id r206mr846965qka.421.1633564804390; Wed, 06 Oct 2021 17:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633564804; cv=none; d=google.com; s=arc-20160816; b=0sNxERfisDaKkz8LTzd22DwikjRlDxRXSlwyHghcDy9d6cUaYy7vYQWv6N7H1ybZri 93a8KGkya49OFqeNVHhgOAj+plPaIzbrKoEiONZh+9Z9bzuYJedbzbX7H9nuUZtk8bN+ Y0Na1tY7cndawbx4mTdpfS4TJrhe1Po7rDIdtfJNELB9OA54zX94XqbRkXDGXoy4yA9b 2D8qRw0veRBVpZxEL8ZLdtvHAdzpP4YSrcnWFQsSDWFvaxTsnRv6AVxFWpPEMO1IJD4I JkQUrrxAvxHK89sBP7G6VxhA0fmJ1nEuhCxyi7naKNZuLtupwm0fPdUN2vI5BMZtpa8f QDJA== 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=yY/DLF4w98p1HB7YQgtlLV6+TUeSoQoPQTr+5QNyu/E=; b=bR2i11hhiBpVodG6ggujFW0ASfVG5yv97IPqVTLlr7bYKq92ff7J7i+LqibVTzf2uE dvvOVqn3Sykm73NBauKgBf6K+Rpurbjs3FTzduHbZ9iey6Uls7ZLssRCMZx8InXrNOFF ozKMJOsYC9Nj3H4ZjrO5rrUu76Vca7FR0aqGqc4g+lrW/AlGVT5Yf2/OsLTZhV2h2TAo kM9mDvbdYwLBmIwYCaNY8ZDIeEseRwDUpaMf6lUhfj5H302CNX6R9617YAip7lekbibF 08xD6D6yESzybeLCM4wv+HIHPLbR6vhAhUec7eITuy7iuAfKpF30icDUiRkf8JPgGZBE xtyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2113-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2113-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 f5si13456374qkh.384.2021.10.06.17.00.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 17:00:04 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2113-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-2113-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2113-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 B08871C07C8 for ; Thu, 7 Oct 2021 00:00:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3D5582C93; Thu, 7 Oct 2021 00:00:02 +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 A4D992C81 for ; Thu, 7 Oct 2021 00:00:00 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="249414258" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="249414258" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.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="560351292" 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:59 -0700 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau , kishen.maloor@intel.com Subject: [RFC PATCH 6/6] DO-NOT-MERGE: debug: mptcp: Warn on unexpected events when userspace PM is active Date: Wed, 6 Oct 2021 16:59:53 -0700 Message-Id: <20211006235953.212243-7-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" This is to confirm the previous commits work as expected, not sure if such checks will be needed upstream. Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 45 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index affa84099bdd..f6299bda6eb2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -753,14 +753,10 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_soc= k *msk, mptcp_pm_nl_rm_addr_or_subflow(msk, rm_list, MPTCP_MIB_RMSUBFLOW); } =20 -void mptcp_pm_nl_work(struct mptcp_sock *msk) +static void mptcp_pm_kernel_work(struct mptcp_sock *msk) { struct mptcp_pm_data *pm =3D &msk->pm; =20 - msk_owned_by_me(msk); - - spin_lock_bh(&msk->pm.lock); - pr_debug("msk=3D%p status=3D%x", msk, pm->status); if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) { pm->status &=3D ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED); @@ -782,6 +778,45 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) pm->status &=3D ~BIT(MPTCP_PM_SUBFLOW_ESTABLISHED); mptcp_pm_nl_subflow_established(msk); } +} + +static void mptcp_pm_userspace_work(struct mptcp_sock *msk) +{ + struct mptcp_pm_data *pm =3D &msk->pm; + + pr_debug("msk=3D%p status=3D%x", msk, pm->status); + if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) { + pm->status &=3D ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED); + WARN_ONCE(1, "Unexpected ADD_ADDR status in userspace PM mode"); + } + if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) { + pm->status &=3D ~BIT(MPTCP_PM_ADD_ADDR_SEND_ACK); + WARN_ONCE(1, "Unexpected ADD_ADDR retransmit status in userspace PM mode= "); + } + if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) { + pm->status &=3D ~BIT(MPTCP_PM_RM_ADDR_RECEIVED); + WARN_ONCE(1, "Unexpected RM_ADDR status in userspace PM mode"); + } + if (pm->status & BIT(MPTCP_PM_ESTABLISHED)) { + pm->status &=3D ~BIT(MPTCP_PM_ESTABLISHED); + WARN_ONCE(1, "Unexpected established status in userspace PM mode"); + } + if (pm->status & BIT(MPTCP_PM_SUBFLOW_ESTABLISHED)) { + pm->status &=3D ~BIT(MPTCP_PM_SUBFLOW_ESTABLISHED); + WARN_ONCE(1, "Unexpected subflow established status in userspace PM mode= "); + } +} + +void mptcp_pm_nl_work(struct mptcp_sock *msk) +{ + msk_owned_by_me(msk); + + spin_lock_bh(&msk->pm.lock); + + if (READ_ONCE(msk->pm.userspace)) + mptcp_pm_userspace_work(msk); + else + mptcp_pm_kernel_work(msk); =20 spin_unlock_bh(&msk->pm.lock); } --=20 2.33.0