Module Name: src
Committed By: maxv
Date: Sat Apr 28 15:45:16 UTC 2018
Modified Files:
src/sys/netipsec: ipsec.c ipsec_input.c ipsec_output.c ipsec_private.h
key.c xform_ah.c xform_esp.c xform_ipcomp.c xform_ipip.c
Log Message:
Remove IPSEC_SPLASSERT_SOFTNET, it has always been a no-op.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.66 -r1.67 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.73 -r1.74 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netipsec/ipsec_private.h
cvs rdiff -u -r1.254 -r1.255 src/sys/netipsec/key.c
cvs rdiff -u -r1.94 -r1.95 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netipsec/xform_ipcomp.c
cvs rdiff -u -r1.68 -r1.69 src/sys/netipsec/xform_ipip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.159 src/sys/netipsec/ipsec.c:1.160
--- src/sys/netipsec/ipsec.c:1.159 Sat Apr 28 14:21:03 2018
+++ src/sys/netipsec/ipsec.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.159 2018/04/28 14:21:03 maxv Exp $ */
+/* $NetBSD: ipsec.c,v 1.160 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.159 2018/04/28 14:21:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.160 2018/04/28 15:45:16 maxv Exp $");
/*
* IPsec controller part.
@@ -1610,8 +1610,6 @@ ipsec_chkreplay(u_int32_t seq, const str
u_int32_t wsizeb; /* constant: bits of window size */
int frlast; /* constant: last frame */
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
KASSERT(sav != NULL);
KASSERT(sav->replay != NULL);
@@ -1668,8 +1666,6 @@ ipsec_updatereplay(u_int32_t seq, const
u_int32_t wsizeb; /* constant: bits of window size */
int frlast; /* constant: last frame */
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
KASSERT(sav != NULL);
KASSERT(sav->replay != NULL);
Index: src/sys/netipsec/ipsec_input.c
diff -u src/sys/netipsec/ipsec_input.c:1.66 src/sys/netipsec/ipsec_input.c:1.67
--- src/sys/netipsec/ipsec_input.c:1.66 Thu Apr 19 08:27:38 2018
+++ src/sys/netipsec/ipsec_input.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_input.c,v 1.66 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: ipsec_input.c,v 1.67 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.66 2018/04/19 08:27:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.67 2018/04/28 15:45:16 maxv Exp $");
/*
* IPsec input processing.
@@ -326,8 +326,6 @@ ipsec4_common_input_cb(struct mbuf *m, s
struct secasindex *saidx;
int error;
- IPSEC_SPLASSERT_SOFTNET("ipsec4_common_input_cb");
-
if (__predict_false(m == NULL)) {
panic("%s: NULL mbuf", __func__);
}
Index: src/sys/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.73 src/sys/netipsec/ipsec_output.c:1.74
--- src/sys/netipsec/ipsec_output.c:1.73 Thu Apr 19 08:27:38 2018
+++ src/sys/netipsec/ipsec_output.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_output.c,v 1.73 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: ipsec_output.c,v 1.74 2018/04/28 15:45:16 maxv Exp $ */
/*
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.73 2018/04/19 08:27:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.74 2018/04/28 15:45:16 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -154,8 +154,6 @@ ipsec_process_done(struct mbuf *m, const
uint64_t *data = NULL;
int hlen, roff;
- IPSEC_SPLASSERT_SOFTNET("ipsec_process_done");
-
KASSERT(m != NULL);
KASSERT(isr != NULL);
KASSERT(sav != NULL);
@@ -376,7 +374,6 @@ do { \
struct secasvar *sav = NULL;
struct secasindex saidx;
- IPSEC_SPLASSERT_SOFTNET("ipsec_nextisr");
KASSERTMSG(af == AF_INET || af == AF_INET6,
"invalid address family %u", af);
again:
Index: src/sys/netipsec/ipsec_private.h
diff -u src/sys/netipsec/ipsec_private.h:1.8 src/sys/netipsec/ipsec_private.h:1.9
--- src/sys/netipsec/ipsec_private.h:1.8 Sat Apr 28 14:39:34 2018
+++ src/sys/netipsec/ipsec_private.h Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_private.h,v 1.8 2018/04/28 14:39:34 maxv Exp $ */
+/* $NetBSD: ipsec_private.h,v 1.9 2018/04/28 15:45:16 maxv Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -64,11 +64,6 @@ extern percpu_t *pfkeystat_percpu;
#define PFKEY_STATINC(x) _NET_STATINC(pfkeystat_percpu, x)
#define PFKEY_STATADD(x, v) _NET_STATADD(pfkeystat_percpu, x, v)
-/*
- * Remainings of ipsec_osdep.h
- */
-#define IPSEC_SPLASSERT_SOFTNET(msg) do {} while (0)
-
/* superuser opened socket? */
#define IPSEC_PRIVILEGED_SO(so) ((so)->so_uidinfo->ui_uid == 0)
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.254 src/sys/netipsec/key.c:1.255
--- src/sys/netipsec/key.c:1.254 Thu Apr 19 08:27:38 2018
+++ src/sys/netipsec/key.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.254 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: key.c,v 1.255 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.254 2018/04/19 08:27:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.255 2018/04/28 15:45:16 maxv Exp $");
/*
* This code is referred to RFC 2367
@@ -1078,7 +1078,6 @@ key_checkrequest(const struct ipsecreque
* temporarily null out below. Need to rethink how we
* handle bundled SA's in the callback thread.
*/
- IPSEC_SPLASSERT_SOFTNET("key_checkrequest");
sav = key_lookup_sa_bysaidx(saidx);
if (sav != NULL) {
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.94 src/sys/netipsec/xform_ah.c:1.95
--- src/sys/netipsec/xform_ah.c:1.94 Tue Apr 24 08:07:06 2018
+++ src/sys/netipsec/xform_ah.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.94 2018/04/24 08:07:06 maxv Exp $ */
+/* $NetBSD: xform_ah.c,v 1.95 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.94 2018/04/24 08:07:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.95 2018/04/28 15:45:16 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -522,8 +522,6 @@ ah_input(struct mbuf *m, struct secasvar
bool pool_used;
uint8_t nxt;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
KASSERT(sav != NULL);
KASSERT(sav->key_auth != NULL);
KASSERT(sav->tdb_authalgxform != NULL);
@@ -902,8 +900,6 @@ ah_output(struct mbuf *m, const struct i
size_t ipoffs;
bool pool_used;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
KASSERT(sav != NULL);
KASSERT(sav->tdb_authalgxform != NULL);
ahx = sav->tdb_authalgxform;
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.81 src/sys/netipsec/xform_esp.c:1.82
--- src/sys/netipsec/xform_esp.c:1.81 Thu Apr 19 08:27:39 2018
+++ src/sys/netipsec/xform_esp.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.81 2018/04/19 08:27:39 maxv Exp $ */
+/* $NetBSD: xform_esp.c,v 1.82 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.81 2018/04/19 08:27:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.82 2018/04/28 15:45:16 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -303,8 +303,6 @@ esp_input(struct mbuf *m, struct secasva
struct cryptodesc *crde;
struct cryptop *crp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
KASSERT(sav != NULL);
KASSERT(sav->tdb_encalgxform != NULL);
KASSERTMSG((skip&3) == 0 && (m->m_pkthdr.len&3) == 0,
@@ -706,8 +704,6 @@ esp_output(struct mbuf *m, const struct
struct cryptodesc *crde = NULL, *crda = NULL;
struct cryptop *crp;
- IPSEC_SPLASSERT_SOFTNET(__func__);
-
esph = sav->tdb_authalgxform;
KASSERT(sav->tdb_encalgxform != NULL);
espx = sav->tdb_encalgxform;
Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.62 src/sys/netipsec/xform_ipcomp.c:1.63
--- src/sys/netipsec/xform_ipcomp.c:1.62 Thu Apr 19 08:27:39 2018
+++ src/sys/netipsec/xform_ipcomp.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipcomp.c,v 1.62 2018/04/19 08:27:39 maxv Exp $ */
+/* $NetBSD: xform_ipcomp.c,v 1.63 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.62 2018/04/19 08:27:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.63 2018/04/28 15:45:16 maxv Exp $");
/* IP payload compression protocol (IPComp), see RFC 2393 */
#if defined(_KERNEL_OPT)
@@ -146,7 +146,6 @@ ipcomp_input(struct mbuf *m, struct seca
struct cryptop *crp;
int error, hlen = IPCOMP_HLENGTH, stat = IPCOMP_STAT_CRYPTO;
- IPSEC_SPLASSERT_SOFTNET(__func__);
KASSERT(skip + hlen <= m->m_pkthdr.len);
/* Get crypto descriptors */
@@ -382,7 +381,6 @@ ipcomp_output(struct mbuf *m, const stru
struct cryptop *crp;
struct tdb_crypto *tc;
- IPSEC_SPLASSERT_SOFTNET(__func__);
KASSERT(sav != NULL);
KASSERT(sav->tdb_compalgxform != NULL);
ipcompx = sav->tdb_compalgxform;
Index: src/sys/netipsec/xform_ipip.c
diff -u src/sys/netipsec/xform_ipip.c:1.68 src/sys/netipsec/xform_ipip.c:1.69
--- src/sys/netipsec/xform_ipip.c:1.68 Tue Apr 24 08:07:06 2018
+++ src/sys/netipsec/xform_ipip.c Sat Apr 28 15:45:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipip.c,v 1.68 2018/04/24 08:07:06 maxv Exp $ */
+/* $NetBSD: xform_ipip.c,v 1.69 2018/04/28 15:45:16 maxv Exp $ */
/* $FreeBSD: xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.68 2018/04/24 08:07:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.69 2018/04/28 15:45:16 maxv Exp $");
/*
* IP-inside-IP processing
@@ -333,7 +333,6 @@ ipip_output(struct mbuf *m, const struct
struct ip6_hdr *ip6, *ip6o;
#endif
- IPSEC_SPLASSERT_SOFTNET(__func__);
KASSERT(sav != NULL);
/* XXX Deal with empty TDB source/destination addresses. */
