Date: Tue, 22 Jul 2008 15:03:11 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 145615 for review Message-ID: <200807221503.m6MF3BQf058925@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145615 Change 145615 by zec@zec_tpx32 on 2008/07/22 15:02:22 Diff reduction vimage-devel <-> vimage branch. Affected files ... .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 edit .. //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE#3 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#2 edit .. //depot/projects/vimage-devel/src/sys/net/netisr.c#4 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#3 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#6 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#6 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#3 edit .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#5 edit .. //depot/projects/vimage-devel/src/usr.sbin/vimage/Makefile#2 edit .. //depot/projects/vimage-devel/src/usr.sbin/vimage/vimage.c#2 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 (text+ko) ==== @@ -125,9 +125,6 @@ #if (__FreeBSD_version > 460000) #ifndef VIMAGE extern int path_mtu_discovery; -#define V_path_mtu_discovery path_mtu_discovery -#define V_ip_defttl ip_defttl -#define V_ipforwarding ipforwarding #endif #endif ==== //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE#3 (text+ko) ==== @@ -8,13 +8,6 @@ ident VIMAGE options VIMAGE -options IPFIREWALL -options IPFIREWALL_VERBOSE -options IPFIREWALL_VERBOSE_LIMIT=100 -options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPFIREWALL_FORWARD -options IPFIREWALL_NAT -options LIBALIAS # # Some kernel subsystems and functions don't yet compile with VIMAGE. Remove ==== //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#4 (text+ko) ==== @@ -356,7 +356,7 @@ static int sysctl_domainname(SYSCTL_HANDLER_ARGS) { - INIT_VPROCG(TD_TO_PROCG(curthread)); + INIT_VPROCG(TD_TO_VPROCG(curthread)); char tmpdomainname[MAXHOSTNAMELEN]; int error; ==== //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#3 (text+ko) ==== @@ -849,7 +849,7 @@ #ifdef VIMAGE int -sysctl_handle_v_int(SYSCTL_HANDLER_V_ARGS) +sysctl_handle_v_int(SYSCTL_HANDLER_ARGS) { int tmpout, error = 0; @@ -1009,7 +1009,7 @@ #ifdef VIMAGE int -sysctl_handle_v_string(SYSCTL_HANDLER_V_ARGS) +sysctl_handle_v_string(SYSCTL_HANDLER_ARGS) { int error=0; char *tmparg; @@ -1088,7 +1088,7 @@ #ifdef VIMAGE int -sysctl_handle_v_opaque(SYSCTL_HANDLER_V_ARGS) +sysctl_handle_v_opaque(SYSCTL_HANDLER_ARGS) { int error, tries; u_int generation; @@ -1421,17 +1421,7 @@ if (error != 0) return (error); #endif -#ifndef VIMAGE error = oid->oid_handler(oid, arg1, arg2, req); -#else - if (oid->oid_v_subs) { - struct sysctl_v_oid *v_oid = (struct sysctl_v_oid *) oid; - error = v_oid->oid_handler(oid, arg1, arg2, - req, oid->oid_v_subs, - oid->oid_v_mod); - } else - error = oid->oid_handler(oid, arg1, arg2, req); -#endif return (error); } ==== //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#2 (text+ko) ==== @@ -26,6 +26,8 @@ * DAMAGE. */ +#include "opt_vimage.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.274 2008/04/17 04:20:10 jeff Exp $"); @@ -45,6 +47,7 @@ #include <sys/ktr.h> #include <sys/umtx.h> #include <sys/cpuset.h> +#include <sys/vimage.h> #include <security/audit/audit.h> ==== //depot/projects/vimage-devel/src/sys/net/netisr.c#4 (text+ko) ==== @@ -169,8 +169,8 @@ m_freem(m); return; } + VNET_ASSERT(m->m_pkthdr.rcvif != NULL) - VNET_ASSERT(m->m_pkthdr.rcvif != NULL) /* * Unless NETISR_FORCEQUEUE is set on the netisr (generally * indicating that the handler still requires Giant, which cannot be ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#3 (text+ko) ==== @@ -464,6 +464,7 @@ memset(&iev, 0, sizeof(iev)); IEEE80211_ADDR_COPY(iev.iev_addr, mac); rt_ieee80211msg(ifp, op, &iev, sizeof(iev)); + CURVNET_RESTORE(); } void ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -3111,7 +3111,9 @@ { INIT_VNET_NETGRAPH(curvnet); +#ifdef VIMAGE LIST_INIT(&V_ng_nodelist); /* XXX should go away */ +#endif V_nextID = 1; return 0; ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#5 (text+ko) ==== @@ -372,7 +372,7 @@ if (priv->links[linkNum] == NULL) return (ENOMEM); priv->links[linkNum]->hook = hook; - NG_HOOK_SET_PRIVATE(hook, (void *)linkNum); + NG_HOOK_SET_PRIVATE(hook, (void *)(intptr_t)linkNum); priv->numLinks++; return (0); } ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#6 (text+ko) ==== @@ -121,11 +121,7 @@ else if ((var) > (max)) { (var) = (max); } static int -#ifndef VIMAGE sysctl_net_ipport_check(SYSCTL_HANDLER_ARGS) -#else -sysctl_net_ipport_check(SYSCTL_HANDLER_V_ARGS) -#endif { #ifdef VIMAGE INIT_VNET_INET(curvnet); ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#4 (text+ko) ==== @@ -157,11 +157,7 @@ static int autoinc_step; #endif -#ifdef VIMAGE -extern int ipfw_chg_hook(SYSCTL_HANDLER_V_ARGS); -#else extern int ipfw_chg_hook(SYSCTL_HANDLER_ARGS); -#endif #ifdef SYSCTL_NODE SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall"); ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#3 (text+ko) ==== @@ -75,11 +75,7 @@ # endif #endif -#ifdef VIMAGE -int ipfw_chg_hook(SYSCTL_HANDLER_V_ARGS); -#else int ipfw_chg_hook(SYSCTL_HANDLER_ARGS); -#endif /* Dummynet hooks. */ ip_dn_ruledel_t *ip_dn_ruledel_ptr = NULL; @@ -493,11 +489,7 @@ #endif /* INET6 */ int -#ifdef VIMAGE -ipfw_chg_hook(SYSCTL_HANDLER_V_ARGS) -#else ipfw_chg_hook(SYSCTL_HANDLER_ARGS) -#endif { #ifdef VIMAGE INIT_VNET_IPFW(curvnet); ==== //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#4 (text+ko) ==== @@ -249,7 +249,7 @@ ripsrc.sin_family = AF_INET; ripsrc.sin_addr = ip->ip_src; last = NULL; - INP_INFO_RLOCK(&ripcbinfo); + INP_INFO_RLOCK(&V_ripcbinfo); LIST_FOREACH(inp, &V_ripcb, inp_list) { INP_RLOCK(inp); if (inp->inp_ip_p && inp->inp_ip_p != proto) { @@ -772,7 +772,6 @@ inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_bind: inp == NULL")); - INP_INFO_WLOCK(&ripcbinfo); INP_INFO_WLOCK(&V_ripcbinfo); INP_WLOCK(inp); inp->inp_laddr = addr->sin_addr; @@ -799,7 +798,6 @@ inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_connect: inp == NULL")); - INP_INFO_WLOCK(&ripcbinfo); INP_INFO_WLOCK(&V_ripcbinfo); INP_WLOCK(inp); inp->inp_faddr = addr->sin_addr; ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#5 (text+ko) ==== @@ -29,14 +29,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * XXX RCS ID + * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 + * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.2 2007/12/12 20:35:59 kmacy Exp $ */ #ifndef _NETINET_TCP_SYNCACHE_H_ #define _NETINET_TCP_SYNCACHE_H_ #ifdef _KERNEL -void syncache_init(void); +void syncache_init(void); #ifdef VIMAGE void syncache_destroy(void); #endif ==== //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#4 (text+ko) ==== @@ -581,7 +581,7 @@ * Check the minimum TTL for socket. */ INP_RLOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); + INP_INFO_RUNLOCK(&V_udbinfo); if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) { INP_RUNLOCK(inp); goto badunlocked; @@ -933,7 +933,7 @@ laddr = inp->inp_laddr; lport = inp->inp_lport; if (src.sin_family == AF_INET) { - INP_INFO_LOCK_ASSERT(&udbinfo); + INP_INFO_LOCK_ASSERT(&V_udbinfo); if ((lport == 0) || (laddr.s_addr == INADDR_ANY && src.sin_addr.s_addr == INADDR_ANY)) { @@ -984,7 +984,7 @@ inp->inp_lport == 0 || sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_BROADCAST) { - INP_INFO_LOCK_ASSERT(&udbinfo); + INP_INFO_LOCK_ASSERT(&V_udbinfo); error = in_pcbconnect_setup(inp, addr, &laddr.s_addr, &lport, &faddr.s_addr, &fport, NULL, td->td_ucred); @@ -998,7 +998,7 @@ /* Commit the local port if newly assigned. */ if (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0) { - INP_INFO_WLOCK_ASSERT(&udbinfo); + INP_INFO_WLOCK_ASSERT(&V_udbinfo); INP_WLOCK_ASSERT(inp); /* * Remember addr if jailed, to prevent ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#3 (text+ko) ==== @@ -450,11 +450,7 @@ /* net.inet6.ip6 */ static int -#ifdef VIMAGE -sysctl_ip6_temppltime(SYSCTL_HANDLER_V_ARGS) -#else sysctl_ip6_temppltime(SYSCTL_HANDLER_ARGS) -#endif { INIT_VNET_INET6(curvnet); #ifdef VIMAGE @@ -477,11 +473,7 @@ } static int -#ifdef VIMAGE -sysctl_ip6_tempvltime(SYSCTL_HANDLER_V_ARGS) -#else sysctl_ip6_tempvltime(SYSCTL_HANDLER_ARGS) -#endif { INIT_VNET_INET6(curvnet); #ifdef VIMAGE ==== //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#4 (text+ko) ==== @@ -354,7 +354,7 @@ return (IPPROTO_DONE); } INP_RLOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); + INP_INFO_RUNLOCK(&V_udbinfo); udp6_append(inp, m, off, &fromsa); INP_RUNLOCK(inp); return (IPPROTO_DONE); ==== //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#4 (text+ko) ==== @@ -580,8 +580,6 @@ { INIT_VNET_IPSEC(curvnet); - V_key_dst.sa_len = 2; - V_key_dst.sa_family = PF_KEY; V_key_src.sa_len = 2; V_key_src.sa_family = PF_KEY; ==== //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#3 (text+ko) ==== @@ -108,7 +108,6 @@ struct pfkeystat _pfkeystat; struct key_cb _key_cb; - struct sockaddr _key_dst; struct sockaddr _key_src; LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX]; @@ -176,7 +175,6 @@ #define V_ipcompstat VNET_IPSEC(ipcompstat) #define V_pfkeystat VNET_IPSEC(pfkeystat) #define V_key_cb VNET_IPSEC(key_cb) -#define V_key_dst VNET_IPSEC(key_dst) #define V_key_src VNET_IPSEC(key_src) #define V_sptree VNET_IPSEC(sptree) #define V_sahtree VNET_IPSEC(sahtree) ==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#5 (text+ko) ==== @@ -115,9 +115,6 @@ #define SYSCTL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1, int arg2, \ struct sysctl_req *req -#define SYSCTL_HANDLER_V_ARGS struct sysctl_oid *oidp, void *arg1, int arg2, \ - struct sysctl_req *req, int subs, int mod - /* definitions for sysctl_req 'lock' member */ #define REQ_UNLOCKED 0 /* not locked and not wired */ #define REQ_LOCKED 1 /* locked and not wired */ @@ -169,22 +166,6 @@ short oid_v_mod; }; -struct sysctl_v_oid { - struct sysctl_oid_list *oid_parent; - SLIST_ENTRY(sysctl_oid) oid_link; - int oid_number; - u_int oid_kind; - void *oid_arg1; - int oid_arg2; - const char *oid_name; - int (*oid_handler)(SYSCTL_HANDLER_V_ARGS); - const char *oid_fmt; - int oid_refcnt; - const char *oid_descr; - short oid_v_subs; - short oid_v_mod; -}; - #define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l) #define SYSCTL_OUT(r, p, l) (r->oldfunc)(r, p, l) @@ -196,9 +177,9 @@ int sysctl_handle_string(SYSCTL_HANDLER_ARGS); int sysctl_handle_opaque(SYSCTL_HANDLER_ARGS); -int sysctl_handle_v_int(SYSCTL_HANDLER_V_ARGS); -int sysctl_handle_v_string(SYSCTL_HANDLER_V_ARGS); -int sysctl_handle_v_opaque(SYSCTL_HANDLER_V_ARGS); +int sysctl_handle_v_int(SYSCTL_HANDLER_ARGS); +int sysctl_handle_v_string(SYSCTL_HANDLER_ARGS); +int sysctl_handle_v_opaque(SYSCTL_HANDLER_ARGS); /* * These functions are used to add/remove an oid from the mib. @@ -247,7 +228,7 @@ #ifdef VIMAGE #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ handler, fmt, descr) \ - static struct sysctl_v_oid sysctl__##parent##_##name = { \ + static struct sysctl_oid sysctl__##parent##_##name = { \ &sysctl_##parent##_children, { 0 }, nbr, kind, \ (void *) offsetof(struct mod, _##a1), a2, #name, \ handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ @@ -391,17 +372,10 @@ SYSCTL_OID(parent, nbr, name, (access), \ ptr, arg, handler, fmt, descr) -#ifdef VIMAGE #define SYSCTL_V_PROC(subs, mod, parent, nbr, name, access, sym, arg, \ handler, fmt, descr) \ SYSCTL_V_OID(subs, mod, parent, nbr, name, (access), \ sym, arg, handler, fmt, descr) -#else -#define SYSCTL_V_PROC(subs, mod, parent, nbr, name, access, sym, arg, \ - handler, fmt, descr) \ - SYSCTL_OID(parent, nbr, name, (access), \ - &sym, arg, handler, fmt, descr) -#endif #define SYSCTL_ADD_PROC(ctx, parent, nbr, name, access, ptr, arg, handler, fmt, descr) \ sysctl_add_oid(ctx, parent, nbr, name, (access), \ @@ -420,9 +394,10 @@ #ifdef VIMAGE #define SYSCTL_RESOLVE_V_ARG1() do { \ char *cp; \ - switch (subs) { \ + switch (oidp->oid_v_subs) { \ case V_NET: \ - cp = (char *) TD_TO_VNET(curthread)->mod_data[mod]; \ + cp = (char *) \ + TD_TO_VNET(curthread)->mod_data[oidp->oid_v_mod]; \ break; \ case V_PROCG: \ cp = (char *) TD_TO_VPROCG(curthread); \ @@ -431,7 +406,7 @@ cp = (char *) TD_TO_VCPU(curthread); \ break; \ default: \ - panic("unsupported module id %d", subs); \ + panic("unsupported module id %d", oidp->oid_v_subs); \ } \ arg1 = cp + (size_t) arg1; \ } while (0) ==== //depot/projects/vimage-devel/src/usr.sbin/vimage/Makefile#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# RCS ID +# $FreeBSD$ PROG= vimage -CFLAGS+= -I/sys WARNS?= 2 +CFLAGS+= -I../../sys MAN= vimage.8 +BINDIR?= /usr/sbin +NO_SHARED?= YES + .include <bsd.prog.mk> - -BINDIR?= /sbin -NOSHARED?= YES ==== //depot/projects/vimage-devel/src/usr.sbin/vimage/vimage.c#2 (text+ko) ==== @@ -160,7 +160,7 @@ switch (cmd) { case VI_GET: - if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; if (argc == 1) printf("%s\n", vi_req.vi_name); @@ -171,11 +171,11 @@ case VI_GETNEXT: case VI_GETNEXT_RECURSE: vi_req.req_action = VI_GET; - if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; vi_print(&vi_req); vi_req.req_action = VI_GETNEXT_RECURSE; - while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { + while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { vi_print(&vi_req); vi_req.req_action = cmd; } @@ -189,7 +189,7 @@ sizeof(vi_req.vi_if_xname)); else vi_req.vi_if_xname[0] = 0; - if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) goto abort; printf("%s@%s\n", vi_req.vi_chroot, vi_req.vi_name); exit(0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807221503.m6MF3BQf058925>