IPsec: Use protocol-specific malloc types instead of M_XDATA.

[markj]

These files should be explicitly including malloc.h.

[jhb]

In D33992#768523, @markj wrote:

These files should be explicitly including malloc.h.

Hmm, probably yes. There's probably a nested include in cryptodev.h that needs to be axed now or some such.

sys/netipsec/xform_ah.c

#ifdef TCP_RFC7413
         tcp_fastopen_init();
 #endif
 }
 
 #ifdef VIMAGE
 static void
 tcp_destroy(void *unused __unused)
 {
-        int error;
+        int error, n;
 
         /*
          * All our processes are gone, all our sockets should be cleaned
          * up, which means, we should be past the tcp_discardcb() calls.
-         * Sleep to let all tcpcb timers really disappear and then cleanup.
-         * Timewait will cleanup its queue and will be ready to go.
-         * XXX-BZ In theory a few ticks should be good enough to make sure
-         * the timers are all really gone.  We should see if we could use a
-         * better metric here and, e.g., check a tcbcb count as an optimization?
+         * Sleep to let all tcpcb timers really disappear and cleanup.
          */
-        DELAY(1000000 / hz);
+        do {
+                pause("tcpdes", hz/10);
+                INP_LIST_RLOCK(&V_tcbinfo);
+                n = V_tcbinfo.ipi_count;
+                INP_LIST_RUNLOCK(&V_tcbinfo);
+        } while (n != 0);
         tcp_hc_destroy();
         syncache_destroy();
         tcp_tw_destroy();
         in_pcbinfo_destroy(&V_tcbinfo);
         /* tcp_discardcb() clears the sack_holes up. */
         uma_zdestroy(V_sack_hole_zone);
         uma_zdestroy(V_tcpcb_zone);
 

sys/netipsec/xform_esp.c

#ifdef TCP_RFC7413
         tcp_fastopen_init();
 #endif
 }
 
 #ifdef VIMAGE
 static void
 tcp_destroy(void *unused __unused)
 {
-        int error;
+        int error, n;
 
         /*
          * All our processes are gone, all our sockets should be cleaned
          * up, which means, we should be past the tcp_discardcb() calls.
-         * Sleep to let all tcpcb timers really disappear and then cleanup.
-         * Timewait will cleanup its queue and will be ready to go.
-         * XXX-BZ In theory a few ticks should be good enough to make sure
-         * the timers are all really gone.  We should see if we could use a
-         * better metric here and, e.g., check a tcbcb count as an optimization?
+         * Sleep to let all tcpcb timers really disappear and cleanup.
          */
-        DELAY(1000000 / hz);
+        do {
+                pause("tcpdes", hz/10);
+                INP_LIST_RLOCK(&V_tcbinfo);
+                n = V_tcbinfo.ipi_count;
+                INP_LIST_RUNLOCK(&V_tcbinfo);
+        } while (n != 0);
         tcp_hc_destroy();
         syncache_destroy();
         tcp_tw_destroy();
         in_pcbinfo_destroy(&V_tcbinfo);
         /* tcp_discardcb() clears the sack_holes up. */
         uma_zdestroy(V_sack_hole_zone);
         uma_zdestroy(V_tcpcb_zone);
 

sys/netipsec/xform_ipcomp.c

#ifdef TCP_RFC7413
         tcp_fastopen_init();
 #endif
 }
 
 #ifdef VIMAGE
 static void
 tcp_destroy(void *unused __unused)
 {
-        int error;
+        int error, n;
 
         /*
          * All our processes are gone, all our sockets should be cleaned
          * up, which means, we should be past the tcp_discardcb() calls.
-         * Sleep to let all tcpcb timers really disappear and then cleanup.
-         * Timewait will cleanup its queue and will be ready to go.
-         * XXX-BZ In theory a few ticks should be good enough to make sure
-         * the timers are all really gone.  We should see if we could use a
-         * better metric here and, e.g., check a tcbcb count as an optimization?
+         * Sleep to let all tcpcb timers really disappear and cleanup.
          */
-        DELAY(1000000 / hz);
+        do {
+                pause("tcpdes", hz/10);
+                INP_LIST_RLOCK(&V_tcbinfo);
+                n = V_tcbinfo.ipi_count;
+                INP_LIST_RUNLOCK(&V_tcbinfo);
+        } while (n != 0);
         tcp_hc_destroy();
         syncache_destroy();
         tcp_tw_destroy();
         in_pcbinfo_destroy(&V_tcbinfo);
         /* tcp_discardcb() clears the sack_holes up. */
         uma_zdestroy(V_sack_hole_zone);
         uma_zdestroy(V_tcpcb_zone);