From owner-freebsd-virtualization@FreeBSD.ORG  Sat Jun 16 00:03:08 2012
Return-Path: <owner-freebsd-virtualization@FreeBSD.ORG>
Delivered-To: freebsd-virtualization@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61273106566B
	for <freebsd-virtualization@hub.freebsd.org>;
	Sat, 16 Jun 2012 00:03:08 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 415F38FC18
	for <freebsd-virtualization@hub.freebsd.org>;
	Sat, 16 Jun 2012 00:03:08 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5G0387w069680
	for <freebsd-virtualization@freefall.freebsd.org>;
	Sat, 16 Jun 2012 00:03:08 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5G038xJ069674;
	Sat, 16 Jun 2012 00:03:08 GMT (envelope-from gnats)
Date: Sat, 16 Jun 2012 00:03:08 GMT
Message-Id: <201206160003.q5G038xJ069674@freefall.freebsd.org>
To: freebsd-virtualization@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/158686: commit references a PR
X-BeenThere: freebsd-virtualization@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: "Discussion of various virtualization techniques FreeBSD supports."
	<freebsd-virtualization.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-virtualization>,
	<mailto:freebsd-virtualization-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-virtualization>
List-Post: <mailto:freebsd-virtualization@freebsd.org>
List-Help: <mailto:freebsd-virtualization-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-virtualization>,
	<mailto:freebsd-virtualization-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2012 00:03:08 -0000

The following reply was made to PR kern/158686; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/158686: commit references a PR
Date: Fri, 15 Jun 2012 20:25:55 +0000 (UTC)

 Author: trociny
 Date: Fri Jun 15 20:25:44 2012
 New Revision: 237144
 URL: http://svn.freebsd.org/changeset/base/237144
 
 Log:
   MFC 236724, 236725:
   
   MFC 236724:
   
   Add VIMAGE support to if_tap.
   
   PR:		kern/152047, kern/158686
   Submitted by:	Daan Vreeken <pa4dan Bliksem.VEHosting.nl>
   
   MFC 236725:
   
   Sort includes.
   
   Submitted by:	Daan Vreeken <pa4dan Bliksem.VEHosting.nl>
 
 Modified:
   stable/9/sys/net/if_tap.c
 Directory Properties:
   stable/9/sys/   (props changed)
 
 Modified: stable/9/sys/net/if_tap.c
 ==============================================================================
 --- stable/9/sys/net/if_tap.c	Fri Jun 15 20:08:13 2012	(r237143)
 +++ stable/9/sys/net/if_tap.c	Fri Jun 15 20:25:44 2012	(r237144)
 @@ -42,6 +42,7 @@
  #include <sys/conf.h>
  #include <sys/fcntl.h>
  #include <sys/filio.h>
 +#include <sys/jail.h>
  #include <sys/kernel.h>
  #include <sys/malloc.h>
  #include <sys/mbuf.h>
 @@ -64,8 +65,9 @@
  #include <net/if.h>
  #include <net/if_clone.h>
  #include <net/if_dl.h>
 -#include <net/route.h>
  #include <net/if_types.h>
 +#include <net/route.h>
 +#include <net/vnet.h>
  
  #include <netinet/in.h>
  
 @@ -214,6 +216,7 @@ tap_destroy(struct tap_softc *tp)
  	KASSERT(!(tp->tap_flags & TAP_OPEN),
  		("%s flags is out of sync", ifp->if_xname));
  
 +	CURVNET_SET(ifp->if_vnet);
  	seldrain(&tp->tap_rsel);
  	knlist_destroy(&tp->tap_rsel.si_note);
  	destroy_dev(tp->tap_dev);
 @@ -222,6 +225,7 @@ tap_destroy(struct tap_softc *tp)
  
  	mtx_destroy(&tp->tap_mtx);
  	free(tp, M_TAP);
 +	CURVNET_RESTORE();
  }
  
  static void
 @@ -363,6 +367,7 @@ tapclone(void *arg, struct ucred *cred, 
  	if (unit == -1)
  		append_unit = 1;
  
 +	CURVNET_SET(CRED_TO_VNET(cred));
  	/* find any existing device, or allocate new unit number */
  	i = clone_create(&tapclones, &tap_cdevsw, &unit, dev, extra);
  	if (i) {
 @@ -381,6 +386,7 @@ tapclone(void *arg, struct ucred *cred, 
  	}
  
  	if_clone_create(name, namelen, NULL);
 +	CURVNET_RESTORE();
  } /* tapclone */
  
  
 @@ -521,6 +527,7 @@ tapclose(struct cdev *dev, int foo, int 
  
  	/* junk all pending output */
  	mtx_lock(&tp->tap_mtx);
 +	CURVNET_SET(ifp->if_vnet);
  	IF_DRAIN(&ifp->if_snd);
  
  	/*
 @@ -544,6 +551,8 @@ tapclose(struct cdev *dev, int foo, int 
  	}
  
  	if_link_state_change(ifp, LINK_STATE_DOWN);
 +	CURVNET_RESTORE();
 +
  	funsetown(&tp->tap_sigio);
  	selwakeuppri(&tp->tap_rsel, PZERO+1);
  	KNOTE_LOCKED(&tp->tap_rsel.si_note, 0);
 @@ -945,7 +954,9 @@ tapwrite(struct cdev *dev, struct uio *u
  	}
  
  	/* Pass packet up to parent. */
 +	CURVNET_SET(ifp->if_vnet);
  	(*ifp->if_input)(ifp, m);
 +	CURVNET_RESTORE();
  	ifp->if_ipackets ++; /* ibytes are counted in parent */
  
  	return (0);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"