Date: Sat, 17 May 2008 01:55:22 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141740 for review Message-ID: <200805170155.m4H1tMiX005038@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141740 Change 141740 by jb@freebsd3 on 2008/05/17 01:54:43 IFC Affected files ... .. //depot/projects/dtrace/ports/MOVED#86 integrate .. //depot/projects/dtrace/src/bin/sh/expand.c#7 integrate .. //depot/projects/dtrace/src/bin/sh/parser.c#6 integrate .. //depot/projects/dtrace/src/bin/sh/parser.h#5 integrate .. //depot/projects/dtrace/src/etc/rc.initdiskless#7 integrate .. //depot/projects/dtrace/src/include/gssapi/gssapi.h#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdtime/strftime.3#5 integrate .. //depot/projects/dtrace/src/lib/libpam/modules/pam_ksu/Makefile#4 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.1#6 integrate .. //depot/projects/dtrace/src/share/timedef/hu_HU.ISO8859-2.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/hu_HU.UTF-8.src#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/genassym.c#10 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#3 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#51 integrate .. //depot/projects/dtrace/src/sys/conf/files#89 integrate .. //depot/projects/dtrace/src/sys/conf/options#51 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/README#1 branch .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/tcp_lro.c#1 branch .. //depot/projects/dtrace/src/sys/dev/ixgbe/tcp_lro.h#1 branch .. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_defs.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_fw.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_fw1.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_fw2.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_subr.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/genassym.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sx.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/subr_lock.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#10 integrate .. //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/net/ethernet.h#8 integrate .. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/genassym.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/_lock.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/_lockmgr.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/_mutex.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/_rwlock.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/_sx.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/lock.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#21 integrate .. //depot/projects/dtrace/src/sys/sys/mutex.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/socketvar.h#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#34 integrate .. //depot/projects/dtrace/src/tools/regression/aio/aiop/aiop.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/lineno.0#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/lineno.0.stdout#1 branch .. //depot/projects/dtrace/src/usr.bin/cksum/cksum.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/getopt/README#4 delete .. //depot/projects/dtrace/src/usr.bin/getopt/getopt.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/ldd/ldd.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/inet.c#10 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/main.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/netstat.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/netstat.h#8 integrate .. //depot/projects/dtrace/src/usr.bin/truss/Makefile#7 integrate .. //depot/projects/dtrace/src/usr.bin/truss/amd64-fbsd32.c#1 branch .. //depot/projects/dtrace/src/usr.bin/truss/amd64-linux32.c#1 branch .. //depot/projects/dtrace/src/usr.bin/truss/amd64linux32.conf#1 branch .. //depot/projects/dtrace/src/usr.bin/truss/extern.h#7 integrate .. //depot/projects/dtrace/src/usr.bin/truss/fbsd32.conf#1 branch .. //depot/projects/dtrace/src/usr.bin/truss/main.c#10 integrate .. //depot/projects/dtrace/src/usr.sbin/moused/moused.8#7 integrate .. //depot/projects/dtrace/src/usr.sbin/moused/moused.c#7 integrate .. //depot/projects/dtrace/www/en/news/status/report-2008-01-2008-03.xml#2 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#86 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1593 2008/05/12 17:33:17 hrs Exp $ +# $FreeBSD: ports/MOVED,v 1.1594 2008/05/15 22:00:08 flz Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3474,3 +3474,4 @@ x11-toolkits/gtkdatabox|x11-toolkits/gtkdatabox2|2008-05-08|This old version has been superseeded by x11-toolkits/gtkdatabox2 devel/swigruby||2008-05-11|Has expired: use devel/swig13 instead, last release was 8 years ago japanese/epson-ttfonts||2008-05-12|Removed because of extremely restrictive license +x11-servers/xorg-printserver||2008-05-15|Has expired, software is obsolete ==== //depot/projects/dtrace/src/bin/sh/expand.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.52 2008/04/28 07:26:34 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.53 2008/05/15 19:55:27 stefanf Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -638,7 +638,13 @@ special = 1; p = strchr(p, '=') + 1; again: /* jump here after setting a variable with ${var=text} */ - if (special) { + if (varflags & VSLINENO) { + set = 1; + special = 0; + val = var; + p[-1] = '\0'; /* temporarily overwrite '=' to have \0 + terminated string */ + } else if (special) { set = varisset(var, varflags & VSNUL); val = NULL; } else { @@ -768,6 +774,7 @@ default: abort(); } + p[-1] = '='; /* recover overwritten '=' */ if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; ==== //depot/projects/dtrace/src/bin/sh/parser.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -94,6 +94,7 @@ STATIC struct heredoc *heredoc; STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ +STATIC int funclinno; /* line # where the current function started */ /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -567,12 +568,14 @@ /* We have a function */ if (readtoken() != TRP) synexpect(TRP); + funclinno = plinno; #ifdef notdef if (! goodname(n->narg.text)) synerror("Bad function name"); #endif n->type = NDEFUN; n->narg.next = command(); + funclinno = 0; goto checkneg; } else { tokpushback++; @@ -1176,12 +1179,15 @@ */ parsesub: { + char buf[10]; int subtype; int typeloc; int flags; char *p; static const char types[] = "}-+?="; - int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ + int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ + int i; + int linno; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1200,6 +1206,7 @@ typeloc = out - stackblock(); USTPUTC(VSNORMAL, out); subtype = VSNORMAL; + flags = 0; if (c == '{') { bracketed_name = 1; c = pgetc(); @@ -1213,10 +1220,23 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { + p = out; do { STPUTC(c, out); c = pgetc(); } while (!is_eof(c) && is_in_name(c)); + if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + /* Replace the variable name with the + * current line number. */ + linno = plinno; + if (funclinno != 0) + linno -= funclinno - 1; + snprintf(buf, sizeof(buf), "%d", linno); + STADJUST(-6, out); + for (i = 0; buf[i] != '\0'; i++) + STPUTC(buf[i], out); + flags |= VSLINENO; + } } else if (is_digit(c)) { if (bracketed_name) { do { @@ -1239,11 +1259,10 @@ c = pgetc(); } } - flags = 0; if (subtype == 0) { switch (c) { case ':': - flags = VSNUL; + flags |= VSNUL; c = pgetc(); /*FALLTHROUGH*/ default: ==== //depot/projects/dtrace/src/bin/sh/parser.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.12 2008/05/15 19:55:27 stefanf Exp $ */ /* control characters in argument strings */ @@ -45,9 +45,11 @@ #define CTLQUOTEMARK '\210' /* variable substitution byte (follows CTLVAR) */ -#define VSTYPE 0x0f /* type of variable substitution */ -#define VSNUL 0x10 /* colon--treat the empty string as unset */ -#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */ +#define VSTYPE 0x0f /* type of variable substitution */ +#define VSNUL 0x10 /* colon--treat the empty string as unset */ +#define VSLINENO 0x20 /* expansion of $LINENO, the line number \ + follows immediately */ +#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */ /* values of VSTYPE field */ #define VSNORMAL 0x1 /* normal variable: $var or ${var} */ ==== //depot/projects/dtrace/src/etc/rc.initdiskless#7 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.52 2006/12/03 23:50:29 luigi Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -69,6 +69,10 @@ # /conf/1.2.3.4/foo/remount contains "mount -o ro /dev/ad0s3", # then /dev/ad0s3 will be be mounted on /conf/1.2.3.4/foo/ # +# /conf/T/M/remount_optional +# If this file exists, then failure to execute the mount +# command contained in /conf/T/M/remount is non-fatal. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -147,8 +151,12 @@ # # checks error code and drops into shell on failure. # if shell exits, terminates script as well as /etc/rc. +# if remount_optional exists under the mountpoint, skip this check. # chkerr() { + lastitem () ( n=$(($# - 1)) ; shift $n ; echo $1 ) + mountpoint="$(lastitem $2)" + [ -r $mountpoint/remount_optional ] && ( echo "$2 failed: ignoring due to remount_optional" ; return ) case $1 in 0) ;; ==== //depot/projects/dtrace/src/include/gssapi/gssapi.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/include/gssapi/gssapi.h,v 1.2 2008/05/07 13:53:02 dfr Exp $ + * $FreeBSD: src/include/gssapi/gssapi.h,v 1.4 2008/05/16 02:06:10 dfr Exp $ */ #ifndef _GSSAPI_GSSAPI_H_ @@ -89,6 +89,7 @@ */ typedef gss_uint32 OM_uint32; +typedef uint64_t OM_uint64; typedef struct gss_OID_desc_struct { OM_uint32 length; @@ -419,6 +420,8 @@ #define GSS_S_GAP_TOKEN \ (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 4)) +__BEGIN_DECLS + /* * Finally, function prototypes for the GSS-API routines. */ @@ -834,4 +837,6 @@ gss_buffer_t /* buffer for result */ ); +__END_DECLS + #endif /* _GSSAPI_GSSAPI_H_ */ ==== //depot/projects/dtrace/src/lib/libc/stdtime/strftime.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.39 2007/01/09 00:28:11 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.40 2008/05/16 04:33:04 grog Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -154,9 +154,9 @@ .Cm %E* . .It Cm %p is replaced by national representation of either -"ante meridiem" +"ante meridiem" (a.m.) or -"post meridiem" +"post meridiem" (p.m.) as appropriate. .It Cm \&%R is equivalent to ==== //depot/projects/dtrace/src/lib/libpam/modules/pam_ksu/Makefile#4 (text+ko) ==== @@ -22,13 +22,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.7 2008/05/15 15:28:18 dfr Exp $ LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 -DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} +LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto .include <bsd.lib.mk> ==== //depot/projects/dtrace/src/libexec/rtld-elf/rtld.1#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.46 2007/05/17 19:14:25 csjp Exp $ +.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.47 2008/05/15 10:47:14 bms Exp $ .\" -.Dd March 27, 2006 +.Dd May 15, 2008 .Dt RTLD 1 .Os .Sh NAME @@ -174,7 +174,10 @@ .Dq __progname ) . .It Li \&%A The value of the environment variable -.Ev LD_TRACE_LOADED_OBJECTS_PROGNAME +.Ev LD_TRACE_LOADED_OBJECTS_PROGNAME . +Typically used to print both the names of programs and shared libraries +being inspected using +.Xr ldd 1 . .It Li %o The library name. .It Li %p ==== //depot/projects/dtrace/src/share/timedef/hu_HU.ISO8859-2.src#5 (text+ko) ==== @@ -1,56 +1,56 @@ # This is a Hungarian LC_TIME file for ISO 8859-2 code-table # Made by Gabor Zahemszky <zgabor@CoDe.hu> -# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.8 2007/12/30 03:08:52 ache Exp $ +# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.9 2008/05/16 12:50:15 gabor Exp $ # # Short month names # -Jan -Feb -Már -Ápr -Máj -Jún -Júl -Aug -Sze -Okt -Nov -Dec +jan +feb +már +ápr +máj +jún +júl +aug +sze +okt +nov +dec # # Long month names (as in a date) # -Január -Február -Március -Április -Május -Június -Július -Augusztus -Szeptember -Október -November -December +január +február +március +április +május +június +július +augusztus +szeptember +október +november +december # # Short weekday names # -Vas -Hét -Ked -Sze -Csü -Pén -Szo +vas +hét +ked +sze +csü +pén +szo # # Long weekday names # -Vasárnap -Hétfő -Kedd -Szerda -Csütörtök -Péntek -Szombat +vasárnap +hétfő +kedd +szerda +csütörtök +péntek +szombat # # X_fmt # @@ -78,18 +78,18 @@ # # Long month names (without case ending) # -Január -Február -Március -Április -Május -Június -Július -Augusztus -Szeptember -Október -November -December +január +február +március +április +május +június +július +augusztus +szeptember +október +november +december # # md_order # ==== //depot/projects/dtrace/src/share/timedef/hu_HU.UTF-8.src#5 (text+ko) ==== @@ -1,56 +1,56 @@ # This is a Hungarian LC_TIME file for ISO 8859-2 code-table # Made by Gabor Zahemszky <zgabor@CoDe.hu> -# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.3 2007/12/30 03:08:52 ache Exp $ +# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.4 2008/05/16 12:50:15 gabor Exp $ # # Short month names # -Jan -Feb -MĂĄr -Ăpr -MĂĄj -JĂşn -JĂşl -Aug -Sze -Okt -Nov -Dec +jan +feb +mĂĄr +ĂĄpr +mĂĄj +jĂşn +jĂşl +aug +sze +okt +nov +dec # # Long month names (as in a date) # -JanuĂĄr -FebruĂĄr -MĂĄrcius -Ăprilis -MĂĄjus -JĂşnius -JĂşlius -Augusztus -Szeptember -OktĂłber -November -December +januĂĄr +februĂĄr +mĂĄrcius +ĂĄprilis +mĂĄjus +jĂşnius +jĂşlius +augusztus +szeptember +oktĂłber +november +december # # Short weekday names # -Vas -HĂŠt -Ked -Sze -CsĂź -PĂŠn -Szo +vas +hĂŠt +ked +sze +csĂź +pĂŠn +szo # # Long weekday names # -VasĂĄrnap -HĂŠtfĹ -Kedd -Szerda -CsĂźtĂśrtĂśk -PĂŠntek -Szombat +vasĂĄrnap +hĂŠtfĹ +kedd +szerda +csĂźtĂśrtĂśk +pĂŠntek +szombat # # X_fmt # @@ -78,18 +78,18 @@ # # Long month names (without case ending) # -JanuĂĄr -FebruĂĄr -MĂĄrcius -Ăprilis -MĂĄjus -JĂşnius -JĂşlius -Augusztus -Szeptember -OktĂłber -November -December +januĂĄr +februĂĄr +mĂĄrcius +ĂĄprilis +mĂĄjus +jĂşnius +jĂşlius +augusztus +szeptember +oktĂłber +november +december # # md_order # ==== //depot/projects/dtrace/src/sys/amd64/amd64/genassym.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -214,7 +214,4 @@ ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_UPL)); ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); -ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); -ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); - ASSYM(MSR_GSBASE, MSR_GSBASE); ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/lock.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/lock.h,v 1.3 2008/05/16 02:09:13 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_LOCK_H_ @@ -35,8 +35,7 @@ #define LO_ALLMASK (LO_INITIALIZED | LO_WITNESS | LO_QUIET | \ LO_RECURSABLE | LO_SLEEPABLE | LO_UPGRADABLE | \ - LO_DUPOK | LO_ENROLLPEND | LO_CLASSMASK | \ - LO_NOPROFILE) + LO_DUPOK | LO_CLASSMASK | LO_NOPROFILE) #define LO_EXPECTED (LO_INITIALIZED | LO_WITNESS | LO_RECURSABLE | \ LO_SLEEPABLE | LO_UPGRADABLE | LO_DUPOK | \ /* sx lock class */(2 << LO_CLASSSHIFT)) ==== //depot/projects/dtrace/src/sys/conf/NOTES#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1485 2008/05/09 23:02:55 julian Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1486 2008/05/16 06:50:40 benno Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2380,6 +2380,7 @@ options BOOTP_NFSV3 # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. options BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP +options BOOTP_BLOCKSIZE=8192 # Override NFS block size # # Add software watchdog routines. ==== //depot/projects/dtrace/src/sys/conf/files#89 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1298 2008/05/16 18:46:29 jfv Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -850,6 +850,8 @@ dev/ixgb/ixgb_hw.c optional ixgb dev/ixgbe/ixgbe.c optional ixgbe \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/tcp_lro.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_phy.c optional ixgbe \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_api.c optional ixgbe \ ==== //depot/projects/dtrace/src/sys/conf/options#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.628 2008/05/09 23:02:55 julian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.629 2008/05/16 06:27:03 benno Exp $ # # On the handling of kernel options # @@ -353,6 +353,7 @@ ALTQ_NOPCC opt_altq.h ALTQ_DEBUG opt_altq.h BOOTP opt_bootp.h +BOOTP_BLOCKSIZE opt_bootp.h BOOTP_COMPAT opt_bootp.h BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h ==== //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#15 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.87 2008/02/10 06:21:52 iwasaki Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.88 2008/05/16 08:27:02 ps Exp $ */ /* @@ -2738,12 +2738,6 @@ debug(2, "XPT_SCSI_IO %d:%d:%d", bus, target, csio->ccb_h.target_lun); - /* firmware does not support commands > 10 bytes */ - if (csio->cdb_len > 12/*CISS_CDB_BUFFER_SIZE*/) { - debug(3, " command too large (%d > %d)", csio->cdb_len, CISS_CDB_BUFFER_SIZE); - csio->ccb_h.status = CAM_REQ_CMP_ERR; - } - /* check that the CDB pointer is not to a physical address */ if ((csio->ccb_h.flags & CAM_CDB_POINTER) && (csio->ccb_h.flags & CAM_CDB_PHYS)) { debug(3, " CDB pointer is to physical address"); ==== //depot/projects/dtrace/src/sys/dev/ixgbe/LICENSE#2 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/sys/dev/ixgbe/LICENSE,v 1.1 2007/07/11 23:03:16 jfv Exp $ +/****************************************************************************** - Copyright (c) 2001-2007, Intel Corporation + Copyright (c) 2001-2008, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,3 +29,5 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +******************************************************************************/ +/*$FreeBSD: src/sys/dev/ixgbe/LICENSE,v 1.2 2008/05/16 18:46:30 jfv Exp $*/ ==== //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe.c#2 (text+ko) ==== @@ -1,37 +1,37 @@ -/******************************************************************************* +/****************************************************************************** -Copyright (c) 2001-2007, Intel Corporation -All rights reserved. + Copyright (c) 2001-2008, Intel Corporation + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of the Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Intel Corporation nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +******************************************************************************/ +/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.5 2008/05/16 18:46:30 jfv Exp $*/ -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ -/* $FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.4 2007/09/04 02:31:34 jfv Exp $ */ - #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #endif @@ -46,7 +46,7 @@ /********************************************************************* * Driver version *********************************************************************/ -char ixgbe_driver_version[] = "1.2.6"; +char ixgbe_driver_version[] = "1.4.4"; /********************************************************************* * PCI Device ID Table @@ -62,7 +62,11 @@ { {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_DUAL_PORT, 0, 0, 0}, {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_SINGLE_PORT, 0, 0, 0}, + {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AT_DUAL_PORT, 0, 0, 0}, {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598EB_CX4, 0, 0, 0}, + {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598_CX4_DUAL_PORT, 0, 0, 0}, + {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598EB_XF_LR, 0, 0, 0}, + {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AT, 0, 0, 0}, /* required last entry */ {0, 0, 0, 0, 0} }; @@ -83,7 +87,7 @@ static int ixgbe_detach(device_t); static int ixgbe_shutdown(device_t); static void ixgbe_start(struct ifnet *); -static void ixgbe_start_locked(struct ifnet *); +static void ixgbe_start_locked(struct tx_ring *, struct ifnet *); static int ixgbe_ioctl(struct ifnet *, u_long, caddr_t); static void ixgbe_watchdog(struct adapter *); static void ixgbe_init(void *); @@ -93,15 +97,15 @@ static int ixgbe_media_change(struct ifnet *); static void ixgbe_identify_hardware(struct adapter *); static int ixgbe_allocate_pci_resources(struct adapter *); -static void ixgbe_free_pci_resources(struct adapter *); +static int ixgbe_allocate_msix(struct adapter *); +static int ixgbe_allocate_legacy(struct adapter *); +static int ixgbe_allocate_queues(struct adapter *); +static int ixgbe_setup_msix(struct adapter *); +static void ixgbe_free_pci_resources(struct adapter *); static void ixgbe_local_timer(void *); static int ixgbe_hardware_init(struct adapter *); static void ixgbe_setup_interface(device_t, struct adapter *); -static int ixgbe_allocate_queues(struct adapter *); -static int ixgbe_allocate_msix_resources(struct adapter *); -#if __FreeBSD_version >= 700000 -static int ixgbe_setup_msix(struct adapter *); -#endif + static int ixgbe_allocate_transmit_buffers(struct tx_ring *); static int ixgbe_setup_transmit_structures(struct adapter *); static void ixgbe_setup_transmit_ring(struct tx_ring *); @@ -120,8 +124,8 @@ static void ixgbe_disable_intr(struct adapter *); static void ixgbe_update_stats_counters(struct adapter *); static bool ixgbe_txeof(struct tx_ring *); -static int ixgbe_rxeof(struct rx_ring *, int); -static void ixgbe_rx_checksum(struct adapter *, uint32_t, struct mbuf *); +static bool ixgbe_rxeof(struct rx_ring *, int); +static void ixgbe_rx_checksum(struct adapter *, u32, struct mbuf *); static void ixgbe_set_promisc(struct adapter *); static void ixgbe_disable_promisc(struct adapter *); static void ixgbe_set_multi(struct adapter *); @@ -129,8 +133,8 @@ static void ixgbe_print_debug_info(struct adapter *); static void ixgbe_update_link_status(struct adapter *); static int ixgbe_get_buf(struct rx_ring *, int); -static void ixgbe_enable_vlans(struct adapter * adapter); -static int ixgbe_encap(struct adapter *, struct mbuf **); +static void ixgbe_enable_hw_vlans(struct adapter * adapter); +static int ixgbe_xmit(struct tx_ring *, struct mbuf **); static int ixgbe_sysctl_stats(SYSCTL_HANDLER_ARGS); static int ixgbe_sysctl_debug(SYSCTL_HANDLER_ARGS); static int ixgbe_set_flowcntl(SYSCTL_HANDLER_ARGS); @@ -139,24 +143,23 @@ static void ixgbe_dma_free(struct adapter *, struct ixgbe_dma_alloc *); static void ixgbe_add_rx_process_limit(struct adapter *, const char *, const char *, int *, int); -static boolean_t ixgbe_tx_csum_setup(struct tx_ring *, struct mbuf *); +static boolean_t ixgbe_tx_ctx_setup(struct tx_ring *, struct mbuf *); static boolean_t ixgbe_tso_setup(struct tx_ring *, struct mbuf *, u32 *); static void ixgbe_set_ivar(struct adapter *, u16, u8); static void ixgbe_configure_ivars(struct adapter *); +static u8 * ixgbe_mc_array_itr(struct ixgbe_hw *, u8 **, u32 *); -/* Legacy Fast Interrupt routine and handlers */ -#if __FreeBSD_version >= 700000 -static int ixgbe_fast_irq(void *); +/* Legacy (single vector interrupt handler */ +static void ixgbe_legacy_irq(void *); + /* The MSI/X Interrupt handlers */ static void ixgbe_msix_tx(void *); static void ixgbe_msix_rx(void *); static void ixgbe_msix_link(void *); -#else -static void ixgbe_fast_irq(void *); -#endif -static void ixgbe_rxtx(void *context, int pending); -static void ixgbe_link(void *context, int pending); +static void ixgbe_handle_tx(void *context, int pending); +static void ixgbe_handle_rx(void *context, int pending); +static void ixgbe_handle_link(void *context, int pending); #ifndef NO_82598_A0_SUPPORT static void desc_flip(void *); @@ -197,18 +200,31 @@ static int ixgbe_flow_control = 3; TUNABLE_INT("hw.ixgbe.flow_control", &ixgbe_flow_control); -/* Number of TX Queues, note multi tx is not working */ +/* + * Should the driver do LRO on the RX end + * this can be toggled on the fly, but the + * interface must be reset (down/up) for it + * to take effect. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805170155.m4H1tMiX005038>