From owner-p4-projects@FreeBSD.ORG Mon Apr 27 16:56:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B3791065674; Mon, 27 Apr 2009 16:56:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF01A1065670 for ; Mon, 27 Apr 2009 16:56:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB92F8FC16 for ; Mon, 27 Apr 2009 16:56:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3RGuGqX098038 for ; Mon, 27 Apr 2009 16:56:16 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3RGuGKd098034 for perforce@freebsd.org; Mon, 27 Apr 2009 16:56:16 GMT (envelope-from zec@fer.hr) Date: Mon, 27 Apr 2009 16:56:16 GMT Message-Id: <200904271656.n3RGuGKd098034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2009 16:56:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=161180 Change 161180 by zec@zec_amdx2 on 2009/04/27 16:55:47 Manually import random parts of CURVNET_SET() / CURVNET_RESTORE() infrastructure from vimage branch. Hereby declaring the vc2 branch an uncompilable mess until further notice. Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/files#31 edit .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#20 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/subr_pcpu.c#4 edit .. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#15 edit .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#4 edit .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#10 edit .. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#12 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#49 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#23 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#25 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#25 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#23 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#33 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#29 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#36 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#30 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#23 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_tcp.c#2 edit .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#7 edit .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#13 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/files#31 (text+ko) ==== @@ -1946,8 +1946,8 @@ kern/kern_timeout.c standard kern/kern_umtx.c standard kern/kern_uuid.c standard +kern/kern_vimage.c standard kern/kern_xxx.c standard -kern/kern_vimage.c standard kern/link_elf.c standard kern/linker_if.m standard kern/md4c.c optional netsmb ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#20 (text+ko) ==== @@ -1217,7 +1217,7 @@ * receive window. */ static __inline int -select_rcv_wscale(int space) +select_rcv_wscale(int space, struct vnet *vnet) { INIT_VNET_INET(so->so_vnet); int wscale = 0; @@ -1326,7 +1326,7 @@ calc_opt0h(struct socket *so, int mtu_idx) { struct tcpcb *tp = so_sototcpcb(so); - int wscale = select_rcv_wscale(tp->rcv_wnd); + int wscale = select_rcv_wscale(tp->rcv_wnd, so->so_vnet); return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) | V_KEEP_ALIVE((so_options_get(so) & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS | ==== //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -523,6 +524,11 @@ td2->td_sigmask = td->td_sigmask; td2->td_flags = TDF_INMEM; +#ifdef VIMAGE + td2->td_vnet = NULL; + td2->td_vnet_lpush = NULL; +#endif + /* * Duplicate sub-structures as needed. * Increase reference counts on shared objects. ==== //depot/projects/vimage-commit2/src/sys/kern/subr_pcpu.c#4 (text+ko) ==== @@ -135,6 +135,10 @@ db_printf("none\n"); db_show_mdpcpu(pc); +#ifdef VIMAGE + db_printf("curvnet = %p\n", pc->pc_curthread->td_vnet); +#endif + #ifdef WITNESS db_printf("spin locks held:\n"); witness_list_locks(&pc->pc_spinlocks); ==== //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -74,16 +75,19 @@ int flags, struct thread *td) { struct socket *so = fp->f_data; -#ifdef MAC int error; +#ifdef MAC SOCK_LOCK(so); error = mac_socket_check_receive(active_cred, so); SOCK_UNLOCK(so); if (error) return (error); #endif - return (soreceive(so, 0, uio, 0, 0, 0)); + CURVNET_SET(so->so_vnet); + error = soreceive(so, 0, uio, 0, 0, 0); + CURVNET_RESTORE(); + return (error); } /* ARGSUSED */ @@ -125,6 +129,7 @@ struct socket *so = fp->f_data; int error = 0; + CURVNET_SET(so->so_vnet); switch (cmd) { case FIONBIO: SOCK_LOCK(so); @@ -205,6 +210,7 @@ (so, cmd, data, 0, td)); break; } + CURVNET_RESTORE(); return (error); } ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#15 (text+ko) ==== @@ -264,7 +264,7 @@ * soalloc() returns a socket with a ref count of 0. */ static struct socket * -soalloc(void) +soalloc(struct vnet *vnet) { struct socket *so; @@ -286,6 +286,7 @@ so->so_gencnt = ++so_gencnt; ++numopensockets; #ifdef VIMAGE + ++vnet->sockcnt; so->so_vnet = curvnet; #endif mtx_unlock(&so_global_mtx); @@ -307,6 +308,9 @@ mtx_lock(&so_global_mtx); so->so_gencnt = ++so_gencnt; --numopensockets; /* Could be below, but faster here. */ +#ifdef VIMAGE + --so->so_vnet->sockcnt; +#endif mtx_unlock(&so_global_mtx); if (so->so_rcv.sb_hiwat) (void)chgsbsize(so->so_cred->cr_uidinfo, @@ -356,7 +360,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(); + so = soalloc(TD_TO_VNET(td)); if (so == NULL) return (ENOBUFS); @@ -382,7 +386,9 @@ * Auto-sizing of socket buffers is managed by the protocols and * the appropriate flags must be set in the pru_attach function. */ + CURVNET_SET(so->so_vnet); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); + CURVNET_RESTORE(); if (error) { KASSERT(so->so_count == 1, ("socreate: so_count %d", so->so_count)); @@ -424,7 +430,8 @@ if (over) #endif return (NULL); - so = soalloc(); + VNET_ASSERT(head->so_vnet); + so = soalloc(head->so_vnet); if (so == NULL) return (NULL); if ((head->so_options & SO_ACCEPTFILTER) != 0) @@ -496,8 +503,12 @@ int sobind(struct socket *so, struct sockaddr *nam, struct thread *td) { + int error; - return ((*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td)); + CURVNET_SET(so->so_vnet); + error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td); + CURVNET_RESTORE(); + return error; } /* @@ -645,6 +656,7 @@ KASSERT(!(so->so_state & SS_NOFDREF), ("soclose: SS_NOFDREF on enter")); + CURVNET_SET(so->so_vnet); funsetown(&so->so_sigio); if (so->so_state & SS_ISCONNECTED) { if ((so->so_state & SS_ISDISCONNECTING) == 0) { @@ -696,6 +708,7 @@ KASSERT((so->so_state & SS_NOFDREF) == 0, ("soclose: NOFDREF")); so->so_state |= SS_NOFDREF; sorele(so); + CURVNET_RESTORE(); return (error); } @@ -771,7 +784,9 @@ * biting us. */ so->so_error = 0; + CURVNET_SET(so->so_vnet); error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam, td); + CURVNET_RESTORE(); } return (error); @@ -1287,9 +1302,13 @@ sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, struct thread *td) { + int error; - return (so->so_proto->pr_usrreqs->pru_sosend(so, addr, uio, top, - control, flags, td)); + CURVNET_SET(so->so_vnet); + error = so->so_proto->pr_usrreqs->pru_sosend(so, addr, uio, top, + control, flags, td); + CURVNET_RESTORE(); + return (error); } /* @@ -2037,6 +2056,7 @@ soshutdown(struct socket *so, int how) { struct protosw *pr = so->so_proto; + int error; if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) return (EINVAL); @@ -2045,8 +2065,12 @@ } if (how != SHUT_WR) sorflush(so); - if (how != SHUT_RD) - return ((*pr->pr_usrreqs->pru_shutdown)(so)); + if (how != SHUT_RD) { + CURVNET_SET(so->so_vnet); + error = (*pr->pr_usrreqs->pru_shutdown)(so); + CURVNET_RESTORE(); + return (error); + } return (0); } @@ -2070,6 +2094,7 @@ * socket buffer. Don't let our acquire be interrupted by a signal * despite any existing socket disposition on interruptable waiting. */ + CURVNET_SET(so->so_vnet); socantrcvmore(so); (void) sblock(sb, SBL_WAIT | SBL_NOINTR); @@ -2093,6 +2118,7 @@ if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) (*pr->pr_domain->dom_dispose)(asb.sb_mb); sbrelease_internal(&asb, so); + CURVNET_RESTORE(); } /* ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#4 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #ifdef KTRACE #include #endif @@ -264,7 +265,9 @@ if (error) goto done; #endif + CURVNET_SET(so->so_vnet); error = solisten(so, uap->backlog, td); + CURVNET_RESTORE(); #ifdef MAC done: #endif @@ -429,7 +432,9 @@ tmp = fflag & FASYNC; (void) fo_ioctl(nfp, FIOASYNC, &tmp, td->td_ucred, td); sa = 0; + CURVNET_SET(so->so_vnet); error = soaccept(so, &sa); + CURVNET_RESTORE(); if (error) { /* * return a namelen of zero for older code which might @@ -976,9 +981,11 @@ ktruio = cloneuio(&auio); #endif len = auio.uio_resid; + CURVNET_SET(so->so_vnet); error = soreceive(so, &fromsa, &auio, (struct mbuf **)0, (mp->msg_control || controlp) ? &control : (struct mbuf **)0, &mp->msg_flags); + CURVNET_RESTORE(); if (error) { if (auio.uio_resid != (int)len && (error == ERESTART || error == EINTR || error == EWOULDBLOCK)) @@ -1322,7 +1329,9 @@ error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error == 0) { so = fp->f_data; + CURVNET_SET(so->so_vnet); error = sosetopt(so, &sopt); + CURVNET_RESTORE(); fdrop(fp, td); } return(error); @@ -1400,7 +1409,9 @@ error = getsock(td->td_proc->p_fd, s, &fp, NULL); if (error == 0) { so = fp->f_data; + CURVNET_SET(so->so_vnet); error = sogetopt(so, &sopt); + CURVNET_RESTORE(); *valsize = sopt.sopt_valsize; fdrop(fp, td); } @@ -1463,7 +1474,9 @@ return (error); so = fp->f_data; *sa = NULL; + CURVNET_SET(so->so_vnet); error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, sa); + CURVNET_RESTORE(); if (error) goto bad; if (*sa == NULL) @@ -1564,7 +1577,9 @@ goto done; } *sa = NULL; + CURVNET_SET(so->so_vnet); error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, sa); + CURVNET_RESTORE(); if (error) goto bad; if (*sa == NULL) @@ -2176,9 +2191,11 @@ goto done; } SOCKBUF_UNLOCK(&so->so_snd); + CURVNET_SET(so->so_vnet); /* Avoid error aliasing. */ err = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, NULL, NULL, td); + CURVNET_RESTORE(); if (err == 0) { /* * We need two counters to get the ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#10 (text+ko) ==== @@ -90,6 +90,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1647,6 +1648,10 @@ unp_init(void) { +#ifdef VIMAGE + if (!IS_DEFAULT_VNET(curvnet)) + return; +#endif unp_zone = uma_zcreate("unpcb", sizeof(struct unpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); if (unp_zone == NULL) ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#7 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include @@ -141,6 +142,7 @@ } #endif + CURVNET_SET(TD_TO_VNET(curthread)); /* XXX MARKO */ i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); @@ -213,8 +215,10 @@ bcopy(argp->ex_secflavors, np->netc_secflavors, sizeof(np->netc_secflavors)); refcount_init(&np->netc_anon.cr_ref, 1); + CURVNET_RESTORE(); return (0); out: + CURVNET_RESTORE(); free(np, M_NETADDR); return (error); } ==== //depot/projects/vimage-commit2/src/sys/net/bpf.c#12 (text+ko) ==== @@ -873,11 +873,10 @@ m->m_len -= hlen; m->m_data += hlen; /* XXX */ + CURVNET_SET(ifp->if_vnet); #ifdef MAC BPFD_LOCK(d); - CURVNET_SET(ifp->if_vnet); mac_bpfdesc_create_mbuf(d, m); - CURVNET_RESTORE(); if (mc != NULL) mac_bpfdesc_create_mbuf(d, mc); BPFD_UNLOCK(d); @@ -893,6 +892,7 @@ else m_freem(mc); } + CURVNET_RESTORE(); return (error); } @@ -1431,9 +1431,33 @@ struct bpf_if *bp; struct ifnet *theywant; +#define IMUNES_BPF_HACK +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) + struct vnet *target_vnet = curvnet; + char *c; + + /* Hack to support tapping in foreign vnets */ + c = rindex(ifr->ifr_name, '@'); + if ( c != NULL ) { +printf("bpf_setif: %s\n", c); + struct vimage *target_vimage; + + *c++ = 0; + target_vimage = vimage_by_name(TD_TO_VIMAGE(curthread), c); + if (target_vimage == NULL) + return ENXIO; + target_vnet = target_vimage->v_net; + } + CURVNET_SET_QUIET(target_vnet); +#endif + theywant = ifunit(ifr->ifr_name); - if (theywant == NULL || theywant->if_bpf == NULL) + if (theywant == NULL || theywant->if_bpf == NULL) { +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) + CURVNET_RESTORE(); +#endif return (ENXIO); + } bp = theywant->if_bpf; @@ -1473,6 +1497,9 @@ BPFD_LOCK(d); reset_d(d); BPFD_UNLOCK(d); +#if defined(VIMAGE) && defined(IMUNES_BPF_HACK) + CURVNET_RESTORE(); +#endif return (0); } ==== //depot/projects/vimage-commit2/src/sys/net/if.c#49 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -126,7 +127,6 @@ static void if_attachdomain1(struct ifnet *); static int ifconf(u_long, caddr_t); static void if_freemulti(struct ifmultiaddr *); -static void if_grow(void); static void if_init(void *); static void if_check(void *); static void if_route(struct ifnet *, int flag, int fam); @@ -202,7 +202,7 @@ MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address"); -static struct ifnet * +struct ifnet * ifnet_byindex_locked(u_short idx) { INIT_VNET_NET(curvnet); @@ -239,7 +239,7 @@ return (ifp); } -static void +void ifnet_setbyindex(u_short idx, struct ifnet *ifp) { INIT_VNET_NET(curvnet); @@ -584,6 +584,7 @@ void if_free_type(struct ifnet *ifp, u_char type) { + INIT_VNET_NET(ifp->if_vnet); KASSERT(ifp->if_alloctype == type, ("if_free_type: type (%d) != alloctype (%d)", type, @@ -696,11 +697,13 @@ mac_ifnet_create(ifp); #endif - ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, - ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", - net_cdevsw.d_name, ifp->if_xname)); - make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", - net_cdevsw.d_name, ifp->if_index); + if (IS_DEFAULT_VNET(curvnet)) { + ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, + ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", + net_cdevsw.d_name, ifp->if_xname)); + make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", + net_cdevsw.d_name, ifp->if_index); + } ifq_attach(&ifp->if_snd, ifp); @@ -742,13 +745,17 @@ IFNET_WLOCK(); TAILQ_INSERT_TAIL(&V_ifnet, ifp, if_link); +#ifdef VIMAGE + curvnet->ifccnt++; +#endif IFNET_WUNLOCK(); if (domain_init_status >= 2) if_attachdomain1(ifp); EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); - devctl_notify("IFNET", ifp->if_xname, "ATTACH", NULL); + if (IS_DEFAULT_VNET(curvnet)) + devctl_notify("IFNET", ifp->if_xname, "ATTACH", NULL); /* Announce the interface. */ rt_ifannouncemsg(ifp, IFAN_ARRIVAL); @@ -895,6 +902,10 @@ found = 1; break; } +#ifdef VIMAGE + if (found) + curvnet->ifccnt--; +#endif IFNET_WUNLOCK(); if (!found) return; @@ -943,7 +954,8 @@ * Clean up all addresses. */ ifp->if_addr = NULL; - destroy_dev(ifdev_byindex(ifp->if_index)); + if (IS_DEFAULT_VNET(curvnet)) + destroy_dev(ifdev_byindex(ifp->if_index)); ifdev_setbyindex(ifp->if_index, NULL); /* We can now free link ifaddr. */ @@ -972,7 +984,8 @@ /* Announce that the interface is gone. */ rt_ifannouncemsg(ifp, IFAN_DEPARTURE); EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); - devctl_notify("IFNET", ifp->if_xname, "DETACH", NULL); + if (IS_DEFAULT_VNET(curvnet)) + devctl_notify("IFNET", ifp->if_xname, "DETACH", NULL); if_delgroups(ifp); IF_AFDATA_LOCK(ifp); @@ -1701,8 +1714,10 @@ (*lagg_linkstate_p)(ifp, link_state); } - devctl_notify("IFNET", ifp->if_xname, - (link_state == LINK_STATE_UP) ? "LINK_UP" : "LINK_DOWN", NULL); + if (IS_DEFAULT_VNET(curvnet)) + devctl_notify("IFNET", ifp->if_xname, + (link_state == LINK_STATE_UP) ? "LINK_UP" : "LINK_DOWN", + NULL); if (pending > 1) if_printf(ifp, "%d link states coalesced\n", pending); if (log_link_state_change) ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -49,6 +50,7 @@ #include #include #include +#include static void if_clone_free(struct if_clone *ifc); static int if_clone_createif(struct if_clone *ifc, char *name, size_t len, @@ -203,15 +205,14 @@ { int err; - if (ifc->ifc_destroy == NULL) { - err = EOPNOTSUPP; - goto done; - } + if (ifc->ifc_destroy == NULL) + return(EOPNOTSUPP); IF_CLONE_LOCK(ifc); IFC_IFLIST_REMOVE(ifc, ifp); IF_CLONE_UNLOCK(ifc); + CURVNET_SET_QUIET(ifp->if_vnet); if_delgroup(ifp, ifc->ifc_name); err = (*ifc->ifc_destroy)(ifc, ifp); @@ -223,8 +224,7 @@ IFC_IFLIST_INSERT(ifc, ifp); IF_CLONE_UNLOCK(ifc); } - -done: + CURVNET_RESTORE(); return (err); } ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#23 (text+ko) ==== @@ -602,6 +602,8 @@ } #endif + CURVNET_SET_QUIET(ifp->if_vnet); + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { if (ETHER_IS_BROADCAST(eh->ether_dhost)) m->m_flags |= M_BCAST; @@ -638,6 +640,7 @@ /* Allow monitor mode to claim this frame, after stats are updated. */ if (ifp->if_flags & IFF_MONITOR) { m_freem(m); + CURVNET_RESTORE(); return; } @@ -686,8 +689,10 @@ ("%s: ng_ether_input_p is NULL", __func__)); m->m_flags &= ~M_PROMISC; (*ng_ether_input_p)(ifp, &m); - if (m == NULL) + if (m == NULL) { + CURVNET_RESTORE(); return; + } } /* @@ -698,8 +703,10 @@ if (ifp->if_bridge != NULL) { m->m_flags &= ~M_PROMISC; BRIDGE_INPUT(ifp, m); - if (m == NULL) + if (m == NULL) { + CURVNET_RESTORE(); return; + } } #ifdef DEV_CARP @@ -735,6 +742,7 @@ random_harvest(m, 16, 3, 0, RANDOM_NET); ether_demux(ifp, m); + CURVNET_RESTORE(); } /* ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#25 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#25 (text+ko) ==== @@ -1206,6 +1206,7 @@ static void rt_dispatch(struct mbuf *m, const struct sockaddr *sa) { + INIT_VNET_NET(curvnet); struct m_tag *tag; /* @@ -1223,6 +1224,14 @@ *(unsigned short *)(tag + 1) = sa->sa_family; m_tag_prepend(m, tag); } +#ifdef VIMAGE + if (V_loif) + m->m_pkthdr.rcvif = V_loif; + else { + m_freem(m); + return; + } +#endif netisr_queue(NETISR_ROUTE, m); /* mbuf is free'd on failure. */ } ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#7 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -498,9 +499,11 @@ { struct ieee80211_join_event iev; + CURVNET_SET(ifp->if_vnet); memset(&iev, 0, sizeof(iev)); IEEE80211_ADDR_COPY(iev.iev_addr, mac); rt_ieee80211msg(ifp, op, &iev, sizeof(iev)); + CURVNET_RESTORE(); } void @@ -509,6 +512,7 @@ struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = vap->iv_ifp; + CURVNET_SET_QUIET(ifp->if_vnet); IEEE80211_NOTE(vap, IEEE80211_MSG_NODE, ni, "%snode join", (ni == vap->iv_bss) ? "bss " : ""); @@ -520,6 +524,7 @@ notify_macaddr(ifp, newassoc ? RTM_IEEE80211_JOIN : RTM_IEEE80211_REJOIN, ni->ni_macaddr); } + CURVNET_RESTORE(); } void @@ -528,6 +533,7 @@ struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = vap->iv_ifp; + CURVNET_SET_QUIET(ifp->if_vnet); IEEE80211_NOTE(vap, IEEE80211_MSG_NODE, ni, "%snode leave", (ni == vap->iv_bss) ? "bss " : ""); @@ -538,6 +544,7 @@ /* fire off wireless event station leaving */ notify_macaddr(ifp, RTM_IEEE80211_LEAVE, ni->ni_macaddr); } + CURVNET_RESTORE(); } void @@ -548,7 +555,9 @@ IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s\n", "notify scan done"); /* dispatch wireless event indicating scan completed */ + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_SCAN, NULL, 0); + CURVNET_RESTORE(); } void @@ -576,7 +585,9 @@ iev.iev_keyix = k->wk_keyix; iev.iev_keyrsc = k->wk_keyrsc[0]; /* XXX need tid */ iev.iev_rsc = rsc; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_REPLAY, &iev, sizeof(iev)); + CURVNET_RESTORE(); } } @@ -597,7 +608,9 @@ IEEE80211_ADDR_COPY(iev.iev_src, wh->i_addr2); iev.iev_cipher = IEEE80211_CIPHER_TKIP; iev.iev_keyix = keyix; + CURVNET_SET(ifp->if_vnet); rt_ieee80211msg(ifp, RTM_IEEE80211_MICHAEL, &iev, sizeof(iev)); + CURVNET_RESTORE(); } } ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#23 (text+ko) ==== @@ -352,6 +352,7 @@ LIST_ENTRY(ng_node) nd_idnodes; /* ID hash collision list */ struct ng_queue nd_input_queue; /* input queue for locking */ int nd_refs; /* # of references to this node */ + struct vnet *nd_vnet; /* network stack instance */ #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ #define ND_MAGIC 0x59264837 int nd_magic; ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#33 (text+ko) ==== @@ -143,10 +143,12 @@ addr4.sin_len = sizeof(addr4); addr4.sin_family = AF_INET; addr4.sin_addr.s_addr = addr; + CURVNET_SET(ifp->if_vnet); IF_AFDATA_LOCK(ifp); lla_lookup(LLTABLE(ifp), (LLE_DELETE | LLE_IFADDR), (struct sockaddr *)&addr4); IF_AFDATA_UNLOCK(ifp); + CURVNET_RESTORE(); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#29 (text+ko) ==== @@ -1117,6 +1117,13 @@ nsrc = ntohs(igmpv3->igmp_numsrc); +#if 0 /* MARKO, what is this? */ + SLIST_INIT(&V_router_info_head); +#endif + + if (!IS_DEFAULT_VNET(curvnet)) + return (retval); + /* * Deal with group-specific queries upfront. * If any group query is already pending, purge any recorded @@ -3365,7 +3372,7 @@ * indexes to guard against interface detach, they are * unique to each VIMAGE and must be retrieved. */ - CURVNET_SET(m->m_pkthdr.header); + CURVNET_SET((struct vnet *)(m->m_pkthdr.header)); INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); ifindex = igmp_restore_context(m); @@ -3645,9 +3652,7 @@ break; case MOD_UNLOAD: #ifndef VIMAGE_GLOBALS -#ifdef NOTYET vnet_mod_deregister(&vnet_igmp_modinfo); -#endif #else vnet_igmp_idetach(NULL); #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#36 (text+ko) ==== @@ -339,7 +339,7 @@ /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); - ipport_tick(NULL); + callout_reset(&ipport_tick_callout, 1, ipport_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, SHUTDOWN_PRI_DEFAULT); EVENTHANDLER_REGISTER(nmbclusters_change, ipq_zone_change, ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#24 (text+ko) ==== @@ -887,8 +887,9 @@ } void -in6_tmpaddrtimer(void *ignored_arg) +in6_tmpaddrtimer(void *arg) { + CURVNET_SET((struct vnet *) arg); INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); struct nd_ifinfo *ndi; @@ -897,7 +898,7 @@ callout_reset(&V_in6_tmpaddrtimer_ch, (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - - V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, NULL); + V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, arg); bzero(nullbuf, sizeof(nullbuf)); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; @@ -913,6 +914,7 @@ } } + CURVNET_RESTORE(); } static void ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#30 (text+ko) ==== @@ -308,14 +308,14 @@ /* nd6_timer_init */ callout_init(&V_nd6_timer_ch, 0); - callout_reset(&V_nd6_timer_ch, hz, nd6_timer, NULL); + callout_reset(&V_nd6_timer_ch, hz, nd6_timer, curvnet); /* timer for regeneranation of temporary addresses randomize ID */ callout_init(&V_in6_tmpaddrtimer_ch, 0); callout_reset(&V_in6_tmpaddrtimer_ch, (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - V_ip6_temp_regen_advance) * hz, - in6_tmpaddrtimer, NULL); + in6_tmpaddrtimer, curvnet); return (0); } ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#14 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<