diff mbox series

[net-next] Revert "net: snmp: add statistics for tcp small queue check"

Message ID 20211201033246.2826224-1-eric.dumazet@gmail.com (mailing list archive)
State Accepted
Commit ce8299b6f76f28326fedce2b4da90888bd97eab2
Delegated to: Netdev Maintainers
Headers show
Series [net-next] Revert "net: snmp: add statistics for tcp small queue check" | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 5088 this patch: 5088
netdev/cc_maintainers warning 4 maintainers not CCed: yoshfuji@linux-ipv6.org ycheng@google.com kuniyu@amazon.co.jp dsahern@kernel.org
netdev/build_clang success Errors and warnings before: 889 this patch: 889
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 5231 this patch: 5231
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 26 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Eric Dumazet Dec. 1, 2021, 3:32 a.m. UTC 
From: Eric Dumazet <edumazet@google.com>

This reverts commit aeeecb889165617a841e939117f9a8095d0e7d80.

The new SNMP variable (TCPSmallQueueFailure) can be incremented
for good reasons, even on a 100Gbit single TCP_STREAM flow.

If we really wanted to ease driver debugging [1], this would
require something more sophisticated.

[1] Usually, if a driver is delaying TX completions too much,
this can lead to stalls in TCP output. Various work arounds
have been used in the past, like skb_orphan() in ndo_start_xmit().

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Menglong Dong <imagedong@tencent.com>
---
 include/uapi/linux/snmp.h | 1 -
 net/ipv4/proc.c           | 1 -
 net/ipv4/tcp_output.c     | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 2, 2021, 3:20 a.m. UTC | #1 
Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 30 Nov 2021 19:32:46 -0800 you wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> This reverts commit aeeecb889165617a841e939117f9a8095d0e7d80.
> 
> The new SNMP variable (TCPSmallQueueFailure) can be incremented
> for good reasons, even on a 100Gbit single TCP_STREAM flow.
> 
> [...]

Here is the summary with links:
  - [net-next] Revert "net: snmp: add statistics for tcp small queue check"
    https://git.kernel.org/netdev/net-next/c/ce8299b6f76f

You are awesome, thank you!
diff mbox series

Patch

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index e32ec6932e8200fbc9e1f27d00bd43e7b34633d4..904909d020e2c8974128392370540c0ba3af4e15 100644
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -292,7 +292,6 @@  enum
 	LINUX_MIB_TCPDSACKIGNOREDDUBIOUS,	/* TCPDSACKIgnoredDubious */
 	LINUX_MIB_TCPMIGRATEREQSUCCESS,		/* TCPMigrateReqSuccess */
 	LINUX_MIB_TCPMIGRATEREQFAILURE,		/* TCPMigrateReqFailure */
-	LINUX_MIB_TCPSMALLQUEUEFAILURE,		/* TCPSmallQueueFailure */
 	__LINUX_MIB_MAX
 };
 
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 43b7a77cd6b4588cc10150613cf05154640d679f..f30273afb5399ddf0122e46e36da2ddae720a1c3 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -297,7 +297,6 @@  static const struct snmp_mib snmp4_net_list[] = {
 	SNMP_MIB_ITEM("TCPDSACKIgnoredDubious", LINUX_MIB_TCPDSACKIGNOREDDUBIOUS),
 	SNMP_MIB_ITEM("TCPMigrateReqSuccess", LINUX_MIB_TCPMIGRATEREQSUCCESS),
 	SNMP_MIB_ITEM("TCPMigrateReqFailure", LINUX_MIB_TCPMIGRATEREQFAILURE),
-	SNMP_MIB_ITEM("TCPSmallQueueFailure", LINUX_MIB_TCPSMALLQUEUEFAILURE),
 	SNMP_MIB_SENTINEL
 };
 
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index c4ab6c8f0c77d32e1c4e7e558a6a0f0aa17a5986..5079832af5c1090917a8fd5dfb1a3025e2d85ae0 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2524,11 +2524,8 @@  static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb,
 		 * test again the condition.
 		 */
 		smp_mb__after_atomic();
-		if (refcount_read(&sk->sk_wmem_alloc) > limit) {
-			NET_INC_STATS(sock_net(sk),
-				      LINUX_MIB_TCPSMALLQUEUEFAILURE);
+		if (refcount_read(&sk->sk_wmem_alloc) > limit)
 			return true;
-		}
 	}
 	return false;
 }