DO-NOT-MERGE: mptcp: improve code coverage for CI

tcp: warn if tcp_done() is called on a closed socket

  This is an extra check mainly for the CIs: to make sure we don't call
  tcp_done() on an already closed socket as it happened in the past. If
  we do such call, better to catch the error earlier.

mptcp: warn in case of bogus mpc option on established client sk

  As discussed on [1], an additional check is done to catch local
  software bug.

  This patch is supposed to land only in our tree, for both 'export' and
  'export-net' branches, because the warning could be triggered by
  bugged / malicious peer. We want it in our tree for our CI to detect
  internal bugs.

  Link: https://lore.kernel.org/all/[email protected]/ [1]

net: debug patch for WARNING in skb_try_coalesce

  Patch from Paolo Abeni.

  See ticket 572 on GH.

Signed-off-by: Matthieu Baerts <[email protected]>

Author: matttbe

net/core/skbuff.c

@@ -6172,7 +6172,10 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
 		delta = from->truesize - SKB_TRUESIZE(skb_end_offset(from));
 	}
 
-	WARN_ON_ONCE(delta < len);
+	if (WARN_ON_ONCE(delta < len))
+		pr_err("skb len %d delta %d truesize %d headlen %d end %d\n",
+		       len, delta, from->truesize, skb_headlen(from),
+		       skb_end_offset(from));
 
 	memcpy(to_shinfo->frags + to_shinfo->nr_frags,
 	       from_shinfo->frags,

net/ipv4/tcp.c

@@ -4998,6 +4998,8 @@ void tcp_done(struct sock *sk)
 	 */
 	req = rcu_dereference_protected(tcp_sk(sk)->fastopen_rsk, 1);
 
+	WARN_ON_ONCE(sk->sk_state == TCP_CLOSE);
+
 	if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
 		TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
 

net/mptcp/Kconfig

@@ -36,4 +36,13 @@ config MPTCP_KUNIT_TEST
 
 	  If unsure, say N.
 
+config GCOV_PROFILE_MPTCP
+	bool "Enable GCOV profiling on MPTCP"
+	depends on GCOV_KERNEL
+	help
+	  Enable GCOV profiling on MPTCP for checking which functions/lines
+	  are executed.
+
+	  If unsure, say N.
+
 endif

net/mptcp/Makefile

@@ -13,3 +13,8 @@ mptcp_token_test-objs := token_test.o
 obj-$(CONFIG_MPTCP_KUNIT_TEST) += mptcp_crypto_test.o mptcp_token_test.o
 
 obj-$(CONFIG_BPF_SYSCALL) += bpf.o
+
+# for GCOV coverage profiling
+ifdef CONFIG_GCOV_PROFILE_MPTCP
+GCOV_PROFILE := y
+endif

net/mptcp/options.c

@@ -999,7 +999,8 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
 	}
 
 	if (unlikely(!READ_ONCE(msk->pm.server_side)))
-		pr_warn_once("bogus mpc option on established client sk");
+		/* DO-NOT-MERGE: use WARN i/o pr_warn: only for MPTCP export */
+		WARN_ONCE(1, "bogus mpc option on established client sk");
 
 set_fully_established:
 	if (mp_opt->deny_join_id0)