Page MenuHomeFreeBSD
Files F116069567

D29510.diff
No OneTemporary
Actions

D29510.diff
View Options

diff --git a/sys/netinet/tcp_hostcache.h b/sys/netinet/tcp_hostcache.h
--- a/sys/netinet/tcp_hostcache.h
+++ b/sys/netinet/tcp_hostcache.h
@@ -69,16 +69,16 @@
};
struct tcp_hostcache {
- struct hc_head *hashbase;
- uma_zone_t zone;
- u_int hashsize;
- u_int hashmask;
- u_int bucket_limit;
- u_int cache_count;
- u_int cache_limit;
- int expire;
- int prune;
- int purgeall;
+ struct hc_head *hashbase;
+ uma_zone_t zone;
+ u_int hashsize;
+ u_int hashmask;
+ u_int bucket_limit;
+ counter_u64_t cache_count;
+ u_int cache_limit;
+ int expire;
+ int prune;
+ int purgeall;
};
#endif /* !_NETINET_TCP_HOSTCACHE_H_*/
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -147,8 +147,8 @@
CTLFLAG_VNET | CTLFLAG_RDTUN, &VNET_NAME(tcp_hostcache.bucket_limit), 0,
"Per-bucket hash limit for hostcache");
-SYSCTL_UINT(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_VNET | CTLFLAG_RD,
- &VNET_NAME(tcp_hostcache.cache_count), 0,
+SYSCTL_COUNTER_U64(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_VNET | CTLFLAG_RD,
+ &VNET_NAME(tcp_hostcache.cache_count),
"Current number of entries in hostcache");
SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, expire, CTLFLAG_VNET | CTLFLAG_RW,
@@ -199,7 +199,8 @@
/*
* Initialize hostcache structures.
*/
- V_tcp_hostcache.cache_count = 0;
+ V_tcp_hostcache.cache_count = counter_u64_alloc(M_WAITOK);
+ counter_u64_zero(V_tcp_hostcache.cache_count);
V_tcp_hostcache.hashsize = TCP_HOSTCACHE_HASHSIZE;
V_tcp_hostcache.bucket_limit = TCP_HOSTCACHE_BUCKETLIMIT;
V_tcp_hostcache.expire = TCP_HOSTCACHE_EXPIRE;
@@ -267,6 +268,9 @@
/* Purge all hc entries. */
tcp_hc_purge_internal(1);
+ /* Release the counter */
+ counter_u64_free(V_tcp_hostcache.cache_count);
+
/* Free the uma zone and the allocated hash table. */
uma_zdestroy(V_tcp_hostcache.zone);
@@ -374,7 +378,7 @@
* If the bucket limit is reached, reuse the least-used element.
*/
if (hc_head->hch_length >= V_tcp_hostcache.bucket_limit ||
- V_tcp_hostcache.cache_count >= V_tcp_hostcache.cache_limit) {
+ counter_u64_fetch(V_tcp_hostcache.cache_count) >= V_tcp_hostcache.cache_limit) {
hc_entry = TAILQ_LAST(&hc_head->hch_bucket, hc_qhead);
/*
* At first we were dropping the last element, just to
@@ -391,7 +395,7 @@
}
TAILQ_REMOVE(&hc_head->hch_bucket, hc_entry, rmx_q);
V_tcp_hostcache.hashbase[hash].hch_length--;
- V_tcp_hostcache.cache_count--;
+ counter_u64_add(V_tcp_hostcache.cache_count, -1);
TCPSTAT_INC(tcps_hc_bucketoverflow);
#if 0
uma_zfree(V_tcp_hostcache.zone, hc_entry);
@@ -424,7 +428,7 @@
*/
TAILQ_INSERT_HEAD(&hc_head->hch_bucket, hc_entry, rmx_q);
V_tcp_hostcache.hashbase[hash].hch_length++;
- V_tcp_hostcache.cache_count++;
+ counter_u64_add(V_tcp_hostcache.cache_count, 1);
TCPSTAT_INC(tcps_hc_added);
return hc_entry;
@@ -640,7 +644,7 @@
/* Optimize Buffer length query by sbin/sysctl */
if (req->oldptr == NULL) {
- len = (V_tcp_hostcache.cache_count + 1) * linesize;
+ len = (counter_u64_fetch(V_tcp_hostcache.cache_count) + 1) * linesize;
return (SYSCTL_OUT(req, NULL, len));
}
@@ -712,7 +716,7 @@
hc_entry, rmx_q);
uma_zfree(V_tcp_hostcache.zone, hc_entry);
V_tcp_hostcache.hashbase[i].hch_length--;
- V_tcp_hostcache.cache_count--;
+ counter_u64_add(V_tcp_hostcache.cache_count, -1);
} else
hc_entry->rmx_expire -= V_tcp_hostcache.prune;
}

File Metadata

Mime Type
text/plain
Expires
Sat, May 3, 6:42 AM (13 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17926597
Default Alt Text
D29510.diff (3 KB)

Event Timeline