From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
Geliang Tang <geliang@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH net-next 2/2] mptcp: remove pr_fallback()
Date: Wed, 23 Jul 2025 16:32:24 +0200 [thread overview]
Message-ID: <20250723-net-next-mptcp-track-fallbacks-v1-2-a83cce08f2d5@kernel.org> (raw)
In-Reply-To: <20250723-net-next-mptcp-track-fallbacks-v1-0-a83cce08f2d5@kernel.org>
From: Paolo Abeni <pabeni@redhat.com>
We can now track fully the fallback status of a given connection via the
relevant mibs, the mentioned helper is redundant. Remove it completely.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
net/mptcp/options.c | 1 -
net/mptcp/protocol.c | 1 -
net/mptcp/protocol.h | 3 ---
net/mptcp/subflow.c | 4 ----
4 files changed, 9 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 6cf02344249a65d00b5832ebb69dd39d6e5fe98e..70c0ab0ecf905d282e5dc6c1b21ffc6476c8d71b 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -982,7 +982,6 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_FALLBACKFAILED);
goto reset;
}
- pr_fallback(msk);
return false;
}
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 88bf092f230abbecddc965b4242f711a5ba9d6b6..9a287b75c1b31bac9c35581db996e39e594872e0 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1167,7 +1167,6 @@ static void mptcp_update_infinite_map(struct mptcp_sock *msk,
}
mptcp_subflow_ctx(ssk)->send_infinite_map = 0;
- pr_fallback(msk);
}
#define MPTCP_MAX_GSO_SIZE (GSO_LEGACY_MAX_SIZE - (MAX_TCP_HEADER + 1))
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 912f048994a196304a80cde90747d4a512fb3d3d..b15d7fab5c4b66c6fb7a7cbdc91d49547ada6a94 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1257,13 +1257,10 @@ static inline bool mptcp_try_fallback(struct sock *ssk, int fb_mib)
return true;
}
-#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)\n", __func__, a)
-
static inline void mptcp_early_fallback(struct mptcp_sock *msk,
struct mptcp_subflow_context *subflow,
int fb_mib)
{
- pr_fallback(msk);
subflow->request_mptcp = 0;
WARN_ON_ONCE(!__mptcp_try_fallback(msk, fb_mib));
}
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 600e59bba363f9b3350d9d65ca729cba4badb304..3f1b62a9fe889ab1ac07f2a210b9de050436b37e 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -551,7 +551,6 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
goto do_reset;
}
- pr_fallback(msk);
goto fallback;
}
@@ -1855,14 +1854,11 @@ static void subflow_state_change(struct sock *sk)
{
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
struct sock *parent = subflow->conn;
- struct mptcp_sock *msk;
__subflow_state_change(sk);
- msk = mptcp_sk(parent);
if (subflow_simultaneous_connect(sk)) {
WARN_ON_ONCE(!mptcp_try_fallback(sk, MPTCP_MIB_SIMULTCONNFALLBACK));
- pr_fallback(msk);
subflow->conn_finished = 1;
mptcp_propagate_state(parent, sk, subflow, NULL);
}
--
2.50.0
next prev parent reply other threads:[~2025-07-23 14:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-23 14:32 [PATCH net-next 0/2] mptcp: track more fallback cases Matthieu Baerts (NGI0)
2025-07-23 14:32 ` [PATCH net-next 1/2] mptcp: track fallbacks accurately via mibs Matthieu Baerts (NGI0)
2025-07-23 14:32 ` Matthieu Baerts (NGI0) [this message]
2025-07-25 18:40 ` [PATCH net-next 0/2] mptcp: track more fallback cases patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250723-net-next-mptcp-track-fallbacks-v1-2-a83cce08f2d5@kernel.org \
--to=matttbe@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).