From nobody Sun Feb 8 21:06:18 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 0D6A92E8E0E for ; Wed, 9 Jul 2025 15:13:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752073996; cv=none; b=QS/tb7dqDdaNwKkOEJXVJn6/rVdw521RbBL5bBmq01XPkmJJGbBvxkq808zw0uaFaqvNqYsYDv18g+8JMMd2LXvoyFJXzV33l7/idQajBNaxcYDP5UB10bQ3dmZziG/qLQ7UXI3WcOHClsgWTtFzZyEwyWMindCstJtvQzIFCFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752073996; c=relaxed/simple; bh=CY54GeeFpc/TpQeN9P+w0AoVZtvxrqAsPnQMhvyi9C0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=UvH/nsT4cIZuh7KePAbkk/i2XLvQSX+rRYlcE7PmZpuhREUGr20hKwtycB5LEXPwPL0Cd2022pF6s0lB9+G11CqFn265zPMsXFuYsyIXC2Pa0D2Cwl+eueMN7HQwQnv89VY+RhhjexZU/Ih/DHdsyQ00m2OcPdqg8iIRBxazUl8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=EWuBTERI; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EWuBTERI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752073993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Cl+aGVhwNQzbHIp3N94k3RsU6ka5B6QNFfEAL4v5iU=; b=EWuBTERIYQ0Z1sfZB4NSQi2qeOy9+bYAs62YXy9uDBQi3q1mu9qeYnayf7T837InBL63B7 jT113HBsBKXN3nP2dZJnzDJioeH6N3io1dmS7ZRJJqxENO4Qj4Xn1mpUo/VF375afRpCz4 0eVIMQHXygxHVYyPKr7bXxtnwinyhkU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-7F_tyX6gN1uQle0SPm5_-Q-1; Wed, 09 Jul 2025 11:13:12 -0400 X-MC-Unique: 7F_tyX6gN1uQle0SPm5_-Q-1 X-Mimecast-MFC-AGG-ID: 7F_tyX6gN1uQle0SPm5_-Q_1752073991 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 739C31801318 for ; Wed, 9 Jul 2025 15:13:11 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.33.4]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9A6D01956089 for ; Wed, 9 Jul 2025 15:13:10 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-net 5/5] mptcp: remove pr_fallback() Date: Wed, 9 Jul 2025 17:12:54 +0200 Message-ID: <5fa04a9642a079486dad706b4026f8374120a703.1752073685.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2X6lzeobd8CHXD2i2KMarL_MK2WrboHh0nmH0byTjZs_1752073991 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- v2 -> v3: - dropped unused variable in subflow_state_change() --- 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 b49a8b3ffe00..3c08beffbfea 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; } =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 54dc39fd1495..c46993bf9d8e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1166,7 +1166,6 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, } =20 mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; - pr_fallback(msk); } =20 #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 74579743264f..db50b216143a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1254,13 +1254,10 @@ static inline bool mptcp_try_fallback(struct sock *= ssk, int fb_mib) return true; } =20 -#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=3D%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 =3D 0; WARN_ON_ONCE(!__mptcp_try_fallback(msk, fb_mib)); } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 600e59bba363..3f1b62a9fe88 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -551,7 +551,6 @@ static void subflow_finish_connect(struct sock *sk, con= st struct sk_buff *skb) goto do_reset; } =20 - pr_fallback(msk); goto fallback; } =20 @@ -1855,14 +1854,11 @@ static void subflow_state_change(struct sock *sk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); struct sock *parent =3D subflow->conn; - struct mptcp_sock *msk; =20 __subflow_state_change(sk); =20 - msk =3D mptcp_sk(parent); if (subflow_simultaneous_connect(sk)) { WARN_ON_ONCE(!mptcp_try_fallback(sk, MPTCP_MIB_SIMULTCONNFALLBACK)); - pr_fallback(msk); subflow->conn_finished =3D 1; mptcp_propagate_state(parent, sk, subflow, NULL); } --=20 2.50.0