Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Mar 2012 11:11:56 +0000 (UTC)
From:      Andre Oppermann <andre@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r232453 - user/andre/tcp_workqueue/sys/netinet
Message-ID:  <201203031111.q23BBuFI079209@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andre
Date: Sat Mar  3 11:11:56 2012
New Revision: 232453
URL: http://svn.freebsd.org/changeset/base/232453

Log:
  Simplify reporting of global maximum number of TCP segments in
  reassembly queue.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_reass.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_reass.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_reass.c	Sat Mar  3 10:22:49 2012	(r232452)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_reass.c	Sat Mar  3 11:11:56 2012	(r232453)
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
 
-static int tcp_reass_sysctl_maxseg(SYSCTL_HANDLER_ARGS);
 static int tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS);
 
 static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
@@ -82,9 +81,8 @@ static SYSCTL_NODE(_net_inet_tcp, OID_AU
 
 static VNET_DEFINE(int, tcp_reass_maxseg) = 0;
 #define	V_tcp_reass_maxseg		VNET(tcp_reass_maxseg)
-SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, maxsegments,
-    CTLTYPE_INT | CTLFLAG_RDTUN,
-    &VNET_NAME(tcp_reass_maxseg), 0, &tcp_reass_sysctl_maxseg, "I",
+SYSCTL_VNET_INT(_net_inet_tcp_reass, OID_AUTO, maxsegments, CTLFLAG_RDTUN,
+    &VNET_NAME(tcp_reass_maxseg), 0,
     "Global maximum number of TCP Segments in Reassembly Queue");
 
 static VNET_DEFINE(int, tcp_reass_qsize) = 0;
@@ -109,8 +107,10 @@ static void
 tcp_reass_zone_change(void *tag)
 {
 
+	/* Set the zone limit and read back the effective value. */
 	V_tcp_reass_maxseg = nmbclusters / 16;
 	uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg);
+	V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone);
 }
 
 void
@@ -122,7 +122,9 @@ tcp_reass_init(void)
 	    &V_tcp_reass_maxseg);
 	V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+	/* Set the zone limit and read back the effective value. */
 	uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg);
+	V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone);
 	EVENTHANDLER_REGISTER(nmbclusters_change,
 	    tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY);
 }
@@ -156,13 +158,6 @@ tcp_reass_flush(struct tcpcb *tp)
 }
 
 static int
-tcp_reass_sysctl_maxseg(SYSCTL_HANDLER_ARGS)
-{
-	V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone);
-	return (sysctl_handle_int(oidp, arg1, arg2, req));
-}
-
-static int
 tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS)
 {
 	V_tcp_reass_qsize = uma_zone_get_cur(V_tcp_reass_zone);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203031111.q23BBuFI079209>