[src/trunk]: src/sys/netinet tcp_drain: grab softnet_lock where appropriate

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a109957582a5
branches:  trunk
changeset: 770735:a109957582a5
user:      yamt <yamt%NetBSD.org@localhost>
date:      Mon Oct 31 12:56:45 2011 +0000

description:
tcp_drain: grab softnet_lock where appropriate

diffstat:

 sys/netinet/tcp_subr.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 7de192edc1d4 -r a109957582a5 sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c    Mon Oct 31 12:52:19 2011 +0000
+++ b/sys/netinet/tcp_subr.c    Mon Oct 31 12:56:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_subr.c,v 1.241 2011/05/03 18:28:45 dyoung Exp $    */
+/*     $NetBSD: tcp_subr.c,v 1.242 2011/10/31 12:56:45 yamt Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.241 2011/05/03 18:28:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.242 2011/10/31 12:56:45 yamt Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1328,8 +1328,7 @@
 
 /*
  * Protocol drain routine.  Called when memory is in short supply.
- * Don't acquire softnet_lock as can be called from hardware
- * interrupt handler.
+ * Called from pr_fasttimo thus a callout context.
  */
 void
 tcp_drain(void)
@@ -1337,6 +1336,7 @@
        struct inpcb_hdr *inph;
        struct tcpcb *tp;
 
+       mutex_enter(softnet_lock);
        KERNEL_LOCK(1, NULL);
 
        /*
@@ -1371,6 +1371,7 @@
        }
 
        KERNEL_UNLOCK_ONE(NULL);
+       mutex_exit(softnet_lock);
 }
 
 /*