CVS commit: src/sys/net

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sat Feb  1 02:57:56 UTC 2020

Modified Files:
        src/sys/net: if_ipsec.c if_ipsec.h

Log Message:
Fix order in rollback case; switch if_ipsec to atomic_load/store_*.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net/if_ipsec.c
cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_ipsec.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.26 src/sys/net/if_ipsec.c:1.27
--- src/sys/net/if_ipsec.c:1.26	Wed Jan 29 04:34:10 2020
+++ src/sys/net/if_ipsec.c	Sat Feb  1 02:57:55 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.c,v 1.26 2020/01/29 04:34:10 thorpej Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.27 2020/02/01 02:57:55 riastradh Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,13 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.26 2020/01/29 04:34:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.27 2020/02/01 02:57:55 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 
 #include <sys/param.h>
+#include <sys/atomic.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
@@ -1130,7 +1131,6 @@ if_ipsec_set_tunnel(struct ifnet *ifp,
 	if_ipsec_copy_variant(nullvar, ovar);
 	if_ipsec_clear_config(nullvar);
 	psref_target_init(&nullvar->iv_psref, iv_psref_class);
-	membar_producer();
 	/*
 	 * (2-3) Swap variant include its SPs.
 	 */
@@ -1236,7 +1236,6 @@ if_ipsec_delete_tunnel(struct ifnet *ifp
 	if_ipsec_copy_variant(nullvar, ovar);
 	if_ipsec_clear_config(nullvar);
 	psref_target_init(&nullvar->iv_psref, iv_psref_class);
-	membar_producer();
 	/*
 	 * (2-3) Swap variant include its SPs.
 	 */
@@ -1323,7 +1322,6 @@ if_ipsec_ensure_flags(struct ifnet *ifp,
 	if_ipsec_copy_variant(nullvar, ovar);
 	if_ipsec_clear_config(nullvar);
 	psref_target_init(&nullvar->iv_psref, iv_psref_class);
-	membar_producer();
 	/*
 	 * (2-3) Swap variant include its SPs.
 	 */
@@ -1894,16 +1892,16 @@ if_ipsec_update_variant(struct ipsec_sof
 	 * we stop packet processing while replacing SPs, that is, we set
 	 * "null" config variant to sc->ipsec_var.
 	 */
-	sc->ipsec_var = nullvar;
+	atomic_store_release(&sc->ipsec_var, nullvar);
 	pserialize_perform(sc->ipsec_psz);
 	psref_target_destroy(&ovar->iv_psref, iv_psref_class);
 
 	error = if_ipsec_replace_sp(sc, ovar, nvar);
 	if (!error)
-		sc->ipsec_var = nvar;
+		atomic_store_release(&sc->ipsec_var, nvar);
 	else {
-		sc->ipsec_var = ovar; /* rollback */
 		psref_target_init(&ovar->iv_psref, iv_psref_class);
+		atomic_store_release(&sc->ipsec_var, ovar); /* rollback */
 	}
 
 	pserialize_perform(sc->ipsec_psz);

Index: src/sys/net/if_ipsec.h
diff -u src/sys/net/if_ipsec.h:1.6 src/sys/net/if_ipsec.h:1.7
--- src/sys/net/if_ipsec.h:1.6	Fri Nov  1 04:28:14 2019
+++ src/sys/net/if_ipsec.h	Sat Feb  1 02:57:55 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.h,v 1.6 2019/11/01 04:28:14 knakahara Exp $  */
+/*	$NetBSD: if_ipsec.h,v 1.7 2020/02/01 02:57:55 riastradh Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -165,9 +165,8 @@ if_ipsec_getref_variant(struct ipsec_sof
 	int s;
 
 	s = pserialize_read_enter();
-	var = sc->ipsec_var;
+	var = atomic_load_consume(&sc->ipsec_var);
 	KASSERT(var != NULL);
-	membar_datadep_consumer();
 	psref_acquire(psref, &var->iv_psref, iv_psref_class);
 	pserialize_read_exit(s);