svn commit: r286850 - stable/10/sys/net

[Luiz Otavio O Souza]

Author: loos
Date: Mon Aug 17 18:21:18 2015
New Revision: 286850
URL: https://svnweb.freebsd.org/changeset/base/286850

Log:
  MFC r286139:
  
    Do not allocate the buffers at opening of the descriptor, because once
    the buffer is allocated we are committed to a particular buffer method
    (BPF_BUFMODE_BUFFER in this case).
  
    If we are using zero-copy buffers, the userland program must register its
    buffers before set the interface.
  
    If we are using kernel memory buffers, we can allocate the buffer at the
    time that the interface is being set.
  
    This fix allows the usage of BIOCSETBUFMODE after r235746.
  
    Update the comments to reflect the recent changes.
  
    Sponsored by: Rubicon Communications (Netgate)

Modified:
  stable/10/sys/net/bpf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/bpf.c
==============================================================================
--- stable/10/sys/net/bpf.c	Mon Aug 17 17:57:01 2015	(r286849)
+++ stable/10/sys/net/bpf.c	Mon Aug 17 18:21:18 2015	(r286850)
@@ -787,7 +787,7 @@ static	int
 bpfopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct bpf_d *d;
-	int error, size;
+	int error;
 
 	d = malloc(sizeof(*d), M_BPF, M_WAITOK | M_ZERO);
 	error = devfs_set_cdevpriv(d, bpf_dtor);
@@ -817,10 +817,6 @@ bpfopen(struct cdev *dev, int flags, int
 	callout_init_mtx(&d->bd_callout, &d->bd_lock, 0);
 	knlist_init_mtx(&d->bd_sel.si_note, &d->bd_lock);
 
-	/* Allocate default buffers */
-	size = d->bd_bufsize;
-	bpf_buffer_ioctl_sblen(d, &size);
-
 	return (0);
 }
 
@@ -1411,10 +1407,33 @@ bpfioctl(struct cdev *dev, u_long cmd, c
 	 * Set interface.
 	 */
 	case BIOCSETIF:
-		BPF_LOCK();
-		error = bpf_setif(d, (struct ifreq *)addr);
-		BPF_UNLOCK();
-		break;
+		{
+			int alloc_buf, size;
+
+			/*
+			 * Behavior here depends on the buffering model.  If
+			 * we're using kernel memory buffers, then we can
+			 * allocate them here.  If we're using zero-copy,
+			 * then the user process must have registered buffers
+			 * by the time we get here.
+			 */
+			alloc_buf = 0;
+			BPFD_LOCK(d);
+			if (d->bd_bufmode == BPF_BUFMODE_BUFFER &&
+			    d->bd_sbuf == NULL)
+				alloc_buf = 1;
+			BPFD_UNLOCK(d);
+			if (alloc_buf) {
+				size = d->bd_bufsize;
+				error = bpf_buffer_ioctl_sblen(d, &size);
+				if (error != 0)
+					break;
+			}
+			BPF_LOCK();
+			error = bpf_setif(d, (struct ifreq *)addr);
+			BPF_UNLOCK();
+			break;
+		}
 
 	/*
 	 * Set read timeout.
@@ -1861,10 +1880,8 @@ bpf_setif(struct bpf_d *d, struct ifreq 
 	BPFIF_RUNLOCK(bp);
 
 	/*
-	 * Behavior here depends on the buffering model.  If we're using
-	 * kernel memory buffers, then we can allocate them here.  If we're
-	 * using zero-copy, then the user process must have registered
-	 * buffers by the time we get here.  If not, return an error.
+	 * At this point, we expect the buffer is already allocated.  If not,
+	 * return an error.
 	 */
 	switch (d->bd_bufmode) {
 	case BPF_BUFMODE_BUFFER: