d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

two small changes:

Browse Source 
- intercept FIONBIO and FIOASYNC ioctls on netmap file descriptors.
  libpcap calls them to set non blocking I/O on the file descriptor,
  for netmap this is a no-op because there is no read/write,
  but not intercepting would cause fcntl() to return -1
- rate limit and put under netmap.verbose some messages that occur
  when threads use concurrently the same file descriptor.
This commit is contained in:
Luigi Rizzo 2014-02-18 04:27:41 +00:00
parent a0efd3fb34
commit 89e3fd5247
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=262149
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/netmap/netmap.c
View File

@ -137,6 +137,7 @@ ports attached to the switch)
#include <sys/param.h> /* defines used in kernel.h */
#include <sys/kernel.h> /* types used in module initialization */
#include <sys/conf.h> /* cdevsw struct, UID, GID */
#include <sys/filio.h> /* FIONBIO */
#include <sys/sockio.h>
#include <sys/socketvar.h> /* struct socket */
#include <sys/malloc.h>
@ -1827,6 +1828,11 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
break;
#ifdef __FreeBSD__
case FIONBIO:
case FIOASYNC:
ND("FIONBIO/FIOASYNC are no-ops");
break;
case BIOCIMMEDIATE:
case BIOCGHDRCMPLT:
case BIOCSHDRCMPLT:
@ -2002,7 +2008,9 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
continue;
/* only one thread does txsync */
if (nm_kr_tryget(kring)) {
D("%p lost race on txring %d, ok", priv, i);
if (netmap_verbose)
RD(2, "%p lost race on txring %d, ok",
priv, i);
continue;
}
if (nm_txsync_prologue(kring) >= kring->nkr_num_slots) {
@ -2049,7 +2057,9 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
kring = &na->rx_rings[i];
if (nm_kr_tryget(kring)) {
D("%p lost race on rxring %d, ok", priv, i);
if (netmap_verbose)
RD(2, "%p lost race on rxring %d, ok",
priv, i);
continue;
}