Page MenuHomeFreeBSD
Files F145902494

D29524.id86688.diff
No OneTemporary
Actions

D29524.id86688.diff
View Options

Index: sys/netinet/tcp_hostcache.c
===================================================================
--- sys/netinet/tcp_hostcache.c
+++ sys/netinet/tcp_hostcache.c
@@ -644,6 +644,7 @@
const int linesize = 128;
struct sbuf sb;
int i, error, len;
+ bool do_drain = false;
struct hc_metrics *hc_entry;
char ip4buf[INET_ADDRSTRLEN];
#ifdef INET6
@@ -701,9 +702,17 @@
hc_entry->rmx_hits,
hc_entry->rmx_updates,
hc_entry->rmx_expire);
+ do_drain = true;
}
THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx);
- sbuf_drain(&sb);
+ /* Need to track if sbuf has data, to avoid
+ * a KASSERT when coordinating the sbuf_drain
+ * in between holding the locks
+ */
+ if (do_drain) {
+ sbuf_drain(&sb);
+ do_drain = false;
+ }
}
#undef msec
error = sbuf_finish(&sb);
@@ -769,7 +778,7 @@
KASSERT(V_tcp_hostcache.hashbase[i].hch_length > 0 &&
V_tcp_hostcache.hashbase[i].hch_length <=
V_tcp_hostcache.bucket_limit,
- ("tcp_hostcache: bucket langth out of range at %u: %u",
+ ("tcp_hostcache: bucket length out of range at %u: %u",
i, V_tcp_hostcache.hashbase[i].hch_length));
if (all || hc_entry->rmx_expire <= 0) {
TAILQ_REMOVE(&V_tcp_hostcache.hashbase[i].hch_bucket,

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 26, 11:11 PM (6 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29008769
Default Alt Text
D29524.id86688.diff (1 KB)

Event Timeline