Date: Tue, 25 Jun 2002 20:34:56 -0700 (PDT) From: "Kenneth D. Merry" <ken@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/etc MAKEDEV src/share/man/man4 ti.4 src/share/man/man9 Makefile src/sys/conf NOTES files options src/sys/kern kern_subr.c uipc_socket.c uipc_syscalls.c src/sys/modules/ti Makefile src/sys/net if_media.c src/sys/netinet ... Message-ID: <200206260334.g5Q3Yu464637@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
ken 2002/06/25 20:34:56 PDT
Modified files:
etc MAKEDEV
share/man/man4 ti.4
share/man/man9 Makefile
sys/conf NOTES files options
sys/kern kern_subr.c uipc_socket.c uipc_syscalls.c
sys/modules/ti Makefile
sys/net if_media.c
sys/netinet ip_output.c
sys/pci if_ti.c if_tireg.h ti_fw.h ti_fw2.h
sys/sys mbuf.h socketvar.h uio.h
sys/ufs/ufs ufs_readwrite.c
sys/vm vm_fault.c vm_object.c vm_object.h
vm_page.c vm_page.h
Log:
At long last, commit the zero copy sockets code.
MAKEDEV: Add MAKEDEV glue for the ti(4) device nodes.
ti.4: Update the ti(4) man page to include information on the
TI_JUMBO_HDRSPLIT and TI_PRIVATE_JUMBOS kernel options,
and also include information about the new character
device interface and the associated ioctls.
man9/Makefile: Add jumbo.9 and zero_copy.9 man pages and associated
links.
jumbo.9: New man page describing the jumbo buffer allocator
interface and operation.
zero_copy.9: New man page describing the general characteristics of
the zero copy send and receive code, and what an
application author should do to take advantage of the
zero copy functionality.
NOTES: Add entries for ZERO_COPY_SOCKETS, TI_PRIVATE_JUMBOS,
TI_JUMBO_HDRSPLIT, MSIZE, and MCLSHIFT.
conf/files: Add uipc_jumbo.c and uipc_cow.c.
conf/options: Add the 5 options mentioned above.
kern_subr.c: Receive side zero copy implementation. This takes
"disposable" pages attached to an mbuf, gives them to
a user process, and then recycles the user's page.
This is only active when ZERO_COPY_SOCKETS is turned on
and the kern.ipc.zero_copy.receive sysctl variable is
set to 1.
uipc_cow.c: Send side zero copy functions. Takes a page written
by the user and maps it copy on write and assigns it
kernel virtual address space. Removes copy on write
mapping once the buffer has been freed by the network
stack.
uipc_jumbo.c: Jumbo disposable page allocator code. This allocates
(optionally) disposable pages for network drivers that
want to give the user the option of doing zero copy
receive.
uipc_socket.c: Add kern.ipc.zero_copy.{send,receive} sysctls that are
enabled if ZERO_COPY_SOCKETS is turned on.
Add zero copy send support to sosend() -- pages get
mapped into the kernel instead of getting copied if
they meet size and alignment restrictions.
uipc_syscalls.c:Un-staticize some of the sf* functions so that they
can be used elsewhere. (uipc_cow.c)
if_media.c: In the SIOCGIFMEDIA ioctl in ifmedia_ioctl(), avoid
calling malloc() with M_WAITOK. Return an error if
the M_NOWAIT malloc fails.
The ti(4) driver and the wi(4) driver, at least, call
this with a mutex held. This causes witness warnings
for 'ifconfig -a' with a wi(4) or ti(4) board in the
system. (I've only verified for ti(4)).
ip_output.c: Fragment large datagrams so that each segment contains
a multiple of PAGE_SIZE amount of data plus headers.
This allows the receiver to potentially do page
flipping on receives.
if_ti.c: Add zero copy receive support to the ti(4) driver. If
TI_PRIVATE_JUMBOS is not defined, it now uses the
jumbo(9) buffer allocator for jumbo receive buffers.
Add a new character device interface for the ti(4)
driver for the new debugging interface. This allows
(a patched version of) gdb to talk to the Tigon board
and debug the firmware. There are also a few additional
debugging ioctls available through this interface.
Add header splitting support to the ti(4) driver.
Tweak some of the default interrupt coalescing
parameters to more useful defaults.
Add hooks for supporting transmit flow control, but
leave it turned off with a comment describing why it
is turned off.
if_tireg.h: Change the firmware rev to 12.4.11, since we're really
at 12.4.11 plus fixes from 12.4.13.
Add defines needed for debugging.
Remove the ti_stats structure, it is now defined in
sys/tiio.h.
ti_fw.h: 12.4.11 firmware.
ti_fw2.h: 12.4.11 firmware, plus selected fixes from 12.4.13,
and my header splitting patches. Revision 12.4.13
doesn't handle 10/100 negotiation properly. (This
firmware is the same as what was in the tree previously,
with the addition of header splitting support.)
sys/jumbo.h: Jumbo buffer allocator interface.
sys/mbuf.h: Add a new external mbuf type, EXT_DISPOSABLE, to
indicate that the payload buffer can be thrown away /
flipped to a userland process.
socketvar.h: Add prototype for socow_setup.
tiio.h: ioctl interface to the character portion of the ti(4)
driver, plus associated structure/type definitions.
uio.h: Change prototype for uiomoveco() so that we'll know
whether the source page is disposable.
ufs_readwrite.c:Update for new prototype of uiomoveco().
vm_fault.c: In vm_fault(), check to see whether we need to do a page
based copy on write fault.
vm_object.c: Add a new function, vm_object_allocate_wait(). This
does the same thing that vm_object allocate does, except
that it gives the caller the opportunity to specify whether
it should wait on the uma_zalloc() of the object structre.
This allows vm objects to be allocated while holding a
mutex. (Without generating WITNESS warnings.)
vm_object_allocate() is implemented as a call to
vm_object_allocate_wait() with the malloc flag set to
M_WAITOK.
vm_object.h: Add prototype for vm_object_allocate_wait().
vm_page.c: Add page-based copy on write setup, clear and fault
routines.
vm_page.h: Add page based COW function prototypes and variable in
the vm_page structure.
Many thanks to Drew Gallatin, who wrote the zero copy send and receive
code, and to all the other folks who have tested and reviewed this code
over the years.
Revision Changes Path
1.324 +8 -1 src/etc/MAKEDEV
1.19 +87 -2 src/share/man/man4/ti.4
1.167 +6 -1 src/share/man/man9/Makefile
1.1041 +16 -0 src/sys/conf/NOTES
1.654 +2 -0 src/sys/conf/files
1.327 +7 -0 src/sys/conf/options
1.54 +171 -20 src/sys/kern/kern_subr.c
1.124 +102 -0 src/sys/kern/uipc_socket.c
1.114 +7 -7 src/sys/kern/uipc_syscalls.c
1.13 +3 -2 src/sys/modules/ti/Makefile
1.17 +3 -1 src/sys/net/if_media.c
1.160 +44 -2 src/sys/netinet/ip_output.c
1.60 +1153 -15 src/sys/pci/if_ti.c
1.25 +64 -188 src/sys/pci/if_tireg.h
1.10 +1012 -1017 src/sys/pci/ti_fw.h
1.11 +4363 -4011 src/sys/pci/ti_fw2.h
1.94 +1 -0 src/sys/sys/mbuf.h
1.84 +1 -0 src/sys/sys/socketvar.h
1.21 +1 -1 src/sys/sys/uio.h
1.93 +1 -1 src/sys/ufs/ufs/ufs_readwrite.c
1.144 +14 -0 src/sys/vm/vm_fault.c
1.219 +20 -5 src/sys/vm/vm_object.c
1.81 +1 -0 src/sys/vm/vm_object.h
1.190 +69 -0 src/sys/vm/vm_page.c
1.102 +5 -0 src/sys/vm/vm_page.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206260334.g5Q3Yu464637>