Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need for membar_datadep_consumer here.

Browse Source 
PSLIST_READER_FOREACH takes care of it already.
PSLIST_WRITER_FOREACH is exclusive so doesn't need it.
This commit is contained in:
riastradh 2017-04-15 17:06:45 +00:00
parent ef94a4990e
commit c8bcfc34de
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netinet/ip_encap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $ */ /* $NetBSD: ip_encap.c,v 1.64 2017/04/15 17:06:45 riastradh Exp $ */
/* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */ /* $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $ */
/* /*
@ -68,7 +68,7 @@
#define USE_RADIX #define USE_RADIX
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.63 2017/04/07 03:31:50 ozaki-r Exp $"); __KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.64 2017/04/15 17:06:45 riastradh Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_mrouting.h" #include "opt_mrouting.h"
@ -274,8 +274,6 @@ encap4_lookup(struct mbuf *m, int off, int proto, enum direction dir,
PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) { PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
struct psref elem_psref; struct psref elem_psref;
membar_datadep_consumer();
if (ep->af != AF_INET) if (ep->af != AF_INET)
continue; continue;
if (ep->proto >= 0 && ep->proto != proto) if (ep->proto >= 0 && ep->proto != proto)
@ -442,8 +440,6 @@ encap6_lookup(struct mbuf *m, int off, int proto, enum direction dir,
PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) { PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
struct psref elem_psref; struct psref elem_psref;
membar_datadep_consumer();
if (ep->af != AF_INET6) if (ep->af != AF_INET6)
continue; continue;
if (ep->proto >= 0 && ep->proto != proto) if (ep->proto >= 0 && ep->proto != proto)
@ -678,8 +674,6 @@ encap_attach(int af, int proto,
/* check if anyone have already attached with exactly same config */ /* check if anyone have already attached with exactly same config */
pss = pserialize_read_enter(); pss = pserialize_read_enter();
PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) { PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
membar_datadep_consumer();
if (ep->af != af) if (ep->af != af)
continue; continue;
if (ep->proto != proto) if (ep->proto != proto)
@ -920,8 +914,6 @@ encap6_ctlinput(int cmd, const struct sockaddr *sa, void *d0)
PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) { PSLIST_READER_FOREACH(ep, &encap_table, struct encaptab, chain) {
struct psref elem_psref; struct psref elem_psref;
membar_datadep_consumer();
if (ep->af != AF_INET6) if (ep->af != AF_INET6)
continue; continue;
if (ep->proto >= 0 && ep->proto != nxt) if (ep->proto >= 0 && ep->proto != nxt)
@ -959,8 +951,6 @@ encap_detach(const struct encaptab *cookie)
KASSERT(encap_lock_held()); KASSERT(encap_lock_held());
PSLIST_WRITER_FOREACH(p, &encap_table, struct encaptab, chain) { PSLIST_WRITER_FOREACH(p, &encap_table, struct encaptab, chain) {
membar_datadep_consumer();
if (p == ep) { if (p == ep) {
error = encap_remove(p); error = encap_remove(p);
if (error) if (error)