Attachment 170568 Details for Bug 209680 – (Hopefully) make TCP/IP connections reliable under memory pressure again

[patch] (Hopefully) make TCP/IP connections reliable under memory pressure again

Hopefully-make-TCP-IP-connections-reliable-under-mem.diff (text/plain), 2.27 KB, created by Fabian Keil on 2016-05-23 14:41:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2016-05-23 14:41:33 UTC

Size: 2.27 KB

patch

obsolete

>From 50cf0603e22fbc72e0b9c82941b3da483c0ed057 Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Sat, 14 May 2016 13:15:31 +0200
>Subject: [PATCH 7/7] (Hopefully) make TCP/IP connections reliable under memory
> pressure again
>
>... by bringing back the UMA_ZONE_NOFREE flag for a
>couple of TCP related UMA zones.
>
>This reverts r297740/f3240321 completely and partially
>reverts r297738/55f63f4b6bf and r297742/0a1a3e73fc.
>
>Obtained from: ElectroBSD
>---
> sys/netinet/tcp_fastopen.c | 2 +-
> sys/netinet/tcp_subr.c     | 7 ++++---
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c
>index ec02d18f..482320e 100644
>--- a/sys/netinet/tcp_fastopen.c
>+++ b/sys/netinet/tcp_fastopen.c
>@@ -204,7 +204,7 @@ void
> tcp_fastopen_init(void)
> {
> 	V_counter_zone = uma_zcreate("tfo", sizeof(unsigned int),
>-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
>+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
> 	rm_init(&V_tcp_fastopen_keylock, "tfo_keylock");
> 	callout_init_rm(&V_tcp_fastopen_autokey_ctx.c,
> 	    &V_tcp_fastopen_keylock, 0);
>diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
>index 03526df..2783611 100644
>--- a/sys/netinet/tcp_subr.c
>+++ b/sys/netinet/tcp_subr.c
>@@ -650,13 +650,14 @@ tcp_init(void)
> 		    hashsize);
> 	}
> 	in_pcbinfo_init(&V_tcbinfo, "tcp", &V_tcb, hashsize, hashsize,
>-	    "tcp_inpcb", tcp_inpcb_init, NULL, 0, IPI_HASHFIELDS_4TUPLE);
>+	    "tcp_inpcb", tcp_inpcb_init, NULL, UMA_ZONE_NOFREE,
>+	    IPI_HASHFIELDS_4TUPLE);
> 
> 	/*
> 	 * These have to be type stable for the benefit of the timers.
> 	 */
> 	V_tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem),
>-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
>+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
> 	uma_zone_set_max(V_tcpcb_zone, maxsockets);
> 	uma_zone_set_warning(V_tcpcb_zone, "kern.ipc.maxsockets limit reached");
> 
>@@ -666,7 +667,7 @@ tcp_init(void)
> 
> 	TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack);
> 	V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole),
>-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
>+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
> 
> 	/* Skip initialization of globals for non-default instances. */
> 	if (!IS_DEFAULT_VNET(curvnet))
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 209680: 170568 | 170569