From owner-p4-projects@FreeBSD.ORG Sun Sep 9 07:45:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8828816A46C; Sun, 9 Sep 2007 07:45:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E7E216A468 for ; Sun, 9 Sep 2007 07:45:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 414B513C48E for ; Sun, 9 Sep 2007 07:45:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l897jsgH074789 for ; Sun, 9 Sep 2007 07:45:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l897jrP0074786 for perforce@freebsd.org; Sun, 9 Sep 2007 07:45:53 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Sep 2007 07:45:53 GMT Message-Id: <200709090745.l897jrP0074786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 07:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=126214 Change 126214 by kmacy@kmacy_home:ethng on 2007/09/09 07:45:15 IFC 126210 integrate 4-port fixes, firmware update, and use after free fix Affected files ... .. //depot/projects/ethng/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/ethng/src/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/ethng/src/etc/services#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_update.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/ethng/src/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/ethng/src/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/ethng/src/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/ethng/src/share/man/man4/rum.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/zyd.4#2 integrate .. //depot/projects/ethng/src/share/man/man5/Makefile#3 integrate .. //depot/projects/ethng/src/share/man/man5/ar.5#1 branch .. //depot/projects/ethng/src/share/man/man5/elf.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#15 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#16 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#16 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#18 edit .. //depot/projects/ethng/src/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/ethng/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/ethng/src/sys/net/rtsock.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/ethng/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sbus/sbusreg.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/ethng/src/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/periodic/periodic.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate Differences ... ==== //depot/projects/ethng/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -154,6 +154,8 @@ pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_program="/sbin/pflogd" # where the pflogd program lives pflog_flags="" # additional flags for pflogd +ftpproxy_enable="NO" # Set to YES to enable ftp-proxy(8) for pf +ftpproxy_flags="" # additional flags for ftp-proxy(8) pfsync_enable="NO" # Expose pf state to other hosts for syncing pfsync_syncdev="" # Interface for pfsync to work through pfsync_syncpeer="" # IP address of pfsync peer host ==== //depot/projects/ethng/src/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.82 2007/08/17 07:58:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $ .include @@ -11,7 +11,7 @@ devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ - fsck ftpd \ + fsck ftp-proxy ftpd \ gbde geli geli2 \ hcsecd \ hostapd hostid hostname \ ==== //depot/projects/ethng/src/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.110 2007/05/20 03:57:47 grog Exp $ +# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2186,6 +2186,8 @@ sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp +iscsi-target 3260/tcp # iSCSI port +iscsi-target 3260/udp # iSCSI port ccmail 3264/tcp #cc:mail/lotus ccmail 3264/udp #cc:mail/lotus dec-notes 3333/tcp #DEC Notes @@ -2326,6 +2328,10 @@ montage-lm 6147/udp #Montage License Manager ricardo-lm 6148/tcp #Ricardo North America License Manager ricardo-lm 6148/udp #Ricardo North America License Manager +sge_qmaster 6444/tcp #Grid Engine Qmaster Service +sge_qmaster 6444/udp #Grid Engine Qmaster Service +sge_execd 6445/tcp #Grid Engine Execution Service +sge_execd 6445/upd #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp ircd 6667/tcp #Internet Relay Chat (unoffical) ==== //depot/projects/ethng/src/lib/libc/sys/kqueue.2#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.45 2006/11/20 22:20:04 jhb Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ .\" -.Dd August 25, 2006 +.Dd September 6, 2007 .Dt KQUEUE 2 .Os .Sh NAME @@ -542,11 +542,6 @@ system and this manual page were written by .An Jonathan Lemon Aq jlemon@FreeBSD.org . .Sh BUGS -It is currently not possible to watch a -.Xr vnode 9 -that resides on anything but -a UFS file system. -.Pp The .Dv EVFILT_NETDEV filter is currently only implemented for devices that use the ==== //depot/projects/ethng/src/lib/libelf/elf_update.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.3 2006/12/25 02:24:38 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $ .\" -.Dd December 16, 2006 +.Dd September 08, 2007 .Os .Dt ELF_UPDATE 3 .Sh NAME @@ -228,6 +228,11 @@ .Ar elf contained section descriptors that were incorrectly aligned or were too small for their data. +.It Bq Er ELF_E_LAYOUT +The flag +.Dv ELF_F_LAYOUT +was set on the Elf descriptor and the section header table overlapped +an extent in the object mapped by a section descriptor. .It Bq Er ELF_E_MODE An .Dv ELF_C_WRITE ==== //depot/projects/ethng/src/lib/libelf/elf_update.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.3 2007/09/08 08:20:12 jkoshy Exp $"); #include #include @@ -68,7 +68,10 @@ */ /* - * Compute the extents of a section, by looking at the. + * Compute the extents of a section, by looking at the data + * descriptors associated with it. The function returns zero if an + * error was detected. `*rc' holds the maximum file extent seen so + * far. */ static int _libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t *rc) @@ -267,7 +270,7 @@ { int ec; off_t nrc; - size_t sh_type; + size_t sh_type, shdr_start, shdr_end; Elf_Scn *s, *ts; ec = e->e_class; @@ -311,6 +314,29 @@ rc = s->s_offset + s->s_size; } + /* + * If the application is controlling file layout, check for an + * overlap between this section's extents and the SHDR table. + */ + if (e->e_flags & ELF_F_LAYOUT) { + + if (e->e_class == ELFCLASS32) + shdr_start = e->e_u.e_elf.e_ehdr.e_ehdr32->e_shoff; + else + shdr_start = e->e_u.e_elf.e_ehdr.e_ehdr64->e_shoff; + + shdr_end = shdr_start + _libelf_fsize(ELF_T_SHDR, e->e_class, + e->e_version, e->e_u.e_elf.e_nscn); + + STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) { + if (s->s_offset >= shdr_end || + s->s_offset + s->s_size <= shdr_start) + continue; + LIBELF_SET_ERROR(LAYOUT, 0); + return ((off_t) -1); + } + } + assert(nrc == rc); return (rc); @@ -446,18 +472,17 @@ /* * Compute the space taken up by the section header table, if - * one is needed. + * one is needed. If ELF_F_LAYOUT is asserted, the + * application may have placed the section header table in + * between existing sections, so the net size of the file need + * not increase due to the presence of the section header + * table. */ if (shnum) { fsz = _libelf_fsize(ELF_T_SHDR, ec, eh_version, (size_t) 1); align = _libelf_falign(ELF_T_SHDR, ec); if (e->e_flags & ELF_F_LAYOUT) { - if (rc > shoff) { - LIBELF_SET_ERROR(HEADER, 0); - return ((off_t) -1); - } - if (shoff % align) { LIBELF_SET_ERROR(LAYOUT, 0); return ((off_t) -1); @@ -465,7 +490,8 @@ } else shoff = roundup(rc, align); - rc = shoff + fsz * shnum; + if (shoff + fsz * shnum > (size_t) rc) + rc = shoff + fsz * shnum; } else shoff = 0; @@ -619,7 +645,7 @@ _libelf_write_elf(Elf *e, off_t newsize) { int ec; - off_t rc; + off_t maxrc, rc; size_t fsz, msz, phnum, shnum; uint64_t phoff, shoff; void *ehdr; @@ -728,16 +754,17 @@ goto error; /* - * Write out the section header table, if required. + * Write out the section header table, if required. Note that + * if flag ELF_F_LAYOUT has been set the section header table + * could reside in between byte ranges mapped by section + * descriptors. */ - if (shnum != 0 && shoff != 0) { - assert((unsigned) rc <= shoff); - if ((uint64_t) rc < shoff) (void) memset(newfile + rc, LIBELF_PRIVATE(fillchar), shoff - rc); + maxrc = rc; rc = shoff; assert(rc % _libelf_falign(ELF_T_SHDR, ec) == 0); @@ -763,11 +790,11 @@ rc += fsz; } + + if (maxrc > rc) + rc = maxrc; } - /* - */ - assert(rc == newsize); /* ==== //depot/projects/ethng/src/lib/libelf/libelf_convert.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Joseph Koshy + * Copyright (c) 2006,2007 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.3 2007/09/09 02:10:53 jkoshy Exp $"); #include #include @@ -605,15 +605,14 @@ `ifdef(`IGNORE_'$1$2, `.$3$2 = NULL', `ifdef(`BASE_'$1, - `ifdef(`IGNORE_'$1, - `.$3$2 = NULL', - `.$3$2 = libelf_cvt_$1_$3')', + `.$3$2 = libelf_cvt_$1_$3', `ifdef(`SIZEDEP_'$1, `.$3$2 = libelf_cvt_$1$2_$3', `.$3$2 = libelf_cvt$2_$1_$3')')')') define(`CONVERTER_NAME', - `#if __FreeBSD_version >= $3 + `ifdef(`IGNORE_'$1,`', + `#if __FreeBSD_version >= $3 [ELF_T_$1] = { CONV($1,32,tof), CONV($1,32,tom), CONV($1,64,tof), CONV($1,64,tom) }, ==== //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.320 2007/09/02 09:15:08 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.323 2007/09/09 01:32:36 bmah Exp $ 2000 @@ -31,6 +31,17 @@ 2007 The &os; Documentation Project + + + &tm-attrib.freebsd; + &tm-attrib.amd; + &tm-attrib.ibm; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.sun; + &tm-attrib.general; + + @@ -38,10 +49,10 @@ This document contains the hardware compatibility notes for &os; &release.current;. - It lists - devices known to work on this platform, as well as some notes on - boot-time kernel customization that may be useful when attempting to - configure support for new devices. + It lists the hardware platforms supported by &os;, as well as the + various types of hardware devices (storage controllers, network + interfaces, and so on), along with known working instances of these + devices. @@ -56,7 +67,7 @@ amd64 Since mid-2003 &os;/&arch.amd64; has supported the AMD64 - (Hammer) and Intel EM64T architecture, + (Hammer) and &intel; EM64T architecture, and is now one of the Tier-1 platforms (fully supported architecture), which are expected to be Production Quality with respects to all aspects of the &os; operating system, @@ -72,34 +83,34 @@ - AMD Athlon64 (Clawhammer). + &amd.athlon;64 (Clawhammer). - AMD Opteron (Sledgehammer). + &amd.opteron; (Sledgehammer). - Intel 64-bit Xeon (Nacona). + &intel; 64-bit &xeon; (Nacona). This processor is fabricated on 90nm process technology, and operates - with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets. + with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets. - Intel Pentium 4 Processor supporting Intel EM64T + &intel; &pentium; 4 Processor supporting &intel; EM64T (Prescott). This is fabricated on 90nm process technology, uses FC-LGA775 package, and operates with 3.20F/3.40F/3.60F GHz - and Intel 925X Express chipsets. + and &intel; 925X Express chipsets. The corresponding S-Spec numbers are SL7L9, SL7L8, SL7LA, SL7NZ, SL7PZ, and SL7PX. Note that processors marked as 5xx numbers do not support EM64T. - Intel EM64T is an extended version of IA-32 (x86) and - different from Intel IA-64 (Itanium) architecture, which &os;/ia64 - supports. Some Intel's old documentation refers to Intel EM64T as + &intel; EM64T is an extended version of IA-32 (x86) and + different from &intel; IA-64 (Itanium) architecture, which &os;/ia64 + supports. Some &intel;'s old documentation refers to &intel; EM64T as 64-bit extension technology or IA-32e. The largest tested @@ -128,17 +139,17 @@ list all combinations of equipment supported by &os;. Nevertheless, some general guidelines are presented here. - Almost all i386-compatible processors with a floating point unit + Almost all &i386;-compatible processors with a floating point unit are supported. All - Intel processors beginning with the 80486 are supported, including - the 80486, Pentium, Pentium Pro, Pentium II, Pentium III, - Pentium 4, and variants thereof, such as the Xeon and Celeron - processors. All i386-compatible AMD - processors are also supported, including the Am486, Am5x86, K5, K6 - (and variants), Athlon (including Athlon-MP, Athlon-XP, Athlon-4, - and Athlon Thunderbird), and Duron processors. The AMD + &intel; processors beginning with the 80486 are supported, including + the 80486, &pentium;, &pentium; Pro, &pentium; II, &pentium; III, + &pentium; 4, and variants thereof, such as the &xeon; and &celeron; + processors. All &i386;-compatible AMD + processors are also supported, including the &am486;, &am5x86;, K5, &amd.k6; + (and variants), &amd.athlon; (including Athlon-MP, Athlon-XP, Athlon-4, + and Athlon Thunderbird), and &amd.duron; processors. The AMD Élan SC520 embedded processor is supported. The Transmeta - Crusoe is recognized and supported, as are i386-compatible + Crusoe is recognized and supported, as are &i386;-compatible processors from Cyrix and NexGen. There is a wide variety of motherboards available for this @@ -153,7 +164,7 @@ &a.smp; may yield some clues. &os; will take advantage of HyperThreading (HTT) support on - Intel CPUs that support this feature. A kernel with the + &intel; CPUs that support this feature. A kernel with the options SMP feature enabled will automatically detect the additional logical processors. The default &os; scheduler treats the logical processors the same as @@ -187,7 +198,7 @@ Most modern laptops (as well as many desktops) use the Advanced Configuration and Power Management (ACPI) standard. &os; supports ACPI via the ACPI Component Architecture reference - implementation from Intel, as described in the &man.acpi.4; manual + implementation from &intel;, as described in the &man.acpi.4; manual page. The use of ACPI causes instabilities on some machines and it may be necessary to disable the ACPI driver, which is normally loaded via a kernel module. This may be accomplished by adding @@ -217,9 +228,9 @@ Currently supported processors are the - Itanium and the + &itanium; and the - Itanium 2. + &itanium; 2. Supported chipsets include: @@ -227,10 +238,10 @@ HP zx1 - Intel 460GX + &intel; 460GX - Intel E8870 + &intel; E8870 @@ -250,9 +261,9 @@ pc98 - NEC PC-9801/9821 series with almost all i386-compatible processors, - including 80486, Pentium, Pentium Pro, Pentium II, and variants. - All i386-compatible processors by AMD, Cyrix, IBM, and IDT + NEC PC-9801/9821 series with almost all &i386;-compatible processors, + including 80486, &pentium;, &pentium; Pro, &pentium; II, and variants. + All &i386;-compatible processors by AMD, Cyrix, IBM, and IDT are also supported. NEC FC-9801/9821 series, and NEC SV-98 series @@ -289,11 +300,15 @@ sparc64 This section describes the systems currently known to be supported - by &os; on the UltraSPARC platform. For background information on the + by &os; on the &ultrasparc; platform. For background information on the various hardware designs see the Sun System Handbook. SMP is supported on all systems with more than 1 processor. + In general, &os;/&arch.sparc64; systems must use serial consoles. + While it is possible to boot or install a system using the + OpenFirmware console, the console device is not usable. + If you have a system that is not listed here, it may not have been tested with &os; &release.current;. We encourage you to try it and send a note to the &a.sparc; with your results, @@ -303,105 +318,105 @@ - Blade 100 + &sun.blade; 100 - Blade 150 + &sun.blade; 150 - Enterprise 220R + &sun.enterprise; 220R - Enterprise 250 + &sun.enterprise; 250 - Enterprise 420R + &sun.enterprise; 420R - Enterprise 450 + &sun.enterprise; 450 - Fire V100 + &sun.fire; V100 - Fire V120 + &sun.fire; V120 - Netra t1 105 + &netra; t1 105 - Netra T1 AC200/DC200 + &netra; T1 AC200/DC200 - Netra t 1100 + &netra; t 1100 - Netra t 1120 + &netra; t 1120 - Netra t 1125 + &netra; t 1125 - Netra t 1400/1405 + &netra; t 1400/1405 - Netra 120 + &netra; 120 - Netra X1 + &netra; X1 - SPARCEngine Ultra AXi + &sparcengine; Ultra AXi - SPARCEngine Ultra AXmp + &sparcengine; Ultra AXmp - Ultra 1 (serial console) + &sun.ultra; 1 - Ultra 1E + &sun.ultra; 1E - Ultra 2 + &sun.ultra; 2 - Ultra 5 + &sun.ultra; 5 - Ultra 10 + &sun.ultra; 10 - Ultra 30 + &sun.ultra; 30 - Ultra 60 + &sun.ultra; 60 - Ultra 80 + &sun.ultra; 80 The following systems are partially supported by &os;. In particular - the onboard scsi controller in sbus systems is not supported. + the onboard SCSI controller in sbus systems is not supported. - Enterprise 3500 + &sun.enterprise; 3500 - Enterprise 4500 + &sun.enterprise; 4500 The following systems are not supported by &os;. This may be due - to lack of processor support (UltraSPARC III), due to a quirk in the + to lack of processor support (&ultrasparc; III), due to a quirk in the system design that makes &os; unstable, or due to lack of support for sufficient onboard devices to make &os; generally useful. - All systems containing UltraSPARC III processor(s). + All systems containing &ultrasparc; III processor(s). @@ -754,6 +769,8 @@ [&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver) + &hwlist.rum; + [&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent Technologies WaveLAN/IEEE 802.11b wireless network adapters and workalikes using the Lucent Hermes, Intersil ==== //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1061 2007/08/24 15:18:42 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1062 2007/09/06 19:53:06 brueffer Exp $ 2000 @@ -308,6 +308,9 @@ The &man.apm.4; suspend/resume support has been improved. + The &man.cpufreq.4; CPU frequency control framework is now + enabled in the GENERIC kernel. + Security event auditing is now supported in the &os; kernel, and is enabled by the AUDIT kernel configuration option. The option is enabled in the @@ -315,8 +318,9 @@ in the &man.audit.4; manual page. Support for the Camellia block cipher has been added to the - &os; kernel. It can now be specified as a cipher in IPsec. More - information on Camellia can be found in RFC 4132. + &os; kernel. It can now be specified as a cipher in &man.ipsec.4; + and &man.geli.8;. More information on Camellia can be found in + RFC 4132. The options COMPAT_43 kernel configuration option has been deemed unnecessary and has been @@ -934,6 +938,10 @@ have been included in the GENERIC kernel by default. + [&arch.amd64;, &arch.i386;] The &man.zyd.4; driver + has been added. It provides support for ZyDAS ZD1211/ZD1211B USB + IEEE 802.11 b/g wireless network devices. + The network interface groups feature has been imported from OpenBSD. This feature allows an administrator to, for example, apply firewall rules to an entire group of @@ -1121,9 +1129,13 @@ The &man.ng.ether.4; Netgraph node no longer overwrites the MAC address of outgoing frames by default. &merged; + The &man.ng.h4.4; Netgraph node is now MPSAFE. + The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged; + The &man.ng.ppp.4; Netgraph node is now MPSAFE. &merged; + A new &man.ng.pred1.4; Netgraph node type has been added to implement Predictor-1 PPP compression. &merged; @@ -1536,10 +1548,6 @@ The &man.bsnmpd.1; utility now supports the Host Resources MIB described in RFC 2790. &merged; - &man.cached.8; has been added. It is a daemon that caches - the results of nsswitch lookups (such as those to the password, - group, and services databases) for improved performance. - The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the file that the link points to. &merged; @@ -1881,6 +1889,10 @@ These lines need to have the word auth replaced with the word account. + &man.nscd.8; has been added. It is a daemon that caches + the results of nsswitch lookups (such as those to the password, + group, and services databases) for improved performance. + The &man.periodic.8; daily script now supports display of the status of &man.gmirror.8;, &man.graid3.8;, &man.gstripe.8;, and &man.gconcat.8; devices. ==== //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.97 2007/09/02 09:11:10 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.98 2007/09/07 15:30:35 brueffer Exp $ # # @@ -105,6 +105,7 @@ rc i386 rr232x i386,amd64 rue i386,pc98,amd64 +rum i386,amd64 safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 sf i386,pc98,ia64,amd64 ==== //depot/projects/ethng/src/sbin/camcontrol/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.16 2004/05/14 13:31:21 cognet Exp $ +# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.17 2007/09/08 20:24:12 ken Exp $ PROG= camcontrol SRCS= camcontrol.c util.c @@ -12,8 +12,8 @@ .else WARNS?= 6 .endif -DPADD= ${LIBCAM} ${LIBSBUF} -LDADD= -lcam -lsbuf +DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} +LDADD= -lcam -lsbuf -lutil MAN= camcontrol.8 .include ==== //depot/projects/ethng/src/sbin/camcontrol/camcontrol.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998, 1999, 2000, 2002, 2005, 2006 Kenneth D. Merry. +.\" Copyright (c) 1998, 1999, 2000, 2002, 2005, 2006, 2007 Kenneth D. Merry. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.43 2006/09/18 11:55:08 ru Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.44 2007/09/08 20:24:12 ken Exp $ .\" .Dd August 21, 2006 .Dt CAMCONTROL 8 @@ -66,6 +66,16 @@ .Op Fl l .Op Fl r Ar reporttype .Nm +.Ic readcap +.Op device id +.Op generic args +.Op Fl b +.Op Fl h +.Op Fl H +.Op Fl N +.Op Fl q +.Op Fl s +.Nm .Ic start .Op device id .Op generic args @@ -304,6 +314,46 @@ .Nm will try to print out LUN numbers in a reasonable format. It can understand the peripheral, flat, LUN and extended LUN formats. +.It Ic readcap +Send the SCSI READ CAPACITY command to the given device and display +the results. +If the device is larger than 2TB, the SCSI READ CAPACITY (16) service +action will be sent to obtain the full size of the device. +By default, +.Nm +will print out the last logical block of the device, and the blocksize of +the device in bytes. +To modify the output format, use the following options: +.Bl -tag -width 5n +.It Fl b +Just print out the blocksize, not the last block or device size. +This cannot be used with +.Fl N +or +.Fl s . +.It Fl h +Print out the device size in human readable (base 2, 1K == 1024) format. +This implies +.Fl N +and cannot be used with +.Fl q +or +.Fl b . +.It Fl H +Print out the device size in human readable (base 10, 1K == 1000) format. +.It Fl N +Print out the number of blocks in the device instead of the last logical +block. +.It Fl q +Quiet, print out the numbers only (separated by a comma if +.Fl b +or +.Fl s +are not specified). +.It Fl s +Print out the last logical block or the size of the device only, and omit +the blocksize. +.El .It Ic start Send the SCSI Start/Stop Unit (0x1B) command to the given device with the start bit set. ==== //depot/projects/ethng/src/sbin/camcontrol/camcontrol.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006 Kenneth D. Merry + * Copyright (c) 1997-2007 Kenneth D. Merry * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.57 2007/01/28 21:34:07 wilko Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.58 2007/09/08 20:24:12 ken Exp $"); #include #include @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -69,7 +70,8 @@ CAM_CMD_TAG = 0x0000000e, CAM_CMD_RATE = 0x0000000f, CAM_CMD_DETACH = 0x00000010, - CAM_CMD_REPORTLUNS = 0x00000011 + CAM_CMD_REPORTLUNS = 0x00000011, + CAM_CMD_READCAP = 0x00000012 } cam_cmdmask; typedef enum { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 9 07:49:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74EB516A46D; Sun, 9 Sep 2007 07:49:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B2E516A41A for ; Sun, 9 Sep 2007 07:49:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30FB313C49D for ; Sun, 9 Sep 2007 07:49:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l897n1v3074957 for ; Sun, 9 Sep 2007 07:49:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l897mxQ9074952 for perforce@freebsd.org; Sun, 9 Sep 2007 07:48:59 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Sep 2007 07:48:59 GMT Message-Id: <200709090748.l897mxQ9074952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 07:49:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=126215 Change 126215 by kmacy@kmacy:storage:toestack on 2007/09/09 07:48:38 IFC 126210 4-port fixes, firmware update, and use after free fix Affected files ... .. //depot/projects/toestack/etc/defaults/rc.conf#2 integrate .. //depot/projects/toestack/etc/rc.d/Makefile#2 integrate .. //depot/projects/toestack/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/toestack/etc/services#2 integrate .. //depot/projects/toestack/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/toestack/lib/libelf/elf_update.3#2 integrate .. //depot/projects/toestack/lib/libelf/elf_update.c#2 integrate .. //depot/projects/toestack/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/toestack/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/toestack/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/toestack/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/toestack/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/toestack/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/toestack/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/toestack/share/man/man4/rum.4#2 integrate .. //depot/projects/toestack/share/man/man4/wlan.4#2 integrate .. //depot/projects/toestack/share/man/man4/zyd.4#2 integrate .. //depot/projects/toestack/share/man/man5/Makefile#2 integrate .. //depot/projects/toestack/share/man/man5/ar.5#1 branch .. //depot/projects/toestack/share/man/man5/elf.5#2 integrate .. //depot/projects/toestack/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/toestack/sys/amd64/conf/MULTIQ#2 edit .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#3 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#2 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#2 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/toestack/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/toestack/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/toestack/sys/net/rtsock.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/toestack/sys/netinet/sctputil.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctputil.h#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/toestack/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/toestack/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/toestack/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/toestack/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/toestack/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/toestack/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/toestack/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/toestack/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sbus/sbusreg.h#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/toestack/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/toestack/usr.sbin/periodic/periodic.8#2 integrate .. //depot/projects/toestack/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate Differences ... ==== //depot/projects/toestack/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -154,6 +154,8 @@ pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_program="/sbin/pflogd" # where the pflogd program lives pflog_flags="" # additional flags for pflogd +ftpproxy_enable="NO" # Set to YES to enable ftp-proxy(8) for pf +ftpproxy_flags="" # additional flags for ftp-proxy(8) pfsync_enable="NO" # Expose pf state to other hosts for syncing pfsync_syncdev="" # Interface for pfsync to work through pfsync_syncpeer="" # IP address of pfsync peer host ==== //depot/projects/toestack/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.82 2007/08/17 07:58:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $ .include @@ -11,7 +11,7 @@ devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ - fsck ftpd \ + fsck ftp-proxy ftpd \ gbde geli geli2 \ hcsecd \ hostapd hostid hostname \ ==== //depot/projects/toestack/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.110 2007/05/20 03:57:47 grog Exp $ +# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2186,6 +2186,8 @@ sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp +iscsi-target 3260/tcp # iSCSI port +iscsi-target 3260/udp # iSCSI port ccmail 3264/tcp #cc:mail/lotus ccmail 3264/udp #cc:mail/lotus dec-notes 3333/tcp #DEC Notes @@ -2326,6 +2328,10 @@ montage-lm 6147/udp #Montage License Manager ricardo-lm 6148/tcp #Ricardo North America License Manager ricardo-lm 6148/udp #Ricardo North America License Manager +sge_qmaster 6444/tcp #Grid Engine Qmaster Service +sge_qmaster 6444/udp #Grid Engine Qmaster Service +sge_execd 6445/tcp #Grid Engine Execution Service +sge_execd 6445/upd #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp ircd 6667/tcp #Internet Relay Chat (unoffical) ==== //depot/projects/toestack/lib/libc/sys/kqueue.2#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.45 2006/11/20 22:20:04 jhb Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ .\" -.Dd August 25, 2006 +.Dd September 6, 2007 .Dt KQUEUE 2 .Os .Sh NAME @@ -542,11 +542,6 @@ system and this manual page were written by .An Jonathan Lemon Aq jlemon@FreeBSD.org . .Sh BUGS -It is currently not possible to watch a -.Xr vnode 9 -that resides on anything but -a UFS file system. -.Pp The .Dv EVFILT_NETDEV filter is currently only implemented for devices that use the ==== //depot/projects/toestack/lib/libelf/elf_update.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.3 2006/12/25 02:24:38 jkoshy Exp $ +.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $ .\" -.Dd December 16, 2006 +.Dd September 08, 2007 .Os .Dt ELF_UPDATE 3 .Sh NAME @@ -228,6 +228,11 @@ .Ar elf contained section descriptors that were incorrectly aligned or were too small for their data. +.It Bq Er ELF_E_LAYOUT +The flag +.Dv ELF_F_LAYOUT +was set on the Elf descriptor and the section header table overlapped +an extent in the object mapped by a section descriptor. .It Bq Er ELF_E_MODE An .Dv ELF_C_WRITE ==== //depot/projects/toestack/lib/libelf/elf_update.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.3 2007/09/08 08:20:12 jkoshy Exp $"); #include #include @@ -68,7 +68,10 @@ */ /* - * Compute the extents of a section, by looking at the. + * Compute the extents of a section, by looking at the data + * descriptors associated with it. The function returns zero if an + * error was detected. `*rc' holds the maximum file extent seen so + * far. */ static int _libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t *rc) @@ -267,7 +270,7 @@ { int ec; off_t nrc; - size_t sh_type; + size_t sh_type, shdr_start, shdr_end; Elf_Scn *s, *ts; ec = e->e_class; @@ -311,6 +314,29 @@ rc = s->s_offset + s->s_size; } + /* + * If the application is controlling file layout, check for an + * overlap between this section's extents and the SHDR table. + */ + if (e->e_flags & ELF_F_LAYOUT) { + + if (e->e_class == ELFCLASS32) + shdr_start = e->e_u.e_elf.e_ehdr.e_ehdr32->e_shoff; + else + shdr_start = e->e_u.e_elf.e_ehdr.e_ehdr64->e_shoff; + + shdr_end = shdr_start + _libelf_fsize(ELF_T_SHDR, e->e_class, + e->e_version, e->e_u.e_elf.e_nscn); + + STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) { + if (s->s_offset >= shdr_end || + s->s_offset + s->s_size <= shdr_start) + continue; + LIBELF_SET_ERROR(LAYOUT, 0); + return ((off_t) -1); + } + } + assert(nrc == rc); return (rc); @@ -446,18 +472,17 @@ /* * Compute the space taken up by the section header table, if - * one is needed. + * one is needed. If ELF_F_LAYOUT is asserted, the + * application may have placed the section header table in + * between existing sections, so the net size of the file need + * not increase due to the presence of the section header + * table. */ if (shnum) { fsz = _libelf_fsize(ELF_T_SHDR, ec, eh_version, (size_t) 1); align = _libelf_falign(ELF_T_SHDR, ec); if (e->e_flags & ELF_F_LAYOUT) { - if (rc > shoff) { - LIBELF_SET_ERROR(HEADER, 0); - return ((off_t) -1); - } - if (shoff % align) { LIBELF_SET_ERROR(LAYOUT, 0); return ((off_t) -1); @@ -465,7 +490,8 @@ } else shoff = roundup(rc, align); - rc = shoff + fsz * shnum; + if (shoff + fsz * shnum > (size_t) rc) + rc = shoff + fsz * shnum; } else shoff = 0; @@ -619,7 +645,7 @@ _libelf_write_elf(Elf *e, off_t newsize) { int ec; - off_t rc; + off_t maxrc, rc; size_t fsz, msz, phnum, shnum; uint64_t phoff, shoff; void *ehdr; @@ -728,16 +754,17 @@ goto error; /* - * Write out the section header table, if required. + * Write out the section header table, if required. Note that + * if flag ELF_F_LAYOUT has been set the section header table + * could reside in between byte ranges mapped by section + * descriptors. */ - if (shnum != 0 && shoff != 0) { - assert((unsigned) rc <= shoff); - if ((uint64_t) rc < shoff) (void) memset(newfile + rc, LIBELF_PRIVATE(fillchar), shoff - rc); + maxrc = rc; rc = shoff; assert(rc % _libelf_falign(ELF_T_SHDR, ec) == 0); @@ -763,11 +790,11 @@ rc += fsz; } + + if (maxrc > rc) + rc = maxrc; } - /* - */ - assert(rc == newsize); /* ==== //depot/projects/toestack/lib/libelf/libelf_convert.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Joseph Koshy + * Copyright (c) 2006,2007 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.3 2007/09/09 02:10:53 jkoshy Exp $"); #include #include @@ -605,15 +605,14 @@ `ifdef(`IGNORE_'$1$2, `.$3$2 = NULL', `ifdef(`BASE_'$1, - `ifdef(`IGNORE_'$1, - `.$3$2 = NULL', - `.$3$2 = libelf_cvt_$1_$3')', + `.$3$2 = libelf_cvt_$1_$3', `ifdef(`SIZEDEP_'$1, `.$3$2 = libelf_cvt_$1$2_$3', `.$3$2 = libelf_cvt$2_$1_$3')')')') define(`CONVERTER_NAME', - `#if __FreeBSD_version >= $3 + `ifdef(`IGNORE_'$1,`', + `#if __FreeBSD_version >= $3 [ELF_T_$1] = { CONV($1,32,tof), CONV($1,32,tom), CONV($1,64,tof), CONV($1,64,tom) }, ==== //depot/projects/toestack/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.320 2007/09/02 09:15:08 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.323 2007/09/09 01:32:36 bmah Exp $ 2000 @@ -31,6 +31,17 @@ 2007 The &os; Documentation Project + + + &tm-attrib.freebsd; + &tm-attrib.amd; + &tm-attrib.ibm; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.sun; + &tm-attrib.general; + + @@ -38,10 +49,10 @@ This document contains the hardware compatibility notes for &os; &release.current;. - It lists - devices known to work on this platform, as well as some notes on - boot-time kernel customization that may be useful when attempting to - configure support for new devices. + It lists the hardware platforms supported by &os;, as well as the + various types of hardware devices (storage controllers, network + interfaces, and so on), along with known working instances of these + devices. @@ -56,7 +67,7 @@ amd64 Since mid-2003 &os;/&arch.amd64; has supported the AMD64 - (Hammer) and Intel EM64T architecture, + (Hammer) and &intel; EM64T architecture, and is now one of the Tier-1 platforms (fully supported architecture), which are expected to be Production Quality with respects to all aspects of the &os; operating system, @@ -72,34 +83,34 @@ - AMD Athlon64 (Clawhammer). + &amd.athlon;64 (Clawhammer). - AMD Opteron (Sledgehammer). + &amd.opteron; (Sledgehammer). - Intel 64-bit Xeon (Nacona). + &intel; 64-bit &xeon; (Nacona). This processor is fabricated on 90nm process technology, and operates - with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets. + with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets. - Intel Pentium 4 Processor supporting Intel EM64T + &intel; &pentium; 4 Processor supporting &intel; EM64T (Prescott). This is fabricated on 90nm process technology, uses FC-LGA775 package, and operates with 3.20F/3.40F/3.60F GHz - and Intel 925X Express chipsets. + and &intel; 925X Express chipsets. The corresponding S-Spec numbers are SL7L9, SL7L8, SL7LA, SL7NZ, SL7PZ, and SL7PX. Note that processors marked as 5xx numbers do not support EM64T. - Intel EM64T is an extended version of IA-32 (x86) and - different from Intel IA-64 (Itanium) architecture, which &os;/ia64 - supports. Some Intel's old documentation refers to Intel EM64T as + &intel; EM64T is an extended version of IA-32 (x86) and + different from &intel; IA-64 (Itanium) architecture, which &os;/ia64 + supports. Some &intel;'s old documentation refers to &intel; EM64T as 64-bit extension technology or IA-32e. The largest tested @@ -128,17 +139,17 @@ list all combinations of equipment supported by &os;. Nevertheless, some general guidelines are presented here. - Almost all i386-compatible processors with a floating point unit + Almost all &i386;-compatible processors with a floating point unit are supported. All - Intel processors beginning with the 80486 are supported, including - the 80486, Pentium, Pentium Pro, Pentium II, Pentium III, - Pentium 4, and variants thereof, such as the Xeon and Celeron - processors. All i386-compatible AMD - processors are also supported, including the Am486, Am5x86, K5, K6 - (and variants), Athlon (including Athlon-MP, Athlon-XP, Athlon-4, - and Athlon Thunderbird), and Duron processors. The AMD + &intel; processors beginning with the 80486 are supported, including + the 80486, &pentium;, &pentium; Pro, &pentium; II, &pentium; III, + &pentium; 4, and variants thereof, such as the &xeon; and &celeron; + processors. All &i386;-compatible AMD + processors are also supported, including the &am486;, &am5x86;, K5, &amd.k6; + (and variants), &amd.athlon; (including Athlon-MP, Athlon-XP, Athlon-4, + and Athlon Thunderbird), and &amd.duron; processors. The AMD Élan SC520 embedded processor is supported. The Transmeta - Crusoe is recognized and supported, as are i386-compatible + Crusoe is recognized and supported, as are &i386;-compatible processors from Cyrix and NexGen. There is a wide variety of motherboards available for this @@ -153,7 +164,7 @@ &a.smp; may yield some clues. &os; will take advantage of HyperThreading (HTT) support on - Intel CPUs that support this feature. A kernel with the + &intel; CPUs that support this feature. A kernel with the options SMP feature enabled will automatically detect the additional logical processors. The default &os; scheduler treats the logical processors the same as @@ -187,7 +198,7 @@ Most modern laptops (as well as many desktops) use the Advanced Configuration and Power Management (ACPI) standard. &os; supports ACPI via the ACPI Component Architecture reference - implementation from Intel, as described in the &man.acpi.4; manual + implementation from &intel;, as described in the &man.acpi.4; manual page. The use of ACPI causes instabilities on some machines and it may be necessary to disable the ACPI driver, which is normally loaded via a kernel module. This may be accomplished by adding @@ -217,9 +228,9 @@ Currently supported processors are the - Itanium and the + &itanium; and the - Itanium 2. + &itanium; 2. Supported chipsets include: @@ -227,10 +238,10 @@ HP zx1 - Intel 460GX + &intel; 460GX - Intel E8870 + &intel; E8870 @@ -250,9 +261,9 @@ pc98 - NEC PC-9801/9821 series with almost all i386-compatible processors, - including 80486, Pentium, Pentium Pro, Pentium II, and variants. - All i386-compatible processors by AMD, Cyrix, IBM, and IDT + NEC PC-9801/9821 series with almost all &i386;-compatible processors, + including 80486, &pentium;, &pentium; Pro, &pentium; II, and variants. + All &i386;-compatible processors by AMD, Cyrix, IBM, and IDT are also supported. NEC FC-9801/9821 series, and NEC SV-98 series @@ -289,11 +300,15 @@ sparc64 This section describes the systems currently known to be supported - by &os; on the UltraSPARC platform. For background information on the + by &os; on the &ultrasparc; platform. For background information on the various hardware designs see the Sun System Handbook. SMP is supported on all systems with more than 1 processor. + In general, &os;/&arch.sparc64; systems must use serial consoles. + While it is possible to boot or install a system using the + OpenFirmware console, the console device is not usable. + If you have a system that is not listed here, it may not have been tested with &os; &release.current;. We encourage you to try it and send a note to the &a.sparc; with your results, @@ -303,105 +318,105 @@ - Blade 100 + &sun.blade; 100 - Blade 150 + &sun.blade; 150 - Enterprise 220R + &sun.enterprise; 220R - Enterprise 250 + &sun.enterprise; 250 - Enterprise 420R + &sun.enterprise; 420R - Enterprise 450 + &sun.enterprise; 450 - Fire V100 + &sun.fire; V100 - Fire V120 + &sun.fire; V120 - Netra t1 105 + &netra; t1 105 - Netra T1 AC200/DC200 + &netra; T1 AC200/DC200 - Netra t 1100 + &netra; t 1100 - Netra t 1120 + &netra; t 1120 - Netra t 1125 + &netra; t 1125 - Netra t 1400/1405 + &netra; t 1400/1405 - Netra 120 + &netra; 120 - Netra X1 + &netra; X1 - SPARCEngine Ultra AXi + &sparcengine; Ultra AXi - SPARCEngine Ultra AXmp + &sparcengine; Ultra AXmp - Ultra 1 (serial console) + &sun.ultra; 1 - Ultra 1E + &sun.ultra; 1E - Ultra 2 + &sun.ultra; 2 - Ultra 5 + &sun.ultra; 5 - Ultra 10 + &sun.ultra; 10 - Ultra 30 + &sun.ultra; 30 - Ultra 60 + &sun.ultra; 60 - Ultra 80 + &sun.ultra; 80 The following systems are partially supported by &os;. In particular - the onboard scsi controller in sbus systems is not supported. + the onboard SCSI controller in sbus systems is not supported. - Enterprise 3500 + &sun.enterprise; 3500 - Enterprise 4500 + &sun.enterprise; 4500 The following systems are not supported by &os;. This may be due - to lack of processor support (UltraSPARC III), due to a quirk in the + to lack of processor support (&ultrasparc; III), due to a quirk in the system design that makes &os; unstable, or due to lack of support for sufficient onboard devices to make &os; generally useful. - All systems containing UltraSPARC III processor(s). + All systems containing &ultrasparc; III processor(s). @@ -754,6 +769,8 @@ [&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver) + &hwlist.rum; + [&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent Technologies WaveLAN/IEEE 802.11b wireless network adapters and workalikes using the Lucent Hermes, Intersil ==== //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1061 2007/08/24 15:18:42 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1062 2007/09/06 19:53:06 brueffer Exp $ 2000 @@ -308,6 +308,9 @@ The &man.apm.4; suspend/resume support has been improved. + The &man.cpufreq.4; CPU frequency control framework is now + enabled in the GENERIC kernel. + Security event auditing is now supported in the &os; kernel, and is enabled by the AUDIT kernel configuration option. The option is enabled in the @@ -315,8 +318,9 @@ in the &man.audit.4; manual page. Support for the Camellia block cipher has been added to the - &os; kernel. It can now be specified as a cipher in IPsec. More - information on Camellia can be found in RFC 4132. + &os; kernel. It can now be specified as a cipher in &man.ipsec.4; + and &man.geli.8;. More information on Camellia can be found in + RFC 4132. The options COMPAT_43 kernel configuration option has been deemed unnecessary and has been @@ -934,6 +938,10 @@ have been included in the GENERIC kernel by default. + [&arch.amd64;, &arch.i386;] The &man.zyd.4; driver + has been added. It provides support for ZyDAS ZD1211/ZD1211B USB + IEEE 802.11 b/g wireless network devices. + The network interface groups feature has been imported from OpenBSD. This feature allows an administrator to, for example, apply firewall rules to an entire group of @@ -1121,9 +1129,13 @@ The &man.ng.ether.4; Netgraph node no longer overwrites the MAC address of outgoing frames by default. &merged; + The &man.ng.h4.4; Netgraph node is now MPSAFE. + The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged; + The &man.ng.ppp.4; Netgraph node is now MPSAFE. &merged; + A new &man.ng.pred1.4; Netgraph node type has been added to implement Predictor-1 PPP compression. &merged; @@ -1536,10 +1548,6 @@ The &man.bsnmpd.1; utility now supports the Host Resources MIB described in RFC 2790. &merged; - &man.cached.8; has been added. It is a daemon that caches - the results of nsswitch lookups (such as those to the password, - group, and services databases) for improved performance. - The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the file that the link points to. &merged; @@ -1881,6 +1889,10 @@ These lines need to have the word auth replaced with the word account. + &man.nscd.8; has been added. It is a daemon that caches + the results of nsswitch lookups (such as those to the password, + group, and services databases) for improved performance. + The &man.periodic.8; daily script now supports display of the status of &man.gmirror.8;, &man.graid3.8;, &man.gstripe.8;, and &man.gconcat.8; devices. ==== //depot/projects/toestack/release/doc/share/misc/dev.archlist.txt#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.97 2007/09/02 09:11:10 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.98 2007/09/07 15:30:35 brueffer Exp $ # # @@ -105,6 +105,7 @@ rc i386 rr232x i386,amd64 rue i386,pc98,amd64 +rum i386,amd64 safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 sf i386,pc98,ia64,amd64 ==== //depot/projects/toestack/sbin/camcontrol/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.16 2004/05/14 13:31:21 cognet Exp $ +# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.17 2007/09/08 20:24:12 ken Exp $ PROG= camcontrol SRCS= camcontrol.c util.c @@ -12,8 +12,8 @@ .else WARNS?= 6 .endif -DPADD= ${LIBCAM} ${LIBSBUF} -LDADD= -lcam -lsbuf +DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} +LDADD= -lcam -lsbuf -lutil MAN= camcontrol.8 .include ==== //depot/projects/toestack/sbin/camcontrol/camcontrol.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998, 1999, 2000, 2002, 2005, 2006 Kenneth D. Merry. +.\" Copyright (c) 1998, 1999, 2000, 2002, 2005, 2006, 2007 Kenneth D. Merry. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.43 2006/09/18 11:55:08 ru Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.44 2007/09/08 20:24:12 ken Exp $ .\" .Dd August 21, 2006 .Dt CAMCONTROL 8 @@ -66,6 +66,16 @@ .Op Fl l .Op Fl r Ar reporttype .Nm +.Ic readcap +.Op device id +.Op generic args +.Op Fl b +.Op Fl h +.Op Fl H +.Op Fl N +.Op Fl q +.Op Fl s +.Nm .Ic start .Op device id .Op generic args @@ -304,6 +314,46 @@ .Nm will try to print out LUN numbers in a reasonable format. It can understand the peripheral, flat, LUN and extended LUN formats. +.It Ic readcap +Send the SCSI READ CAPACITY command to the given device and display +the results. +If the device is larger than 2TB, the SCSI READ CAPACITY (16) service +action will be sent to obtain the full size of the device. +By default, +.Nm +will print out the last logical block of the device, and the blocksize of +the device in bytes. +To modify the output format, use the following options: +.Bl -tag -width 5n +.It Fl b +Just print out the blocksize, not the last block or device size. +This cannot be used with +.Fl N +or +.Fl s . +.It Fl h +Print out the device size in human readable (base 2, 1K == 1024) format. +This implies +.Fl N +and cannot be used with +.Fl q +or +.Fl b . +.It Fl H +Print out the device size in human readable (base 10, 1K == 1000) format. +.It Fl N +Print out the number of blocks in the device instead of the last logical +block. +.It Fl q +Quiet, print out the numbers only (separated by a comma if +.Fl b +or +.Fl s +are not specified). +.It Fl s +Print out the last logical block or the size of the device only, and omit +the blocksize. +.El .It Ic start Send the SCSI Start/Stop Unit (0x1B) command to the given device with the start bit set. ==== //depot/projects/toestack/sbin/camcontrol/camcontrol.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006 Kenneth D. Merry + * Copyright (c) 1997-2007 Kenneth D. Merry * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.57 2007/01/28 21:34:07 wilko Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.58 2007/09/08 20:24:12 ken Exp $"); #include #include @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -69,7 +70,8 @@ CAM_CMD_TAG = 0x0000000e, CAM_CMD_RATE = 0x0000000f, CAM_CMD_DETACH = 0x00000010, - CAM_CMD_REPORTLUNS = 0x00000011 + CAM_CMD_REPORTLUNS = 0x00000011, + CAM_CMD_READCAP = 0x00000012 } cam_cmdmask; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 9 07:50:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 841E416A46E; Sun, 9 Sep 2007 07:50:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50F6816A420 for ; Sun, 9 Sep 2007 07:50:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4780D13C4A7 for ; Sun, 9 Sep 2007 07:50:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l897o34K075129 for ; Sun, 9 Sep 2007 07:50:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l897o2LB075122 for perforce@freebsd.org; Sun, 9 Sep 2007 07:50:02 GMT (envelope-from jb@freebsd.org) Date: Sun, 9 Sep 2007 07:50:02 GMT Message-Id: <200709090750.l897o2LB075122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 126216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 07:50:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=126216 Change 126216 by jb@jb_freebsd7 on 2007/09/09 07:49:54 IFOpenSolaris. (not much has changed in the OpenSolaris/DTrace world during my sabatical) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#8 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#8 (text) ==== From owner-p4-projects@FreeBSD.ORG Sun Sep 9 16:35:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B664416A421; Sun, 9 Sep 2007 16:35:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83B3C16A41A for ; Sun, 9 Sep 2007 16:35:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63A5613C478 for ; Sun, 9 Sep 2007 16:35:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89GZhNE045830 for ; Sun, 9 Sep 2007 16:35:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89GZhHk045827 for perforce@freebsd.org; Sun, 9 Sep 2007 16:35:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 9 Sep 2007 16:35:43 GMT Message-Id: <200709091635.l89GZhHk045827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 126229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 16:35:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=126229 Change 126229 by gonzo@gonzo_jeeves on 2007/09/09 16:35:08 o Implement bus_dmamap_load_mbuf_sg Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#6 (text+ko) ==== @@ -672,8 +672,37 @@ { int error = 0; - panic("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__); + M_ASSERTPKTHDR(m0); + + flags |= BUS_DMA_NOWAIT; + *nsegs = -1; + map->flags &= ~DMAMAP_TYPE_MASK; + map->flags |= DMAMAP_MBUF | DMAMAP_COHERENT; + map->buffer = m0; + map->len = 0; + + if (m0->m_pkthdr.len <= dmat->maxsize) { + vm_offset_t lastaddr = 0; + struct mbuf *m; + + for (m = m0; m != NULL && error == 0; m = m->m_next) { + if (m->m_len > 0) { + error = bus_dmamap_load_buffer(dmat, segs, map, + m->m_data, m->m_len, + pmap_kernel(), flags, &lastaddr, nsegs); + map->len += m->m_len; + } + } + } else { + error = EINVAL; + } + + ++*nsegs; + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, *nsegs); + return (error); + } /* From owner-p4-projects@FreeBSD.ORG Sun Sep 9 18:00:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C527416A46C; Sun, 9 Sep 2007 18:00:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82C8716A468 for ; Sun, 9 Sep 2007 18:00:36 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 639CB13C461 for ; Sun, 9 Sep 2007 18:00:36 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89I0aWm060619 for ; Sun, 9 Sep 2007 18:00:36 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89I0aM5060616 for perforce@freebsd.org; Sun, 9 Sep 2007 18:00:36 GMT (envelope-from cnst@FreeBSD.org) Date: Sun, 9 Sep 2007 18:00:36 GMT Message-Id: <200709091800.l89I0aM5060616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 18:00:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=126230 Change 126230 by cnst@dale on 2007/09/09 18:00:16 put in a hack for supporting "Sysctl internal magic", and now hw.sensors tree magically works in sysctl(8)! dale# sysctl hw.sensors.{lm0.volt{0,1,2,3},cpu{0,1}} hw.sensors.lm0.volt0: 1.23 VDC (VCore) hw.sensors.lm0.volt1: 12.30 VDC (+12V) hw.sensors.lm0.volt2: 3.33 VDC (+3.3V) hw.sensors.lm0.volt3: 3.31 VDC (+3.3V) hw.sensors.cpu0.temp0: 28.00 degC hw.sensors.cpu1.temp0: 28.00 degC dale# (All other utilities continue working using a cross-platform sysctl(3) interface, compatible with OpenBSD.) Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#13 edit .. //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#4 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#12 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#13 $ */ /* $FreeBSD$ */ /* $OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $ */ /* $OpenBSD: kern_sysctl.c,v 1.154 2007/06/01 17:29:10 beck Exp $ */ @@ -58,6 +58,11 @@ TAILQ_HEAD(, sensor_task) tasklist = TAILQ_HEAD_INITIALIZER(tasklist); +#ifndef NOSYSCTL8HACK +void sensor_sysctl8magic_install(struct ksensordev *); +void sensor_sysctl8magic_deinstall(struct ksensordev *); +#endif + void sensordev_install(struct ksensordev *sensdev) { @@ -77,6 +82,10 @@ } sensordev_count++; mtx_unlock(&Giant); + +#ifndef NOSYSCTL8HACK + sensor_sysctl8magic_install(sensdev); +#endif } void @@ -122,6 +131,10 @@ sensordev_count--; SLIST_REMOVE(&sensordev_list, sensdev, ksensordev, list); mtx_unlock(&Giant); + +#ifndef NOSYSCTL8HACK + sensor_sysctl8magic_deinstall(sensdev); +#endif } void @@ -270,9 +283,66 @@ int sysctl_handle_sensor(SYSCTL_HANDLER_ARGS); int sysctl_sensors_handler(SYSCTL_HANDLER_ARGS); + +#ifndef NOSYSCTL8HACK + +SYSCTL_NODE(_hw, OID_AUTO, sensors, CTLFLAG_RD, NULL, + "Hardware Sensors sysctl internal magic"); +SYSCTL_NODE(_hw, HW_SENSORS, _sensors, CTLFLAG_RD, sysctl_sensors_handler, + "Hardware Sensors XP MIB interface"); + +#else /* NOSYSCTL8HACK */ + SYSCTL_NODE(_hw, HW_SENSORS, sensors, CTLFLAG_RD, sysctl_sensors_handler, "Hardware Sensors"); +#endif /* !NOSYSCTL8HACK */ + + +#ifndef NOSYSCTL8HACK + +/* + * XXX: + * FreeBSD's sysctl(9) .oid_handler functionality is not accustomed + * for the CTLTYPE_NODE handler to handle the undocumented sysctl + * magic calls. As soon as such functionality is developed, + * sysctl_sensors_handler() should be converted to handle all such + * calls, and these sysctl_add_oid(9) calls should be removed + * "with a big axe". This whole sysctl_add_oid(9) business is solely + * to please sysctl(8). + */ + +void +sensor_sysctl8magic_install(struct ksensordev *sensdev) +{ + struct sysctl_oid_list *ol; + struct sysctl_ctx_list *cl = &sensdev->clist; + struct ksensor *s; + struct ksensors_head *sh = &sensdev->sensors_list; + + sysctl_ctx_init(cl); + ol = SYSCTL_CHILDREN(SYSCTL_ADD_NODE(cl, &SYSCTL_NODE_CHILDREN(_hw, + sensors), sensdev->num, sensdev->xname, CTLFLAG_RD, NULL, "")); + SLIST_FOREACH(s, sh, list) { + char n[32]; + + snprintf(n, sizeof(n), "%s%d", sensor_type_s[s->type], s->numt); + SYSCTL_ADD_PROC(cl, ol, OID_AUTO, n, CTLTYPE_STRUCT | + CTLFLAG_RD, s, 0, sysctl_handle_sensor, "S,sensor", ""); + } +} + +void +sensor_sysctl8magic_deinstall(struct ksensordev *sensdev) +{ + struct sysctl_ctx_list *cl = &sensdev->clist; + + sysctl_ctx_free(cl); +} + +#endif /* !NOSYSCTL8HACK */ + + int sysctl_handle_sensordev(SYSCTL_HANDLER_ARGS) { ==== //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#3 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#4 $ */ /* $FreeBSD$ */ /* $OpenBSD: sensors.h,v 1.23 2007/03/22 16:55:31 deraadt Exp $ */ @@ -53,7 +53,6 @@ SENSOR_MAX_TYPES }; -#ifndef _KERNEL static const char * const sensor_type_s[SENSOR_MAX_TYPES + 1] = { "temp", "fan", @@ -72,7 +71,6 @@ "timedelta", "undefined" }; -#endif /* !_KERNEL */ #define SENSOR_DRIVE_EMPTY 1 #define SENSOR_DRIVE_READY 2 @@ -123,6 +121,9 @@ #ifdef _KERNEL #include +#ifndef NOSYSCTL8HACK + #include +#endif /* Sensor data */ struct ksensor { @@ -145,6 +146,12 @@ int maxnumt[SENSOR_MAX_TYPES]; int sensors_count; struct ksensors_head sensors_list; +#ifndef NOSYSCTL8HACK + struct sysctl_ctx_list clist; /* XXX: sysctl(9) .oid_handler() for + * CTLTYPE_NODE type doesn't support + * the undocumented sysctl magic. + */ +#endif /* !NOSYSCTL8HACK */ }; /* struct ksensordev */ From owner-p4-projects@FreeBSD.ORG Sun Sep 9 18:43:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B58116A468; Sun, 9 Sep 2007 18:43:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1EC316A421 for ; Sun, 9 Sep 2007 18:43:33 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9028513C469 for ; Sun, 9 Sep 2007 18:43:33 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89IhX2g064443 for ; Sun, 9 Sep 2007 18:43:33 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89IhX6o064440 for perforce@freebsd.org; Sun, 9 Sep 2007 18:43:33 GMT (envelope-from cnst@FreeBSD.org) Date: Sun, 9 Sep 2007 18:43:33 GMT Message-Id: <200709091843.l89IhX6o064440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 18:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=126232 Change 126232 by cnst@dale on 2007/09/09 18:42:58 workaround, so that invalid values are not printed before: %sysctl hw.sensors hw.sensors.lm0.volt0: 1.23 VDC (VCore) hw.sensors.lm0.volt1: 12.30 VDC (+12V) hw.sensors.lm0.volt2: 3.33 VDC (+3.3V) hw.sensors.lm0.volt3: 3.31 VDC (+3.3V) hw.sensors.lm0.volt4: -45.19 VDC (-12V) hw.sensors.lm0.volt5: 1.58 VDC hw.sensors.lm0.volt6: 0.10 VDC hw.sensors.lm0.volt7: 3.31 VDC (3.3VSB) hw.sensors.lm0.volt8: 1.02 VDC (VBAT) hw.sensors.lm0.temp0: 58.00 degC hw.sensors.lm0.temp1: 23.00 degC hw.sensors.lm0.temp2: -273.15 degC hw.sensors.lm0.fan0: 0 RPM hw.sensors.lm0.fan1: 897 RPM hw.sensors.lm0.fan2: 0 RPM hw.sensors.cpu0.temp0: 27.00 degC hw.sensors.cpu1.temp0: 27.00 degC % now: dale# ./sysctl hw.sensors hw.sensors.lm0.volt0: 1.23 VDC (VCore) hw.sensors.lm0.volt1: 12.30 VDC (+12V) hw.sensors.lm0.volt2: 3.33 VDC (+3.3V) hw.sensors.lm0.volt3: 3.31 VDC (+3.3V) hw.sensors.lm0.volt4: -45.19 VDC (-12V) hw.sensors.lm0.volt5: 1.58 VDC hw.sensors.lm0.volt6: 0.10 VDC hw.sensors.lm0.volt7: 3.31 VDC (3.3VSB) hw.sensors.lm0.volt8: 1.02 VDC (VBAT) hw.sensors.lm0.temp0: 58.00 degC hw.sensors.lm0.temp1: 24.00 degC hw.sensors.lm0.temp2: invalid hw.sensors.lm0.fan0: invalid hw.sensors.lm0.fan1: 897 RPM hw.sensors.lm0.fan2: invalid hw.sensors.cpu0.temp0: 27.00 degC hw.sensors.cpu1.temp0: 28.00 degC dale# And this is how it always was and is in systat(1) (and ideally how it should be in sysctl(8)): %systat -sensors /0 /1 /2 /3 /4 /5 /6 /7 /8 /9 /10 Load Average | Sensor Value Status Description lm0.temp0 58.00 degC lm0.temp1 24.00 degC lm0.fan1 892 RPM lm0.volt0 1.23 V DC (VCore) lm0.volt1 12.30 V DC (+12V) lm0.volt2 3.33 V DC (+3.3V) lm0.volt3 3.31 V DC (+3.3V) lm0.volt4 -45.19 V DC (-12V) lm0.volt5 1.58 V DC lm0.volt6 0.10 V DC lm0.volt7 3.31 V DC (3.3VSB) lm0.volt8 1.02 V DC (VBAT) cpu0.temp0 27.00 degC cpu1.temp0 28.00 degC Affected files ... .. //depot/projects/soc2007/cnst-sensors/sbin.sysctl/sysctl.c#9 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sbin.sysctl/sysctl.c#9 (text+ko) ==== @@ -418,7 +418,14 @@ return (1); } - if (s->flags & SENSOR_FUNKNOWN) + if (s->flags & SENSOR_FINVALID) + /* + * XXX: with this flag, the node should be entirely ignored, + * but as the magic-based sysctl(8) is not too flexible, we + * simply have to print out that the sensor is invalid. + */ + printf("invalid"); + else if (s->flags & SENSOR_FUNKNOWN) printf("unknown"); else { switch (s->type) { From owner-p4-projects@FreeBSD.ORG Sun Sep 9 20:36:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 932D816A420; Sun, 9 Sep 2007 20:36:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A37216A418 for ; Sun, 9 Sep 2007 20:36:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45D1613C458 for ; Sun, 9 Sep 2007 20:36:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89Ka2JJ073369 for ; Sun, 9 Sep 2007 20:36:02 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89Ka1Ke073366 for perforce@freebsd.org; Sun, 9 Sep 2007 20:36:01 GMT (envelope-from gabor@freebsd.org) Date: Sun, 9 Sep 2007 20:36:01 GMT Message-Id: <200709092036.l89Ka1Ke073366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 20:36:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=126237 Change 126237 by gabor@gabor_server on 2007/09/09 20:35:53 MFen Affected files ... .. //depot/projects/docproj_hu/share/sgml/freebsd.dsl#2 edit .. //depot/projects/docproj_hu/share/sgml/mailing-lists.ent#2 edit .. //depot/projects/docproj_hu/share/sgml/teams.ent#2 edit .. //depot/projects/docproj_hu/share/sgml/trademarks.ent#2 edit Differences ... ==== //depot/projects/docproj_hu/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -2,7 +2,7 @@ $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.1 2007/04/15 15:23:55 gabor Exp $ The FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan - Original revision: 1.20 + Original revision: 1.22 --> - Original Revision: r1.56 --> + Original Revision: r1.57 --> FreeBSD lista szerver"> @@ -231,6 +231,10 @@ FreeBSD Internet service provider's levelezési lista"> freebsd-isp"> + +FreeBSD jails levelezési lista"> +freebsd-jail"> + FreeBSD Java Language levelezési lista"> freebsd-java"> ==== //depot/projects/docproj_hu/share/sgml/teams.ent#2 (text+ko) ==== @@ -11,10 +11,12 @@ + Original Revision: r1.18 --> admins@FreeBSD.org"> +bugmeister@FreeBSD.org"> + core-secretary@FreeBSD.org"> cvsadm@FreeBSD.org"> ==== //depot/projects/docproj_hu/share/sgml/trademarks.ent#2 (text+ko) ==== @@ -13,7 +13,7 @@ + Original Revision: r1.43 --> A 3Com és HomeConnect a 3Com Corporation bejegyzett védjegyei."> @@ -49,6 +49,8 @@ AMD Duron"> AMD-K6"> AMD Opteron"> +AMD Sempron"> +AMD Turion"> Athlon"> Élan"> Opteron"> @@ -61,6 +63,7 @@ AirPort"> Apple"> FireWire"> +iMac"> Mac"> Macintosh"> Mac OS"> @@ -97,6 +100,14 @@ Corel Corporation és/vagy leányvállalatainak bejegyzett védjegye Kanadában, az Egyesült Államokban és/vagy más országokban."> +WordPerfect"> + + +A Coverity bejegyzett + védjegye, a Coverity Extend, Coverity Prevent és Coverity + Prevent SQS pedig védjegyei a Coverity, Inc.-nek."> +Coverity"> +Coverity Prevent"> A Sound Blaster a Creative Technology Ltd. @@ -149,6 +160,7 @@ védjegyei az Egyesült Államokban."> POSIX"> ++ Az Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium és Xeon az Intel Corporation vagy leányvállalatainak védjegyei vagy bejegyzett @@ -162,6 +174,7 @@ Itanium"> Pentium"> Xeon"> +Core"> Az Intuit és Quicken az Intuit Inc., @@ -289,6 +302,7 @@ A RealNetworks, RealPlayer és RealAudio a RealNetworks, Inc. bejegyzett védjegyei."> +RealPlayer"> @@ -310,6 +324,10 @@ világszerte."> OpenGL"> + +A Slackware Patrick Volkerding + és a Slackware Linux, Inc. bejegyzett védjegye."> + A Sparc, Sparc64, SPARCEngine és UltraSPARC a SPARC International, Inc védjegyei az Egyesült államokban és más országokban. A SPARC From owner-p4-projects@FreeBSD.ORG Sun Sep 9 20:46:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A81016A49A; Sun, 9 Sep 2007 20:46:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BAB216A494 for ; Sun, 9 Sep 2007 20:46:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F398813C480 for ; Sun, 9 Sep 2007 20:46:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89KkFvE074014 for ; Sun, 9 Sep 2007 20:46:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89KkFUp074011 for perforce@freebsd.org; Sun, 9 Sep 2007 20:46:15 GMT (envelope-from gabor@freebsd.org) Date: Sun, 9 Sep 2007 20:46:15 GMT Message-Id: <200709092046.l89KkFUp074011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 20:46:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=126238 Change 126238 by gabor@gabor_server on 2007/09/09 20:45:45 - Add English glossary here to translate Affected files ... .. //depot/projects/docproj_hu/share/sgml/glossary/freebsd-glossary.sgml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 9 21:23:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69BCC16A41B; Sun, 9 Sep 2007 21:23:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05E0116A418 for ; Sun, 9 Sep 2007 21:23:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D507913C428 for ; Sun, 9 Sep 2007 21:23:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89LN3ui086232 for ; Sun, 9 Sep 2007 21:23:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89LN3fZ086229 for perforce@freebsd.org; Sun, 9 Sep 2007 21:23:03 GMT (envelope-from gabor@freebsd.org) Date: Sun, 9 Sep 2007 21:23:03 GMT Message-Id: <200709092123.l89LN3fZ086229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 21:23:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=126239 Change 126239 by gabor@gabor_server on 2007/09/09 21:22:15 - Fix typos Affected files ... .. //depot/projects/docproj_hu/share/sgml/trademarks.ent#3 edit Differences ... ==== //depot/projects/docproj_hu/share/sgml/trademarks.ent#3 (text+ko) ==== @@ -160,7 +160,7 @@ védjegyei az Egyesült Államokban."> POSIX"> -+ + Az Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium és Xeon az Intel Corporation vagy leányvállalatainak védjegyei vagy bejegyzett @@ -253,7 +253,7 @@ A Netscape és a Netscape Navigator a Netscape Communications Corporation bejegyzett védjegyei az Egyesült Államokban és más - országokban."> + országokban."> Netscape"> Netscape Navigator"> From owner-p4-projects@FreeBSD.ORG Sun Sep 9 21:23:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26C6216A4FD; Sun, 9 Sep 2007 21:23:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 800F816A479 for ; Sun, 9 Sep 2007 21:23:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F76913C465 for ; Sun, 9 Sep 2007 21:23:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89LN47c086239 for ; Sun, 9 Sep 2007 21:23:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89LN3VA086235 for perforce@freebsd.org; Sun, 9 Sep 2007 21:23:03 GMT (envelope-from gabor@freebsd.org) Date: Sun, 9 Sep 2007 21:23:03 GMT Message-Id: <200709092123.l89LN3VA086235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 21:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126240 Change 126240 by gabor@gabor_server on 2007/09/09 21:22:49 - Use HU versions where possible Affected files ... .. //depot/projects/docproj_hu/books/handbook/book.sgml#2 edit .. //depot/projects/docproj_hu/share/sgml/catalog#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/book.sgml#2 (text+ko) ==== @@ -5,7 +5,7 @@ --> + %books.ent; %chapters; ==== //depot/projects/docproj_hu/share/sgml/catalog#2 (text+ko) ==== @@ -9,9 +9,12 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU" "articles.ent" -PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" +PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU" "books.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//HU" + "bookinfo.ent" + PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" "freebsd.dsl" From owner-p4-projects@FreeBSD.ORG Sun Sep 9 21:46:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E05F616A478; Sun, 9 Sep 2007 21:46:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B882816A476 for ; Sun, 9 Sep 2007 21:46:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B03B13C467 for ; Sun, 9 Sep 2007 21:46:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89LkY6a087655 for ; Sun, 9 Sep 2007 21:46:34 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89LkYq6087652 for perforce@freebsd.org; Sun, 9 Sep 2007 21:46:34 GMT (envelope-from gabor@freebsd.org) Date: Sun, 9 Sep 2007 21:46:34 GMT Message-Id: <200709092146.l89LkYq6087652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 21:46:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=126241 Change 126241 by gabor@gabor_server on 2007/09/09 21:45:42 - Add this file Affected files ... .. //depot/projects/docproj_hu/share/sgml/books.ent#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 9 22:02:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD3516A41A; Sun, 9 Sep 2007 22:02:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6137716A418 for ; Sun, 9 Sep 2007 22:02:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B38213C461 for ; Sun, 9 Sep 2007 22:02:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89M2ukX088764 for ; Sun, 9 Sep 2007 22:02:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89M2tXC088761 for perforce@freebsd.org; Sun, 9 Sep 2007 22:02:55 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 9 Sep 2007 22:02:55 GMT Message-Id: <200709092202.l89M2tXC088761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 126242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 22:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=126242 Change 126242 by pgj@disznohal on 2007/09/09 22:02:00 Added "freebsd.ent" and inserted its references for localisation. Affected files ... .. //depot/projects/docproj_hu/share/sgml/books.ent#2 edit .. //depot/projects/docproj_hu/share/sgml/catalog#3 edit .. //depot/projects/docproj_hu/share/sgml/freebsd.ent#1 add Differences ... ==== //depot/projects/docproj_hu/share/sgml/books.ent#2 (text+ko) ==== @@ -8,7 +8,7 @@ %man; %bookinfo; - + %freebsd; %authors; ==== //depot/projects/docproj_hu/share/sgml/catalog#3 (text+ko) ==== @@ -21,6 +21,9 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU" "freebsd.dsl" +PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU" + "freebsd.ent" + PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" "l10n.ent" From owner-p4-projects@FreeBSD.ORG Sun Sep 9 23:30:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 369A216A420; Sun, 9 Sep 2007 23:30:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D99B316A417 for ; Sun, 9 Sep 2007 23:30:49 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B228213C45E for ; Sun, 9 Sep 2007 23:30:49 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l89NUn6V097140 for ; Sun, 9 Sep 2007 23:30:49 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l89NUnVK097137 for perforce@freebsd.org; Sun, 9 Sep 2007 23:30:49 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 9 Sep 2007 23:30:49 GMT Message-Id: <200709092330.l89NUnVK097137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2007 23:30:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=126243 Change 126243 by zec@zec_tpx32 on 2007/09/09 23:30:14 Modify vi_destroy() to return an error if attempting to kill a vnet with live sockets. This is completely unprotected from races and needs more thought / work. In addition to ethernet/VLAN ifnets, allow for ng_iface ifnets to be reassigned from one vnet to another as well. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#36 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#36 (text+ko) ==== @@ -51,12 +51,14 @@ #include #include +//#define DEBUG_ORDERING + MALLOC_DEFINE(M_VIMAGE, "vimage", "virtual image resource container"); MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); -static void vi_destroy(struct vimage *); +static int vi_destroy(struct vimage *); static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); static int vnet_mod_destructor(struct vnet_modlink *); @@ -333,6 +335,9 @@ bcopy(IF_LLADDR(ifp), eaddr, 6); ether_ifdetach(ifp); break; + case IFT_PROPVIRTUAL: /* XXX ng_eiface */ + if_detach(ifp); + break; default: panic("don't know yet how to handle iftype %d", ifp->if_type); /* if_detach(ifp); */ @@ -374,21 +379,22 @@ int unit = 0; struct ifnet *iter; +#define FINDFREEUNIT(dname) \ + do { \ + snprintf(ifp->if_xname, IFNAMSIZ, "%s%d", dname, unit); \ + TAILQ_FOREACH(iter, &V_ifnet, if_link) \ + if (strcmp(ifp->if_xname, iter->if_xname) == 0) \ + break; \ + unit++; \ + } while (iter); + switch (ifp->if_type) { case IFT_ETHER: case IFT_L2VLAN: - do { - snprintf(ifp->if_xname, - IFNAMSIZ, "eth%d", unit); - TAILQ_FOREACH(iter, &V_ifnet, - if_link) - if (strcmp( - ifp->if_xname, - iter->if_xname) - == 0) - break; - unit++; - } while (iter); + FINDFREEUNIT("eth"); + break; + case IFT_PROPVIRTUAL: + FINDFREEUNIT("ser"); break; default: break; @@ -401,6 +407,9 @@ case IFT_L2VLAN: ether_ifattach(ifp, eaddr); break; + case IFT_PROPVIRTUAL: /* XXX ng_eiface */ + if_attach(ifp); + break; default: panic("don't know yet how to handle iftype %d", ifp->if_type); /* if_attach(ifp); */ @@ -484,7 +493,7 @@ case SIOCSPVIMAGE: if (vi_req->req_action == VI_DESTROY) { - vi_destroy(vip_r); + error = vi_destroy(vip_r); break; } @@ -627,7 +636,7 @@ * the timers... How can one ever be sure to have done *all* the necessary * steps? */ -static void +static int vi_destroy(struct vimage *vip) { struct vnet *vnet = vip->v_vnet; @@ -636,6 +645,10 @@ struct ifnet *ifp, *nifp; struct vnet_modlink *vml; + /* XXX Beware of races -> more locking to be done... */ + if (vnet->sockcnt != 0) + return (EBUSY); + VNET_LIST_LOCK(); LIST_REMOVE(vnet, vnet_le); VNET_LIST_UNLOCK(); @@ -679,6 +692,8 @@ LIST_REMOVE(vip, vi_le); vi_free(vip, M_VIMAGE); + + return (0); } static int vnet_mod_constructor(vml) From owner-p4-projects@FreeBSD.ORG Mon Sep 10 00:20:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D008E16A421; Mon, 10 Sep 2007 00:20:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A215216A417 for ; Mon, 10 Sep 2007 00:20:56 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A68113C45B for ; Mon, 10 Sep 2007 00:20:56 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A0KuS9002085 for ; Mon, 10 Sep 2007 00:20:56 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A0KuJc002076 for perforce@freebsd.org; Mon, 10 Sep 2007 00:20:56 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 10 Sep 2007 00:20:56 GMT Message-Id: <200709100020.l8A0KuJc002076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 00:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=126247 Change 126247 by zec@zec_tpx32 on 2007/09/10 00:20:43 Set curvnet to ifp->if_vnet for each ifnet in if_clone_destroyif() during the cleanup process. This is necessary since it is possible for cloning ifnets to be assigned to remote vnets. Affected files ... .. //depot/projects/vimage/src/sys/net/if_clone.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_clone.c#6 (text+ko) ==== @@ -208,15 +208,14 @@ { int err; - if (ifc->ifc_destroy == NULL) { - err = EOPNOTSUPP; - goto done; - } + if (ifc->ifc_destroy == NULL) + return(EOPNOTSUPP); IF_CLONE_LOCK(ifc); IFC_IFLIST_REMOVE(ifc, ifp); IF_CLONE_UNLOCK(ifc); + CURVNET_SET_QUIET(ifp->if_vnet); if_delgroup(ifp, ifc->ifc_name); err = (*ifc->ifc_destroy)(ifc, ifp); @@ -228,8 +227,7 @@ IFC_IFLIST_INSERT(ifc, ifp); IF_CLONE_UNLOCK(ifc); } - -done: + CURVNET_RESTORE(); return (err); } From owner-p4-projects@FreeBSD.ORG Mon Sep 10 00:28:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D414616A468; Mon, 10 Sep 2007 00:28:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A54B416A420 for ; Mon, 10 Sep 2007 00:28:06 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DC1B13C459 for ; Mon, 10 Sep 2007 00:28:06 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A0S6wY002522 for ; Mon, 10 Sep 2007 00:28:06 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A0S6ZJ002519 for perforce@freebsd.org; Mon, 10 Sep 2007 00:28:06 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 10 Sep 2007 00:28:06 GMT Message-Id: <200709100028.l8A0S6ZJ002519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 00:28:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=126248 Change 126248 by zec@zec_tpx32 on 2007/09/10 00:28:01 When a vlan ifnet is assigned to a remote vnet, do not allow vlandev/vlantag to be either read or updated. In effect this makes a vlan ifnet assigned to a remote vnet (at least visually) indistinguishable from plain ethernet ifnets. Affected files ... .. //depot/projects/vimage/src/sys/net/if_vlan.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_vlan.c#5 (text+ko) ==== @@ -1379,6 +1379,12 @@ error = copyin(ifr->ifr_data, &vlr, sizeof(vlr)); if (error) break; +#ifdef VIMAGE + if (ifp->if_home_vnet != ifp->if_vnet) { + error = EPERM; + break; + } +#endif if (vlr.vlr_parent[0] == '\0') { vlan_unconfig(ifp); break; @@ -1406,6 +1412,12 @@ case SIOCGETVLAN: bzero(&vlr, sizeof(vlr)); +#ifdef VIMAGE + if (ifp->if_home_vnet != ifp->if_vnet) { + error = EPERM; + break; + } +#endif VLAN_LOCK(); if (TRUNK(ifv) != NULL) { strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname, From owner-p4-projects@FreeBSD.ORG Mon Sep 10 02:12:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D1CF16A421; Mon, 10 Sep 2007 02:12:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0015116A417 for ; Mon, 10 Sep 2007 02:12:47 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outC.internet-mail-service.net (outC.internet-mail-service.net [216.240.47.226]) by mx1.freebsd.org (Postfix) with ESMTP id C54F013C459 for ; Mon, 10 Sep 2007 02:12:47 +0000 (UTC) (envelope-from julian@elischer.org) Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160) by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP; Sun, 09 Sep 2007 19:12:47 -0700 Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id DE0101262E8; Sun, 9 Sep 2007 19:12:46 -0700 (PDT) Message-ID: <46E4A81E.1020703@elischer.org> Date: Sun, 09 Sep 2007 19:12:46 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728) MIME-Version: 1.0 To: Marko Zec References: <200709092330.l89NUnVK097137@repoman.freebsd.org> In-Reply-To: <200709092330.l89NUnVK097137@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 126243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 02:12:48 -0000 Marko Zec wrote: > > > In addition to ethernet/VLAN ifnets, allow for ng_iface > ifnets to be reassigned from one vnet to another as well. > > I thought assignation was a property of all interfaces no matter what the type? From owner-p4-projects@FreeBSD.ORG Mon Sep 10 04:02:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D24716A420; Mon, 10 Sep 2007 04:02:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE8D416A417 for ; Mon, 10 Sep 2007 04:02:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9532C13C45D for ; Mon, 10 Sep 2007 04:02:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A42jRA030947 for ; Mon, 10 Sep 2007 04:02:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A42i8l030944 for perforce@freebsd.org; Mon, 10 Sep 2007 04:02:44 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Sep 2007 04:02:44 GMT Message-Id: <200709100402.l8A42i8l030944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 04:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=126250 Change 126250 by kmacy@kmacy_home:ethng on 2007/09/10 04:01:53 IFC @126249 Affected files ... .. //depot/projects/ethng/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/ethng/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/ethng/src/sys/net/bpf.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/Makefile#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/main.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/main.h#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_acct.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_adjtime.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_audit_control.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_audit_getaudit.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_audit_setaudit.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_audit_submit.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_clock_settime.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_cred.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_io.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_kenv_set.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_kenv_unset.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_msgbuf.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_netinet_raw.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_proc_setlogin.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_proc_setrlimit.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_sched_rtprio.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_sched_setpriority.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_settimeofday.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_sysctl_write.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_admin.c#2 delete .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_chflags.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_chmod.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_chown.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_chroot.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_fhopen.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_fhstat.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_generation.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_getfh.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_read_write.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_setgid.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vfs_utimes.c#1 branch .. //depot/projects/ethng/src/tools/regression/priv/priv_vm_madv_protect.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vm_mlock.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_vm_munlock.c#2 integrate .. //depot/projects/ethng/src/tools/regression/priv/test_utimes.c#2 delete .. //depot/projects/ethng/src/usr.bin/netstat/sctp.c#3 integrate Differences ... ==== //depot/projects/ethng/src/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ */ #ifndef _ENDIAN_H_ @@ -99,13 +99,15 @@ static __inline __uint16_t __bswap16_var(__uint16_t v) { + __uint32_t ret = v & 0xffff; + __asm __volatile( "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "+r" (v)); + : "+r" (ret)); - return (v); + return ((__uint16_t)ret); } #ifdef __OPTIMIZE__ ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#16 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.19 2007/09/09 04:34:03 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.20 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ @@ -34,9 +34,6 @@ #ifndef _CXGB_ADAPTER_H_ #define _CXGB_ADAPTER_H_ -#include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.19 2007/09/09 04:34:03 kmacy Exp $"); - #include #include #include ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_include.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.1 2007/05/28 22:57:26 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.2 2007/09/10 00:59:51 kmacy Exp $ */ @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.33 2007/09/09 01:28:02 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.35 2007/09/10 00:59:51 kmacy Exp $"); #include #include @@ -397,16 +397,21 @@ device_t child; const struct adapter_info *ai; struct adapter *sc; - int i, reg, error = 0; + int i, error = 0; uint32_t vers; int port_qsets = 1; #ifdef MSI_SUPPORTED - int msi_needed; + int msi_needed, reg; #endif sc = device_get_softc(dev); sc->dev = dev; sc->msi_count = 0; - + ai = cxgb_get_adapter_info(dev); + + /* + * XXX not really related but a recent addition + */ +#ifdef MSI_SUPPORTED /* find the PCIe link width and set max read request to 4KB*/ if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { uint16_t lnk, pectl; @@ -418,14 +423,13 @@ pci_write_config(dev, reg + 0x8, pectl, 2); } - ai = cxgb_get_adapter_info(dev); if (sc->link_width != 0 && sc->link_width <= 4 && (ai->nports0 + ai->nports1) <= 2) { device_printf(sc->dev, "PCIe x%d Link, expect reduced performance\n", sc->link_width); } - +#endif touch_bars(dev); pci_enable_busmaster(dev); /* @@ -705,114 +709,6 @@ return; } -static int -alloc_filters(struct adapter *adap) -{ - struct filter_info *p; - int nfilters; - - if ((nfilters = adap->params.mc5.nfilters) == 0) - return (0); - - adap->filters = malloc(nfilters*sizeof(struct filter_info), - M_DEVBUF, M_ZERO|M_WAITOK); - - if (adap->filters == NULL) - return (ENOMEM); - - /* Set the default filters, only need to set non-0 fields here. */ - p = &adap->filters[nfilters - 1]; - p->vlan = 0xfff; - p->vlan_prio = FILTER_NO_VLAN_PRI; - p->pass = p->rss = p->valid = p->locked = 1; - - return (0); -} - -static inline void -set_tcb_field_ulp(struct cpl_set_tcb_field *req, - unsigned int tid, unsigned int word, - uint64_t mask, uint64_t val) -{ - struct ulp_txpkt *txpkt = (struct ulp_txpkt *)req; - - txpkt->cmd_dest = htonl(V_ULPTX_CMD(ULP_TXPKT)); - txpkt->len = htonl(V_ULPTX_NFLITS(sizeof(*req) / 8)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid)); - req->reply = V_NO_REPLY(1); - req->cpu_idx = 0; - req->word = htons(word); - req->mask = htobe64(mask); - req->val = htobe64(val); -} - -static int -set_filter(struct adapter *adap, int id, const struct filter_info *f) -{ - int len; - struct mbuf *m; - struct ulp_txpkt *txpkt; - struct work_request_hdr *wr; - struct cpl_pass_open_req *oreq; - struct cpl_set_tcb_field *sreq; - - len = sizeof(*wr) + sizeof(*oreq) + 2 * sizeof(*sreq); - id += t3_mc5_size(&adap->mc5) - adap->params.mc5.nroutes - - adap->params.mc5.nfilters; - - m = m_gethdr(M_TRYWAIT, MT_DATA); - wr = mtod(m, struct work_request_hdr *); - wr->wr_hi = htonl(V_WR_OP(FW_WROPCODE_BYPASS) | F_WR_ATOMIC); - m->m_len = m->m_pkthdr.len = len; - - oreq = (struct cpl_pass_open_req *)(wr + 1); - txpkt = (struct ulp_txpkt *)oreq; - txpkt->cmd_dest = htonl(V_ULPTX_CMD(ULP_TXPKT)); - txpkt->len = htonl(V_ULPTX_NFLITS(sizeof(*oreq) / 8)); - OPCODE_TID(oreq) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, id)); - oreq->local_port = htons(f->dport); - oreq->peer_port = htons(f->sport); - oreq->local_ip = htonl(f->dip); - oreq->peer_ip = htonl(f->sip); - oreq->peer_netmask = htonl(f->sip_mask); - oreq->opt0h = 0; - oreq->opt0l = htonl(F_NO_OFFLOAD); - oreq->opt1 = htonl(V_MAC_MATCH_VALID(f->mac_vld) | - V_CONN_POLICY(CPL_CONN_POLICY_FILTER) | - V_VLAN_PRI(f->vlan_prio >> 1) | - V_VLAN_PRI_VALID(f->vlan_prio != FILTER_NO_VLAN_PRI) | - V_PKT_TYPE(f->pkt_type) | V_OPT1_VLAN(f->vlan) | - V_MAC_MATCH(f->mac_idx | (f->mac_hit << 4))); - - sreq = (struct cpl_set_tcb_field *)(oreq + 1); - set_tcb_field_ulp(sreq, id, 1, 0x1800808000ULL, - (f->report_filter_id << 15) | (1 << 23) | - ((u64)f->pass << 35) | ((u64)!f->rss << 36)); - set_tcb_field_ulp(sreq + 1, id, 25, 0x3f80000, - (u64)adap->rrss_map[f->qset] << 19); - t3_mgmt_tx(adap, m); - return 0; -} - -static int -setup_hw_filters(struct adapter *adap) -{ - int i, err; - -#ifndef USE_FILTERS - return (0); -#endif - if (adap->filters == NULL) - return 0; - - t3_enable_filters(adap); - - for (i = err = 0; i < adap->params.mc5.nfilters && !err; i++) - if (adap->filters[i].locked) - err = set_filter(adap, i, &adap->filters[i]); - return err; -} - /** * setup_sge_qsets - configure SGE Tx/Rx/response queues * @sc: the controller softc @@ -1479,7 +1375,12 @@ static void update_tpeeprom(struct adapter *adap) { +#ifdef FIRMWARE_LATEST const struct firmware *tpeeprom; +#else + struct firmware *tpeeprom; +#endif + char buf[64]; uint32_t version; unsigned int major, minor; @@ -1535,7 +1436,11 @@ static int update_tpsram(struct adapter *adap) { +#ifdef FIRMWARE_LATEST const struct firmware *tpsram; +#else + struct firmware *tpsram; +#endif char buf[64]; int ret; char rev; @@ -1603,7 +1508,6 @@ if (err) goto out; - alloc_filters(sc); setup_rss(sc); t3_add_configured_sysctls(sc); sc->flags |= FULL_INIT_DONE; @@ -1641,7 +1545,6 @@ if (!(sc->flags & QUEUES_BOUND)) { printf("bind qsets\n"); bind_qsets(sc); - setup_hw_filters(sc); sc->flags |= QUEUES_BOUND; } out: @@ -2301,121 +2204,6 @@ #endif } -#if 0 -static void * -filter_get_idx(struct seq_file *seq, loff_t pos) -{ - int i; - struct adapter *adap = seq->private; - struct filter_info *p = adap->filters; - - if (!p) - return NULL; - - for (i = 0; i < adap->params.mc5.nfilters; i++, p++) - if (p->valid) { - if (!pos) - return p; - pos--; - } - return NULL; -} - -static void *filter_get_nxt_idx(struct seq_file *seq, struct filter_info *p) -{ - struct adapter *adap = seq->private; - struct filter_info *end = &adap->filters[adap->params.mc5.nfilters]; - - while (++p < end && !p->valid) - ; - return p < end ? p : NULL; -} - -static void *filter_seq_start(struct seq_file *seq, loff_t *pos) -{ - return *pos ? filter_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; -} - -static void *filter_seq_next(struct seq_file *seq, void *v, loff_t *pos) -{ - v = *pos ? filter_get_nxt_idx(seq, v) : filter_get_idx(seq, 0); - if (v) - ++*pos; - return v; -} - -static void filter_seq_stop(struct seq_file *seq, void *v) -{ -} - -static int filter_seq_show(struct seq_file *seq, void *v) -{ - static const char *pkt_type[] = { "any", "tcp", "udp", "frag" }; - - if (v == SEQ_START_TOKEN) - seq_puts(seq, "index SIP DIP sport " - "dport VLAN PRI MAC type Q\n"); - else { - char sip[20], dip[20]; - struct filter_info *f = v; - struct adapter *adap = seq->private; - - sprintf(sip, NIPQUAD_FMT "/%-2u", HIPQUAD(f->sip), - f->sip_mask ? 33 - ffs(f->sip_mask) : 0); - sprintf(dip, NIPQUAD_FMT, HIPQUAD(f->dip)); - seq_printf(seq, "%5zu %18s %15s ", f - adap->filters, sip, dip); - seq_printf(seq, f->sport ? "%5u " : " * ", f->sport); - seq_printf(seq, f->dport ? "%5u " : " * ", f->dport); - seq_printf(seq, f->vlan != 0xfff ? "%4u " : " * ", f->vlan); - seq_printf(seq, f->vlan_prio == FILTER_NO_VLAN_PRI ? - " * " : "%1u/%1u ", f->vlan_prio, f->vlan_prio | 1); - if (!f->mac_vld) - seq_printf(seq, " * "); - else if (f->mac_hit) - seq_printf(seq, "%3u ", f->mac_idx); - else - seq_printf(seq, " -1 "); - seq_printf(seq, "%4s ", pkt_type[f->pkt_type]); - if (!f->pass) - seq_printf(seq, "-\n"); - else if (f->rss) - seq_printf(seq, "*\n"); - else - seq_printf(seq, "%1u\n", f->qset); - } - return 0; -} - -static struct seq_operations filter_seq_ops = { - .start = filter_seq_start, - .next = filter_seq_next, - .stop = filter_seq_stop, - .show = filter_seq_show -}; - -static int filter_seq_open(struct inode *inode, struct file *file) -{ - int rc = seq_open(file, &filter_seq_ops); - - if (!rc) { - struct proc_dir_entry *dp = PDE(inode); - struct seq_file *seq = file->private_data; - - seq->private = dp->data; - } - return rc; -} - -static struct file_operations filter_seq_fops = { - .owner = THIS_MODULE, - .open = filter_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release -}; - -#endif - static int set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset) { @@ -2733,79 +2521,6 @@ m->nmtus = NMTUS; break; } - case CHELSIO_SET_FILTER: { - struct ch_filter *f = (struct ch_filter *)data; - struct filter_info *p; - int ret; - - if (sc->params.mc5.nfilters == 0) - return (EOPNOTSUPP); - if (!(sc->flags & FULL_INIT_DONE)) - return (EAGAIN); /* can still change nfilters */ - if (sc->filters == NULL) - return (ENOMEM); - - if (f->filter_id >= sc->params.mc5.nfilters || - (f->val.dip && f->mask.dip != 0xffffffff) || - (f->val.sport && f->mask.sport != 0xffff) || - (f->val.dport && f->mask.dport != 0xffff) || - (f->mask.vlan && f->mask.vlan != 0xfff) || - (f->mask.vlan_prio && f->mask.vlan_prio != 7) || - (f->mac_addr_idx != 0xffff && f->mac_addr_idx > 15) || - f->qset >= SGE_QSETS || - sc->rrss_map[f->qset] >= RSS_TABLE_SIZE) - return (EINVAL); - - p = &sc->filters[f->filter_id]; - if (p->locked) - return (EPERM); - - p->sip = f->val.sip; - p->sip_mask = f->mask.sip; - p->dip = f->val.dip; - p->sport = f->val.sport; - p->dport = f->val.dport; - p->vlan = f->mask.vlan ? f->val.vlan : 0xfff; - p->vlan_prio = f->mask.vlan_prio ? (f->val.vlan_prio & 6) : - FILTER_NO_VLAN_PRI; - p->mac_hit = f->mac_hit; - p->mac_vld = f->mac_addr_idx != 0xffff; - p->mac_idx = f->mac_addr_idx; - p->pkt_type = f->proto; - p->report_filter_id = f->want_filter_id; - p->pass = f->pass; - p->rss = f->rss; - p->qset = f->qset; - - ret = set_filter(sc, f->filter_id, p); - if (ret) - return ret; - p->valid = 1; - break; - } - case CHELSIO_DEL_FILTER: { - struct ch_filter *f = (struct ch_filter *)data; - struct filter_info *p; - - if (sc->params.mc5.nfilters == 0) - return (EOPNOTSUPP); - if (!(sc->flags & FULL_INIT_DONE)) - return (EAGAIN); /* can still change nfilters */ - if (sc->filters == NULL) - return (ENOMEM); - if (f->filter_id >= sc->params.mc5.nfilters) - return (EINVAL); - - p = &sc->filters[f->filter_id]; - if (p->locked) - return (EPERM); - memset(p, 0, sizeof(*p)); - p->sip_mask = 0xffffffff; - p->vlan = 0xfff; - p->vlan_prio = FILTER_NO_VLAN_PRI; - p->pkt_type = 1; - return set_filter(sc, f->filter_id, p); - } case CHELSIO_DEVUP: if (!is_offload(sc)) return (EOPNOTSUPP); ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#3 (text+ko) ==== @@ -26,19 +26,24 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_offload.h,v 1.4 2007/08/17 05:57:04 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_offload.h,v 1.5 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ #ifndef _CXGB_OFFLOAD_H #define _CXGB_OFFLOAD_H - +#ifdef CONFIG_DEFINED +#include +#include +#include +#include +#else +#include +#include +#include #include -#include - -#include -#include +#endif struct adapter; struct cxgb_client; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.13 2007/09/09 04:34:03 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.14 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ @@ -92,6 +92,9 @@ #define TSO_SUPPORTED #define VLAN_SUPPORTED #define TASKQUEUE_CURRENT +#else +#define if_name(ifp) (ifp)->if_xname +#define M_SANITY(m, n) #endif #define __read_mostly __attribute__((__section__(".data.read_mostly"))) ==== //depot/projects/ethng/src/sys/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.442 2007/08/28 20:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.443 2007/09/10 00:00:16 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1693,7 +1693,7 @@ goto restart; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_check_vnode_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; @@ -3550,7 +3550,7 @@ goto out; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_check_vnode_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; ==== //depot/projects/ethng/src/sys/net/bpf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.180 2007/08/06 14:26:00 rwatson Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.181 2007/09/10 00:03:06 thompsa Exp $ */ #include "opt_bpf.h" @@ -102,7 +102,7 @@ static void bpf_detachd(struct bpf_d *); static void bpf_freed(struct bpf_d *); static void bpf_mcopy(const void *, void *, size_t); -static int bpf_movein(struct uio *, int, int, struct mbuf **, +static int bpf_movein(struct uio *, int, struct ifnet *, struct mbuf **, struct sockaddr *, int *, struct bpf_insn *); static int bpf_setif(struct bpf_d *, struct ifreq *); static void bpf_timed_out(void *); @@ -158,10 +158,11 @@ { 1, NULL, filt_bpfdetach, filt_bpfread }; static int -bpf_movein(struct uio *uio, int linktype, int mtu, struct mbuf **mp, +bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp, struct sockaddr *sockp, int *hdrlen, struct bpf_insn *wfilter) { const struct ieee80211_bpf_params *p; + struct ether_header *eh; struct mbuf *m; int error; int len; @@ -241,7 +242,7 @@ len = uio->uio_resid; - if (len - hlen > mtu) + if (len - hlen > ifp->if_mtu) return (EMSGSIZE); if ((unsigned)len > MCLBYTES) @@ -273,6 +274,20 @@ goto bad; } + /* Check for multicast destination */ + switch (linktype) { + case DLT_EN10MB: + eh = mtod(m, struct ether_header *); + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { + if (bcmp(ifp->if_broadcastaddr, eh->ether_dhost, + ETHER_ADDR_LEN) == 0) + m->m_flags |= M_BCAST; + else + m->m_flags |= M_MCAST; + } + break; + } + /* * Make room for link header, and copy it to sockaddr */ @@ -615,7 +630,7 @@ bzero(&dst, sizeof(dst)); m = NULL; hlen = 0; - error = bpf_movein(uio, (int)d->bd_bif->bif_dlt, ifp->if_mtu, + error = bpf_movein(uio, (int)d->bd_bif->bif_dlt, ifp, &m, &dst, &hlen, d->bd_wfilter); if (error) return (error); ==== //depot/projects/ethng/src/sys/security/mac/mac_framework.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.83 2007/06/26 14:14:01 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.84 2007/09/10 00:00:16 rwatson Exp $ */ /* @@ -351,8 +351,6 @@ int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); -int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, @@ -400,6 +398,8 @@ struct timespec atime, struct timespec mtime); int mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); +int mac_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); int mac_getsockopt_label(struct ucred *cred, struct socket *so, ==== //depot/projects/ethng/src/sys/security/mac/mac_policy.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.93 2007/07/05 06:45:37 peter Exp $ + * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.94 2007/09/10 00:00:16 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -524,10 +524,6 @@ typedef int (*mpo_check_vnode_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dvplabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_check_vnode_delete_t)(struct ucred *cred, - struct vnode *dvp, struct label *dvplabel, - struct vnode *vp, struct label *vplabel, - struct componentname *cnp); typedef int (*mpo_check_vnode_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type); @@ -604,6 +600,10 @@ typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_vnode_unlink_t)(struct ucred *cred, + struct vnode *dvp, struct label *dvplabel, + struct vnode *vp, struct label *vplabel, + struct componentname *cnp); typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); @@ -868,7 +868,6 @@ mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; mpo_check_vnode_create_t mpo_check_vnode_create; - mpo_check_vnode_delete_t mpo_check_vnode_delete; mpo_check_vnode_deleteacl_t mpo_check_vnode_deleteacl; mpo_check_vnode_deleteextattr_t mpo_check_vnode_deleteextattr; mpo_check_vnode_exec_t mpo_check_vnode_exec; @@ -897,6 +896,7 @@ mpo_check_vnode_setowner_t mpo_check_vnode_setowner; mpo_check_vnode_setutimes_t mpo_check_vnode_setutimes; mpo_check_vnode_stat_t mpo_check_vnode_stat; + mpo_check_vnode_unlink_t mpo_check_vnode_unlink; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; mpo_create_mbuf_from_firewall_t mpo_create_mbuf_from_firewall; ==== //depot/projects/ethng/src/sys/security/mac/mac_vfs.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.121 2007/04/23 13:36:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.122 2007/09/10 00:00:16 rwatson Exp $"); #include "opt_mac.h" @@ -391,20 +391,6 @@ } int -mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, - struct componentname *cnp) -{ - int error; - - ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_delete"); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_delete"); - - MAC_CHECK(check_vnode_delete, cred, dvp, dvp->v_label, vp, - vp->v_label, cnp); - return (error); -} - -int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type) { @@ -741,6 +727,20 @@ } int +mac_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, struct vnode *vp, + struct componentname *cnp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_unlink"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_unlink"); + + MAC_CHECK(check_vnode_unlink, cred, dvp, dvp->v_label, vp, + vp->v_label, cnp); + return (error); +} + +int mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { ==== //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.106 2007/04/23 13:36:53 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.107 2007/09/10 00:00:16 rwatson Exp $ */ /* @@ -2625,30 +2625,6 @@ } static int -mac_biba_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dvplabel, struct vnode *vp, struct label *vplabel, - struct componentname *cnp) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(cred->cr_label); - obj = SLOT(dvplabel); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - obj = SLOT(vplabel); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_biba_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type) { @@ -3187,6 +3163,30 @@ } static int +mac_biba_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dvplabel, struct vnode *vp, struct label *vplabel, + struct componentname *cnp) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(dvplabel); + + if (!mac_biba_dominate_effective(subj, obj)) + return (EACCES); + + obj = SLOT(vplabel); + + if (!mac_biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel) { @@ -3389,7 +3389,6 @@ .mpo_check_vnode_chdir = mac_biba_check_vnode_chdir, .mpo_check_vnode_chroot = mac_biba_check_vnode_chroot, .mpo_check_vnode_create = mac_biba_check_vnode_create, - .mpo_check_vnode_delete = mac_biba_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_biba_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_biba_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_biba_check_vnode_exec, @@ -3415,6 +3414,7 @@ .mpo_check_vnode_setowner = mac_biba_check_vnode_setowner, .mpo_check_vnode_setutimes = mac_biba_check_vnode_setutimes, .mpo_check_vnode_stat = mac_biba_check_vnode_stat, + .mpo_check_vnode_unlink = mac_biba_check_vnode_unlink, .mpo_check_vnode_write = mac_biba_check_vnode_write, .mpo_associate_nfsd_label = mac_biba_associate_nfsd_label, .mpo_create_mbuf_from_firewall = mac_biba_create_mbuf_from_firewall, ==== //depot/projects/ethng/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.38 2007/07/05 13:16:04 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.39 2007/09/10 00:00:17 rwatson Exp $ */ /* @@ -504,19 +504,6 @@ } static int -mac_bsdextended_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dvplabel, struct vnode *vp, struct label *vplabel, - struct componentname *cnp) -{ - int error; - - error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); - if (error) - return (error); - return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); -} - -static int mac_bsdextended_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type) { @@ -708,6 +695,19 @@ return (mac_bsdextended_check_vp(active_cred, vp, MBI_STAT)); } +static int +mac_bsdextended_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dvplabel, struct vnode *vp, struct label *vplabel, + struct componentname *cnp) +{ + int error; + + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); + if (error) + return (error); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + static struct mac_policy_ops mac_bsdextended_ops = { .mpo_destroy = mac_bsdextended_destroy, @@ -720,7 +720,6 @@ .mpo_check_vnode_chdir = mac_bsdextended_check_vnode_chdir, .mpo_check_vnode_chroot = mac_bsdextended_check_vnode_chroot, .mpo_check_vnode_create = mac_bsdextended_check_create_vnode, - .mpo_check_vnode_delete = mac_bsdextended_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_bsdextended_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_bsdextended_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_bsdextended_check_vnode_exec, @@ -742,6 +741,7 @@ .mpo_check_vnode_setowner = mac_bsdextended_check_vnode_setowner, .mpo_check_vnode_setutimes = mac_bsdextended_check_vnode_setutimes, .mpo_check_vnode_stat = mac_bsdextended_check_vnode_stat, + .mpo_check_vnode_unlink = mac_bsdextended_check_vnode_unlink, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 10 04:03:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF23E16A46B; Mon, 10 Sep 2007 04:03:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92A9A16A417 for ; Mon, 10 Sep 2007 04:03:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3262413C45D for ; Mon, 10 Sep 2007 04:03:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A43mx9032203 for ; Mon, 10 Sep 2007 04:03:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A43lSP032199 for perforce@freebsd.org; Mon, 10 Sep 2007 04:03:47 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Sep 2007 04:03:47 GMT Message-Id: <200709100403.l8A43lSP032199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 04:03:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=126251 Change 126251 by kmacy@kmacy:storage:toestack on 2007/09/10 04:03:29 IFC 126249 Affected files ... .. //depot/projects/toestack/sys/arm/include/endian.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/toestack/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/toestack/sys/net/bpf.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/toestack/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/toestack/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/toestack/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/toestack/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/toestack/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/Makefile#2 integrate .. //depot/projects/toestack/tools/regression/priv/main.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/main.h#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_acct.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_adjtime.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_audit_control.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_audit_getaudit.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_audit_setaudit.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_audit_submit.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_clock_settime.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_cred.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_io.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_kenv_set.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_kenv_unset.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_msgbuf.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_netinet_raw.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_proc_setlogin.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_proc_setrlimit.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_sched_rtprio.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_sched_setpriority.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_settimeofday.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_sysctl_write.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_admin.c#2 delete .. //depot/projects/toestack/tools/regression/priv/priv_vfs_chflags.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_vfs_chmod.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_vfs_chown.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_chroot.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_fhopen.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_fhstat.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_generation.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_getfh.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_read_write.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_setgid.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vfs_utimes.c#1 branch .. //depot/projects/toestack/tools/regression/priv/priv_vm_madv_protect.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vm_mlock.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/priv_vm_munlock.c#2 integrate .. //depot/projects/toestack/tools/regression/priv/test_utimes.c#2 delete .. //depot/projects/toestack/usr.bin/netstat/sctp.c#2 integrate Differences ... ==== //depot/projects/toestack/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ */ #ifndef _ENDIAN_H_ @@ -99,13 +99,15 @@ static __inline __uint16_t __bswap16_var(__uint16_t v) { + __uint32_t ret = v & 0xffff; + __asm __volatile( "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "+r" (v)); + : "+r" (ret)); - return (v); + return ((__uint16_t)ret); } #ifdef __OPTIMIZE__ ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.19 2007/09/09 04:34:03 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.20 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ @@ -34,9 +34,6 @@ #ifndef _CXGB_ADAPTER_H_ #define _CXGB_ADAPTER_H_ -#include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.19 2007/09/09 04:34:03 kmacy Exp $"); - #include #include #include ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.1 2007/05/28 22:57:26 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.2 2007/09/10 00:59:51 kmacy Exp $ */ @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.33 2007/09/09 01:28:02 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.35 2007/09/10 00:59:51 kmacy Exp $"); #include #include @@ -397,16 +397,21 @@ device_t child; const struct adapter_info *ai; struct adapter *sc; - int i, reg, error = 0; + int i, error = 0; uint32_t vers; int port_qsets = 1; #ifdef MSI_SUPPORTED - int msi_needed; + int msi_needed, reg; #endif sc = device_get_softc(dev); sc->dev = dev; sc->msi_count = 0; - + ai = cxgb_get_adapter_info(dev); + + /* + * XXX not really related but a recent addition + */ +#ifdef MSI_SUPPORTED /* find the PCIe link width and set max read request to 4KB*/ if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { uint16_t lnk, pectl; @@ -418,14 +423,13 @@ pci_write_config(dev, reg + 0x8, pectl, 2); } - ai = cxgb_get_adapter_info(dev); if (sc->link_width != 0 && sc->link_width <= 4 && (ai->nports0 + ai->nports1) <= 2) { device_printf(sc->dev, "PCIe x%d Link, expect reduced performance\n", sc->link_width); } - +#endif touch_bars(dev); pci_enable_busmaster(dev); /* @@ -705,114 +709,6 @@ return; } -static int -alloc_filters(struct adapter *adap) -{ - struct filter_info *p; - int nfilters; - - if ((nfilters = adap->params.mc5.nfilters) == 0) - return (0); - - adap->filters = malloc(nfilters*sizeof(struct filter_info), - M_DEVBUF, M_ZERO|M_WAITOK); - - if (adap->filters == NULL) - return (ENOMEM); - - /* Set the default filters, only need to set non-0 fields here. */ - p = &adap->filters[nfilters - 1]; - p->vlan = 0xfff; - p->vlan_prio = FILTER_NO_VLAN_PRI; - p->pass = p->rss = p->valid = p->locked = 1; - - return (0); -} - -static inline void -set_tcb_field_ulp(struct cpl_set_tcb_field *req, - unsigned int tid, unsigned int word, - uint64_t mask, uint64_t val) -{ - struct ulp_txpkt *txpkt = (struct ulp_txpkt *)req; - - txpkt->cmd_dest = htonl(V_ULPTX_CMD(ULP_TXPKT)); - txpkt->len = htonl(V_ULPTX_NFLITS(sizeof(*req) / 8)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid)); - req->reply = V_NO_REPLY(1); - req->cpu_idx = 0; - req->word = htons(word); - req->mask = htobe64(mask); - req->val = htobe64(val); -} - -static int -set_filter(struct adapter *adap, int id, const struct filter_info *f) -{ - int len; - struct mbuf *m; - struct ulp_txpkt *txpkt; - struct work_request_hdr *wr; - struct cpl_pass_open_req *oreq; - struct cpl_set_tcb_field *sreq; - - len = sizeof(*wr) + sizeof(*oreq) + 2 * sizeof(*sreq); - id += t3_mc5_size(&adap->mc5) - adap->params.mc5.nroutes - - adap->params.mc5.nfilters; - - m = m_gethdr(M_TRYWAIT, MT_DATA); - wr = mtod(m, struct work_request_hdr *); - wr->wr_hi = htonl(V_WR_OP(FW_WROPCODE_BYPASS) | F_WR_ATOMIC); - m->m_len = m->m_pkthdr.len = len; - - oreq = (struct cpl_pass_open_req *)(wr + 1); - txpkt = (struct ulp_txpkt *)oreq; - txpkt->cmd_dest = htonl(V_ULPTX_CMD(ULP_TXPKT)); - txpkt->len = htonl(V_ULPTX_NFLITS(sizeof(*oreq) / 8)); - OPCODE_TID(oreq) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, id)); - oreq->local_port = htons(f->dport); - oreq->peer_port = htons(f->sport); - oreq->local_ip = htonl(f->dip); - oreq->peer_ip = htonl(f->sip); - oreq->peer_netmask = htonl(f->sip_mask); - oreq->opt0h = 0; - oreq->opt0l = htonl(F_NO_OFFLOAD); - oreq->opt1 = htonl(V_MAC_MATCH_VALID(f->mac_vld) | - V_CONN_POLICY(CPL_CONN_POLICY_FILTER) | - V_VLAN_PRI(f->vlan_prio >> 1) | - V_VLAN_PRI_VALID(f->vlan_prio != FILTER_NO_VLAN_PRI) | - V_PKT_TYPE(f->pkt_type) | V_OPT1_VLAN(f->vlan) | - V_MAC_MATCH(f->mac_idx | (f->mac_hit << 4))); - - sreq = (struct cpl_set_tcb_field *)(oreq + 1); - set_tcb_field_ulp(sreq, id, 1, 0x1800808000ULL, - (f->report_filter_id << 15) | (1 << 23) | - ((u64)f->pass << 35) | ((u64)!f->rss << 36)); - set_tcb_field_ulp(sreq + 1, id, 25, 0x3f80000, - (u64)adap->rrss_map[f->qset] << 19); - t3_mgmt_tx(adap, m); - return 0; -} - -static int -setup_hw_filters(struct adapter *adap) -{ - int i, err; - -#ifndef USE_FILTERS - return (0); -#endif - if (adap->filters == NULL) - return 0; - - t3_enable_filters(adap); - - for (i = err = 0; i < adap->params.mc5.nfilters && !err; i++) - if (adap->filters[i].locked) - err = set_filter(adap, i, &adap->filters[i]); - return err; -} - /** * setup_sge_qsets - configure SGE Tx/Rx/response queues * @sc: the controller softc @@ -1479,7 +1375,12 @@ static void update_tpeeprom(struct adapter *adap) { +#ifdef FIRMWARE_LATEST const struct firmware *tpeeprom; +#else + struct firmware *tpeeprom; +#endif + char buf[64]; uint32_t version; unsigned int major, minor; @@ -1535,7 +1436,11 @@ static int update_tpsram(struct adapter *adap) { +#ifdef FIRMWARE_LATEST const struct firmware *tpsram; +#else + struct firmware *tpsram; +#endif char buf[64]; int ret; char rev; @@ -1603,7 +1508,6 @@ if (err) goto out; - alloc_filters(sc); setup_rss(sc); t3_add_configured_sysctls(sc); sc->flags |= FULL_INIT_DONE; @@ -1641,7 +1545,6 @@ if (!(sc->flags & QUEUES_BOUND)) { printf("bind qsets\n"); bind_qsets(sc); - setup_hw_filters(sc); sc->flags |= QUEUES_BOUND; } out: @@ -2300,121 +2203,6 @@ #endif } -#if 0 -static void * -filter_get_idx(struct seq_file *seq, loff_t pos) -{ - int i; - struct adapter *adap = seq->private; - struct filter_info *p = adap->filters; - - if (!p) - return NULL; - - for (i = 0; i < adap->params.mc5.nfilters; i++, p++) - if (p->valid) { - if (!pos) - return p; - pos--; - } - return NULL; -} - -static void *filter_get_nxt_idx(struct seq_file *seq, struct filter_info *p) -{ - struct adapter *adap = seq->private; - struct filter_info *end = &adap->filters[adap->params.mc5.nfilters]; - - while (++p < end && !p->valid) - ; - return p < end ? p : NULL; -} - -static void *filter_seq_start(struct seq_file *seq, loff_t *pos) -{ - return *pos ? filter_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; -} - -static void *filter_seq_next(struct seq_file *seq, void *v, loff_t *pos) -{ - v = *pos ? filter_get_nxt_idx(seq, v) : filter_get_idx(seq, 0); - if (v) - ++*pos; - return v; -} - -static void filter_seq_stop(struct seq_file *seq, void *v) -{ -} - -static int filter_seq_show(struct seq_file *seq, void *v) -{ - static const char *pkt_type[] = { "any", "tcp", "udp", "frag" }; - - if (v == SEQ_START_TOKEN) - seq_puts(seq, "index SIP DIP sport " - "dport VLAN PRI MAC type Q\n"); - else { - char sip[20], dip[20]; - struct filter_info *f = v; - struct adapter *adap = seq->private; - - sprintf(sip, NIPQUAD_FMT "/%-2u", HIPQUAD(f->sip), - f->sip_mask ? 33 - ffs(f->sip_mask) : 0); - sprintf(dip, NIPQUAD_FMT, HIPQUAD(f->dip)); - seq_printf(seq, "%5zu %18s %15s ", f - adap->filters, sip, dip); - seq_printf(seq, f->sport ? "%5u " : " * ", f->sport); - seq_printf(seq, f->dport ? "%5u " : " * ", f->dport); - seq_printf(seq, f->vlan != 0xfff ? "%4u " : " * ", f->vlan); - seq_printf(seq, f->vlan_prio == FILTER_NO_VLAN_PRI ? - " * " : "%1u/%1u ", f->vlan_prio, f->vlan_prio | 1); - if (!f->mac_vld) - seq_printf(seq, " * "); - else if (f->mac_hit) - seq_printf(seq, "%3u ", f->mac_idx); - else - seq_printf(seq, " -1 "); - seq_printf(seq, "%4s ", pkt_type[f->pkt_type]); - if (!f->pass) - seq_printf(seq, "-\n"); - else if (f->rss) - seq_printf(seq, "*\n"); - else - seq_printf(seq, "%1u\n", f->qset); - } - return 0; -} - -static struct seq_operations filter_seq_ops = { - .start = filter_seq_start, - .next = filter_seq_next, - .stop = filter_seq_stop, - .show = filter_seq_show -}; - -static int filter_seq_open(struct inode *inode, struct file *file) -{ - int rc = seq_open(file, &filter_seq_ops); - - if (!rc) { - struct proc_dir_entry *dp = PDE(inode); - struct seq_file *seq = file->private_data; - - seq->private = dp->data; - } - return rc; -} - -static struct file_operations filter_seq_fops = { - .owner = THIS_MODULE, - .open = filter_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release -}; - -#endif - static int set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset) { @@ -2732,79 +2520,6 @@ m->nmtus = NMTUS; break; } - case CHELSIO_SET_FILTER: { - struct ch_filter *f = (struct ch_filter *)data; - struct filter_info *p; - int ret; - - if (sc->params.mc5.nfilters == 0) - return (EOPNOTSUPP); - if (!(sc->flags & FULL_INIT_DONE)) - return (EAGAIN); /* can still change nfilters */ - if (sc->filters == NULL) - return (ENOMEM); - - if (f->filter_id >= sc->params.mc5.nfilters || - (f->val.dip && f->mask.dip != 0xffffffff) || - (f->val.sport && f->mask.sport != 0xffff) || - (f->val.dport && f->mask.dport != 0xffff) || - (f->mask.vlan && f->mask.vlan != 0xfff) || - (f->mask.vlan_prio && f->mask.vlan_prio != 7) || - (f->mac_addr_idx != 0xffff && f->mac_addr_idx > 15) || - f->qset >= SGE_QSETS || - sc->rrss_map[f->qset] >= RSS_TABLE_SIZE) - return (EINVAL); - - p = &sc->filters[f->filter_id]; - if (p->locked) - return (EPERM); - - p->sip = f->val.sip; - p->sip_mask = f->mask.sip; - p->dip = f->val.dip; - p->sport = f->val.sport; - p->dport = f->val.dport; - p->vlan = f->mask.vlan ? f->val.vlan : 0xfff; - p->vlan_prio = f->mask.vlan_prio ? (f->val.vlan_prio & 6) : - FILTER_NO_VLAN_PRI; - p->mac_hit = f->mac_hit; - p->mac_vld = f->mac_addr_idx != 0xffff; - p->mac_idx = f->mac_addr_idx; - p->pkt_type = f->proto; - p->report_filter_id = f->want_filter_id; - p->pass = f->pass; - p->rss = f->rss; - p->qset = f->qset; - - ret = set_filter(sc, f->filter_id, p); - if (ret) - return ret; - p->valid = 1; - break; - } - case CHELSIO_DEL_FILTER: { - struct ch_filter *f = (struct ch_filter *)data; - struct filter_info *p; - - if (sc->params.mc5.nfilters == 0) - return (EOPNOTSUPP); - if (!(sc->flags & FULL_INIT_DONE)) - return (EAGAIN); /* can still change nfilters */ - if (sc->filters == NULL) - return (ENOMEM); - if (f->filter_id >= sc->params.mc5.nfilters) - return (EINVAL); - - p = &sc->filters[f->filter_id]; - if (p->locked) - return (EPERM); - memset(p, 0, sizeof(*p)); - p->sip_mask = 0xffffffff; - p->vlan = 0xfff; - p->vlan_prio = FILTER_NO_VLAN_PRI; - p->pkt_type = 1; - return set_filter(sc, f->filter_id, p); - } case CHELSIO_DEVUP: if (!is_offload(sc)) return (EOPNOTSUPP); ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#2 (text+ko) ==== @@ -26,19 +26,24 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_offload.h,v 1.4 2007/08/17 05:57:04 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_offload.h,v 1.5 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ #ifndef _CXGB_OFFLOAD_H #define _CXGB_OFFLOAD_H - +#ifdef CONFIG_DEFINED +#include +#include +#include +#include +#else +#include +#include +#include #include -#include - -#include -#include +#endif struct adapter; struct cxgb_client; ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.13 2007/09/09 04:34:03 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.14 2007/09/10 00:59:51 kmacy Exp $ ***************************************************************************/ @@ -92,6 +92,9 @@ #define TSO_SUPPORTED #define VLAN_SUPPORTED #define TASKQUEUE_CURRENT +#else +#define if_name(ifp) (ifp)->if_xname +#define M_SANITY(m, n) #endif #define __read_mostly __attribute__((__section__(".data.read_mostly"))) ==== //depot/projects/toestack/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.442 2007/08/28 20:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.443 2007/09/10 00:00:16 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1693,7 +1693,7 @@ goto restart; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_check_vnode_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; @@ -3550,7 +3550,7 @@ goto out; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_check_vnode_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; ==== //depot/projects/toestack/sys/net/bpf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.180 2007/08/06 14:26:00 rwatson Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.181 2007/09/10 00:03:06 thompsa Exp $ */ #include "opt_bpf.h" @@ -102,7 +102,7 @@ static void bpf_detachd(struct bpf_d *); static void bpf_freed(struct bpf_d *); static void bpf_mcopy(const void *, void *, size_t); -static int bpf_movein(struct uio *, int, int, struct mbuf **, +static int bpf_movein(struct uio *, int, struct ifnet *, struct mbuf **, struct sockaddr *, int *, struct bpf_insn *); static int bpf_setif(struct bpf_d *, struct ifreq *); static void bpf_timed_out(void *); @@ -158,10 +158,11 @@ { 1, NULL, filt_bpfdetach, filt_bpfread }; static int -bpf_movein(struct uio *uio, int linktype, int mtu, struct mbuf **mp, +bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp, struct sockaddr *sockp, int *hdrlen, struct bpf_insn *wfilter) { const struct ieee80211_bpf_params *p; + struct ether_header *eh; struct mbuf *m; int error; int len; @@ -241,7 +242,7 @@ len = uio->uio_resid; - if (len - hlen > mtu) + if (len - hlen > ifp->if_mtu) return (EMSGSIZE); if ((unsigned)len > MCLBYTES) @@ -273,6 +274,20 @@ goto bad; } + /* Check for multicast destination */ + switch (linktype) { + case DLT_EN10MB: + eh = mtod(m, struct ether_header *); + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { + if (bcmp(ifp->if_broadcastaddr, eh->ether_dhost, + ETHER_ADDR_LEN) == 0) + m->m_flags |= M_BCAST; + else + m->m_flags |= M_MCAST; + } + break; + } + /* * Make room for link header, and copy it to sockaddr */ @@ -615,7 +630,7 @@ bzero(&dst, sizeof(dst)); m = NULL; hlen = 0; - error = bpf_movein(uio, (int)d->bd_bif->bif_dlt, ifp->if_mtu, + error = bpf_movein(uio, (int)d->bd_bif->bif_dlt, ifp, &m, &dst, &hlen, d->bd_wfilter); if (error) return (error); ==== //depot/projects/toestack/sys/security/mac/mac_framework.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.83 2007/06/26 14:14:01 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.84 2007/09/10 00:00:16 rwatson Exp $ */ /* @@ -351,8 +351,6 @@ int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); -int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, @@ -400,6 +398,8 @@ struct timespec atime, struct timespec mtime); int mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); +int mac_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); int mac_getsockopt_label(struct ucred *cred, struct socket *so, ==== //depot/projects/toestack/sys/security/mac/mac_policy.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.93 2007/07/05 06:45:37 peter Exp $ + * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.94 2007/09/10 00:00:16 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -524,10 +524,6 @@ typedef int (*mpo_check_vnode_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dvplabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_check_vnode_delete_t)(struct ucred *cred, - struct vnode *dvp, struct label *dvplabel, - struct vnode *vp, struct label *vplabel, - struct componentname *cnp); typedef int (*mpo_check_vnode_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type); @@ -604,6 +600,10 @@ typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_vnode_unlink_t)(struct ucred *cred, + struct vnode *dvp, struct label *dvplabel, + struct vnode *vp, struct label *vplabel, + struct componentname *cnp); typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); @@ -868,7 +868,6 @@ mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; mpo_check_vnode_create_t mpo_check_vnode_create; - mpo_check_vnode_delete_t mpo_check_vnode_delete; mpo_check_vnode_deleteacl_t mpo_check_vnode_deleteacl; mpo_check_vnode_deleteextattr_t mpo_check_vnode_deleteextattr; mpo_check_vnode_exec_t mpo_check_vnode_exec; @@ -897,6 +896,7 @@ mpo_check_vnode_setowner_t mpo_check_vnode_setowner; mpo_check_vnode_setutimes_t mpo_check_vnode_setutimes; mpo_check_vnode_stat_t mpo_check_vnode_stat; + mpo_check_vnode_unlink_t mpo_check_vnode_unlink; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; mpo_create_mbuf_from_firewall_t mpo_create_mbuf_from_firewall; ==== //depot/projects/toestack/sys/security/mac/mac_vfs.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.121 2007/04/23 13:36:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.122 2007/09/10 00:00:16 rwatson Exp $"); #include "opt_mac.h" @@ -391,20 +391,6 @@ } int -mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, - struct componentname *cnp) -{ - int error; - - ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_delete"); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_delete"); - - MAC_CHECK(check_vnode_delete, cred, dvp, dvp->v_label, vp, - vp->v_label, cnp); - return (error); -} - -int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type) { @@ -741,6 +727,20 @@ } int +mac_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, struct vnode *vp, + struct componentname *cnp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_unlink"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_unlink"); + + MAC_CHECK(check_vnode_unlink, cred, dvp, dvp->v_label, vp, + vp->v_label, cnp); + return (error); +} + +int mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { ==== //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.106 2007/04/23 13:36:53 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.107 2007/09/10 00:00:16 rwatson Exp $ */ /* @@ -2625,30 +2625,6 @@ } static int -mac_biba_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dvplabel, struct vnode *vp, struct label *vplabel, - struct componentname *cnp) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(cred->cr_label); - obj = SLOT(dvplabel); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - obj = SLOT(vplabel); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_biba_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type) { @@ -3187,6 +3163,30 @@ } static int +mac_biba_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dvplabel, struct vnode *vp, struct label *vplabel, + struct componentname *cnp) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(dvplabel); + + if (!mac_biba_dominate_effective(subj, obj)) + return (EACCES); + + obj = SLOT(vplabel); + + if (!mac_biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel) { @@ -3389,7 +3389,6 @@ .mpo_check_vnode_chdir = mac_biba_check_vnode_chdir, .mpo_check_vnode_chroot = mac_biba_check_vnode_chroot, .mpo_check_vnode_create = mac_biba_check_vnode_create, - .mpo_check_vnode_delete = mac_biba_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_biba_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_biba_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_biba_check_vnode_exec, @@ -3415,6 +3414,7 @@ .mpo_check_vnode_setowner = mac_biba_check_vnode_setowner, .mpo_check_vnode_setutimes = mac_biba_check_vnode_setutimes, .mpo_check_vnode_stat = mac_biba_check_vnode_stat, + .mpo_check_vnode_unlink = mac_biba_check_vnode_unlink, .mpo_check_vnode_write = mac_biba_check_vnode_write, .mpo_associate_nfsd_label = mac_biba_associate_nfsd_label, .mpo_create_mbuf_from_firewall = mac_biba_create_mbuf_from_firewall, ==== //depot/projects/toestack/sys/security/mac_bsdextended/mac_bsdextended.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.38 2007/07/05 13:16:04 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.39 2007/09/10 00:00:17 rwatson Exp $ */ /* @@ -504,19 +504,6 @@ } static int -mac_bsdextended_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dvplabel, struct vnode *vp, struct label *vplabel, - struct componentname *cnp) -{ - int error; - - error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); - if (error) - return (error); - return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); -} - -static int mac_bsdextended_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type) { @@ -708,6 +695,19 @@ return (mac_bsdextended_check_vp(active_cred, vp, MBI_STAT)); } +static int +mac_bsdextended_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dvplabel, struct vnode *vp, struct label *vplabel, + struct componentname *cnp) +{ + int error; + + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); + if (error) + return (error); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + static struct mac_policy_ops mac_bsdextended_ops = { .mpo_destroy = mac_bsdextended_destroy, @@ -720,7 +720,6 @@ .mpo_check_vnode_chdir = mac_bsdextended_check_vnode_chdir, .mpo_check_vnode_chroot = mac_bsdextended_check_vnode_chroot, .mpo_check_vnode_create = mac_bsdextended_check_create_vnode, - .mpo_check_vnode_delete = mac_bsdextended_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_bsdextended_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_bsdextended_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_bsdextended_check_vnode_exec, @@ -742,6 +741,7 @@ .mpo_check_vnode_setowner = mac_bsdextended_check_vnode_setowner, .mpo_check_vnode_setutimes = mac_bsdextended_check_vnode_setutimes, .mpo_check_vnode_stat = mac_bsdextended_check_vnode_stat, + .mpo_check_vnode_unlink = mac_bsdextended_check_vnode_unlink, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 10 09:56:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6886016A420; Mon, 10 Sep 2007 09:56:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 386A616A419 for ; Mon, 10 Sep 2007 09:56:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D07913C4A5 for ; Mon, 10 Sep 2007 09:56:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8A9uULd089605 for ; Mon, 10 Sep 2007 09:56:30 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8A9uTT0089602 for perforce@freebsd.org; Mon, 10 Sep 2007 09:56:29 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 10 Sep 2007 09:56:29 GMT Message-Id: <200709100956.l8A9uTT0089602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 09:56:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=126259 Change 126259 by zec@zec_tca51 on 2007/09/10 09:56:25 Fix for nd6_llinfo_timer() where INIT_VNET_INET6(curvnet) was attempted before curvnet was set. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/nd6.c#22 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#22 (text+ko) ==== @@ -462,7 +462,6 @@ static void nd6_llinfo_timer(void *arg) { - INIT_VNET_INET6(curvnet); struct llinfo_nd6 *ln; struct rtentry *rt; struct in6_addr *dst; @@ -489,6 +488,7 @@ ndi = ND_IFINFO(ifp); CURVNET_SET(ifp->if_vnet); + INIT_VNET_INET6(curvnet); /* sanity check */ if (rt->rt_llinfo && (struct llinfo_nd6 *)rt->rt_llinfo != ln) From owner-p4-projects@FreeBSD.ORG Mon Sep 10 10:09:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60AFE16A41B; Mon, 10 Sep 2007 10:09:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19F2216A419 for ; Mon, 10 Sep 2007 10:09:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA86F13C46B for ; Mon, 10 Sep 2007 10:09:46 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8AA9ktU091483 for ; Mon, 10 Sep 2007 10:09:46 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8AA9k0D091480 for perforce@freebsd.org; Mon, 10 Sep 2007 10:09:46 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 10 Sep 2007 10:09:46 GMT Message-Id: <200709101009.l8AA9k0D091480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 10:09:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=126260 Change 126260 by zec@zec_tca51 on 2007/09/10 10:08:48 Remove a stale debugging printf(). Affected files ... .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#24 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#24 (text+ko) ==== @@ -1106,7 +1106,6 @@ void ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) { - printf("---> tcp6_input() \n"); #define IS2292(x, y) ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y)) struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); From owner-p4-projects@FreeBSD.ORG Mon Sep 10 10:27:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF0B16A46C; Mon, 10 Sep 2007 10:27:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A06916A421 for ; Mon, 10 Sep 2007 10:27:07 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id D796213C465 for ; Mon, 10 Sep 2007 10:27:06 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 997789B652; Mon, 10 Sep 2007 11:54:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id D9E119B644; Mon, 10 Sep 2007 11:54:43 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Mon, 10 Sep 2007 11:54:41 +0200 User-Agent: KMail/1.9.7 References: <200709092330.l89NUnVK097137@repoman.freebsd.org> <46E4A81E.1020703@elischer.org> In-Reply-To: <46E4A81E.1020703@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200709101154.42412.zec@icir.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 126243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 10:27:07 -0000 On Monday 10 September 2007 04:12:46 Julian Elischer wrote: > Marko Zec wrote: > > In addition to ethernet/VLAN ifnets, allow for ng_iface > > ifnets to be reassigned from one vnet to another as well. > > I thought assignation was a property of all interfaces no matter what > the type? Some ifnet types have private structures that have trouble surviving if_detach()/if_attach() sequence called externaly on them. For example 802.11 ifnets typically hold bpf handles hidden somwhere inside their private state, and thus cannot be easily moved around vnets without modifying the drivers, and that is what I wish to avoid... For some other ifnets, say ppp(4) or sl(4), I'm not sure it would make much sense to reassign them from one vnet to another; others like gif/gre might need special handling to ensure "outer" and "inner" addresses live in proper vnets, until this is addressed properly I thought it might be better to disallow moving of such ifnets around vnets... Cheers, Marko From owner-p4-projects@FreeBSD.ORG Mon Sep 10 15:38:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB73716A41A; Mon, 10 Sep 2007 15:38:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9106F16A418 for ; Mon, 10 Sep 2007 15:38:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FCD513C46E for ; Mon, 10 Sep 2007 15:38:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8AFcvcL032241 for ; Mon, 10 Sep 2007 15:38:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8AFcvqU032238 for perforce@freebsd.org; Mon, 10 Sep 2007 15:38:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Sep 2007 15:38:57 GMT Message-Id: <200709101538.l8AFcvqU032238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 126271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 15:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=126271 Change 126271 by rwatson@rwatson_zoo on 2007/09/10 15:38:28 Update some additional files for mac2 changes. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#8 edit .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.h#2 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#15 delete Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#8 (text+ko) ==== @@ -107,8 +107,6 @@ #include #include #include -#include -#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_ipsec.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_framework.h#2 (text+ko) ==== @@ -90,44 +90,44 @@ /* * Kernel functions to manage and evaluate labels. */ -void mac_init_bpfdesc(struct bpf_d *); -void mac_init_cred(struct ucred *); -void mac_init_devfs(struct devfs_dirent *); -void mac_init_ifnet(struct ifnet *); -int mac_init_inpcb(struct inpcb *, int); -void mac_init_sysv_msgmsg(struct msg *); -void mac_init_sysv_msgqueue(struct msqid_kernel *); -void mac_init_sysv_sem(struct semid_kernel *); -void mac_init_sysv_shm(struct shmid_kernel *); +void mac_bpfdesc_init(struct bpf_d *); +void mac_cred_init(struct ucred *); +void mac_devfs_init(struct devfs_dirent *); +void mac_ifnet_init(struct ifnet *); +int mac_inpcb_init(struct inpcb *, int); +void mac_sysvmsg_init(struct msg *); +void mac_sysvmsq_init(struct msqid_kernel *); +void mac_sysvsem_init(struct semid_kernel *); +void mac_sysvshm_init(struct shmid_kernel *); int mac_init_ipq(struct ipq *, int); int mac_init_socket(struct socket *, int); -void mac_init_pipe(struct pipepair *); -void mac_init_posix_sem(struct ksem *); -int mac_init_mbuf(struct mbuf *, int); -int mac_init_mbuf_tag(struct m_tag *, int); -void mac_init_mount(struct mount *); -void mac_init_proc(struct proc *); -void mac_init_vnode(struct vnode *); +void mac_pipe_init(struct pipepair *); +void mac_posix_sem_init(struct ksem *); +int mac_mbuf_init(struct mbuf *, int); +int mac_mbuf_tag_init(struct m_tag *, int); +void mac_mount_init(struct mount *); +void mac_proc_init(struct proc *); +void mac_vnode_init(struct vnode *); void mac_copy_mbuf(struct mbuf *, struct mbuf *); void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); void mac_copy_vnode_label(struct label *, struct label *); -void mac_destroy_bpfdesc(struct bpf_d *); -void mac_destroy_cred(struct ucred *); -void mac_destroy_devfs(struct devfs_dirent *); -void mac_destroy_ifnet(struct ifnet *); -void mac_destroy_inpcb(struct inpcb *); -void mac_destroy_sysv_msgmsg(struct msg *); -void mac_destroy_sysv_msgqueue(struct msqid_kernel *); -void mac_destroy_sysv_sem(struct semid_kernel *); -void mac_destroy_sysv_shm(struct shmid_kernel *); +void mac_bpfdesc_destroy(struct bpf_d *); +void mac_cred_destroy(struct ucred *); +void mac_devfs_destroy(struct devfs_dirent *); +void mac_ifnet_destroy(struct ifnet *); +void mac_inpcb_destroy(struct inpcb *); +void mac_sysvmsg_destroy(struct msg *); +void mac_sysvmsq_destroy(struct msqid_kernel *); +void mac_sysvsem_destroy(struct semid_kernel *); +void mac_sysvshm_destroy(struct shmid_kernel *); void mac_destroy_ipq(struct ipq *); void mac_destroy_socket(struct socket *); -void mac_destroy_pipe(struct pipepair *); -void mac_destroy_posix_sem(struct ksem *); -void mac_destroy_proc(struct proc *); -void mac_destroy_mbuf_tag(struct m_tag *); -void mac_destroy_mount(struct mount *); -void mac_destroy_vnode(struct vnode *); +void mac_pipe_destroy(struct pipepair *); +void mac_posix_sem_destroy(struct ksem *); +void mac_proc_destroy(struct proc *); +void mac_mbuf_tag_destroy(struct m_tag *); +void mac_mount_destroy(struct mount *); +void mac_vnode_destroy(struct vnode *); struct label *mac_cred_label_alloc(void); void mac_cred_label_free(struct label *); @@ -138,15 +138,15 @@ * Labeling event operations: file system objects, and things that look a lot * like file system objects. */ -void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, +void mac_vnode_associate_devfs(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); -int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); -void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -void mac_create_devfs_device(struct ucred *cred, struct mount *mp, +int mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp); +void mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp); +void mac_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de); -void mac_create_devfs_directory(struct mount *mp, char *dirname, +void mac_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de); -void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, +void mac_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct devfs_dirent *de); int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); From owner-p4-projects@FreeBSD.ORG Mon Sep 10 15:48:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96A616A420; Mon, 10 Sep 2007 15:48:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B4FA16A41A for ; Mon, 10 Sep 2007 15:48:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A34F13C4DA for ; Mon, 10 Sep 2007 15:48:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8AFmAXL032822 for ; Mon, 10 Sep 2007 15:48:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8AFm975032819 for perforce@freebsd.org; Mon, 10 Sep 2007 15:48:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Sep 2007 15:48:09 GMT Message-Id: <200709101548.l8AFm975032819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 126272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 15:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=126272 Change 126272 by rwatson@rwatson_zoo on 2007/09/10 15:48:00 Integrate TrustedBSD MAC2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/zyd/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mount.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -734,6 +734,11 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_sched_getaffinity_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)]; + char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)]; +}; struct linux_set_thread_area_args { char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; }; @@ -1099,6 +1104,7 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *); int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); int linux_exit_group(struct thread *, struct linux_exit_group_args *); @@ -1172,6 +1178,13 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD6 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 @@ -1346,6 +1359,7 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_sched_getaffinity AUE_NULL #define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL #define LINUX_SYS_AUE_linux_exit_group AUE_EXIT ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #define LINUX_SYS_exit 1 @@ -222,6 +222,7 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_sched_getaffinity 242 #define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_linux_exit_group 252 ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #include @@ -262,7 +262,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -408,7 +408,8 @@ 240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity -242 AUE_NULL UNIMPL linux_sched_getaffinity +242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ + l_ulong *user_mask_ptr); } 243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } 244 AUE_NULL UNIMPL linux_get_thread_area 245 AUE_NULL UNIMPL linux_io_setup ==== //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.67 2007/08/28 20:28:11 jhb Exp $"); #include "opt_compat.h" @@ -135,28 +135,28 @@ static void copy_statfs(struct statfs *in, struct statfs32 *out) { - + + statfs_scale_blocks(in, INT32_MAX); bzero(out, sizeof(*out)); CP(*in, *out, f_bsize); - CP(*in, *out, f_iosize); + out->f_iosize = MIN(in->f_iosize, INT32_MAX); CP(*in, *out, f_blocks); CP(*in, *out, f_bfree); CP(*in, *out, f_bavail); - CP(*in, *out, f_files); - CP(*in, *out, f_ffree); + out->f_files = MIN(in->f_files, INT32_MAX); + out->f_ffree = MIN(in->f_ffree, INT32_MAX); CP(*in, *out, f_fsid); CP(*in, *out, f_owner); CP(*in, *out, f_type); CP(*in, *out, f_flags); - CP(*in, *out, f_flags); - CP(*in, *out, f_syncwrites); - CP(*in, *out, f_asyncwrites); + out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX); + out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX); strlcpy(out->f_fstypename, in->f_fstypename, MFSNAMELEN); strlcpy(out->f_mntonname, in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN)); - CP(*in, *out, f_syncreads); - CP(*in, *out, f_asyncreads); + out->f_syncreads = MIN(in->f_syncreads, INT32_MAX); + out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX); strlcpy(out->f_mntfromname, in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN)); } ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.213 2007/06/12 00:11:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.214 2007/08/28 12:26:35 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1713,3 +1713,24 @@ return (error); } + +/* + * XXX: fake one.. waiting for real implementation of affinity mask. + */ +int +linux_sched_getaffinity(struct thread *td, + struct linux_sched_getaffinity_args *args) +{ + int error; + cpumask_t i = ~0; + + if (args->len < sizeof(cpumask_t)) + return (EINVAL); + + error = copyout(&i, args->user_mask_ptr, sizeof(cpumask_t)); + if (error) + return (EFAULT); + + td->td_retval[0] = sizeof(cpumask_t); + return (0); +} ==== //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.106 2007/07/02 20:08:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.107 2007/08/28 00:09:12 jkim Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -184,8 +184,8 @@ const struct firmware * fw; union { struct { - char wwnn[17]; - char wwpn[17]; + char wwnn[19]; + char wwpn[19]; } fc; } sysctl_info; #endif ==== //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.326 2007/07/25 07:11:08 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.327 2007/08/29 21:00:57 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -865,6 +865,8 @@ /* ASUS products */ product ASUS WL167G 0x1707 WL-167g Wireless Adapter +product ASUS WL159G 0x170c WL-159g +product ASUS A9T_WIFI 0x171b A9T wireless product ASUS RT2573_1 0x1723 RT2573 product ASUS RT2573_2 0x1724 RT2573 @@ -1054,6 +1056,9 @@ product CURITEL HX57XB 0x2101 CDMA 2000 1xRTT USB modem (HX-570/575B/PR-600) product CURITEL PC5740 0x3701 Broadband Wireless modem +/* CyberTAN Technology products */ +product CYBERTAN TG54USB 0x1666 TG54USB + /* Cypress Semiconductor products */ product CYPRESS MOUSE 0x0001 mouse product CYPRESS THERMO 0x0002 thermometer @@ -1121,6 +1126,9 @@ /* DMI products */ product DMI CFSM_RW 0xa109 CF/SM Reader/Writer +/* DrayTek products */ +product DRAYTEK VIGOR550 0x0550 Vigor550 + /* EIZO products */ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor @@ -1200,6 +1208,9 @@ /* FEIYA products */ product FEIYA 5IN1 0x1132 5-in-1 Card Reader +/* Fiberline */ +product FIBERLINE WL430U 0x6003 WL-430U + /* Fossil, Inc products */ product FOSSIL WRISTPDA 0x0002 Wrist PDA @@ -1585,6 +1596,7 @@ product MELCO PCOPRS1 0x00b3 PC-OP-RS1 RemoteStation product MELCO SG54HP 0x00d8 WLI-U2-SG54HP product MELCO G54HP 0x00d9 WLI-U2-G54HP +product MELCO KG54L 0x00da WLI-U2-KG54L /* MetaGeek products */ product METAGEEK WISPYX 0x083e MetaGeek Wi-Spy 2.4x @@ -1815,6 +1827,7 @@ product PHILIPS PCA646VC 0x0303 PCA646VC PC Camera product PHILIPS PCVC680K 0x0308 PCVC680K Vesta Pro PC Camera product PHILIPS DSS150 0x0471 DSS 150 Digital Speaker System +product PHILIPS SNU5600 0x1236 SNU5600 product PHILIPS UM10016 0x1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit product PHILIPS DIVAUSB 0x1801 DIVA USB mp3 player @@ -1832,6 +1845,7 @@ product PLANEX2 GWUS54SG 0xc002 GW-US54SG product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL product PLANEX2 GWUSMM 0xed02 GW-USMM +product PLANEX3 GWUS54GZ 0xab10 GW-US54GZ product PLANEX3 GU1000T 0xab11 GU-1000T product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini @@ -1930,6 +1944,8 @@ /* Sagem products */ product SAGEM USBSERIAL 0x0027 USB-Serial Controller +product SAGEM XG760A 0x004a XG-760A +product SAGEM XG76NA 0x0062 XG-76NA /* Samsung products */ product SAMSUNG ML6060 0x3008 ML-6060 laser printer @@ -1957,6 +1973,9 @@ product SCANLOGIC SL11R 0x0002 SL11R IDE Adapter product SCANLOGIC 336CX 0x0300 Phantom 336CX - C3 scanner +/* Senao products */ +product SENAO NUB8301 0x2000 NUB-8301 + /* ShanTou products */ product SHANTOU ST268 0x0268 ST268 @@ -2114,6 +2133,9 @@ product SURECOM RT2570 0x11f3 RT2570 product SURECOM RT2573 0x31f3 RT2573 +/* Sweex products */ +product SWEEX ZD1211 0x1809 ZD1211 + /* System TALKS, Inc. */ product SYSTEMTALKS SGCX2UL 0x1920 SGC-X2UL @@ -2133,6 +2155,11 @@ /* TEAC products */ product TEAC FD05PUB 0x0000 FD-05PUB floppy +/* Tekram Technology products */ +product TEKRAM QUICKWLAN 0x1630 QuickWLAN +product TEKRAM ZD1211_1 0x5630 ZD1211 +product TEKRAM ZD1211_2 0x6630 ZD1211 + /* Telex Communications products */ product TELEX MIC1 0x0001 Enhanced USB Microphone @@ -2166,6 +2193,7 @@ product TRUMPION MP3 0x1200 MP3 player /* TwinMOS */ +product TWINMOS G240 0xa006 G240 product TWINMOS MDIV 0x1325 Memory Disk IV /* Ubiquam products */ @@ -2187,12 +2215,17 @@ product UMEDIA TEW444UBEU_NF 0x3007 TEW-444UB EU (no firmware) product UMEDIA TEW429UB_A 0x300a TEW-429UB_A product UMEDIA TEW429UB 0x300b TEW-429UB +product UMEDIA TEW429UBC1 0x300d TEW-429UB C1 +product UMEDIA ALL0298V2 0x3204 ALL0298 v2 product UMEDIA AR5523_2 0x3205 AR5523 product UMEDIA AR5523_2_NF 0x3206 AR5523 (no firmware) /* Universal Access products */ product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter +/* U.S. Robotics products */ +product USR USR5423 0x0121 USR5423 WLAN + /* VidzMedia products */ product VIDZMEDIA MONSTERTV 0x4fb1 MonsterTV P2H @@ -2213,6 +2246,7 @@ /* VTech products */ product VTECH RT2570 0x3012 RT2570 +product VTECH ZD1211B 0x3014 ZD1211B /* Wacom products */ product WACOM CT0405U 0x0000 CT-0405-U Tablet @@ -2265,8 +2299,10 @@ product ZCOM M4Y750 0x0001 M4Y-750 product ZCOM XI725 0x0002 XI-725/726 product ZCOM XI735 0x0005 XI-735 +product ZCOM ZD1211 0x0011 ZD1211 product ZCOM AR5523 0x0012 AR5523 product ZCOM AR5523_NF 0x0013 AR5523 driver (no firmware) +product ZCOM ZD1211B 0x001a ZD1211B /* Zinwell products */ product ZINWELL RT2570 0x0260 RT2570 @@ -2277,6 +2313,15 @@ /* Zoran Microelectronics products */ product ZORAN EX20DSC 0x4343 Digital Camera EX-20 DSC +/* Zydas Technology Corporation products */ +product ZYDAS ZD1211 0x1211 ZD1211 WLAN abg +product ZYDAS ZD1211B 0x1215 ZD1211B + /* ZyXEL Communication Co. products */ product ZYXEL OMNI56K 0x1500 Omni 56K Plus product ZYXEL 980N 0x2011 Scorpion-980N keyboard +product ZYXEL ZYAIRG220 0x3401 ZyAIR G-220 +product ZYXEL G200V2 0x3407 G-200 v2 +product ZYXEL AG225H 0x3409 AG-225H +product ZYXEL M202 0x340a M-202 +product ZYXEL G220V2 0x340f G-220 v2 ==== //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.93 2007/08/28 12:32:01 kib Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.88 2007/08/28 12:26:35 kib Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -731,6 +731,11 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_sched_getaffinity_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)]; + char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)]; +}; struct linux_set_thread_area_args { char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; }; @@ -1118,6 +1123,7 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *); int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_get_thread_area(struct thread *, struct linux_get_thread_area_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); @@ -1192,6 +1198,13 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD6 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 @@ -1366,6 +1379,7 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_sched_getaffinity AUE_NULL #define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_get_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL ==== //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.85 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.86 2007/08/28 12:32:01 kib Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.88 2007/08/28 12:26:35 kib Exp */ #define LINUX_SYS_exit 1 @@ -228,6 +228,7 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_sched_getaffinity 242 #define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_get_thread_area 244 #define LINUX_SYS_linux_fadvise64 250 ==== //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.93 2007/08/28 12:32:01 kib Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.88 2007/08/28 12:26:35 kib Exp */ #include @@ -261,7 +261,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ { AS(linux_get_thread_area_args), (sy_call_t *)linux_get_thread_area, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ ==== //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.88 2007/08/28 12:26:35 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -410,7 +410,8 @@ 240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity -242 AUE_NULL UNIMPL linux_sched_getaffinity +242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ + l_ulong *user_mask_ptr); } 243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } 244 AUE_NULL STD { int linux_get_thread_area(struct l_user_desc *desc); } 245 AUE_NULL UNIMPL linux_io_setup ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.120 2007/06/13 20:01:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.121 2007/08/29 21:17:11 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -444,8 +444,6 @@ ktruserret(struct thread *td) { - if (STAILQ_EMPTY(&td->td_proc->p_ktr)) - return; ktrace_enter(td); sx_xlock(&ktrace_sx); ktr_drain(td); ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.441 2007/07/04 22:57:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.442 2007/08/28 20:28:11 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -206,6 +206,47 @@ } /* + * Used by statfs conversion routines to scale the block size up if + * necessary so that all of the block counts are <= 'max_size'. Note + * that 'max_size' should be a bitmask, i.e. 2^n - 1 for some non-zero + * value of 'n'. + */ +void +statfs_scale_blocks(struct statfs *sf, long max_size) +{ + uint64_t count; + int shift; + + KASSERT(powerof2(max_size + 1), ("%s: invalid max_size", __func__)); + + /* + * Attempt to scale the block counts to give a more accurate + * overview to userland of the ratio of free space to used + * space. To do this, find the largest block count and compute + * a divisor that lets it fit into a signed integer <= max_size. + */ + if (sf->f_bavail < 0) + count = -sf->f_bavail; + else + count = sf->f_bavail; + count = MAX(sf->f_blocks, MAX(sf->f_bfree, count)); + if (count <= max_size) + return; + + count >>= flsl(max_size); + shift = 0; + while (count > 0) { + shift++; + count >>=1; + } + + sf->f_bsize <<= shift; + sf->f_blocks >>= shift; + sf->f_bfree >>= shift; + sf->f_bavail >>= shift; +} + +/* * Get filesystem statistics. */ #ifndef _SYS_SYSPROTO_H_ @@ -636,12 +677,13 @@ struct ostatfs *osp; { + statfs_scale_blocks(nsp, LONG_MAX); bzero(osp, sizeof(*osp)); - osp->f_bsize = MIN(nsp->f_bsize, LONG_MAX); + osp->f_bsize = nsp->f_bsize; osp->f_iosize = MIN(nsp->f_iosize, LONG_MAX); - osp->f_blocks = MIN(nsp->f_blocks, LONG_MAX); - osp->f_bfree = MIN(nsp->f_bfree, LONG_MAX); - osp->f_bavail = MIN(nsp->f_bavail, LONG_MAX); + osp->f_blocks = nsp->f_blocks; + osp->f_bfree = nsp->f_bfree; + osp->f_bavail = nsp->f_bavail; osp->f_files = MIN(nsp->f_files, LONG_MAX); osp->f_ffree = MIN(nsp->f_ffree, LONG_MAX); osp->f_owner = nsp->f_owner; ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.172 2007/08/26 18:38:30 maxim Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.173 2007/08/29 19:34:28 green Exp $ */ #define DEB(x) @@ -3077,7 +3077,6 @@ else at->af = AF_LINK; at->hdr = ip; - m_tag_prepend(m, mtag); break; } ==== //depot/projects/trustedbsd/mac2/sys/sys/mount.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.21 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/sys/mount.h,v 1.226 2007/04/22 16:18:10 rwatson Exp $ + * $FreeBSD: src/sys/sys/mount.h,v 1.227 2007/08/28 20:28:12 jhb Exp $ */ #ifndef _SYS_MOUNT_H_ @@ -653,6 +653,7 @@ struct mntarg *mount_argb(struct mntarg *ma, int flag, const char *name); struct mntarg *mount_argf(struct mntarg *ma, const char *name, const char *fmt, ...); struct mntarg *mount_argsu(struct mntarg *ma, const char *name, const void *val, int len); +void statfs_scale_blocks(struct statfs *sf, long max_size); struct vfsconf *vfs_byname(const char *); struct vfsconf *vfs_byname_kld(const char *, struct thread *td, int *); void vfs_mount_destroy(struct mount *); From owner-p4-projects@FreeBSD.ORG Mon Sep 10 18:50:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56EBB16A421; Mon, 10 Sep 2007 18:50:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F229F16A41B for ; Mon, 10 Sep 2007 18:50:08 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6E6F13C494 for ; Mon, 10 Sep 2007 18:50:08 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8AIo8pR064624 for ; Mon, 10 Sep 2007 18:50:08 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8AIo8Na064620 for perforce@freebsd.org; Mon, 10 Sep 2007 18:50:08 GMT (envelope-from mharvan@FreeBSD.org) Date: Mon, 10 Sep 2007 18:50:08 GMT Message-Id: <200709101850.l8AIo8Na064620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 18:50:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=126280 Change 126280 by mharvan@mharvan_bike-planet on 2007/09/10 18:49:38 update the README based on feedback from Christopher Arnold * libevent has to be installed * remove the -p option Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/README#5 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/mtund.c#15 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/README#5 (text+ko) ==== @@ -4,11 +4,12 @@ On a FreeBSD system, a simple make should suffice. Before that, please patch your system with patches in ../sys.patches to get additional -goodies. +goodies. Note that you also need to install libevent, i.e., pkg_add -r +libevent. USAGE -server: tunneld -s -p port -client: tunneld -c -p port host +server: tunneld -s +client: tunneld -c host You should set up nat on the tun interfaces. With pf: nat on ral0 from !(ral0) to any -> (ral0) ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/mtund.c#15 (text+ko) ==== @@ -1338,8 +1338,8 @@ /* } */ /* pl = load_plugin("./plugin_tcp.so"); */ /* pl->name = "tcp_1234"; */ -/* pl = load_plugin("./plugin_icmp.so"); */ -/* pl->name = "icmp"; */ + pl = load_plugin("./plugin_icmp.so"); + pl->name = "icmp"; pl = load_plugin("./plugin_dns/plugin_dns.so"); pl->name = "dns_53"; From owner-p4-projects@FreeBSD.ORG Mon Sep 10 19:30:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58EA416A419; Mon, 10 Sep 2007 19:30:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D795016A421 for ; Mon, 10 Sep 2007 19:30:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC6DA13C457 for ; Mon, 10 Sep 2007 19:30:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8AJU169068528 for ; Mon, 10 Sep 2007 19:30:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8AJU1Vx068524 for perforce@freebsd.org; Mon, 10 Sep 2007 19:30:01 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 10 Sep 2007 19:30:01 GMT Message-Id: <200709101930.l8AJU1Vx068524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 126284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 19:30:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=126284 Change 126284 by pgj@disznohal on 2007/09/10 19:29:52 IFC Affected files ... .. //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/docproj_hu/share/sgml/translators.ent#2 integrate Differences ... ==== //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -996,6 +996,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') ==== //depot/projects/docproj_hu/share/sgml/translators.ent#2 (text+ko) ==== @@ -1,8 +1,8 @@ gabor@FreeBSD.org"> -pali.gabor@gmail.com"> +pgj@FreeBSD.org"> From owner-p4-projects@FreeBSD.ORG Mon Sep 10 20:27:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A9916A421; Mon, 10 Sep 2007 20:27:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D22C816A417 for ; Mon, 10 Sep 2007 20:27:29 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id 6DE8B13C469 for ; Mon, 10 Sep 2007 20:27:26 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 54290667217; Mon, 10 Sep 2007 22:27:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kh8uYVJcg8cp; Mon, 10 Sep 2007 22:27:24 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 276D3667202; Mon, 10 Sep 2007 22:27:24 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l8AKRNsM070756; Mon, 10 Sep 2007 22:27:23 +0200 (CEST) (envelope-from rdivacky) Date: Mon, 10 Sep 2007 22:27:23 +0200 From: Roman Divacky To: Matus Harvan Message-ID: <20070910202723.GA70743@freebsd.org> References: <200709101850.l8AIo8Na064620@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200709101850.l8AIo8Na064620@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 126280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 20:27:30 -0000 On Mon, Sep 10, 2007 at 06:50:08PM +0000, Matus Harvan wrote: > http://perforce.freebsd.org/chv.cgi?CH=126280 > > Change 126280 by mharvan@mharvan_bike-planet on 2007/09/10 18:49:38 > > update the README based on feedback from Christopher Arnold > * libevent has to be installed > * remove the -p option havent we imported a (subset of) libevent recently? From owner-p4-projects@FreeBSD.ORG Mon Sep 10 20:51:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C6AB16A468; Mon, 10 Sep 2007 20:51:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E380C16A418; Mon, 10 Sep 2007 20:51:08 +0000 (UTC) (envelope-from matus.harvan@inf.ethz.ch) Received: from xsmtp1.ethz.ch (xsmtp1.ethz.ch [82.130.70.13]) by mx1.freebsd.org (Postfix) with ESMTP id 5EAA413C481; Mon, 10 Sep 2007 20:51:07 +0000 (UTC) (envelope-from matus.harvan@inf.ethz.ch) Received: from xfe1.d.ethz.ch ([82.130.124.41]) by xsmtp1.ethz.ch with Microsoft SMTPSVC(6.0.3790.3959); Mon, 10 Sep 2007 22:39:02 +0200 Received: from bike-planet.inf.ethz.ch ([82.130.71.8]) by xfe1.d.ethz.ch over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 10 Sep 2007 22:39:02 +0200 Received: by bike-planet.inf.ethz.ch (Postfix, from userid 1001) id 4847C1D27CB; Mon, 10 Sep 2007 22:39:06 +0200 (CEST) Date: Mon, 10 Sep 2007 22:39:05 +0200 From: Matus Harvan To: Roman Divacky Message-ID: <20070910203905.GA4593@iu-bremen.de> References: <200709101850.l8AIo8Na064620@repoman.freebsd.org> <20070910202723.GA70743@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SUOF0GtieIMvvwua" Content-Disposition: inline In-Reply-To: <20070910202723.GA70743@freebsd.org> User-Agent: Mutt/1.4.2.3i X-OriginalArrivalTime: 10 Sep 2007 20:39:02.0238 (UTC) FILETIME=[9F3647E0:01C7F3EA] Cc: Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 126280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 20:51:09 -0000 --SUOF0GtieIMvvwua Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 10, 2007 at 10:27:23PM +0200, Roman Divacky wrote: > On Mon, Sep 10, 2007 at 06:50:08PM +0000, Matus Harvan wrote: > > http://perforce.freebsd.org/chv.cgi?CH=3D126280 > >=20 > > Change 126280 by mharvan@mharvan_bike-planet on 2007/09/10 18:49:38 > >=20 > > update the README based on feedback from Christopher Arnold > > * libevent has to be installed > > * remove the -p option >=20 > havent we imported a (subset of) libevent recently? Don't know much about that. There seems to be something in /usr/include/sys/event.h, but I have not tried using it yet. Matus --SUOF0GtieIMvvwua Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG5atp43LQWDWf0QIRAmeZAKCFCbbA07PECh/0s/3DHpNR1ceRYQCfUVmP chsTk4sgTXeSVxHHyY5eenc= =ArEM -----END PGP SIGNATURE----- --SUOF0GtieIMvvwua-- From owner-p4-projects@FreeBSD.ORG Mon Sep 10 21:03:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7F5C16A419; Mon, 10 Sep 2007 21:03:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90A0216A477; Mon, 10 Sep 2007 21:03:16 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id 3C70213C49D; Mon, 10 Sep 2007 21:03:16 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 28F49667228; Mon, 10 Sep 2007 23:03:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kaC7BSuxPuNU; Mon, 10 Sep 2007 23:03:14 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 0F76266721E; Mon, 10 Sep 2007 23:03:14 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l8AL3DCI072002; Mon, 10 Sep 2007 23:03:13 +0200 (CEST) (envelope-from rdivacky) Date: Mon, 10 Sep 2007 23:03:13 +0200 From: Roman Divacky To: Matus Harvan Message-ID: <20070910210313.GA71970@freebsd.org> References: <200709101850.l8AIo8Na064620@repoman.freebsd.org> <20070910202723.GA70743@freebsd.org> <20070910203905.GA4593@iu-bremen.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070910203905.GA4593@iu-bremen.de> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 126280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 21:03:17 -0000 On Mon, Sep 10, 2007 at 10:39:05PM +0200, Matus Harvan wrote: > On Mon, Sep 10, 2007 at 10:27:23PM +0200, Roman Divacky wrote: > > On Mon, Sep 10, 2007 at 06:50:08PM +0000, Matus Harvan wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=126280 > > > > > > Change 126280 by mharvan@mharvan_bike-planet on 2007/09/10 18:49:38 > > > > > > update the README based on feedback from Christopher Arnold > > > * libevent has to be installed > > > * remove the -p option > > > > havent we imported a (subset of) libevent recently? > > Don't know much about that. There seems to be something in > /usr/include/sys/event.h, but I have not tried using it yet. check src/contrib/pf/libevent From owner-p4-projects@FreeBSD.ORG Tue Sep 11 08:37:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20F7016A419; Tue, 11 Sep 2007 08:37:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB0D916A41A for ; Tue, 11 Sep 2007 08:37:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF06813C459 for ; Tue, 11 Sep 2007 08:37:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8B8bF22064404 for ; Tue, 11 Sep 2007 08:37:15 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8B8bFZF064401 for perforce@freebsd.org; Tue, 11 Sep 2007 08:37:15 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 11 Sep 2007 08:37:15 GMT Message-Id: <200709110837.l8B8bFZF064401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 08:37:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=126303 Change 126303 by zec@zec_tpx32 on 2007/09/11 08:37:03 Remove a debugging printf() which was firing when more than one reader would be acquiring a lock ovet global vnet list. Given that so far no problems with the vnet list locking scheme were encountered on neither UP nor SMP machines, this printf() goes away to reduce occasional noise... Affected files ... .. //depot/projects/vimage/src/sys/sys/vimage.h#36 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/vimage.h#36 (text+ko) ==== @@ -329,9 +329,6 @@ #define VNET_LIST_REF() \ mtx_lock(&vnet_list_refc_mtx); \ vnet_list_refc++; \ - if (vnet_list_refc > 1) \ - printf ("XXX vnet_list_refc = %d in %s\n", \ - vnet_list_refc, __FUNCTION__); \ mtx_unlock(&vnet_list_refc_mtx); #define VNET_LIST_UNREF() \ From owner-p4-projects@FreeBSD.ORG Tue Sep 11 09:12:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9E6916A41B; Tue, 11 Sep 2007 09:12:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F4C516A418 for ; Tue, 11 Sep 2007 09:12:01 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A351B13C4A8 for ; Tue, 11 Sep 2007 09:12:01 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8B9C1kJ076279 for ; Tue, 11 Sep 2007 09:12:01 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8B9C1tA076276 for perforce@freebsd.org; Tue, 11 Sep 2007 09:12:01 GMT (envelope-from mharvan@FreeBSD.org) Date: Tue, 11 Sep 2007 09:12:01 GMT Message-Id: <200709110912.l8B9C1tA076276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 09:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=126305 Change 126305 by mharvan@mharvan_peleus on 2007/09/11 09:11:05 s/CATCHAL/LISTENALL/g where I forgot to do it last time Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#17 edit .. //depot/projects/soc2007/mharvan-mtund/sys.patches/usr_include.patch#3 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#17 (text+ko) ==== @@ -51,7 +51,7 @@ #define MAXTMPCONNS 10 #define TEMP_CONN_TIMEOUT 5 -#define USE_TCP_CATCHALL 1 +#define USE_TCP_LISTENALL 1 #define min(a,b) ( (a>b) ? b : a ) @@ -393,12 +393,12 @@ /* open the socket */ if (server) { data->conns->fd = tcp_listen(port); - /* enable TCP_CATCHALL */ - if (USE_TCP_CATCHALL != 0) { + /* enable TCP_LISTENALL */ + if (USE_TCP_LISTENALL != 0) { int soval = 1; if (0 != setsockopt(data->conns->fd, IPPROTO_TCP, - TCP_CATCHALL, &soval, sizeof(soval))) - warnx("setsockopt(TCP_CATCHALL) failed\n"); + TCP_LISTENALL, &soval, sizeof(soval))) + warnx("setsockopt(TCP_LISTENALL) failed\n"); } event_set(&data->conns->ev, data->conns->fd, EV_PERSIST | EV_READ, ==== //depot/projects/soc2007/mharvan-mtund/sys.patches/usr_include.patch#3 (text+ko) ==== @@ -4,7 +4,7 @@ #define TCP_NOOPT 0x08 /* don't use TCP options */ #define TCP_MD5SIG 0x10 /* use MD5 digests (RFC2385) */ #define TCP_INFO 0x20 /* retrieve tcp_info structure */ -+#define TCP_LISTENALL 0x40 /* bind to all unused TCP ports */ ++#define TCP_LISTENALL 0x40 /* listen on all unused TCP ports */ #define TCPI_OPT_TIMESTAMPS 0x01 #define TCPI_OPT_SACK 0x02 From owner-p4-projects@FreeBSD.ORG Tue Sep 11 09:38:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F034116A41A; Tue, 11 Sep 2007 09:38:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9EA216A418 for ; Tue, 11 Sep 2007 09:38:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4C9713C458 for ; Tue, 11 Sep 2007 09:38:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8B9caow077695 for ; Tue, 11 Sep 2007 09:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8B9cacT077692 for perforce@freebsd.org; Tue, 11 Sep 2007 09:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Sep 2007 09:38:36 GMT Message-Id: <200709110938.l8B9cacT077692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 126306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 09:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=126306 Change 126306 by rwatson@rwatson_zoo on 2007/09/11 09:38:28 Fix typo. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#6 (text+ko) ==== @@ -269,7 +269,7 @@ } int -mac_ocket_check_saccept(struct ucred *cred, struct socket *so) +mac_socket_check_accept(struct ucred *cred, struct socket *so) { int error; From owner-p4-projects@FreeBSD.ORG Tue Sep 11 09:39:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D4B216A41B; Tue, 11 Sep 2007 09:39:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B12C16A418 for ; Tue, 11 Sep 2007 09:39:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9FB13C46E for ; Tue, 11 Sep 2007 09:39:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8B9dckG077731 for ; Tue, 11 Sep 2007 09:39:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8B9dcn2077728 for perforce@freebsd.org; Tue, 11 Sep 2007 09:39:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Sep 2007 09:39:38 GMT Message-Id: <200709110939.l8B9dcn2077728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 126307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 09:39:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=126307 Change 126307 by rwatson@rwatson_zoo on 2007/09/11 09:39:24 Fix typos. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#6 (text+ko) ==== @@ -934,7 +934,7 @@ static int mac_biba_vnode_create_extattr(struct ucred *cred, struct mount *mp, struct label *mplabel, struct vnode *dvp, struct label *dvplabel, - struct vnode *vp, struct label *vvplabel, struct componentname *cnp) + struct vnode *vp, struct label *vplabel, struct componentname *cnp) { struct mac_biba *source, *dest, temp; size_t buflen; @@ -1334,7 +1334,7 @@ } static int -mac_biba_ipq_match(struct mbuf *m, struct label *mabel, +mac_biba_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_biba *a, *b; @@ -3243,7 +3243,7 @@ static struct mac_policy_ops mac_biba_ops = { - .mpo_policy_init = mac_biba_policy_init, + .mpo_init = mac_biba_policy_init, .mpo_bpfdesc_init_label = mac_biba_init_label, .mpo_cred_init_label = mac_biba_init_label, .mpo_devfs_init_label = mac_biba_init_label, From owner-p4-projects@FreeBSD.ORG Tue Sep 11 20:08:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 565D616A468; Tue, 11 Sep 2007 20:08:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1484A16A420 for ; Tue, 11 Sep 2007 20:08:05 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15CAB13C46B for ; Tue, 11 Sep 2007 20:08:05 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8BK84iu053098 for ; Tue, 11 Sep 2007 20:08:04 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8BK8418053095 for perforce@freebsd.org; Tue, 11 Sep 2007 20:08:04 GMT (envelope-from cnst@FreeBSD.org) Date: Tue, 11 Sep 2007 20:08:04 GMT Message-Id: <200709112008.l8BK8418053095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 20:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126311 Change 126311 by cnst@dale on 2007/09/11 20:07:44 integrate; resolve; submit Affected files ... .. //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#2 integrate Differences ... ==== //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.22 2006/11/27 20:19:05 yar Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.23 2007/09/11 07:51:03 ru Exp $"); /* * Pigs display from Bill Reeves at Lucasfilm @@ -66,7 +66,6 @@ struct kinfo_proc *pt_kp; } *pt; -static long stime[CPUSTATES]; static int fscale; static double lccpu; @@ -92,45 +91,27 @@ showpigs() { register int i, j, y, k; - float total; - int factor; const char *uname, *pname; char pidname[30]; if (pt == NULL) return; - /* Accumulate the percent of cpu per user. */ - total = 0.0; - for (i = 0; i <= nproc; i++) { - /* Accumulate the percentage. */ - total += pt[i].pt_pctcpu; - } - if (total < 1.0) - total = 1.0; - factor = 50.0/total; - - qsort(pt, nproc + 1, sizeof (struct p_times), compar); + qsort(pt, nproc, sizeof (struct p_times), compar); y = 1; - i = nproc + 1; + i = nproc; if (i > wnd->_maxy-1) i = wnd->_maxy-1; for (k = 0; i > 0 && pt[k].pt_pctcpu > 0.01; i--, y++, k++) { - if (pt[k].pt_kp == NULL) { - uname = ""; - pname = ""; - } - else { - uname = user_from_uid(pt[k].pt_kp->ki_uid, 0); - pname = pt[k].pt_kp->ki_comm; - } + uname = user_from_uid(pt[k].pt_kp->ki_uid, 0); + pname = pt[k].pt_kp->ki_comm; wmove(wnd, y, 0); wclrtoeol(wnd); mvwaddstr(wnd, y, 0, uname); snprintf(pidname, sizeof(pidname), "%10.10s", pname); mvwaddstr(wnd, y, 9, pidname); wmove(wnd, y, 20); - for (j = pt[k].pt_pctcpu*factor + 0.5; j > 0; j--) + for (j = pt[k].pt_pctcpu * 50 + 0.5; j > 0; j--) waddch(wnd, 'X'); } wmove(wnd, y, 0); wclrtobot(wnd); @@ -143,13 +124,6 @@ size_t len; int err; - len = sizeof(stime); - err = sysctlbyname("kern.cp_time", &stime, &len, NULL, 0); - if (err || len != sizeof(stime)) { - perror("kern.cp_time"); - return (0); - } - len = sizeof(ccpu); err = sysctlbyname("kern.ccpu", &ccpu, &len, NULL, 0); if (err || len != sizeof(ccpu)) { @@ -176,11 +150,7 @@ float ftime; float *pctp; struct kinfo_proc *kpp; - long c_time[CPUSTATES]; - double t; static int lastnproc = 0; - size_t len; - int err; if ((kpp = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc)) == NULL) { error("%s", kvm_geterr(kd)); @@ -191,7 +161,7 @@ if (nproc > lastnproc) { free(pt); if ((pt = - malloc((nproc + 1) * sizeof(struct p_times))) == NULL) { + malloc(nproc * sizeof(struct p_times))) == NULL) { error("Out of memory"); die(0); } @@ -210,24 +180,6 @@ *pctp = ((double) kpp[i].ki_pctcpu / fscale) / (1.0 - exp(ftime * lccpu)); } - /* - * and for the imaginary "idle" process - */ - len = sizeof(c_time); - err = sysctlbyname("kern.cp_time", &c_time, &len, NULL, 0); - if (err || len != sizeof(c_time)) { - perror("kern.cp_time"); - return; - } - t = 0; - for (i = 0; i < CPUSTATES; i++) - t += c_time[i] - stime[i]; - if (t == 0.0) - t = 1.0; - pt[nproc].pt_kp = NULL; - pt[nproc].pt_pctcpu = (c_time[CP_IDLE] - stime[CP_IDLE]) / t; - for (i = 0; i < CPUSTATES; i++) - stime[i] = c_time[i]; } void From owner-p4-projects@FreeBSD.ORG Wed Sep 12 02:58:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40D1616A419; Wed, 12 Sep 2007 02:58:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F154916A41B for ; Wed, 12 Sep 2007 02:58:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AED6F13C48E for ; Wed, 12 Sep 2007 02:58:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C2wBf3002773 for ; Wed, 12 Sep 2007 02:58:11 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C2wBkH002769 for perforce@freebsd.org; Wed, 12 Sep 2007 02:58:11 GMT (envelope-from cnst@FreeBSD.org) Date: Wed, 12 Sep 2007 02:58:11 GMT Message-Id: <200709120258.l8C2wBkH002769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 02:58:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=126319 Change 126319 by cnst@last on 2007/09/12 02:57:32 branch files.{i386,amd64} Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.conf/files.amd64#1 branch .. //depot/projects/soc2007/cnst-sensors/sys.conf/files.i386#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 12 03:02:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1710E16A468; Wed, 12 Sep 2007 03:02:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C363D16A420 for ; Wed, 12 Sep 2007 03:02:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E24313C457 for ; Wed, 12 Sep 2007 03:02:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C32HK8003302 for ; Wed, 12 Sep 2007 03:02:17 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C32HHJ003299 for perforce@freebsd.org; Wed, 12 Sep 2007 03:02:17 GMT (envelope-from cnst@FreeBSD.org) Date: Wed, 12 Sep 2007 03:02:17 GMT Message-Id: <200709120302.l8C32HHJ003299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 03:02:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=126320 Change 126320 by cnst@last on 2007/09/12 03:01:50 branch modules/Makefile Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 12 03:06:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08A4216A420; Wed, 12 Sep 2007 03:06:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B026716A417 for ; Wed, 12 Sep 2007 03:06:23 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 850D613C478 for ; Wed, 12 Sep 2007 03:06:23 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C36NrI004694 for ; Wed, 12 Sep 2007 03:06:23 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C36Nfe004691 for perforce@freebsd.org; Wed, 12 Sep 2007 03:06:23 GMT (envelope-from cnst@FreeBSD.org) Date: Wed, 12 Sep 2007 03:06:23 GMT Message-Id: <200709120306.l8C36Nfe004691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 03:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=126321 Change 126321 by cnst@last on 2007/09/12 03:06:04 connect lm module to the build Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#2 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#2 (text+ko) ==== @@ -146,6 +146,7 @@ ${_linprocfs} \ ${_linsysfs} \ ${_linux} \ + ${_lm} \ lmc \ lpt \ mac_biba \ @@ -456,6 +457,7 @@ _iwi= iwi _iwifw= iwifw _ixgb= ixgb +_lm= lm _mly= mly _nfe= nfe _nve= nve @@ -515,6 +517,7 @@ _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux +_lm= lm _mly= mly _ndis= ndis _nfe= nfe From owner-p4-projects@FreeBSD.ORG Wed Sep 12 03:14:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2097E16A469; Wed, 12 Sep 2007 03:14:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B161216A420 for ; Wed, 12 Sep 2007 03:14:34 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8079B13C4B7 for ; Wed, 12 Sep 2007 03:14:34 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C3EYb8005268 for ; Wed, 12 Sep 2007 03:14:34 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C3EXiT005263 for perforce@freebsd.org; Wed, 12 Sep 2007 03:14:33 GMT (envelope-from cnst@FreeBSD.org) Date: Wed, 12 Sep 2007 03:14:33 GMT Message-Id: <200709120314.l8C3EXiT005263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 03:14:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=126322 Change 126322 by cnst@last on 2007/09/12 03:14:25 it(4), for most ITE Tech Super I/O Hardware Monitors Obtained from: OpenBSD + applied local modifications for FreeBSD Affected files ... .. //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#10 edit .. //depot/projects/soc2007/cnst-sensors/share.man.man4/Makefile#5 edit .. //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#1 add .. //depot/projects/soc2007/cnst-sensors/sys.amd64.conf/GENERIC.hints#3 edit .. //depot/projects/soc2007/cnst-sensors/sys.conf/files.amd64#2 edit .. //depot/projects/soc2007/cnst-sensors/sys.conf/files.i386#2 edit .. //depot/projects/soc2007/cnst-sensors/sys.dev.it/it.c#1 add .. //depot/projects/soc2007/cnst-sensors/sys.dev.it/itvar.h#1 add .. //depot/projects/soc2007/cnst-sensors/sys.i386.conf/GENERIC.hints#2 edit .. //depot/projects/soc2007/cnst-sensors/sys.modules.it/Makefile#1 add .. //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#10 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $P4: //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#9 $ +# $P4: //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#10 $ # Author: Constantine A. Murenin, 2007-07 # This file creates symbolic links for GSoC2007 cnst_sensors project @@ -17,7 +17,8 @@ #create some directories that are specific for this project, #if they don't exist already echo "DIRS=\"\\" >>$CVSDIFFSH -for i in "sys/dev/lm" "sys/modules/lm" "usr.sbin/sensorsd" +for i in "sys/dev/it" "sys/dev/lm" \ + "sys/modules/it" "sys/modules/lm" "usr.sbin/sensorsd" do DIR2C=$TPREFIX/$i #directory to create if [ ! -d $DIR2C ] ==== //depot/projects/soc2007/cnst-sensors/share.man.man4/Makefile#5 (text+ko) ==== @@ -131,6 +131,7 @@ iscsi_initiator.4 \ isp.4 \ ispfw.4 \ + ${_it.4} \ iwi.4 \ ixgb.4 \ joy.4 \ @@ -548,6 +549,7 @@ _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _if_nxge.4= if_nxge.4 +_it.4= it.4 _ipmi.4= ipmi.4 _nfsmb.4= nfsmb.4 _nfe.4= nfe.4 ==== //depot/projects/soc2007/cnst-sensors/sys.amd64.conf/GENERIC.hints#3 (text+ko) ==== @@ -35,3 +35,9 @@ hint.ppc.0.irq="7" hint.lm.0.at="isa" hint.lm.0.port="0x290" +hint.it.0.at="isa" +hint.it.0.port="0x290" +hint.it.1.at="isa" +hint.it.1.port="0xc00" +hint.it.2.at="isa" +hint.it.2.port="0xd00" ==== //depot/projects/soc2007/cnst-sensors/sys.conf/files.amd64#2 (text+ko) ==== @@ -169,6 +169,7 @@ dev/ipmi/ipmi_smbios.c optional ipmi dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci +dev/it/it.c optional it isa dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa ==== //depot/projects/soc2007/cnst-sensors/sys.conf/files.i386#2 (text+ko) ==== @@ -204,6 +204,7 @@ dev/ipmi/ipmi_smbios.c optional ipmi dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci +dev/it/it.c optional it isa dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_isa.c optional le isa dev/mem/memutil.c optional mem ==== //depot/projects/soc2007/cnst-sensors/sys.i386.conf/GENERIC.hints#2 (text+ko) ==== @@ -78,3 +78,9 @@ hint.le.0.drq="0" hint.lm.0.at="isa" hint.lm.0.port="0x290" +hint.it.0.at="isa" +hint.it.0.port="0x290" +hint.it.1.at="isa" +hint.it.1.port="0xc00" +hint.it.2.at="isa" +hint.it.2.port="0xd00" ==== //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#3 (text+ko) ==== @@ -131,6 +131,7 @@ iscsi \ isp \ ispfw \ + ${_it} \ ${_iwi} \ ${_iwifw} \ ${_ixgb} \ @@ -454,6 +455,7 @@ _ips= ips _ipw= ipw _ipwfw= ipwfw +_it= it _iwi= iwi _iwifw= iwifw _ixgb= ixgb @@ -513,6 +515,7 @@ _ips= ips _ipw= ipw _ipwfw= ipwfw +_it= it _ixgb= ixgb _linprocfs= linprocfs _linsysfs= linsysfs From owner-p4-projects@FreeBSD.ORG Wed Sep 12 06:28:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108FA16A421; Wed, 12 Sep 2007 06:28:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D650116A41B for ; Wed, 12 Sep 2007 06:28:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C09D413C458 for ; Wed, 12 Sep 2007 06:28:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C6SgAT073726 for ; Wed, 12 Sep 2007 06:28:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C6SdIh073721 for perforce@freebsd.org; Wed, 12 Sep 2007 06:28:39 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 06:28:39 GMT Message-Id: <200709120628.l8C6SdIh073721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 06:28:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=126325 Change 126325 by kmacy@kmacy_home:ethng on 2007/09/12 06:27:54 IFC 126324 Affected files ... .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/ethng/src/share/man/man4/ata.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ral.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ural.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/wlan.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/wlan_amrr.4#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/ethng/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/ethng/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/ethng/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/ethng/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/ethng/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/pigs.c#2 integrate Differences ... ==== //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.323 2007/09/09 01:32:36 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.325 2007/09/10 17:58:16 brueffer Exp $ 2000 @@ -766,11 +766,21 @@ &hwlist.cnw; + [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network + adapter (&man.ipw.4; driver) + + [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2200BG/2915ABG MiniPCI + and 2225BG PCI network adapters (&man.iwi.4; driver) + + &hwlist.ral; + [&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver) &hwlist.rum; + &hwlist.ural; + [&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent Technologies WaveLAN/IEEE 802.11b wireless network adapters and workalikes using the Lucent Hermes, Intersil ==== //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1062 2007/09/06 19:53:06 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1064 2007/09/11 23:31:14 bmah Exp $ 2000 @@ -1548,6 +1548,10 @@ The &man.bsnmpd.1; utility now supports the Host Resources MIB described in RFC 2790. &merged; + The &man.camcontrol.8; utility now supports + a readcap to display the size of + devices. + The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the file that the link points to. &merged; @@ -1829,7 +1833,8 @@ an architecture to pass through to the underlying makefiles. &merged; - The &man.mount.8; nodev option has + The &man.mount.8; dev + and nodev options have been removed. The &man.mount.8; utility now supports &man.mqueuefs.5;. @@ -1844,6 +1849,22 @@ that these late file systems should be mounted. &merged; + A number of the file + system-specific mount_* + utilities have been removed, in favor of the more general + &man.mount.8; command with a option. + Specifically, these commands are: + mount_devfs, + mount_ext2fs, + mount_fdescfs, + mount_linprocfs, + mount_procfs, + mount_std, + mount_linsysfs, + mount_reiserfs, and + mount_umapfs. + + The &man.moused.8; daemon now supports an flag to enable horizontal virtual scrolling similar to the flag for vertical virtual scrolling. ==== //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#5 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.98 2007/09/07 15:30:35 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.99 2007/09/10 17:58:16 brueffer Exp $ # # @@ -104,6 +104,7 @@ pst i386 rc i386 rr232x i386,amd64 +ral i386,amd64 rue i386,pc98,amd64 rum i386,amd64 safe i386,pc98,amd64 @@ -163,6 +164,7 @@ umass i386,pc98,amd64,powerpc umodem i386,pc98,amd64 uplcom i386,pc98,amd64 +ural i386,amd64 urio i386,pc98,amd64,powerpc uscanner i386,pc98,amd64,powerpc uvisor i386,pc98,amd64 ==== //depot/projects/ethng/src/share/man/man4/ata.4#2 (text+ko) ==== @@ -25,9 +25,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/share/man/man4/ata.4,v 1.72 2007/03/10 12:44:22 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ata.4,v 1.73 2007/09/10 20:25:55 brueffer Exp $ .\" -.Dd March 10, 2007 +.Dd September 10, 2007 .Dt ATA 4 .Os .Sh NAME @@ -119,7 +119,7 @@ .It HighPoint: HPT302, HPT366, HPT368, HPT370, HPT371, HPT372, HPT372N, HPT374. .It Intel: -6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8. +6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8, ICH9. .It ITE: IT8211F, IT8212F. .It JMicron: ==== //depot/projects/ethng/src/share/man/man4/ral.4#2 (text+ko) ==== @@ -13,9 +13,9 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/ral.4,v 1.12 2007/02/03 19:29:31 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ral.4,v 1.13 2007/09/10 17:54:14 brueffer Exp $ .\" -.Dd March 5, 2006 +.Dd September 10, 2007 .Os .Dt RAL 4 .Sh NAME @@ -66,95 +66,96 @@ .Sh HARDWARE The .Nm -driver supports the following adapters: +driver supports PCI/CardBus wireless adapters based on the Ralink Technology +RT2500, RT2501, and RT2600 chipsets, including: .Pp .Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "RT2561S" "CardBus" .It Em Card Ta Em MAC/BBP Ta Em Bus -.It Li "A-Link WL54H" Ta RT2560 Ta PCI -.It Li "A-Link WL54PC" Ta RT2560 Ta CardBus -.It Li "AirLink101 AWLC5025" Ta RT2661 Ta CardBus -.It Li "AirLink101 AWLH5025" Ta RT2661 Ta PCI -.It Li "Amigo AWI-914W" Ta RT2560 Ta CardBus -.It Li "Amigo AWI-922W" Ta RT2560 Ta mini-PCI -.It Li "Amigo AWI-926W" Ta RT2560 Ta PCI -.It Li "AMIT WL531C" Ta RT2560 Ta CardBus -.It Li "AMIT WL531P" Ta RT2560 Ta PCI -.It Li "AOpen AOI-831" Ta RT2560 Ta PCI -.It Li "ASUS WL-107G" Ta RT2560 Ta CardBus -.It Li "ASUS WL-130g" Ta RT2560 Ta PCI -.It Li "Atlantis Land A02-PCI-W54" Ta RT2560 Ta PCI -.It Li "Atlantis Land A02-PCM-W54" Ta RT2560 Ta CardBus -.It Li "Belkin F5D7000 v3" Ta RT2560 Ta PCI -.It Li "Belkin F5D7010 v2" Ta RT2560 Ta CardBus -.It Li "Billionton MIWLGRL" Ta RT2560 Ta mini-PCI -.It Li "Canyon CN-WF511" Ta RT2560 Ta PCI -.It Li "Canyon CN-WF513" Ta RT2560 Ta CardBus -.It Li "CC&C WL-2102" Ta RT2560 Ta CardBus -.It Li "CNet CWC-854" Ta RT2560 Ta CardBus -.It Li "CNet CWP-854" Ta RT2560 Ta PCI -.It Li "Compex WL54G" Ta RT2560 Ta CardBus -.It Li "Compex WLP54G" Ta RT2560 Ta PCI -.It Li "Conceptronic C54RC" Ta RT2560 Ta CardBus -.It Li "Conceptronic C54Ri" Ta RT2560 Ta PCI -.It Li "Digitus DN-7001G-RA" Ta RT2560 Ta CardBus -.It Li "Digitus DN-7006G-RA" Ta RT2560 Ta PCI -.It Li "E-Tech WGPC02" Ta RT2560 Ta CardBus -.It Li "E-Tech WGPI02" Ta RT2560 Ta PCI -.It Li "Edimax EW-7108PCg" Ta RT2560 Ta CardBus -.It Li "Edimax EW-7128g" Ta RT2560 Ta PCI -.It Li "Eminent EM3036" Ta RT2560 Ta CardBus -.It Li "Eminent EM3037" Ta RT2560 Ta PCI -.It Li "Encore ENLWI-G-RLAM" Ta RT2560 Ta PCI -.It Li "Encore ENPWI-G-RLAM" Ta RT2560 Ta CardBus -.It Li "Fiberline WL-400P" Ta RT2560 Ta PCI -.It Li "Fibreline WL-400X" Ta RT2560 Ta CardBus -.It Li "Gigabyte GN-WI01GS" Ta RT2561S Ta mini-PCI -.It Li "Gigabyte GN-WIKG" Ta RT2560 Ta mini-PCI -.It Li "Gigabyte GN-WMKG" Ta RT2560 Ta CardBus -.It Li "Gigabyte GN-WP01GS" Ta RT2561S Ta PCI -.It Li "Gigabyte GN-WPKG" Ta RT2560 Ta PCI -.It Li "Hawking HWC54GR" Ta RT2560 Ta CardBus -.It Li "Hawking HWP54GR" Ta RT2560 Ta PCI -.It Li "iNexQ CR054g-009 (R03)" Ta RT2560 Ta PCI -.It Li "JAHT WN-4054P" Ta RT2560 Ta CardBus -.It Li "JAHT WN-4054PCI" Ta RT2560 Ta PCI -.It Li "LevelOne WNC-0301 v2" Ta RT2560 Ta PCI -.It Li "LevelOne WPC-0301 v2" Ta RT2560 Ta CardBus -.It Li "Linksys WMP54G v4" Ta RT2560 Ta PCI -.It Li "Micronet SP906GK" Ta RT2560 Ta PCI -.It Li "Micronet SP908GK V3" Ta RT2560 Ta CardBus -.It Li "Minitar MN54GCB-R" Ta RT2560 Ta CardBus -.It Li "Minitar MN54GPC-R" Ta RT2560 Ta PCI -.It Li "MSI CB54G2" Ta RT2560 Ta CardBus -.It Li "MSI MP54G2" Ta RT2560 Ta mini-PCI -.It Li "MSI PC54G2" Ta RT2560 Ta PCI -.It Li "OvisLink EVO-W54PCI" Ta RT2560 Ta PCI -.It Li "PheeNet HWL-PCIG/RA" Ta RT2560 Ta PCI -.It Li "Pro-Nets CB80211G" Ta RT2560 Ta CardBus -.It Li "Pro-Nets PC80211G" Ta RT2560 Ta PCI -.It Li "Repotec RP-WB7108" Ta RT2560 Ta CardBus -.It Li "Repotec RP-WP0854" Ta RT2560 Ta PCI -.It Li "SATech SN-54C" Ta RT2560 Ta CardBus -.It Li "SATech SN-54P" Ta RT2560 Ta PCI -.It Li "Sitecom WL-112" Ta RT2560 Ta CardBus -.It Li "Sitecom WL-115" Ta RT2560 Ta PCI -.It Li "SMC SMCWCB-GM" Ta RT2661 Ta CardBus -.It Li "SMC SMCWPCI-GM" Ta RT2661 Ta PCI -.It Li "SparkLAN WL-685R" Ta RT2560 Ta CardBus -.It Li "Surecom EP-9321-g" Ta RT2560 Ta PCI -.It Li "Surecom EP-9321-g1" Ta RT2560 Ta PCI -.It Li "Surecom EP-9428-g" Ta RT2560 Ta CardBus -.It Li "Sweex LC500050" Ta RT2560 Ta CardBus -.It Li "Sweex LC700030" Ta RT2560 Ta PCI -.It Li "TekComm NE-9321-g" Ta RT2560 Ta PCI -.It Li "TekComm NE-9428-g" Ta RT2560 Ta CardBus -.It Li "Unex CR054g-R02" Ta RT2560 Ta PCI -.It Li "Unex MR054g-R02" Ta RT2560 Ta CardBus -.It Li "Zinwell ZWX-G160" Ta RT2560 Ta CardBus -.It Li "Zinwell ZWX-G360" Ta RT2560 Ta mini-PCI -.It Li "Zinwell ZWX-G361" Ta RT2560 Ta PCI -.It Li "Zonet ZEW1500" Ta RT2560 Ta CardBus -.It Li "Zonet ZEW1600" Ta RT2560 Ta PCI +.It "A-Link WL54H" Ta RT2560 Ta PCI +.It "A-Link WL54PC" Ta RT2560 Ta CardBus +.It "AirLink101 AWLC5025" Ta RT2661 Ta CardBus +.It "AirLink101 AWLH5025" Ta RT2661 Ta PCI +.It "Amigo AWI-914W" Ta RT2560 Ta CardBus +.It "Amigo AWI-922W" Ta RT2560 Ta mini-PCI +.It "Amigo AWI-926W" Ta RT2560 Ta PCI +.It "AMIT WL531C" Ta RT2560 Ta CardBus +.It "AMIT WL531P" Ta RT2560 Ta PCI +.It "AOpen AOI-831" Ta RT2560 Ta PCI +.It "ASUS WL-107G" Ta RT2560 Ta CardBus +.It "ASUS WL-130g" Ta RT2560 Ta PCI +.It "Atlantis Land A02-PCI-W54" Ta RT2560 Ta PCI +.It "Atlantis Land A02-PCM-W54" Ta RT2560 Ta CardBus +.It "Belkin F5D7000 v3" Ta RT2560 Ta PCI +.It "Belkin F5D7010 v2" Ta RT2560 Ta CardBus +.It "Billionton MIWLGRL" Ta RT2560 Ta mini-PCI +.It "Canyon CN-WF511" Ta RT2560 Ta PCI +.It "Canyon CN-WF513" Ta RT2560 Ta CardBus +.It "CC&C WL-2102" Ta RT2560 Ta CardBus +.It "CNet CWC-854" Ta RT2560 Ta CardBus +.It "CNet CWP-854" Ta RT2560 Ta PCI +.It "Compex WL54G" Ta RT2560 Ta CardBus +.It "Compex WLP54G" Ta RT2560 Ta PCI +.It "Conceptronic C54RC" Ta RT2560 Ta CardBus +.It "Conceptronic C54Ri" Ta RT2560 Ta PCI +.It "Digitus DN-7001G-RA" Ta RT2560 Ta CardBus +.It "Digitus DN-7006G-RA" Ta RT2560 Ta PCI +.It "E-Tech WGPC02" Ta RT2560 Ta CardBus +.It "E-Tech WGPI02" Ta RT2560 Ta PCI +.It "Edimax EW-7108PCg" Ta RT2560 Ta CardBus +.It "Edimax EW-7128g" Ta RT2560 Ta PCI +.It "Eminent EM3036" Ta RT2560 Ta CardBus +.It "Eminent EM3037" Ta RT2560 Ta PCI +.It "Encore ENLWI-G-RLAM" Ta RT2560 Ta PCI +.It "Encore ENPWI-G-RLAM" Ta RT2560 Ta CardBus +.It "Fiberline WL-400P" Ta RT2560 Ta PCI +.It "Fibreline WL-400X" Ta RT2560 Ta CardBus +.It "Gigabyte GN-WI01GS" Ta RT2561S Ta mini-PCI +.It "Gigabyte GN-WIKG" Ta RT2560 Ta mini-PCI +.It "Gigabyte GN-WMKG" Ta RT2560 Ta CardBus +.It "Gigabyte GN-WP01GS" Ta RT2561S Ta PCI +.It "Gigabyte GN-WPKG" Ta RT2560 Ta PCI +.It "Hawking HWC54GR" Ta RT2560 Ta CardBus +.It "Hawking HWP54GR" Ta RT2560 Ta PCI +.It "iNexQ CR054g-009 (R03)" Ta RT2560 Ta PCI +.It "JAHT WN-4054P" Ta RT2560 Ta CardBus +.It "JAHT WN-4054PCI" Ta RT2560 Ta PCI +.It "LevelOne WNC-0301 v2" Ta RT2560 Ta PCI +.It "LevelOne WPC-0301 v2" Ta RT2560 Ta CardBus +.It "Linksys WMP54G v4" Ta RT2560 Ta PCI +.It "Micronet SP906GK" Ta RT2560 Ta PCI +.It "Micronet SP908GK V3" Ta RT2560 Ta CardBus +.It "Minitar MN54GCB-R" Ta RT2560 Ta CardBus +.It "Minitar MN54GPC-R" Ta RT2560 Ta PCI +.It "MSI CB54G2" Ta RT2560 Ta CardBus +.It "MSI MP54G2" Ta RT2560 Ta mini-PCI +.It "MSI PC54G2" Ta RT2560 Ta PCI +.It "OvisLink EVO-W54PCI" Ta RT2560 Ta PCI +.It "PheeNet HWL-PCIG/RA" Ta RT2560 Ta PCI +.It "Pro-Nets CB80211G" Ta RT2560 Ta CardBus +.It "Pro-Nets PC80211G" Ta RT2560 Ta PCI +.It "Repotec RP-WB7108" Ta RT2560 Ta CardBus +.It "Repotec RP-WP0854" Ta RT2560 Ta PCI +.It "SATech SN-54C" Ta RT2560 Ta CardBus +.It "SATech SN-54P" Ta RT2560 Ta PCI +.It "Sitecom WL-112" Ta RT2560 Ta CardBus +.It "Sitecom WL-115" Ta RT2560 Ta PCI +.It "SMC SMCWCB-GM" Ta RT2661 Ta CardBus +.It "SMC SMCWPCI-GM" Ta RT2661 Ta PCI +.It "SparkLAN WL-685R" Ta RT2560 Ta CardBus +.It "Surecom EP-9321-g" Ta RT2560 Ta PCI +.It "Surecom EP-9321-g1" Ta RT2560 Ta PCI +.It "Surecom EP-9428-g" Ta RT2560 Ta CardBus +.It "Sweex LC500050" Ta RT2560 Ta CardBus +.It "Sweex LC700030" Ta RT2560 Ta PCI +.It "TekComm NE-9321-g" Ta RT2560 Ta PCI +.It "TekComm NE-9428-g" Ta RT2560 Ta CardBus +.It "Unex CR054g-R02" Ta RT2560 Ta PCI +.It "Unex MR054g-R02" Ta RT2560 Ta CardBus +.It "Zinwell ZWX-G160" Ta RT2560 Ta CardBus +.It "Zinwell ZWX-G360" Ta RT2560 Ta mini-PCI +.It "Zinwell ZWX-G361" Ta RT2560 Ta PCI +.It "Zonet ZEW1500" Ta RT2560 Ta CardBus +.It "Zonet ZEW1600" Ta RT2560 Ta PCI .El .Pp An up to date list can be found at ==== //depot/projects/ethng/src/share/man/man4/ural.4#2 (text+ko) ==== @@ -13,9 +13,9 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/ural.4,v 1.14 2007/06/15 04:41:15 kevlo Exp $ +.\" $FreeBSD: src/share/man/man4/ural.4,v 1.15 2007/09/10 17:54:14 brueffer Exp $ .\" -.Dd October 7, 2006 +.Dd September 10, 2007 .Os .Dt URAL 4 .Sh NAME @@ -55,37 +55,38 @@ .Sh HARDWARE The .Nm -driver supports the following adapters: +driver supports USB 2.0 wireless adapters based on the Ralink Technology +RT2500USB chipset, including: .Pp .Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "Bus" .It Em Card Ta Em Bus -.It Li "AMIT WL532U" Ta USB -.It Li "ASUS WL-167g" Ta USB -.It Li "Belkin F5D7050 v2000" Ta USB -.It Li "Buffalo WLI-U2-KG54-AI" Ta USB -.It Li "CNet CWD-854" Ta USB -.It Li "Compex WLU54G 2A1100" Ta USB -.It Li "Conceptronic C54RU" Ta USB -.It Li "D-Link DWL-G122 b1" Ta USB -.It Li "Dynalink WLG25USB" Ta USB -.It Li "E-Tech WGUS02" Ta USB -.It Li "Gigabyte GN-WBKG" Ta USB -.It Li "Hercules HWGUSB2-54" Ta USB -.It Li "KCORP LifeStyle KLS-685" Ta USB -.It Li "Linksys WUSB54G v4" Ta USB -.It Li "Linksys WUSB54GP v4" Ta USB -.It Li "MSI MS-6861" Ta USB -.It Li "MSI MS-6865" Ta USB -.It Li "MSI MS-6869" Ta USB -.It Li "NovaTech NV-902" Ta USB -.It Li "OvisLink Evo-W54USB" Ta USB -.It Li "SerComm UB801R" Ta USB -.It Li "SparkLAN WL-685R" Ta USB -.It Li "Surecom EP-9001-g" Ta USB -.It Li "Sweex LC100060" Ta USB -.It Li "Tonze UW-6200C" Ta USB -.It Li "Zinwell ZWX-G261" Ta USB -.It Li "Zonet ZEW2500P" Ta USB +.It "AMIT WL532U" Ta USB +.It "ASUS WL-167g" Ta USB +.It "Belkin F5D7050 v2000" Ta USB +.It "Buffalo WLI-U2-KG54-AI" Ta USB +.It "CNet CWD-854" Ta USB +.It "Compex WLU54G 2A1100" Ta USB +.It "Conceptronic C54RU" Ta USB +.It "D-Link DWL-G122 b1" Ta USB +.It "Dynalink WLG25USB" Ta USB +.It "E-Tech WGUS02" Ta USB +.It "Gigabyte GN-WBKG" Ta USB +.It "Hercules HWGUSB2-54" Ta USB +.It "KCORP LifeStyle KLS-685" Ta USB +.It "Linksys WUSB54G v4" Ta USB +.It "Linksys WUSB54GP v4" Ta USB +.It "MSI MS-6861" Ta USB +.It "MSI MS-6865" Ta USB +.It "MSI MS-6869" Ta USB +.It "NovaTech NV-902" Ta USB +.It "OvisLink Evo-W54USB" Ta USB +.It "SerComm UB801R" Ta USB +.It "SparkLAN WL-685R" Ta USB +.It "Surecom EP-9001-g" Ta USB +.It "Sweex LC100060" Ta USB +.It "Tonze UW-6200C" Ta USB +.It "Zinwell ZWX-G261" Ta USB +.It "Zonet ZEW2500P" Ta USB .El .Pp An up to date list can be found at ==== //depot/projects/ethng/src/share/man/man4/wlan.4#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/share/man/man4/wlan.4,v 1.12 2007/09/06 20:15:04 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.13 2007/09/10 17:20:21 brueffer Exp $ .\" .Dd September 6, 2007 .Dt WLAN 4 @@ -50,8 +50,9 @@ .Xr ral 4 , .Xr rum 4 , .Xr ural 4 , +.Xr wi 4 , and -.Xr wi 4 +.Xr zyd 4 drivers, with other drivers to follow. .Pp The ==== //depot/projects/ethng/src/share/man/man4/wlan_amrr.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan_amrr.4,v 1.1 2007/06/15 04:41:15 kevlo Exp $ +.\" $FreeBSD: src/share/man/man4/wlan_amrr.4,v 1.2 2007/09/10 18:17:50 brueffer Exp $ .\" -.Dd June 15, 2007 +.Dd September 10, 2007 .Dt WLAN_AMRR 4 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh DESCRIPTION The .Nm -module implements Adaptive Multi-Rate Retry tx rate control +module implements the Adaptive Multi-Rate Retry tx rate control algorithm for use with 802.11 devices. The .Nm @@ -45,7 +45,8 @@ .Sh SEE ALSO .Xr rum 4 , .Xr ural 4 , -.Xr wlan 4 +.Xr wlan 4 , +.Xr zyd 4 .Sh STANDARDS More information can be found in the paper describing the .Em AMRR ==== //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1061,7 +1061,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 (text+ko) ==== @@ -1439,7 +1439,7 @@ return (1); #endif #else - if (kmem_used() > kmem_size() / 2) + if (kmem_used() > (kmem_size() * 4) / 5) return (1); #endif @@ -2729,7 +2729,7 @@ arc_c_max = (arc_c * 8) - (1<<30); else arc_c_max = arc_c_min; - arc_c_max = MAX(arc_c * 4, arc_c_max); + arc_c_max = MAX(arc_c * 6, arc_c_max); #ifdef _KERNEL /* * Allow the tunables to override our calculations if they are ==== //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 (text+ko) ==== @@ -949,6 +949,39 @@ atomic_add_32(&zfs_active_fs_count, -1); } +#ifdef __i386__ +static int desiredvnodes_backup; +#endif + +static void +zfs_vnodes_adjust(void) +{ +#ifdef __i386__ + int val; + + desiredvnodes_backup = desiredvnodes; + + /* + * We calculate newdesiredvnodes the same way it is done in + * vntblinit(). If it is equal to desiredvnodes, it means that + * it wasn't tuned by the administrator and we can tune it down. + */ + val = min(maxproc + cnt.v_page_count / 4, 2 * vm_kmem_size / + (5 * (sizeof(struct vm_object) + sizeof(struct vnode)))); + if (desiredvnodes == val) + desiredvnodes = (3 * desiredvnodes) / 4; +#endif +} + +static void +zfs_vnodes_adjust_back(void) +{ + +#ifdef __i386__ + desiredvnodes = desiredvnodes_backup; +#endif +} + void zfs_init(void) { @@ -964,6 +997,13 @@ * Initialize znode cache, vnode ops, etc... */ zfs_znode_init(); + + /* + * Reduce number of vnodes. Originally number of vnodes is calculated + * with UFS inode in mind. We reduce it here, because it's too big for + * ZFS/i386. + */ + zfs_vnodes_adjust(); } void @@ -971,6 +1011,7 @@ { zfsctl_fini(); zfs_znode_fini(); + zfs_vnodes_adjust_back(); } int ==== //depot/projects/ethng/src/sys/dev/an/if_an.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.83 2007/08/07 12:26:19 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.84 2007/09/10 12:53:34 avatar Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -1862,6 +1862,7 @@ struct ifreq *ifr; struct thread *td = curthread; struct ieee80211req *ireq; + struct ieee80211_channel ch; u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; u_int8_t *tmpptr; struct an_ltv_genconfig *config; @@ -2217,6 +2218,22 @@ } ireq->i_val = status->an_cur_channel; break; + case IEEE80211_IOC_CURCHAN: + sc->areq.an_type = AN_RID_STATUS; + if (an_read_record(sc, + (struct an_ltv_gen *)&sc->areq)) { + error = EINVAL; + break; + } + bzero(&ch, sizeof(ch)); + ch.ic_freq = ieee80211_ieee2mhz(status->an_cur_channel, + IEEE80211_CHAN_B); + ch.ic_flags = IEEE80211_CHAN_B; + ch.ic_ieee = status->an_cur_channel; + AN_UNLOCK(sc); + error = copyout(&ch, ireq->i_data, sizeof(ch)); + AN_LOCK(sc); + break; case IEEE80211_IOC_POWERSAVE: sc->areq.an_type = AN_RID_ACTUALCFG; if (an_read_record(sc, ==== //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $"); #include "opt_ata.h" #include @@ -1710,6 +1710,10 @@ { ATA_I82801HB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, { ATA_I82801HBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, + { ATA_I82801IB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, + { ATA_I82801IB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, + { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, + { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, { ATA_I31244, 0, 0, 0x00, ATA_SA150, "31244" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; ==== //depot/projects/ethng/src/sys/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $ */ /* structure holding chipset config info */ @@ -167,6 +167,10 @@ #define ATA_I82801HB_S2 0x28258086 #define ATA_I82801HBM_S1 0x28298086 #define ATA_I82801HBM_S2 0x282a8086 +#define ATA_I82801IB_S1 0x29208086 +#define ATA_I82801IB_AH6 0x29228086 +#define ATA_I82801IB_AH4 0x29238086 +#define ATA_I82801IB_S2 0x29268086 #define ATA_I31244 0x32008086 #define ATA_ITE_ID 0x1283 ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#18 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.35 2007/09/10 00:59:51 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.36 2007/09/11 23:49:27 kmacy Exp $"); #include #include @@ -1238,10 +1238,6 @@ u_int nq[2]; uint8_t cpus[SGE_QSETS + 1]; uint16_t rspq_map[RSS_TABLE_SIZE]; - - - if ((adap->flags & USING_MSIX) == 0) - return; for (i = 0; i < SGE_QSETS; ++i) cpus[i] = i; ==== //depot/projects/ethng/src/sys/dev/em/if_em.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.183 2007/08/06 14:25:59 rwatson Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.184 2007/09/10 21:50:40 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -2450,8 +2450,8 @@ /* Make sure our PCI config space has the necessary stuff set */ adapter->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); - if ((adapter->hw.bus.pci_cmd_word & PCIM_CMD_BUSMASTEREN) == 0 && - (adapter->hw.bus.pci_cmd_word & PCIM_CMD_MEMEN)) { + if (!((adapter->hw.bus.pci_cmd_word & PCIM_CMD_BUSMASTEREN) && + (adapter->hw.bus.pci_cmd_word & PCIM_CMD_MEMEN))) { device_printf(dev, "Memory Access and/or Bus Master bits " "were not set!\n"); adapter->hw.bus.pci_cmd_word |= @@ -2495,7 +2495,7 @@ adapter->hw.hw_addr = (uint8_t *)&adapter->osdep.mem_bus_space_handle; /* Only older adapters use IO mapping */ - if ((adapter->hw.mac.type > e1000_82542) && + if ((adapter->hw.mac.type > e1000_82543) && (adapter->hw.mac.type < e1000_82571)) { /* Figure our where our IO BAR is ? */ for (rid = PCIR_BAR(0); rid < PCIR_CIS;) { @@ -2557,7 +2557,7 @@ rid = 1; adapter->msi = 1; } - } else if (adapter->hw.mac.type > e1000_82571) { + } else if (adapter->hw.mac.type >= e1000_82571) { val = pci_msi_count(dev); if (val == 1 && pci_alloc_msi(dev, &val) == 0) { rid = 1; @@ -3698,7 +3698,7 @@ break; case IPPROTO_UDP: if (mp->m_pkthdr.csum_flags & CSUM_UDP) - type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_TCP; + type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_UDP; break; } ==== //depot/projects/ethng/src/sys/dev/em/if_em.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.61 2007/05/17 00:14:03 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.62 2007/09/10 21:50:40 jfv Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -181,7 +181,6 @@ #define EM_SMARTSPEED_DOWNSHIFT 3 #define EM_SMARTSPEED_MAX 15 #define EM_MAX_INTR 10 -#define EM_TSO_SEG_SIZE 4096 /* Max dma seg size */ #define MAX_NUM_MULTICAST_ADDRESSES 128 #define PCI_ANY_ID (~0U) ==== //depot/projects/ethng/src/sys/i386/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.27 2007/05/08 22:01:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.28 2007/09/11 22:54:09 attilio Exp $"); #include #include @@ -406,7 +406,7 @@ apic_register_enumerator(&madt_enumerator); } -SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, madt_register, NULL) +SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_SECOND, madt_register, NULL) /* * Call the handler routine for each entry in the MADT table. ==== //depot/projects/ethng/src/sys/i386/i386/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.43 2007/08/02 21:17:57 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.44 2007/09/11 22:54:09 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1065,7 +1065,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) +SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL) /* * Setup the I/O APICs. ==== //depot/projects/ethng/src/sys/kern/subr_smp.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.200 2007/07/03 18:37:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.201 2007/09/11 22:54:09 attilio Exp $"); #include #include @@ -148,7 +148,7 @@ mp_ncpus); cpu_mp_announce(); } -SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_SECOND, mp_start, NULL) +SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_THIRD, mp_start, NULL) void forward_signal(struct thread *td) ==== //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.28 2007/09/08 17:48:45 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.30 2007/09/10 21:01:56 rrs Exp $"); #include #include #include @@ -1026,13 +1026,11 @@ sctp_assoc_immediate_retrans(struct sctp_tcb *stcb, struct sctp_nets *dstnet) { int error; - struct sctp_tmit_chunk *chk; - //for debug - if (dstnet->dest_state & SCTP_ADDR_UNCONFIRMED) { - SCTPDBG(SCTP_DEBUG_ASCONF1, "assoc_immediate_retrans: specified destination is UNCONFIRMED\n"); - return; - } + if (dstnet->dest_state & SCTP_ADDR_UNCONFIRMED) { + SCTPDBG(SCTP_DEBUG_ASCONF1, "assoc_immediate_retrans: specified destination is UNCONFIRMED\n"); + return; + } if (stcb->asoc.deleted_primary == NULL) { SCTPDBG(SCTP_DEBUG_ASCONF1, "assoc_immediate_retrans: Funny, old primary is not stored\n"); return; @@ -1063,14 +1061,6 @@ #ifdef SCTP_AUDITING_ENABLED sctp_auditing(4, stcb->sctp_ep, stcb->asoc.deleted_primary); #endif - /* Debug code */ - SCTPDBG(SCTP_DEBUG_ASCONF1, "assoc_immediate_retrans: calling chunk_output, retran_cnt is %d\n", stcb->asoc.sent_queue_retran_cnt); - TAILQ_FOREACH(chk, &stcb->asoc.sent_queue, sctp_next) { - SCTPDBG(SCTP_DEBUG_ASCONF1, "assoc_immediate_retrans: chk->whoTo is "); - SCTPDBG_ADDR(SCTP_DEBUG_ASCONF1, &chk->whoTo->ro._l_addr.sa); - SCTPDBG(SCTP_DEBUG_ASCONF1, "state is %d\n", chk->sent); - } - /* end Debug code */ sctp_chunk_output(stcb->sctp_ep, stcb, SCTP_OUTPUT_FROM_T3, SCTP_SO_NOT_LOCKED); if ((stcb->asoc.num_send_timers_up == 0) && (stcb->asoc.sent_queue_cnt > 0)) { @@ -1091,7 +1081,6 @@ sctp_net_immediate_retrans(struct sctp_tcb *stcb, struct sctp_nets *net) { struct sctp_tmit_chunk *chk; - int cnt = 0; /* debug */ SCTPDBG(SCTP_DEBUG_ASCONF1, "net_immediate_retrans:\n"); SCTPDBG(SCTP_DEBUG_ASCONF1, "RTO is %d\n", net->RTO); @@ -1104,11 +1093,9 @@ if (chk->sent < SCTP_DATAGRAM_RESEND) { chk->sent = SCTP_DATAGRAM_RESEND; sctp_ucount_incr(stcb->asoc.sent_queue_retran_cnt); - cnt++; } } } - SCTPDBG(SCTP_DEBUG_ASCONF1, "%d chunks are marked to RESEND, retran_cnt is %d\n", cnt, stcb->asoc.sent_queue_retran_cnt); } static void @@ -1171,9 +1158,8 @@ stcb->sctp_ep->def_vrf_id); if (net->ro.ro_rt == NULL) continue; - //have to be considered... - changed = 0; + changed = 0; if (net->ro._l_addr.sa.sa_family == AF_INET) { if (sctp_v4src_match_nexthop(newifa, (sctp_route_t *) & net->ro)) changed = 1; ==== //depot/projects/ethng/src/sys/netinet/sctp_cc_functions.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.h,v 1.1 2007/07/14 09:36:27 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.h,v 1.2 2007/09/10 17:06:25 rrs Exp $"); #ifndef __sctp_cc_functions_h__ #define __sctp_cc_functions_h__ @@ -78,6 +78,15 @@ sctp_cwnd_update_after_fr_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net); +/* + * HTCP algorithms are directly taken from + * R.N.Shorten, D.J.Leith and are work/outcome from + * a Cisco-URP grant to enhance HTCP for satellite + * communications. We use the BSD Liscense + * granted from his source and have modified his + * algorithms to fit within the SCTP BSD framework. + */ + void sctp_htcp_set_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net); ==== //depot/projects/ethng/src/sys/netinet/sctp_input.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.60 2007/09/08 17:48:45 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.61 2007/09/10 17:06:25 rrs Exp $"); #include #include @@ -2513,11 +2513,11 @@ atomic_add_int(&(*stcb)->asoc.refcnt, 1); SCTP_TCB_UNLOCK((*stcb)); SCTP_SOCKET_LOCK(so, 1); - SCTP_TCB_LOCK((*stcb)); - atomic_subtract_int(&(*stcb)->asoc.refcnt, 1); #endif soisconnected(so); #if defined (__APPLE__) || defined(SCTP_SO_LOCK_TESTING) + SCTP_TCB_LOCK((*stcb)); + atomic_subtract_int(&(*stcb)->asoc.refcnt, 1); SCTP_SOCKET_UNLOCK(so, 1); #endif return (m); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 12 06:46:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E35DF16A469; Wed, 12 Sep 2007 06:46:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08D016A420 for ; Wed, 12 Sep 2007 06:46:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DC5D13C461 for ; Wed, 12 Sep 2007 06:46:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C6k4sL074776 for ; Wed, 12 Sep 2007 06:46:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C6k4mq074773 for perforce@freebsd.org; Wed, 12 Sep 2007 06:46:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 12 Sep 2007 06:46:04 GMT Message-Id: <200709120646.l8C6k4mq074773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 126326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 06:46:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126326 Change 126326 by zhouzhouyi@zhouzhouyi_mactest on 2007/09/12 06:45:41 Add Mandatory Access Control Hooks for ptrace Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#12 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/ptrace.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/debug/00.t#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#22 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#12 (text+ko) ==== @@ -7,7 +7,7 @@ #CFLAGS+=-DHAS_STAT64 all: macproc mactest mdconfigopenrdonly fifo_io pipe_io macping shmtest \ - semtest msgtest mmaptest tcpconnect + semtest msgtest mmaptest tcpconnect ptrace macproc: macproc.c gcc -Wall ${CFLAGS} macproc.c -o macproc -lutil @@ -31,9 +31,10 @@ gcc ${CFLAGS} -o msgtest msgtest.c macconf.c mactestparser.tab.c mmaptest: mmaptest.c macconf.c mactestparser.tab.c gcc ${CFLAGS} -o mmaptest mmaptest.c macconf.c mactestparser.tab.c -tcpconnect: tcpconnect.c +tcpconnect: tcpconnect.c macconf.c mactestparser.tab.c gcc ${CFLAGS} -o tcpconnect tcpconnect.c macconf.c mactestparser.tab.c -lpcap - +ptrace: ptrace.c macconf.c mactestparser.tab.c + gcc ${CFLAGS} -o ptrace ptrace.c macconf.c mactestparser.tab.c clean: rm -f macproc @@ -46,4 +47,5 @@ rm -f semtest rm -f msgtest rm -f mmaptest - rm -f tcpconnect+ rm -f tcpconnect + rm -f ptrace ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/mactest/mactest.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $ + * $FreeBSD: src/tools/regression/mactest/macproc.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $ */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#22 (text+ko) ==== @@ -26,6 +26,7 @@ msgtest="${maindir}/msgtest" mmaptest="${maindir}/mmaptest" tcpconnect="${maindir}/tcpconnect" +ptrace="${maindir}/ptrace" . ${maindir}/tests/conf ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 (text+ko) ==== @@ -2186,8 +2186,8 @@ MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_check_proc_debug " "with cr_label:", strlen("mac_test_check_proc_debug " - "with cr_label:")); - MAC_TEST_LOG_SUBMIT_LABEL(cred, cred->cr_label); + "with cr_label and proc label:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_debug); From owner-p4-projects@FreeBSD.ORG Wed Sep 12 06:52:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D6F816A41B; Wed, 12 Sep 2007 06:52:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB57216A419 for ; Wed, 12 Sep 2007 06:52:12 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8D8013C48A for ; Wed, 12 Sep 2007 06:52:12 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C6qC8B075168 for ; Wed, 12 Sep 2007 06:52:12 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C6qCtb075165 for perforce@freebsd.org; Wed, 12 Sep 2007 06:52:12 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 12 Sep 2007 06:52:12 GMT Message-Id: <200709120652.l8C6qCtb075165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 126327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 06:52:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=126327 Change 126327 by zhouzhouyi@zhouzhouyi_mactest on 2007/09/12 06:51:32 Modify the semaphore implementation of concurreny of tcp_server and tcp_client Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tcpconnect.c#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tcpconnect.c#2 (text+ko) ==== @@ -152,6 +152,14 @@ printf("pcap_open_live(): %s\n",errbuf); exit(1); } /*Release the semaphore to let server go*/ + for (;;) { + int i; + i = semctl(semid, 0, GETNCNT); + if (i == -1) + err(1, "semctl GETNCNT"); + if (i == 1) + break; + } s.sem_num = 0; s.sem_op = 1; s.sem_flg = SEM_UNDO; @@ -183,6 +191,14 @@ err(1, "sever: semop -1"); /*Release the semaphore to let client go */ + for (;;) { + int i; + i = semctl(semid1, 0, GETNCNT); + if (i == -1) + err(1, "semctl GETNCNT"); + if (i == 1) + break; + } s1.sem_num = 0; s1.sem_op = 1; s1.sem_flg = SEM_UNDO; From owner-p4-projects@FreeBSD.ORG Wed Sep 12 08:31:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B688A16A41A; Wed, 12 Sep 2007 08:31:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 717D616A418 for ; Wed, 12 Sep 2007 08:31:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DFDC13C465 for ; Wed, 12 Sep 2007 08:31:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C8VJgX085598 for ; Wed, 12 Sep 2007 08:31:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C8VJAP085595 for perforce@freebsd.org; Wed, 12 Sep 2007 08:31:19 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 08:31:19 GMT Message-Id: <200709120831.l8C8VJAP085595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 08:31:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=126329 Change 126329 by kmacy@kmacy_home:ethng on 2007/09/12 08:30:25 Add callout_init_rwlock Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_timeout.c#3 edit .. //depot/projects/ethng/src/sys/sys/callout.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_timeout.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,9 @@ static int avg_mtxcalls; SYSCTL_INT(_debug, OID_AUTO, to_avg_mtxcalls, CTLFLAG_RD, &avg_mtxcalls, 0, "Average number of mtx callouts made per softclock call. Units = 1/1000"); +static int avg_rwcalls; +SYSCTL_INT(_debug, OID_AUTO, to_avg_rwcalls, CTLFLAG_RD, &avg_rwcalls, 0, + "Average number of rw callouts made per softclock call. Units = 1/1000"); static int avg_mpcalls; SYSCTL_INT(_debug, OID_AUTO, to_avg_mpcalls, CTLFLAG_RD, &avg_mpcalls, 0, "Average number of MP callouts made per softclock call. Units = 1/1000"); @@ -171,6 +175,7 @@ int depth; int mpcalls; int mtxcalls; + int rwcalls; int gcalls; #ifdef DIAGNOSTIC struct bintime bt1, bt2; @@ -185,6 +190,7 @@ mpcalls = 0; mtxcalls = 0; + rwcalls = 0; gcalls = 0; depth = 0; steps = 0; @@ -216,6 +222,7 @@ void (*c_func)(void *); void *c_arg; struct mtx *c_mtx; + struct rwlock *c_rwlock; int c_flags; nextsoftcheck = TAILQ_NEXT(c, c_links.tqe); @@ -223,6 +230,7 @@ c_func = c->c_func; c_arg = c->c_arg; c_mtx = c->c_mtx; + c_rwlock = c->c_rwlock; c_flags = c->c_flags; if (c->c_flags & CALLOUT_LOCAL_ALLOC) { c->c_func = NULL; @@ -237,7 +245,19 @@ } curr_cancelled = 0; mtx_unlock_spin(&callout_lock); - if (c_mtx != NULL) { + if (c_rwlock != NULL) { + rw_wlock(c_rwlock); + if (curr_cancelled) { + rw_wunlock(c_rwlock); + goto skip; + } + curr_cancelled = 1; + rwcalls++; + + CTR3(KTR_CALLOUT, "callout mtx" + " %p func %p arg %p", + c, c_func, c_arg); + } else if (c_mtx != NULL) { if (c_flags & CALLOUT_NETGIANT) { mtx_lock(&Giant); gcalls++; @@ -297,8 +317,10 @@ lastfunc = c_func; } #endif - if ((c_flags & CALLOUT_RETURNUNLOCKED) == 0) + if (c_mtx != NULL && (c_flags & CALLOUT_RETURNUNLOCKED) == 0) mtx_unlock(c_mtx); + if (c_rwlock != NULL && (c_flags & CALLOUT_RETURNUNLOCKED_RW) == 0) + rw_wunlock(c_rwlock); if (c_flags & CALLOUT_NETGIANT) mtx_unlock(&Giant); skip: @@ -322,6 +344,7 @@ avg_depth += (depth * 1000 - avg_depth) >> 8; avg_mpcalls += (mpcalls * 1000 - avg_mpcalls) >> 8; avg_mtxcalls += (mtxcalls * 1000 - avg_mtxcalls) >> 8; + avg_rwcalls += (rwcalls * 1000 - avg_rwcalls) >> 8; avg_gcalls += (gcalls * 1000 - avg_gcalls) >> 8; nextsoftcheck = NULL; mtx_unlock_spin(&callout_lock); @@ -623,7 +646,6 @@ { bzero(c, sizeof *c); if (mpsafe) { - c->c_mtx = NULL; c->c_flags = CALLOUT_RETURNUNLOCKED; } else { c->c_mtx = &Giant; @@ -639,6 +661,7 @@ { bzero(c, sizeof *c); c->c_mtx = mtx; + c->c_rwlock = NULL; KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED|CALLOUT_NETGIANT)) == 0, ("callout_init_mtx: bad flags %d", flags)); /* CALLOUT_RETURNUNLOCKED makes no sense without a mutex. */ @@ -647,6 +670,17 @@ c->c_flags = flags & (CALLOUT_RETURNUNLOCKED|CALLOUT_NETGIANT); } +void +callout_init_rwlock(struct callout *c, struct rwlock *rw, int flags) +{ + bzero(c, sizeof *c); + c->c_mtx = NULL; + c->c_rwlock = rw; + KASSERT((flags & ~CALLOUT_RETURNUNLOCKED_RW) == 0, + ("callout_init_rwlock: bad flags %d", flags)); + c->c_flags = flags & CALLOUT_RETURNUNLOCKED_RW; +} + #ifdef APM_FIXUP_CALLTODO /* * Adjust the kernel calltodo timeout list. This routine is used after ==== //depot/projects/ethng/src/sys/sys/callout.h#2 (text+ko) ==== @@ -54,6 +54,7 @@ void *c_arg; /* function argument */ void (*c_func)(void *); /* function to call */ struct mtx *c_mtx; /* mutex to lock */ + struct rwlock *c_rwlock; /* rwlock to lock */ int c_flags; /* state of this entry */ }; @@ -63,6 +64,7 @@ #define CALLOUT_MPSAFE 0x0008 /* callout handler is mp safe */ #define CALLOUT_RETURNUNLOCKED 0x0010 /* handler returns with mtx unlocked */ #define CALLOUT_NETGIANT 0x0020 /* XXX: obtain Giant before mutex */ +#define CALLOUT_RETURNUNLOCKED_RW 0x0040 /* handler returns with rwlock unlocked */ struct callout_handle { struct callout *callout; @@ -81,6 +83,7 @@ #define callout_drain(c) _callout_stop_safe(c, 1) void callout_init(struct callout *, int); void callout_init_mtx(struct callout *, struct mtx *, int); +void callout_init_rwlock(struct callout *, struct rwlock *, int); #define callout_pending(c) ((c)->c_flags & CALLOUT_PENDING) int callout_reset(struct callout *, int, void (*)(void *), void *); #define callout_stop(c) _callout_stop_safe(c, 0) From owner-p4-projects@FreeBSD.ORG Wed Sep 12 08:32:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFFF616A41B; Wed, 12 Sep 2007 08:32:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DB5416A419 for ; Wed, 12 Sep 2007 08:32:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7965113C465 for ; Wed, 12 Sep 2007 08:32:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C8WLfA085734 for ; Wed, 12 Sep 2007 08:32:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C8WLlm085731 for perforce@freebsd.org; Wed, 12 Sep 2007 08:32:21 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 08:32:21 GMT Message-Id: <200709120832.l8C8WLlm085731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 08:32:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=126330 Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 convert radix node head and route locks from mutexes to rwlocks Affected files ... .. //depot/projects/ethng/src/sys/kern/vfs_export.c#2 edit .. //depot/projects/ethng/src/sys/net/if_var.h#5 edit .. //depot/projects/ethng/src/sys/net/radix.c#2 edit .. //depot/projects/ethng/src/sys/net/radix.h#2 edit .. //depot/projects/ethng/src/sys/net/route.c#2 edit .. //depot/projects/ethng/src/sys/net/route.h#2 edit .. //depot/projects/ethng/src/sys/netinet/if_ether.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/vfs_export.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/ethng/src/sys/net/if_var.h#5 (text+ko) ==== @@ -79,7 +79,7 @@ #include #endif /* _KERNEL */ #include /* XXX */ -#include /* XXX */ +#include /* XXX */ #include /* XXX */ #include ==== //depot/projects/ethng/src/sys/net/radix.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #ifdef _KERNEL #include -#include +#include #include #include #include ==== //depot/projects/ethng/src/sys/net/radix.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ #ifdef _KERNEL #include -#include +#include #endif #ifdef MALLOC_DECLARE @@ -131,7 +131,7 @@ (struct radix_node *rn, struct radix_node_head *head); struct radix_node rnh_nodes[3]; /* empty tree for common case */ #ifdef _KERNEL - struct mtx rnh_mtx; /* locks entire radix tree */ + struct rwlock rnh_lock; /* locks entire radix tree */ #endif }; @@ -145,11 +145,13 @@ #define Free(p) free((caddr_t)p, M_RTABLE); #define RADIX_NODE_HEAD_LOCK_INIT(rnh) \ - mtx_init(&(rnh)->rnh_mtx, "radix node head", NULL, MTX_DEF | MTX_RECURSE) -#define RADIX_NODE_HEAD_LOCK(rnh) mtx_lock(&(rnh)->rnh_mtx) -#define RADIX_NODE_HEAD_UNLOCK(rnh) mtx_unlock(&(rnh)->rnh_mtx) -#define RADIX_NODE_HEAD_DESTROY(rnh) mtx_destroy(&(rnh)->rnh_mtx) -#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) mtx_assert(&(rnh)->rnh_mtx, MA_OWNED) +rw_init(&(rnh)->rnh_lock, "radix node head") +#define RADIX_NODE_HEAD_LOCK(rnh) rw_wlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_UNLOCK(rnh) rw_wunlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_SHARED(rnh) rw_wlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_UNLOCK_SHARED(rnh) rw_wunlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_DESTROY(rnh) rw_destroy(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED) #endif /* _KERNEL */ void rn_init(void); ==== //depot/projects/ethng/src/sys/net/route.c#2 (text+ko) ==== ==== //depot/projects/ethng/src/sys/net/route.h#2 (text+ko) ==== @@ -119,7 +119,7 @@ struct rtentry *rt_parent; /* cloning parent of this route */ #ifdef _KERNEL /* XXX ugly, user apps use this definition but don't have a mtx def */ - struct mtx rt_mtx; /* mutex for routing entry */ + struct rwlock rt_lock; /* mutex for routing entry */ #endif }; @@ -287,11 +287,11 @@ #ifdef _KERNEL #define RT_LOCK_INIT(_rt) \ - mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK) -#define RT_LOCK(_rt) mtx_lock(&(_rt)->rt_mtx) -#define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) -#define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) -#define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) + rw_init(&(_rt)->rt_lock, "rtentry") +#define RT_LOCK(_rt) rw_wlock(&(_rt)->rt_lock) +#define RT_UNLOCK(_rt) rw_wunlock(&(_rt)->rt_lock) +#define RT_LOCK_DESTROY(_rt) rw_destroy(&(_rt)->rt_lock) +#define RT_LOCK_ASSERT(_rt) rw_assert(&(_rt)->rt_lock, RA_LOCKED) #define RT_ADDREF(_rt) do { \ RT_LOCK_ASSERT(_rt); \ ==== //depot/projects/ethng/src/sys/netinet/if_ether.c#2 (text+ko) ==== @@ -222,8 +222,8 @@ RT_ADDREF(rt); la->la_rt = rt; rt->rt_flags |= RTF_LLINFO; - callout_init_mtx(&la->la_timer, &rt->rt_mtx, - CALLOUT_RETURNUNLOCKED); + callout_init_rwlock(&la->la_timer, &rt->rt_lock, + CALLOUT_RETURNUNLOCKED_RW); #ifdef INET /* From owner-p4-projects@FreeBSD.ORG Wed Sep 12 09:10:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B7816A420; Wed, 12 Sep 2007 09:10:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8E3616A417 for ; Wed, 12 Sep 2007 09:10:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D481913C48E for ; Wed, 12 Sep 2007 09:10:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8C9ABC2097844 for ; Wed, 12 Sep 2007 09:10:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C9ABr1097841 for perforce@freebsd.org; Wed, 12 Sep 2007 09:10:11 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 09:10:11 GMT Message-Id: <200709120910.l8C9ABr1097841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 09:10:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=126332 Change 126332 by kmacy@kmacy_home:ethng on 2007/09/12 09:09:19 acquire the rnh lock shared for the lookup and matchaddr case Affected files ... .. //depot/projects/ethng/src/sys/net/route.c#3 edit .. //depot/projects/ethng/src/sys/net/rtsock.c#3 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.c#3 (text+ko) ==== @@ -144,7 +144,7 @@ rtstat.rts_unreach++; goto miss2; } - RADIX_NODE_HEAD_LOCK(rnh); + RADIX_NODE_HEAD_LOCK_SHARED(rnh); if ((rn = rnh->rnh_matchaddr(dst, rnh)) && (rn->rn_flags & RNF_ROOT) == 0) { /* @@ -197,7 +197,7 @@ RT_LOCK(newrt); RT_ADDREF(newrt); } - RADIX_NODE_HEAD_UNLOCK(rnh); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); } else { /* * Either we hit the root or couldn't find any match, @@ -206,7 +206,7 @@ */ rtstat.rts_unreach++; miss: - RADIX_NODE_HEAD_UNLOCK(rnh); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); miss2: if (report) { /* * If required, report the failure to the supervising @@ -1190,12 +1190,12 @@ */ if ((rnh = rt_tables[dst->sa_family]) == NULL) goto bad; - RADIX_NODE_HEAD_LOCK(rnh); + RADIX_NODE_HEAD_LOCK_SHARED(rnh); error = ((rn = rnh->rnh_lookup(dst, netmask, rnh)) == NULL || (rn->rn_flags & RNF_ROOT) || RNTORT(rn)->rt_ifa != ifa || !sa_equal((struct sockaddr *)rn->rn_key, dst)); - RADIX_NODE_HEAD_UNLOCK(rnh); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); if (error) { bad: if (m) ==== //depot/projects/ethng/src/sys/net/rtsock.c#3 (text+ko) ==== @@ -413,16 +413,16 @@ rnh = rt_tables[info.rti_info[RTAX_DST]->sa_family]; if (rnh == NULL) senderr(EAFNOSUPPORT); - RADIX_NODE_HEAD_LOCK(rnh); + RADIX_NODE_HEAD_LOCK_SHARED(rnh); rt = (struct rtentry *) rnh->rnh_lookup(info.rti_info[RTAX_DST], info.rti_info[RTAX_NETMASK], rnh); if (rt == NULL) { /* XXX looks bogus */ - RADIX_NODE_HEAD_UNLOCK(rnh); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); senderr(ESRCH); } RT_LOCK(rt); RT_ADDREF(rt); - RADIX_NODE_HEAD_UNLOCK(rnh); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); /* * Fix for PR: 82974 From owner-p4-projects@FreeBSD.ORG Wed Sep 12 10:29:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6D8116A421; Wed, 12 Sep 2007 10:29:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C43F16A41B for ; Wed, 12 Sep 2007 10:29:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CFBE13C457 for ; Wed, 12 Sep 2007 10:29:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8CATsuN005011 for ; Wed, 12 Sep 2007 10:29:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8CATsQ6005008 for perforce@freebsd.org; Wed, 12 Sep 2007 10:29:54 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 10:29:54 GMT Message-Id: <200709121029.l8CATsQ6005008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 10:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=126333 Change 126333 by kmacy@kmacy_home:ethng on 2007/09/12 10:29:35 x86_64 hwpmc depends on ppro support Affected files ... .. //depot/projects/ethng/src/sys/conf/files.amd64#4 edit Differences ... ==== //depot/projects/ethng/src/sys/conf/files.amd64#4 (text+ko) ==== @@ -180,6 +180,7 @@ dev/hptmv/ioctl.c optional hptmv dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc +dev/hwpmc/hwpmc_ppro.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem From owner-p4-projects@FreeBSD.ORG Wed Sep 12 11:26:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9811416A419; Wed, 12 Sep 2007 11:26:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46C2416A420 for ; Wed, 12 Sep 2007 11:26:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3E113C459 for ; Wed, 12 Sep 2007 11:26:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8CBQ5Yw009603 for ; Wed, 12 Sep 2007 11:26:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8CBQ52Z009600 for perforce@freebsd.org; Wed, 12 Sep 2007 11:26:05 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 11:26:05 GMT Message-Id: <200709121126.l8CBQ52Z009600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 11:26:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126334 Change 126334 by kmacy@kmacy_home:ethng on 2007/09/12 11:25:57 lock shared with rlock Affected files ... .. //depot/projects/ethng/src/sys/net/radix.h#3 edit Differences ... ==== //depot/projects/ethng/src/sys/net/radix.h#3 (text+ko) ==== @@ -148,8 +148,8 @@ rw_init(&(rnh)->rnh_lock, "radix node head") #define RADIX_NODE_HEAD_LOCK(rnh) rw_wlock(&(rnh)->rnh_lock) #define RADIX_NODE_HEAD_UNLOCK(rnh) rw_wunlock(&(rnh)->rnh_lock) -#define RADIX_NODE_HEAD_LOCK_SHARED(rnh) rw_wlock(&(rnh)->rnh_lock) -#define RADIX_NODE_HEAD_UNLOCK_SHARED(rnh) rw_wunlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_SHARED(rnh) rw_rlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_UNLOCK_SHARED(rnh) rw_runlock(&(rnh)->rnh_lock) #define RADIX_NODE_HEAD_DESTROY(rnh) rw_destroy(&(rnh)->rnh_lock) #define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED) #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Wed Sep 12 15:01:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DF4116A419; Wed, 12 Sep 2007 15:01:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1937216A417 for ; Wed, 12 Sep 2007 15:01:46 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 853B413C457 for ; Wed, 12 Sep 2007 15:01:45 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 5B46145E98; Wed, 12 Sep 2007 17:01:43 +0200 (CEST) Received: from localhost (pjd.wheel.pl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 1FE3445E90; Wed, 12 Sep 2007 17:01:37 +0200 (CEST) Date: Wed, 12 Sep 2007 17:00:17 +0200 From: Pawel Jakub Dawidek To: Kip Macy Message-ID: <20070912150017.GA3553@garage.freebsd.pl> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline In-Reply-To: <200709120832.l8C8WLlm085731@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 15:01:47 -0000 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D126330 >=20 > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 >=20 > convert radix node head and route locks from mutexes to rwlocks [...] > rt->rt_flags |=3D RTF_LLINFO; > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > - CALLOUT_RETURNUNLOCKED); > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > + CALLOUT_RETURNUNLOCKED_RW); > =20 Kip, don't add callout_init_rwlock() to the tree. I've callout_init_lock() implemented that operates on any lock type, just like condvar(9). --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --mYCpIKhGyMATD0i+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG5/8BForvXbEpPzQRAixrAKCmfiwWMjpEo6sak37VM3ZRtLJagwCbBjAM hUqfYE9wrKbTDwH42CWKjFk= =phLw -----END PGP SIGNATURE----- --mYCpIKhGyMATD0i+-- From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:18:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D4116A419; Wed, 12 Sep 2007 22:18:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51B0616A417 for ; Wed, 12 Sep 2007 22:18:31 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.233]) by mx1.freebsd.org (Postfix) with ESMTP id 0E1B113C45A for ; Wed, 12 Sep 2007 22:18:30 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: by nz-out-0506.google.com with SMTP id l8so224742nzf for ; Wed, 12 Sep 2007 15:18:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=WFXKdXGx+hXNOqyFYE8AbwQlbij914MY6+V/wXQDc2c=; b=GnS5mxz+DUKZnQm17IYczNC9sf/5PMItBuTvNc82hI1IJOtkiAN7XlXq1UAb6RpgOpp1nkefskpApU3251aBWY7/44hWR5G5f8HN1RFr32qXsRS8WdzOzWEmkP7gV3BH1AZIlFTOSoqS8lIYnEoVtL3b0nheZWJ6miOf8kULCEQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=NIew59bV4Gai3VLom2OlpUIegfs3gu+d/Bak1WFIAYxJDtat0QVJixgHUx+hbbBX3/D4LG3iz5ubkSQ9OL0CfgxT6Dyf9vZEcE5uy6M7SFiOyZn2Dpu0GwIQHLx0tGE76mspdBOrIFsZseqLWmiuqU0TRHhGMmLEMAWQ55lp39k= Received: by 10.114.121.1 with SMTP id t1mr28527wac.1189633846025; Wed, 12 Sep 2007 14:50:46 -0700 (PDT) Received: by 10.114.13.15 with HTTP; Wed, 12 Sep 2007 14:50:46 -0700 (PDT) Message-ID: Date: Wed, 12 Sep 2007 14:50:46 -0700 From: "Kip Macy" To: "Pawel Jakub Dawidek" In-Reply-To: <20070912150017.GA3553@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:18:31 -0000 On 9/12/07, Pawel Jakub Dawidek wrote: > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > http://perforce.freebsd.org/chv.cgi?CH=126330 > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > convert radix node head and route locks from mutexes to rwlocks > [...] > > rt->rt_flags |= RTF_LLINFO; > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > - CALLOUT_RETURNUNLOCKED); > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > + CALLOUT_RETURNUNLOCKED_RW); > > > > Kip, don't add callout_init_rwlock() to the tree. I've > callout_init_lock() implemented that operates on any lock type, just > like condvar(9). point me to a diff From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:30:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 609D716A46C; Wed, 12 Sep 2007 22:30:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3111A16A469 for ; Wed, 12 Sep 2007 22:30:29 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.188]) by mx1.freebsd.org (Postfix) with ESMTP id B12A413C467 for ; Wed, 12 Sep 2007 22:30:28 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so316543nfb for ; Wed, 12 Sep 2007 15:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=htWFh8EiAPD5bD8EGyQmIf/18/nsRdNmqbyUuB6Uhwc=; b=muzhPFO0zjVIo/OskITCahG/hK6vQTHJESDlo/2vOX7RcP2cKAL6TeD1AleKfCE8ivayA/jZXASgp1d1K1ByNdf8ZUN+pBbghJQ1KNKd5F8XUlGfXTq2HN/nysLmTEYW0ixuZ8hCOdDeaRZDvFI0xnTuaJuQuPLU6Rb7oNh8rlg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=FZ8ocjfIpJ55iRuhGxjDgtheH9HiwBdHFwoQC8MWEBiSkzNmcp9rPA8HkR41nasybxJ46qFZEQfzZMn/oelepkhznWF60qvENsQV+qWp2puRvwGdjVryOjcY5ZsME3PC+Mf8rcFLHL2qDbEL6UBUpflGFb/Ou/Ten6W5YGHd+AI= Received: by 10.78.150.7 with SMTP id x7mr25566hud.1189636226887; Wed, 12 Sep 2007 15:30:26 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Wed, 12 Sep 2007 15:30:26 -0700 (PDT) Message-ID: <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> Date: Thu, 13 Sep 2007 00:30:26 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Kip Macy" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> X-Google-Sender-Auth: e7bcc27b38f18b1e Cc: Perforce Change Reviews , Pawel Jakub Dawidek , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:30:29 -0000 2007/9/12, Kip Macy : > On 9/12/07, Pawel Jakub Dawidek wrote: > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=126330 > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > convert radix node head and route locks from mutexes to rwlocks > > [...] > > > rt->rt_flags |= RTF_LLINFO; > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > - CALLOUT_RETURNUNLOCKED); > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > callout_init_lock() implemented that operates on any lock type, just > > like condvar(9). > > point me to a diff I'm courious to know another thing instead. As like condvar() works, it is allowed to before release and later acquire the lock. This scheme let you acquire the lock again following the previous pattern for sx and rw locks (if for example you had a rwlock mantained in write mode you will acquire it in the same way). This is not applicable to callout, instead, as you have the lock 'blank', so with double-kind locks (like rw and sx) how do you lock it? Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:40:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3552F16A420; Wed, 12 Sep 2007 22:40:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3FF616A417; Wed, 12 Sep 2007 22:40:01 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 7C23213C458; Wed, 12 Sep 2007 22:40:01 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id A80FD45E9D; Thu, 13 Sep 2007 00:39:59 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 48CD745E98; Thu, 13 Sep 2007 00:39:54 +0200 (CEST) Date: Thu, 13 Sep 2007 00:38:33 +0200 From: Pawel Jakub Dawidek To: Attilio Rao Message-ID: <20070912223833.GC4909@garage.freebsd.pl> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gr/z0/N6AeWAPJVB" Content-Disposition: inline In-Reply-To: <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:40:02 -0000 --gr/z0/N6AeWAPJVB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 13, 2007 at 12:30:26AM +0200, Attilio Rao wrote: > 2007/9/12, Kip Macy : > > On 9/12/07, Pawel Jakub Dawidek wrote: > > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > > http://perforce.freebsd.org/chv.cgi?CH=3D126330 > > > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > > > convert radix node head and route locks from mutexes to rwloc= ks > > > [...] > > > > rt->rt_flags |=3D RTF_LLINFO; > > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > > - CALLOUT_RETURNUNLOCKED); > > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > > callout_init_lock() implemented that operates on any lock type, just > > > like condvar(9). > > > > point me to a diff >=20 > I'm courious to know another thing instead. > As like condvar() works, it is allowed to before release and later > acquire the lock. > This scheme let you acquire the lock again following the previous > pattern for sx and rw locks (if for example you had a rwlock mantained > in write mode you will acquire it in the same way). > This is not applicable to callout, instead, as you have the lock > 'blank', so with double-kind locks (like rw and sx) how do you lock > it? Always write/exclusive. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --gr/z0/N6AeWAPJVB Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG6GppForvXbEpPzQRAiM5AJ9DwE4JoHnAeh+AVXCmlHdS8Vp1GwCdH266 SsJa32UH5SrW0eppocvkupY= =dyqW -----END PGP SIGNATURE----- --gr/z0/N6AeWAPJVB-- From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:40:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 748CE16A468; Wed, 12 Sep 2007 22:40:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51A8616A418; Wed, 12 Sep 2007 22:40:21 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id E506E13C46B; Wed, 12 Sep 2007 22:40:20 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id B457B45EAE; Thu, 13 Sep 2007 00:40:19 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 6C74A45CD9; Thu, 13 Sep 2007 00:40:15 +0200 (CEST) Date: Thu, 13 Sep 2007 00:38:55 +0200 From: Pawel Jakub Dawidek To: Kip Macy Message-ID: <20070912223855.GD4909@garage.freebsd.pl> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="fOHHtNG4YXGJ0yqR" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:40:21 -0000 --fOHHtNG4YXGJ0yqR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 12, 2007 at 02:50:46PM -0700, Kip Macy wrote: > On 9/12/07, Pawel Jakub Dawidek wrote: > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=3D126330 > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > convert radix node head and route locks from mutexes to rwlocks > > [...] > > > rt->rt_flags |=3D RTF_LLINFO; > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > - CALLOUT_RETURNUNLOCKED); > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > callout_init_lock() implemented that operates on any lock type, just > > like condvar(9). >=20 > point me to a diff This is a part of this patch: http://people.freebsd.org/~pjd/patches/proc_rwlock.patch --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --fOHHtNG4YXGJ0yqR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG6Gp/ForvXbEpPzQRAhKXAJoDEDpSRlyFTNU+F+TR0WFbMzb39QCfVaeE FQmeCWosTDYaRcvyBZ1y8Sk= =e2Bd -----END PGP SIGNATURE----- --fOHHtNG4YXGJ0yqR-- From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:46:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3360016A468; Wed, 12 Sep 2007 22:46:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECF8316A420 for ; Wed, 12 Sep 2007 22:46:31 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.190]) by mx1.freebsd.org (Postfix) with ESMTP id 77C8113C478 for ; Wed, 12 Sep 2007 22:46:31 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so319674nfb for ; Wed, 12 Sep 2007 15:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=PvilHXEVwezJadLWTpMRSG08BiJ0O0HlHPKYbvshEQA=; b=G+0NS/vESmUkW37p1K585CMAhzNjQzR+fpxlF2TfDGEdZDGtvAn4Y/2D2wZJZ9b+GfRa3MRMjs2nO/OCTdI5jV1fQOCtBwjiiKUSKuZ/B9+2xCdg0QTslKaeNXjPnU6Gkm5ZuuVX7ksWTbxsZ3ZXg3Iy6CNkEAAaGJhS+mmbyUA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=ML4exqG6OPc7JoVkSErAtlpvxzEaPZbFha9ajKw3dtAStE/+l6CBUWbZI7HefK7keRVeueVrUzD5eBAHW55WMjbD9UZCkkw3zUG0cGzCqTzZAasUB5IWolbx+os9bJrtL7eHJANNmUsVDFz/qn0tCGTgI8s+vQM7I3XDUYq9K+Q= Received: by 10.78.107.8 with SMTP id f8mr27385huc.1189637189620; Wed, 12 Sep 2007 15:46:29 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Wed, 12 Sep 2007 15:46:29 -0700 (PDT) Message-ID: <3bbf2fe10709121546i375afaf5jc716f9f3609c35e9@mail.gmail.com> Date: Thu, 13 Sep 2007 00:46:29 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Pawel Jakub Dawidek" In-Reply-To: <20070912223833.GC4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> X-Google-Sender-Auth: 865a447f10d9ed2d Cc: Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:46:32 -0000 2007/9/13, Pawel Jakub Dawidek : > On Thu, Sep 13, 2007 at 12:30:26AM +0200, Attilio Rao wrote: > > 2007/9/12, Kip Macy : > > > On 9/12/07, Pawel Jakub Dawidek wrote: > > > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > > > http://perforce.freebsd.org/chv.cgi?CH=126330 > > > > > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > > > > > convert radix node head and route locks from mutexes to rwlocks > > > > [...] > > > > > rt->rt_flags |= RTF_LLINFO; > > > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > > > - CALLOUT_RETURNUNLOCKED); > > > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > > > callout_init_lock() implemented that operates on any lock type, just > > > > like condvar(9). > > > > > > point me to a diff > > > > I'm courious to know another thing instead. > > As like condvar() works, it is allowed to before release and later > > acquire the lock. > > This scheme let you acquire the lock again following the previous > > pattern for sx and rw locks (if for example you had a rwlock mantained > > in write mode you will acquire it in the same way). > > This is not applicable to callout, instead, as you have the lock > > 'blank', so with double-kind locks (like rw and sx) how do you lock > > it? > > Always write/exclusive. When thinking about it I was thinking to add an argument to functions in order to force from outside one of the two things (and maybe do some macro games with them). However write/exclusive one is reasonable for most usage. Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Sep 12 22:49:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3795A16A41A; Wed, 12 Sep 2007 22:49:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DB1716A417 for ; Wed, 12 Sep 2007 22:49:58 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.235]) by mx1.freebsd.org (Postfix) with ESMTP id BD06113C467 for ; Wed, 12 Sep 2007 22:49:57 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: by nz-out-0506.google.com with SMTP id l8so230924nzf for ; Wed, 12 Sep 2007 15:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=TuLMDVHkf9V6+v5AMdoAho8+5SDpV5CqewypujthJo0=; b=W6+QDSbc+Nmeqx81ZnvIax4VObCpWiQ/6Q+BBlPbCJ09XWts8r69WXnagj8tV7XHwJ6UBl3WsNdjcLoerLu5kX2nz8TCshWpsszx5J7aKSuSoT2oPps2T8/0na6uGlAJMB5jeoIBdeV6m6JfupOT7s1h128a+w+jL7qgxR4J+o4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=tEE46hNUEzZaL6gQ3m7p9z2vgmvVTc3UB7bZcgYsMP79O4nXLJib7Jz+lYDCsBDiwD0YwAU/+7dkleJaKzafzm2a2tyfxvzfjzgZa0N+U6wdu7/ictbom61fdKrq4/hyoUj9hmh1ShF8j9vTdKeZEsLdpnapG3IE+ekxzQrwIzU= Received: by 10.115.78.1 with SMTP id f1mr67321wal.1189637396023; Wed, 12 Sep 2007 15:49:56 -0700 (PDT) Received: by 10.114.13.15 with HTTP; Wed, 12 Sep 2007 15:49:55 -0700 (PDT) Message-ID: Date: Wed, 12 Sep 2007 15:49:55 -0700 From: "Kip Macy" To: "Pawel Jakub Dawidek" In-Reply-To: <20070912223833.GC4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> Cc: Attilio Rao , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 22:49:58 -0000 Andrew Thompson explicitly asked for the possibility of shared acquisition. -Kip On 9/12/07, Pawel Jakub Dawidek wrote: > On Thu, Sep 13, 2007 at 12:30:26AM +0200, Attilio Rao wrote: > > 2007/9/12, Kip Macy : > > > On 9/12/07, Pawel Jakub Dawidek wrote: > > > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > > > http://perforce.freebsd.org/chv.cgi?CH=126330 > > > > > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > > > > > convert radix node head and route locks from mutexes to rwlocks > > > > [...] > > > > > rt->rt_flags |= RTF_LLINFO; > > > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > > > - CALLOUT_RETURNUNLOCKED); > > > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > > > callout_init_lock() implemented that operates on any lock type, just > > > > like condvar(9). > > > > > > point me to a diff > > > > I'm courious to know another thing instead. > > As like condvar() works, it is allowed to before release and later > > acquire the lock. > > This scheme let you acquire the lock again following the previous > > pattern for sx and rw locks (if for example you had a rwlock mantained > > in write mode you will acquire it in the same way). > > This is not applicable to callout, instead, as you have the lock > > 'blank', so with double-kind locks (like rw and sx) how do you lock > > it? > > Always write/exclusive. > > -- > Pawel Jakub Dawidek http://www.wheel.pl > pjd@FreeBSD.org http://www.FreeBSD.org > FreeBSD committer Am I Evil? Yes, I Am! > > From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:03:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF70416A46C; Wed, 12 Sep 2007 23:03:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CB9716A469 for ; Wed, 12 Sep 2007 23:03:08 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.189]) by mx1.freebsd.org (Postfix) with ESMTP id BCABA13C469 for ; Wed, 12 Sep 2007 23:03:07 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so322687nfb for ; Wed, 12 Sep 2007 16:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=gALs9GQFOk04J72+G3FlPe43oQGOMVdQgfDt96bc5xQ=; b=MpN2da0+4PCeU+A1wp5qubbYEzLvQH1wHD1KYKVzJch5lJe9/4WhwEiBiEMUSJKqnTQuJlrcOsQY0kQgVrBc73yxXteIf5ZDM/bJajoYStDxmUEY6hYoUP0gkY+SY92ApEAkZu9kM90QEZJhfZF3b/Y7dO9iejtmxmbJRdQFiQU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=HdAmp+nidMVXewxB6wtoAIsqQnM7dSytTBf6+qT50DPdzB2jJBYkYJzpHi6J0RTrE/nCBDtJZ3pNVyrmWZpZdVM1qLHO29/Kiu2ryv/p95RGqcoHyeufch2W30YadRZKYowNSpbvsTv/AB06XXOkL8qi6yZ/UxM4C//lDi1jzWM= Received: by 10.78.131.8 with SMTP id e8mr46257hud.1189638186232; Wed, 12 Sep 2007 16:03:06 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Wed, 12 Sep 2007 16:03:06 -0700 (PDT) Message-ID: <3bbf2fe10709121603r73861f04vb06790bea9400435@mail.gmail.com> Date: Thu, 13 Sep 2007 01:03:06 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Kip Macy" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> X-Google-Sender-Auth: 370d41a7234c87f7 Cc: Perforce Change Reviews , Pawel Jakub Dawidek , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:03:09 -0000 2007/9/13, Kip Macy : > Andrew Thompson explicitly asked for the possibility of shared acquisition. > Probabilly, would be feasible to modify knlist_lock() (if necessary) and softclock() in order to accept a further argument on how to do internal locking. Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:03:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1640F16A468; Wed, 12 Sep 2007 23:03:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD91A16A417; Wed, 12 Sep 2007 23:03:31 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 6DBBE13C465; Wed, 12 Sep 2007 23:03:31 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 5D96D45E9D; Thu, 13 Sep 2007 01:03:30 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 0D27945E90; Thu, 13 Sep 2007 01:03:26 +0200 (CEST) Date: Thu, 13 Sep 2007 01:02:05 +0200 From: Pawel Jakub Dawidek To: Kip Macy Message-ID: <20070912230205.GF4909@garage.freebsd.pl> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SxgehGEc6vB0cZwN" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: Attilio Rao , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:03:32 -0000 --SxgehGEc6vB0cZwN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > Andrew Thompson explicitly asked for the possibility of shared acquisitio= n. A flag for callout_init_lock() will be enough? Or it wants it to be sometimes acquired shared and sometimes exclusive? --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --SxgehGEc6vB0cZwN Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG6G/tForvXbEpPzQRAuZDAJ4rKl3YcKk0wOEr5/nfj+qvacHDFQCfRwZN o0HQD0geZB7OdHvP5uERQkY= =+qAd -----END PGP SIGNATURE----- --SxgehGEc6vB0cZwN-- From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:18:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90B3A16A418; Wed, 12 Sep 2007 23:18:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6825E16A468 for ; Wed, 12 Sep 2007 23:18:43 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.185]) by mx1.freebsd.org (Postfix) with ESMTP id E243F13C46E for ; Wed, 12 Sep 2007 23:18:42 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so325698nfb for ; Wed, 12 Sep 2007 16:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=coxzk7cLUhz5B55ZzWNAGdJQuc6R7i8OhubfkPBXb+A=; b=Lt1mmewbRVy/ra2Fv/xiR+EpiMDdzJ4KSSFpuOixASqUaWBB0n8GG4STLTfK+TLdWaQRF1G/vX5fkOStEM7gEu7S96jzn7wfrwkoUFXJCFiLKc/53/ROzlHFLieqy4d1hHHVBTN0+F2T/99XO0QsE1k8y+/uphglHSChnA49hpw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=Ctm/1DqOY7qQ/vw+kEohJH1G+EzUiIc8YeW6KwHJLbNK+F13mQVM0DxiuHy3kWde5M0Api3sXxpWckDePwqvSSRkdza/57SUVUlxoaRis9tZTzIrNtCY1ZQM3Uj8jqOhQGkVV/x0lSU6/MbauY1GvxALRoSN56GbSmoEwx8pEH8= Received: by 10.78.160.2 with SMTP id i2mr31398hue.1189639121062; Wed, 12 Sep 2007 16:18:41 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Wed, 12 Sep 2007 16:18:41 -0700 (PDT) Message-ID: <3bbf2fe10709121618o3955b1fdm2cdca5b7fea8f6e4@mail.gmail.com> Date: Thu, 13 Sep 2007 01:18:41 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Pawel Jakub Dawidek" In-Reply-To: <20070912230205.GF4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> <20070912230205.GF4909@garage.freebsd.pl> X-Google-Sender-Auth: 90047e62dbd55020 Cc: Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:18:43 -0000 2007/9/13, Pawel Jakub Dawidek : > On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > > Andrew Thompson explicitly asked for the possibility of shared acquisition. > > A flag for callout_init_lock() will be enough? Or it wants it to be > sometimes acquired shared and sometimes exclusive? If it was me I would avoid the 'static' requirement for these stuffs. Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:19:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE54E16A476; Wed, 12 Sep 2007 23:19:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFD3716A417; Wed, 12 Sep 2007 23:19:23 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from heff.fud.org.nz (203-109-251-39.static.bliink.ihug.co.nz [203.109.251.39]) by mx1.freebsd.org (Postfix) with ESMTP id 1B2C913C468; Wed, 12 Sep 2007 23:19:23 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: by heff.fud.org.nz (Postfix, from userid 1001) id 85D761CC26; Thu, 13 Sep 2007 11:05:47 +1200 (NZST) Date: Thu, 13 Sep 2007 11:05:47 +1200 From: Andrew Thompson To: Kip Macy Message-ID: <20070912230547.GB63121@heff.fud.org.nz> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.13 (2006-08-11) Cc: Attilio Rao , Perforce Change Reviews , Pawel Jakub Dawidek , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:19:24 -0000 On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > Andrew Thompson explicitly asked for the possibility of shared acquisition. I dont have a use for shared acquisition at the moment but I imagine it could be handy. > On 9/12/07, Pawel Jakub Dawidek wrote: > > On Thu, Sep 13, 2007 at 12:30:26AM +0200, Attilio Rao wrote: > > > 2007/9/12, Kip Macy : > > > > On 9/12/07, Pawel Jakub Dawidek wrote: > > > > > On Wed, Sep 12, 2007 at 08:32:21AM +0000, Kip Macy wrote: > > > > > > http://perforce.freebsd.org/chv.cgi?CH=126330 > > > > > > > > > > > > Change 126330 by kmacy@kmacy_home:ethng on 2007/09/12 08:31:36 > > > > > > > > > > > > convert radix node head and route locks from mutexes to rwlocks > > > > > [...] > > > > > > rt->rt_flags |= RTF_LLINFO; > > > > > > - callout_init_mtx(&la->la_timer, &rt->rt_mtx, > > > > > > - CALLOUT_RETURNUNLOCKED); > > > > > > + callout_init_rwlock(&la->la_timer, &rt->rt_lock, > > > > > > + CALLOUT_RETURNUNLOCKED_RW); > > > > > > > > > > > > > > > > Kip, don't add callout_init_rwlock() to the tree. I've > > > > > callout_init_lock() implemented that operates on any lock type, just > > > > > like condvar(9). > > > > > > > > point me to a diff > > > > > > I'm courious to know another thing instead. > > > As like condvar() works, it is allowed to before release and later > > > acquire the lock. > > > This scheme let you acquire the lock again following the previous > > > pattern for sx and rw locks (if for example you had a rwlock mantained > > > in write mode you will acquire it in the same way). > > > This is not applicable to callout, instead, as you have the lock > > > 'blank', so with double-kind locks (like rw and sx) how do you lock > > > it? > > > > Always write/exclusive. > > > > -- > > Pawel Jakub Dawidek http://www.wheel.pl > > pjd@FreeBSD.org http://www.FreeBSD.org > > FreeBSD committer Am I Evil? Yes, I Am! > > > > From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:19:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 567CF16A517; Wed, 12 Sep 2007 23:19:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B93E216A46D; Wed, 12 Sep 2007 23:19:23 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from heff.fud.org.nz (203-109-251-39.static.bliink.ihug.co.nz [203.109.251.39]) by mx1.freebsd.org (Postfix) with ESMTP id 1B0E813C465; Wed, 12 Sep 2007 23:19:23 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: by heff.fud.org.nz (Postfix, from userid 1001) id 57EAA1CC2F; Thu, 13 Sep 2007 11:07:00 +1200 (NZST) Date: Thu, 13 Sep 2007 11:07:00 +1200 From: Andrew Thompson To: Pawel Jakub Dawidek Message-ID: <20070912230700.GC63121@heff.fud.org.nz> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> <20070912230205.GF4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070912230205.GF4909@garage.freebsd.pl> User-Agent: Mutt/1.5.13 (2006-08-11) Cc: Attilio Rao , Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:19:24 -0000 On Thu, Sep 13, 2007 at 01:02:05AM +0200, Pawel Jakub Dawidek wrote: > On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > > Andrew Thompson explicitly asked for the possibility of shared acquisition. > > A flag for callout_init_lock() will be enough? Or it wants it to be > sometimes acquired shared and sometimes exclusive? I think a flag is plenty. From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:27:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE59216A46B; Wed, 12 Sep 2007 23:27:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACD0A16A420; Wed, 12 Sep 2007 23:27:10 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 4563E13C46C; Wed, 12 Sep 2007 23:27:10 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id E2FCB45E98; Thu, 13 Sep 2007 01:27:08 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id E39D3456AB; Thu, 13 Sep 2007 01:27:01 +0200 (CEST) Date: Thu, 13 Sep 2007 01:25:41 +0200 From: Pawel Jakub Dawidek To: Attilio Rao Message-ID: <20070912232541.GG4909@garage.freebsd.pl> References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> <20070912230205.GF4909@garage.freebsd.pl> <3bbf2fe10709121618o3955b1fdm2cdca5b7fea8f6e4@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yZnyZsPjQYjG7xG7" Content-Disposition: inline In-Reply-To: <3bbf2fe10709121618o3955b1fdm2cdca5b7fea8f6e4@mail.gmail.com> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:27:11 -0000 --yZnyZsPjQYjG7xG7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 13, 2007 at 01:18:41AM +0200, Attilio Rao wrote: > 2007/9/13, Pawel Jakub Dawidek : > > On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > > > Andrew Thompson explicitly asked for the possibility of shared acquis= ition. > > > > A flag for callout_init_lock() will be enough? Or it wants it to be > > sometimes acquired shared and sometimes exclusive? >=20 > If it was me I would avoid the 'static' requirement for these stuffs. Actually I don't see why one would want to call the same handler with different locked lock. I think a flag for callout_init_lock() should be enough, exactly in the same way we have CALLOUT_RETURNUNLOCKED - we don't decide if the handler returns with lock unlock at callout_reset() time, but at callout_init_mtx() time. The thing is that you know the handler and you know if it needs to modify shared data or not at init time. And for the very uncommon cases, you can always downgrade the lock from within the handler. All in all, I think a flag for callout_init_lock() is enough. Do you feel convinced? --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --yZnyZsPjQYjG7xG7 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFG6HV1ForvXbEpPzQRAiQtAKDb59z9sc1+AMa2wWTMxsaB4rLJiQCg7uEP dI8eVoyy0Cv+QGLlofKlJZg= =DPX3 -----END PGP SIGNATURE----- --yZnyZsPjQYjG7xG7-- From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:31:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F4ED16A469; Wed, 12 Sep 2007 23:31:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1634916A41B for ; Wed, 12 Sep 2007 23:31:47 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.187]) by mx1.freebsd.org (Postfix) with ESMTP id 728B013C461 for ; Wed, 12 Sep 2007 23:31:46 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so328206nfb for ; Wed, 12 Sep 2007 16:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=2+MOCknaauY3V2Li9kMXm8QE4XSDqHI2hQ/jMt3NKEk=; b=BhPz68XM4Bn/lclpXK979lmAOh0XU9uyOVb7q2uqHLS6S0Oz3lwrvkYdC6w5p7IZ57tVSgy98ozP1AQ47bQrU8n7SGkqImq4l+XDnilVNz3ATcrOncu1leI/ZYvnjIsun6wxY/3UGC1aMf7wH+GIZ77HfFrGjnJYk2aOiM677eE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=QQq5wn/EUL7w4PJdOilBZ79wfsBN1ttfczktpxCW7wQi7bHvfbSWO/TyidAlGAYwOT9LTKITSK3T0HtiyufHWAO9hDPlPiffiGiFw4MGlRqvD1ScN9TcuuZmJM4f76QJrnXRwHSs0GROShG1ujfs8oOKdo0f+2kiH6zuM3bVeq8= Received: by 10.78.188.10 with SMTP id l10mr47685huf.1189639904743; Wed, 12 Sep 2007 16:31:44 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Wed, 12 Sep 2007 16:31:44 -0700 (PDT) Message-ID: <3bbf2fe10709121631w7b494d0ap3a2495517b6402f7@mail.gmail.com> Date: Thu, 13 Sep 2007 01:31:44 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "Pawel Jakub Dawidek" In-Reply-To: <20070912232541.GG4909@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200709120832.l8C8WLlm085731@repoman.freebsd.org> <20070912150017.GA3553@garage.freebsd.pl> <3bbf2fe10709121530h6d0681c4xa247fe7d31cb2c2e@mail.gmail.com> <20070912223833.GC4909@garage.freebsd.pl> <20070912230205.GF4909@garage.freebsd.pl> <3bbf2fe10709121618o3955b1fdm2cdca5b7fea8f6e4@mail.gmail.com> <20070912232541.GG4909@garage.freebsd.pl> X-Google-Sender-Auth: 25964e9c1a526c2c Cc: Kip Macy , Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 126330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:31:47 -0000 2007/9/13, Pawel Jakub Dawidek : > On Thu, Sep 13, 2007 at 01:18:41AM +0200, Attilio Rao wrote: > > 2007/9/13, Pawel Jakub Dawidek : > > > On Wed, Sep 12, 2007 at 03:49:55PM -0700, Kip Macy wrote: > > > > Andrew Thompson explicitly asked for the possibility of shared acquisition. > > > > > > A flag for callout_init_lock() will be enough? Or it wants it to be > > > sometimes acquired shared and sometimes exclusive? > > > > If it was me I would avoid the 'static' requirement for these stuffs. > > Actually I don't see why one would want to call the same handler with > different locked lock. I think a flag for callout_init_lock() should be > enough, exactly in the same way we have CALLOUT_RETURNUNLOCKED - we > don't decide if the handler returns with lock unlock at callout_reset() > time, but at callout_init_mtx() time. The thing is that you know the > handler and you know if it needs to modify shared data or not at init > time. And for the very uncommon cases, you can always downgrade the lock > from within the handler. > > All in all, I think a flag for callout_init_lock() is enough. Do you > feel convinced? Yes, probabilly having an initialization flag is good enough. I was just thinking if one can find cases where different ways for handler locking can happen, so that having a general way to avoid this would be better. But, as you explain, an intialization flag is a good solution as well (and avoids any external API modify). Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:38:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4529516A496; Wed, 12 Sep 2007 23:38:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01D6416A47F for ; Wed, 12 Sep 2007 23:38:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E829A13C457 for ; Wed, 12 Sep 2007 23:38:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8CNcGaM095988 for ; Wed, 12 Sep 2007 23:38:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8CNcGXP095985 for perforce@freebsd.org; Wed, 12 Sep 2007 23:38:16 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Sep 2007 23:38:16 GMT Message-Id: <200709122338.l8CNcGXP095985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:38:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=126346 Change 126346 by kmacy@kmacy_home:ethng on 2007/09/12 23:38:04 narrow the scope of the rnh lock so we don't recurse on it in rtrequest make sure we drop the route lock before destroying it Affected files ... .. //depot/projects/ethng/src/sys/net/route.c#4 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.c#4 (text+ko) ==== @@ -153,6 +153,7 @@ */ newrt = rt = RNTORT(rn); nflags = rt->rt_flags & ~ignflags; + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); if (report && (nflags & RTF_CLONING)) { /* * We are apparently adding (report = 0 in delete). @@ -162,12 +163,17 @@ err = rtrequest(RTM_RESOLVE, dst, NULL, NULL, 0, &newrt); if (err) { + RADIX_NODE_HEAD_LOCK_SHARED(rnh); + if (!((rn = rnh->rnh_matchaddr(dst, rnh)) && + (rn->rn_flags & RNF_ROOT) == 0)) + goto miss; /* * If the cloning didn't succeed, maybe * what we have will do. Return that. */ newrt = rt; /* existing route */ RT_LOCK(newrt); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); RT_ADDREF(newrt); goto miss; } @@ -197,7 +203,6 @@ RT_LOCK(newrt); RT_ADDREF(newrt); } - RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); } else { /* * Either we hit the root or couldn't find any match, @@ -297,6 +302,7 @@ /* * and the rtentry itself of course */ + RT_UNLOCK(rt); RT_LOCK_DESTROY(rt); uma_zfree(rtzone, rt); return; From owner-p4-projects@FreeBSD.ORG Wed Sep 12 23:42:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1845B16A418; Wed, 12 Sep 2007 23:42:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A465516A420 for ; Wed, 12 Sep 2007 23:42:37 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 937B113C46C for ; Wed, 12 Sep 2007 23:42:37 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8CNgbuI096315 for ; Wed, 12 Sep 2007 23:42:37 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8CNgMH6096300 for perforce@freebsd.org; Wed, 12 Sep 2007 23:42:22 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 12 Sep 2007 23:42:22 GMT Message-Id: <200709122342.l8CNgMH6096300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 126347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 23:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=126347 Change 126347 by rpaulo@rpaulo_alpha on 2007/09/12 23:41:37 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/endian.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#14 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/an/if_an.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/awi/awi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfireg.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfivar.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2560.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2661.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ray/if_ray.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rum.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zyd.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zydfw.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zydreg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#21 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/wi/if_wi.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/local_apic.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/support.s#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/swtch.s#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/asm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/isa/isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/syscalls.master#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_acct.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_ktrace.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_switch.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_timeout.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_smp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_mount.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_syscalls.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/cxgb/Makefile#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/ixgbe/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/zyd/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/net/bpf.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/rtsock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/_ieee80211.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_input.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_node.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_fw2.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_header.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#15 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.h#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_structs.h#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_var.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.h#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#13 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#14 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#15 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_framework.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_policy.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_vfs.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_test/mac_test.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbusreg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/mbuf.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/mount.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/device_pager.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/phys_pager.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#6 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $ */ #include @@ -81,6 +81,7 @@ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ jmp swact +END(cpu_throw) /* * cpu_switch(old, new, mtx) @@ -256,7 +257,8 @@ movq %rax,%dr7 1: ret - +END(cpu_switch) + /* * savectx(pcb) * Update pcb, saving current processor state. @@ -314,3 +316,4 @@ popfq ret +END(savectx) ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1061,7 +1061,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $ */ #include "opt_ddb.h" @@ -69,7 +69,8 @@ rep stosb ret - +END(bzero) + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -84,6 +85,7 @@ jne 1b sfence ret +END(pagezero) ENTRY(bcmp) movq %rdx,%rcx @@ -101,6 +103,7 @@ setne %al movsbl %al,%eax ret +END(bcmp) /* * bcopy(src, dst, cnt) @@ -144,7 +147,8 @@ movsq cld ret - +END(bcopy) + /* * Note: memcpy does not support overlapping copies */ @@ -159,6 +163,7 @@ rep movsb ret +END(memcpy) /* * pagecopy(%rdi=from, %rsi=to) @@ -185,6 +190,7 @@ jne 2b sfence ret +END(pagecopy) /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ @@ -196,6 +202,7 @@ rep stosw ret +END(fillw) /*****************************************************************************/ /* copyout and fubyte family */ @@ -267,6 +274,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyout) /* * copyin(from_user, to_kernel, len) - MP SAFE @@ -312,6 +320,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyin) /* * casuword32. Compare and set user integer. Returns -1 or the current value. @@ -340,6 +349,7 @@ movq PCPU(CURPCB),%rcx movq $0,PCB_ONFAULT(%rcx) ret +END(casuword32) /* * casuword. Compare and set user word. Returns -1 or the current value. @@ -369,6 +379,7 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq $0,PCB_ONFAULT(%rcx) ret +END(casuword) /* * Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit @@ -388,6 +399,8 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword64) +END(fuword) ENTRY(fuword32) movq PCPU(CURPCB),%rcx @@ -400,6 +413,7 @@ movl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword32) /* * fuswintr() and suswintr() are specialized variants of fuword16() and @@ -412,6 +426,8 @@ ENTRY(fuswintr) movq $-1,%rax ret +END(suswintr) +END(fuswintr) ENTRY(fuword16) movq PCPU(CURPCB),%rcx @@ -424,6 +440,7 @@ movzwl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword16) ENTRY(fubyte) movq PCPU(CURPCB),%rcx @@ -436,6 +453,7 @@ movzbl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fubyte) ALIGN_TEXT fusufault: @@ -464,6 +482,8 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword64) +END(suword) ENTRY(suword32) movq PCPU(CURPCB),%rcx @@ -478,6 +498,7 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword32) ENTRY(suword16) movq PCPU(CURPCB),%rcx @@ -492,6 +513,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(suword16) ENTRY(subyte) movq PCPU(CURPCB),%rcx @@ -507,6 +529,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(subyte) /* * copyinstr(from, to, maxlen, int *lencopied) - MP SAFE @@ -575,7 +598,7 @@ movq %r8,(%r9) 1: ret - +END(copyinstr) /* * copystr(from, to, maxlen, int *lencopied) - MP SAFE @@ -612,6 +635,7 @@ movq %r8,(%rcx) 7: ret +END(copystr) /* * Handling of special amd64 registers and descriptor tables etc @@ -639,6 +663,7 @@ pushq %rax MEXITCOUNT lretq +END(lgdt) /*****************************************************************************/ /* setjump, longjump */ @@ -656,6 +681,7 @@ movq %rdx,56(%rdi) /* save rip */ xorl %eax,%eax /* return(0); */ ret +END(setjmp) ENTRY(longjmp) movq 0(%rdi),%rbx /* restore rbx */ @@ -670,6 +696,7 @@ xorl %eax,%eax /* return(1); */ incl %eax ret +END(longjmp) /* * Support for BB-profiling (gcc -a). The kernbb program will extract ==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/asm.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -77,6 +77,8 @@ #define ENTRY(x) _ENTRY(x) #endif +#define END(x) .size x, . - x + #define RCSID(x) .text; .asciz x #undef __FBSDID ==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/asmacros.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -57,6 +57,8 @@ #define NON_GPROF_ENTRY(name) GEN_ENTRY(name) #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ +#define END(name) .size name, . - name + #ifdef GPROF /* * __mcount is like [.]mcount except that doesn't require its caller to set ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -734,6 +734,11 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_sched_getaffinity_args { + char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; + char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)]; + char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)]; +}; struct linux_set_thread_area_args { char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; }; @@ -1099,6 +1104,7 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *); int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); int linux_exit_group(struct thread *, struct linux_exit_group_args *); @@ -1172,6 +1178,13 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD6 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 @@ -1346,6 +1359,7 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_sched_getaffinity AUE_NULL #define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL #define LINUX_SYS_AUE_linux_exit_group AUE_EXIT ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #define LINUX_SYS_exit 1 @@ -222,6 +222,7 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_sched_getaffinity 242 #define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_linux_exit_group 252 ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ #include @@ -262,7 +262,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -408,7 +408,8 @@ 240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity -242 AUE_NULL UNIMPL linux_sched_getaffinity +242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ + l_ulong *user_mask_ptr); } 243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } 244 AUE_NULL UNIMPL linux_get_thread_area 245 AUE_NULL UNIMPL linux_io_setup ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.35 2007/08/18 16:47:28 cognet Exp $"); /* * ARM bus dma support routines @@ -1091,13 +1091,19 @@ { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; - if (op & BUS_DMASYNC_PREWRITE) { + if ((op & BUS_DMASYNC_PREWRITE) && !(op & BUS_DMASYNC_PREREAD)) { cpu_dcache_wb_range((vm_offset_t)buf, len); cpu_l2cache_wb_range((vm_offset_t)buf, len); } if (op & BUS_DMASYNC_PREREAD) { - cpu_idcache_wbinv_range((vm_offset_t)buf, len); - cpu_l2cache_wbinv_range((vm_offset_t)buf, len); + if ((op & BUS_DMASYNC_PREWRITE) || + ((((vm_offset_t)(buf) | len) & arm_dcache_align_mask) == 0)) { + cpu_dcache_inv_range((vm_offset_t)buf, len); + cpu_l2cache_inv_range((vm_offset_t)buf, len); + } else { + cpu_dcache_wbinv_range((vm_offset_t)buf, len); + cpu_l2cache_wbinv_range((vm_offset_t)buf, len); + } } if (op & BUS_DMASYNC_POSTREAD) { if ((vm_offset_t)buf & arm_dcache_align_mask) { ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ */ #ifndef _ENDIAN_H_ @@ -99,13 +99,15 @@ static __inline __uint16_t __bswap16_var(__uint16_t v) { + __uint32_t ret = v & 0xffff; + __asm __volatile( "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "+r" (v)); + : "+r" (ret)); - return (v); + return ((__uint16_t)ret); } #ifdef __OPTIMIZE__ ==== //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.9 2007/09/12 18:28:09 cognet Exp $"); #include #include @@ -97,7 +97,7 @@ static void sa1110_putc(struct uart_bas *bas, int c) { - while (!uart_getreg(bas, SACOM_SR1) & SR1_TNF); + while (!(uart_getreg(bas, SACOM_SR1) & SR1_TNF)); uart_setreg(bas, SACOM_DR, c); } @@ -186,7 +186,7 @@ uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3) | CR3_TIE); for (i = 0; i < sc->sc_txdatasz; i++) { - while (!uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF); + while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF)); uart_setreg(&sc->sc_bas, SACOM_DR, sc->sc_txbuf[i]); uart_barrier(&sc->sc_bas); ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.6 2006/07/25 01:08:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $"); #include #include @@ -213,8 +213,6 @@ PCIM_CMD_SERRESPEN; bus_space_write_4(sc->sc_st, sc->sc_atu_sh, PCIR_COMMAND, preg); - preg = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, - PCIR_COMMAND); } /* Initialize the bus space tags. */ i80321_io_bs_init(&sc->sc_pci_iot, sc); ==== //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/boot2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.7 2007/08/17 18:22:31 imp Exp $"); #include #include @@ -216,7 +216,7 @@ return; } addr = eh.e_entry; - ((void(*)(int))addr)(RB_BOOTINFO | (opts & RBX_MASK)); + ((void(*)(int))addr)(opts & RBX_MASK); } static int ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.67 2007/08/28 20:28:11 jhb Exp $"); #include "opt_compat.h" @@ -135,28 +135,28 @@ static void copy_statfs(struct statfs *in, struct statfs32 *out) { - + + statfs_scale_blocks(in, INT32_MAX); bzero(out, sizeof(*out)); CP(*in, *out, f_bsize); - CP(*in, *out, f_iosize); + out->f_iosize = MIN(in->f_iosize, INT32_MAX); CP(*in, *out, f_blocks); CP(*in, *out, f_bfree); CP(*in, *out, f_bavail); - CP(*in, *out, f_files); - CP(*in, *out, f_ffree); + out->f_files = MIN(in->f_files, INT32_MAX); + out->f_ffree = MIN(in->f_ffree, INT32_MAX); CP(*in, *out, f_fsid); CP(*in, *out, f_owner); CP(*in, *out, f_type); CP(*in, *out, f_flags); - CP(*in, *out, f_flags); - CP(*in, *out, f_syncwrites); - CP(*in, *out, f_asyncwrites); + out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX); + out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX); strlcpy(out->f_fstypename, in->f_fstypename, MFSNAMELEN); strlcpy(out->f_mntonname, in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN)); - CP(*in, *out, f_syncreads); - CP(*in, *out, f_asyncreads); + out->f_syncreads = MIN(in->f_syncreads, INT32_MAX); + out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX); strlcpy(out->f_mntfromname, in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN)); } ==== //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.213 2007/06/12 00:11:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.214 2007/08/28 12:26:35 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1713,3 +1713,24 @@ return (error); } + +/* + * XXX: fake one.. waiting for real implementation of affinity mask. + */ +int +linux_sched_getaffinity(struct thread *td, + struct linux_sched_getaffinity_args *args) +{ + int error; + cpumask_t i = ~0; + + if (args->len < sizeof(cpumask_t)) + return (EINVAL); + + error = copyout(&i, args->user_mask_ptr, sizeof(cpumask_t)); + if (error) + return (EFAULT); + + td->td_retval[0] = sizeof(cpumask_t); + return (0); +} ==== //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#2 (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/compat/opensolaris/sys/proc.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.2 2007/08/16 20:33:20 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_PROC_H_ @@ -56,6 +56,12 @@ typedef struct thread *kthread_id_t; typedef struct proc proc_t; +#if (KSTACK_PAGES * PAGE_SIZE) < 16384 +#define ZFS_KSTACK_PAGES (16384 / PAGE_SIZE) +#else +#define ZFS_KSTACK_PAGES 0 +#endif + static __inline kthread_t * thread_create(caddr_t stk, size_t stksize, void (*proc)(void *), void *arg, size_t len, proc_t *pp, int state, pri_t pri) @@ -71,7 +77,8 @@ ASSERT(len == 0); ASSERT(state == TS_RUN); - error = kthread_create(proc, arg, &p, 0, 0, "solthread %p", proc); + error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, + "solthread %p", proc); return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL); } ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1449 2007/08/13 17:19:27 emax Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1450 2007/09/12 07:43:42 ariff Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2043,7 +2043,6 @@ device snd_ds1 device snd_emu10k1 device snd_emu10kx -options SND_EMU10KX_MULTICHANNEL device snd_envy24 device snd_envy24ht device snd_es137x ==== //depot/projects/soc2007/rpaulo-macbook/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.605 2007/08/06 14:25:59 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.606 2007/09/12 07:43:42 ariff Exp $ # # On the handling of kernel options # @@ -749,8 +749,5 @@ # XFS XFS -# snd_emu10kx sound driver options -SND_EMU10KX_MULTICHANNEL opt_emu10kx.h - # Interrupt filtering INTR_FILTER opt_global.h >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 13 01:27:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51ABA16A420; Thu, 13 Sep 2007 01:27:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B05416A41A for ; Thu, 13 Sep 2007 01:27:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 245E513C46E for ; Thu, 13 Sep 2007 01:27:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1RpD2014109 for ; Thu, 13 Sep 2007 01:27:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1RoJU014106 for perforce@freebsd.org; Thu, 13 Sep 2007 01:27:50 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 01:27:50 GMT Message-Id: <200709130127.l8D1RoJU014106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 01:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=126348 Change 126348 by kmacy@kmacy_home:ethng on 2007/09/13 01:27:50 remove bogus assert preventing recursion be extra paranoid about volatile when doing adaptive spinning Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_rwlock.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_rwlock.c#2 (text+ko) ==== @@ -186,9 +186,6 @@ MPASS(curthread != NULL); KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wlock() of destroyed rwlock @ %s:%d", file, line)); - KASSERT(rw_wowner(rw) != curthread, - ("%s (%s): wlock already held @ %s:%d", __func__, - rw->lock_object.lo_name, file, line)); WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, line); __rw_wlock(rw, curthread, file, line); @@ -327,7 +324,7 @@ * the owner stops running or the state of the lock * changes. */ - owner = (struct thread *)RW_OWNER(x); + owner = (volatile struct thread *)RW_OWNER(x); if (TD_IS_RUNNING(owner)) { turnstile_cancel(ts); if (LOCK_LOG_TEST(&rw->lock_object, 0)) @@ -337,13 +334,16 @@ lock_profile_obtain_lock_failed(&rw->lock_object, &contested, &waittime); #endif - while ((struct thread*)RW_OWNER(rw->rw_lock)== owner && - TD_IS_RUNNING(owner)) + if (owner == curthread) + panic("logic error in rwlock"); + while ((volatile struct thread*)RW_OWNER(rw->rw_lock)== owner && + TD_IS_RUNNING(owner)) cpu_spinwait(); + continue; + } #endif - /* * We were unable to acquire the lock and the read waiters * flag is set, so we must block on the turnstile. From owner-p4-projects@FreeBSD.ORG Thu Sep 13 01:28:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A3DA16A41A; Thu, 13 Sep 2007 01:28:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBE3516A418 for ; Thu, 13 Sep 2007 01:28:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD4FD13C465 for ; Thu, 13 Sep 2007 01:28:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1Sqms014162 for ; Thu, 13 Sep 2007 01:28:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1SqQL014159 for perforce@freebsd.org; Thu, 13 Sep 2007 01:28:52 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 01:28:52 GMT Message-Id: <200709130128.l8D1SqQL014159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 01:28:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=126349 Change 126349 by kmacy@kmacy_home:ethng on 2007/09/13 01:28:48 update witness ordering for rnh and route locks Affected files ... .. //depot/projects/ethng/src/sys/kern/subr_witness.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/subr_witness.c#2 (text+ko) ==== @@ -306,8 +306,8 @@ * Routing */ { "so_rcv", &lock_class_mtx_sleep }, - { "radix node head", &lock_class_mtx_sleep }, - { "rtentry", &lock_class_mtx_sleep }, + { "radix node head", &lock_class_rw }, + { "rtentry", &lock_class_rw }, { "ifaddr", &lock_class_mtx_sleep }, { NULL, NULL }, /* From owner-p4-projects@FreeBSD.ORG Thu Sep 13 01:34:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286F516A468; Thu, 13 Sep 2007 01:34:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C189416A420 for ; Thu, 13 Sep 2007 01:34:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CE0F13C469 for ; Thu, 13 Sep 2007 01:34:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1Y0S3014662 for ; Thu, 13 Sep 2007 01:34:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1Y0UV014654 for perforce@freebsd.org; Thu, 13 Sep 2007 01:34:00 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 01:34:00 GMT Message-Id: <200709130134.l8D1Y0UV014654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 01:34:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=126350 Change 126350 by kmacy@kmacy_home:ethng on 2007/09/13 01:32:58 update rnh locking primitives to account for the fact that the lock can be recursed Affected files ... .. //depot/projects/ethng/src/sys/net/radix.h#4 edit Differences ... ==== //depot/projects/ethng/src/sys/net/radix.h#4 (text+ko) ==== @@ -145,13 +145,26 @@ #define Free(p) free((caddr_t)p, M_RTABLE); #define RADIX_NODE_HEAD_LOCK_INIT(rnh) \ -rw_init(&(rnh)->rnh_lock, "radix node head") + rw_init_flags(&(rnh)->rnh_lock, "radix node head", RW_RECURSE) #define RADIX_NODE_HEAD_LOCK(rnh) rw_wlock(&(rnh)->rnh_lock) #define RADIX_NODE_HEAD_UNLOCK(rnh) rw_wunlock(&(rnh)->rnh_lock) -#define RADIX_NODE_HEAD_LOCK_SHARED(rnh) rw_rlock(&(rnh)->rnh_lock) -#define RADIX_NODE_HEAD_UNLOCK_SHARED(rnh) rw_runlock(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_DOWNGRADE(rnh) rw_downgrade(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_TRY_UPGRADE(rnh) rw_try_upgrade(&(rnh)->rnh_lock) +#define RADIX_NODE_HEAD_LOCK_SHARED(rnh) \ + do { \ + if (!rw_wowned(&(rnh)->rnh_lock)) \ + rw_rlock(&(rnh)->rnh_lock); \ + } while (0) + +#define RADIX_NODE_HEAD_UNLOCK_SHARED(rnh) \ + do { \ + if (!rw_wowned(&(rnh)->rnh_lock)) \ + rw_runlock(&(rnh)->rnh_lock); \ + } while (0) + #define RADIX_NODE_HEAD_DESTROY(rnh) rw_destroy(&(rnh)->rnh_lock) #define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED) +#define RADIX_NODE_HEAD_UNLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_UNLOCKED) #endif /* _KERNEL */ void rn_init(void); From owner-p4-projects@FreeBSD.ORG Thu Sep 13 01:36:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 239F416A420; Thu, 13 Sep 2007 01:36:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D716B16A41A for ; Thu, 13 Sep 2007 01:36:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D15DD13C458 for ; Thu, 13 Sep 2007 01:36:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1a3dM014756 for ; Thu, 13 Sep 2007 01:36:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1a3oR014753 for perforce@freebsd.org; Thu, 13 Sep 2007 01:36:03 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 01:36:03 GMT Message-Id: <200709130136.l8D1a3oR014753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 01:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=126351 Change 126351 by kmacy@kmacy_home:ethng on 2007/09/13 01:35:09 add shared locking macros declare rtalloc2 which returns with route referenced but unlocked Affected files ... .. //depot/projects/ethng/src/sys/net/route.h#3 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.h#3 (text+ko) ==== @@ -287,9 +287,12 @@ #ifdef _KERNEL #define RT_LOCK_INIT(_rt) \ - rw_init(&(_rt)->rt_lock, "rtentry") + rw_init_flags(&(_rt)->rt_lock, "rtentry", RW_DUPOK) #define RT_LOCK(_rt) rw_wlock(&(_rt)->rt_lock) #define RT_UNLOCK(_rt) rw_wunlock(&(_rt)->rt_lock) +#define RT_LOCK_SHARED(_rt) rw_rlock(&(_rt)->rt_lock) +#define RT_UNLOCK_SHARED(_rt) rw_runlock(&(_rt)->rt_lock) +#define RT_LOCK_DOWNGRADE(_rt) rw_downgrade(&(_rt)->rt_lock) #define RT_LOCK_DESTROY(_rt) rw_destroy(&(_rt)->rt_lock) #define RT_LOCK_ASSERT(_rt) rw_assert(&(_rt)->rt_lock, RA_LOCKED) @@ -349,6 +352,7 @@ void rtalloc_ign(struct route *ro, u_long ignflags); void rtalloc(struct route *ro); /* XXX deprecated, use rtalloc_ign(ro, 0) */ struct rtentry *rtalloc1(struct sockaddr *, int, u_long); +struct rtentry *rtalloc2(struct sockaddr *, int, u_long); int rtexpunge(struct rtentry *); void rtfree(struct rtentry *); int rtinit(struct ifaddr *, int, int); From owner-p4-projects@FreeBSD.ORG Thu Sep 13 01:38:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 439C716A46D; Thu, 13 Sep 2007 01:38:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F69A16A419 for ; Thu, 13 Sep 2007 01:38:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0888C13C4A8 for ; Thu, 13 Sep 2007 01:38:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1c6U5014864 for ; Thu, 13 Sep 2007 01:38:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1c6tR014861 for perforce@freebsd.org; Thu, 13 Sep 2007 01:38:06 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 01:38:06 GMT Message-Id: <200709130138.l8D1c6tR014861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 01:38:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=126352 Change 126352 by kmacy@kmacy_home:ethng on 2007/09/13 01:37:50 add rtalloc2 which does the same work as rtalloc1 but: - internally locks the route shared except when bumping the refcount - returns the route unlocked plug locking holes introduced in previous revision of rtalloc1 Affected files ... .. //depot/projects/ethng/src/sys/net/route.c#5 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.c#5 (text+ko) ==== @@ -114,9 +114,7 @@ RTFREE(rt); ro->ro_rt = NULL; } - ro->ro_rt = rtalloc1(&ro->ro_dst, 1, ignore); - if (ro->ro_rt) - RT_UNLOCK(ro->ro_rt); + ro->ro_rt = rtalloc2(&ro->ro_dst, 1, ignore); } /* @@ -153,8 +151,121 @@ */ newrt = rt = RNTORT(rn); nflags = rt->rt_flags & ~ignflags; + if (report && (nflags & RTF_CLONING)) { + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); + RADIX_NODE_HEAD_LOCK(rnh); + /* + * We are apparently adding (report = 0 in delete). + * If it requires that it be cloned, do so. + * (This implies it wasn't a HOST route.) + */ + err = rtrequest(RTM_RESOLVE, dst, NULL, + NULL, 0, &newrt); + if (err) { + if (!((rn = rnh->rnh_matchaddr(dst, rnh)) && + (rn->rn_flags & RNF_ROOT) == 0)) { + RADIX_NODE_HEAD_UNLOCK(rnh); + goto miss2; + } + /* + * If the cloning didn't succeed, maybe + * what we have will do. Return that. + */ + newrt = rt; /* existing route */ + RT_LOCK(newrt); + RADIX_NODE_HEAD_UNLOCK(rnh); + RT_ADDREF(newrt); + goto miss2; + } + KASSERT(newrt, ("no route and no error")); + RT_LOCK(newrt); + RADIX_NODE_HEAD_UNLOCK(rnh); + if (newrt->rt_flags & RTF_XRESOLVE) { + /* + * If the new route specifies it be + * externally resolved, then go do that. + */ + msgtype = RTM_RESOLVE; + goto miss2; + } + /* Inform listeners of the new route. */ + bzero(&info, sizeof(info)); + info.rti_info[RTAX_DST] = rt_key(newrt); + info.rti_info[RTAX_NETMASK] = rt_mask(newrt); + info.rti_info[RTAX_GATEWAY] = newrt->rt_gateway; + if (newrt->rt_ifp != NULL) { + info.rti_info[RTAX_IFP] = + newrt->rt_ifp->if_addr->ifa_addr; + info.rti_info[RTAX_IFA] = newrt->rt_ifa->ifa_addr; + } + rt_missmsg(RTM_ADD, &info, newrt->rt_flags, 0); + } else { + KASSERT(rt == newrt, ("locking wrong route")); + RT_LOCK(newrt); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); + RT_ADDREF(newrt); + } + } else { + /* + * Either we hit the root or couldn't find any match, + * Which basically means + * "caint get there frm here" + */ + rtstat.rts_unreach++; RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); + miss2: if (report) { + /* + * If required, report the failure to the supervising + * Authorities. + * For a delete, this is not an error. (report == 0) + */ + bzero(&info, sizeof(info)); + info.rti_info[RTAX_DST] = dst; + rt_missmsg(msgtype, &info, 0, err); + } + } + if (newrt) + RT_LOCK_ASSERT(newrt); + return (newrt); +} + +/* + * Look up the route that matches the address given + * Or, at least try.. Create a cloned route if needed. + * + * The returned route, if any, is locked. + */ +struct rtentry * +rtalloc2(struct sockaddr *dst, int report, u_long ignflags) +{ + struct radix_node_head *rnh = rt_tables[dst->sa_family]; + struct rtentry *rt; + struct radix_node *rn; + struct rtentry *newrt; + struct rt_addrinfo info; + u_long nflags; + int err = 0, msgtype = RTM_MISS; + + newrt = NULL; + /* + * Look up the address in the table for that Address Family + */ + if (rnh == NULL) { + rtstat.rts_unreach++; + goto miss2; + } + RADIX_NODE_HEAD_LOCK_SHARED(rnh); + if ((rn = rnh->rnh_matchaddr(dst, rnh)) && + (rn->rn_flags & RNF_ROOT) == 0) { + /* + * If we find it and it's not the root node, then + * get a reference on the rtentry associated. + */ + newrt = rt = RNTORT(rn); + nflags = rt->rt_flags & ~ignflags; if (report && (nflags & RTF_CLONING)) { + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); + RADIX_NODE_HEAD_LOCK(rnh); /* * We are apparently adding (report = 0 in delete). * If it requires that it be cloned, do so. @@ -163,29 +274,32 @@ err = rtrequest(RTM_RESOLVE, dst, NULL, NULL, 0, &newrt); if (err) { - RADIX_NODE_HEAD_LOCK_SHARED(rnh); if (!((rn = rnh->rnh_matchaddr(dst, rnh)) && - (rn->rn_flags & RNF_ROOT) == 0)) - goto miss; + (rn->rn_flags & RNF_ROOT) == 0)) { + RADIX_NODE_HEAD_UNLOCK(rnh); + goto miss2; + } /* * If the cloning didn't succeed, maybe * what we have will do. Return that. */ newrt = rt; /* existing route */ RT_LOCK(newrt); - RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); + RADIX_NODE_HEAD_UNLOCK(rnh); RT_ADDREF(newrt); - goto miss; + RT_LOCK_DOWNGRADE(newrt); + goto miss2; } + RT_LOCK_SHARED(newrt); + RADIX_NODE_HEAD_UNLOCK(rnh); KASSERT(newrt, ("no route and no error")); - RT_LOCK(newrt); if (newrt->rt_flags & RTF_XRESOLVE) { /* * If the new route specifies it be * externally resolved, then go do that. */ msgtype = RTM_RESOLVE; - goto miss; + goto miss2; } /* Inform listeners of the new route. */ bzero(&info, sizeof(info)); @@ -201,7 +315,9 @@ } else { KASSERT(rt == newrt, ("locking wrong route")); RT_LOCK(newrt); + RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); RT_ADDREF(newrt); + RT_LOCK_DOWNGRADE(newrt); } } else { /* @@ -210,7 +326,6 @@ * "caint get there frm here" */ rtstat.rts_unreach++; - miss: RADIX_NODE_HEAD_UNLOCK_SHARED(rnh); miss2: if (report) { /* @@ -225,6 +340,9 @@ } if (newrt) RT_LOCK_ASSERT(newrt); + + RT_UNLOCK_SHARED(newrt); + return (newrt); } From owner-p4-projects@FreeBSD.ORG Thu Sep 13 02:54:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2DE716A419; Thu, 13 Sep 2007 02:54:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA8B716A41B for ; Thu, 13 Sep 2007 02:54:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A19CF13C442 for ; Thu, 13 Sep 2007 02:54:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D2skTK020557 for ; Thu, 13 Sep 2007 02:54:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D2sk0f020554 for perforce@freebsd.org; Thu, 13 Sep 2007 02:54:46 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 02:54:46 GMT Message-Id: <200709130254.l8D2sk0f020554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 02:54:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=126355 Change 126355 by kmacy@kmacy_home:ethng on 2007/09/13 02:54:10 don't try to unlock a null route Affected files ... .. //depot/projects/ethng/src/sys/net/route.c#6 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.c#6 (text+ko) ==== @@ -338,11 +338,10 @@ rt_missmsg(msgtype, &info, 0, err); } } - if (newrt) - RT_LOCK_ASSERT(newrt); - - RT_UNLOCK_SHARED(newrt); - + if (newrt) { + RT_LOCK_ASSERT(newrt); + RT_UNLOCK_SHARED(newrt); + } return (newrt); } From owner-p4-projects@FreeBSD.ORG Thu Sep 13 08:14:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A33216A46E; Thu, 13 Sep 2007 08:14:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 388E216A468 for ; Thu, 13 Sep 2007 08:14:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23BFB13C49D for ; Thu, 13 Sep 2007 08:14:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D8EhSr057197 for ; Thu, 13 Sep 2007 08:14:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D8Ehi7057194 for perforce@freebsd.org; Thu, 13 Sep 2007 08:14:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 13 Sep 2007 08:14:43 GMT Message-Id: <200709130814.l8D8Ehi7057194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 126356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 08:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=126356 Change 126356 by zhouzhouyi@zhouzhouyi_mactest on 2007/09/13 08:14:22 Add Mandatory Access Control test case for proc sched Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sched/00.t#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#4 (text+ko) ==== @@ -2184,7 +2184,7 @@ { MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_check_proc_debug " - "with cr_label:", + "with cr_label and proc label:", strlen("mac_test_check_proc_debug " "with cr_label and proc label:")); MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label); @@ -2201,10 +2201,10 @@ { MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_check_proc_sched " - "with cr_label:", + "with cr_label and proc label:", strlen("mac_test_check_proc_sched " - "with cr_label:")); - MAC_TEST_LOG_SUBMIT_LABEL(cred, cred->cr_label); + "with cr_label and proc label:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_sched); From owner-p4-projects@FreeBSD.ORG Thu Sep 13 16:12:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62ABF16A41B; Thu, 13 Sep 2007 16:12:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2FA616A419 for ; Thu, 13 Sep 2007 16:12:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B846E13C45A for ; Thu, 13 Sep 2007 16:12:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DGCH0N017399 for ; Thu, 13 Sep 2007 16:12:17 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DGCHNG017396 for perforce@freebsd.org; Thu, 13 Sep 2007 16:12:17 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 16:12:17 GMT Message-Id: <200709131612.l8DGCHNG017396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 16:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=126366 Change 126366 by cnst@dale on 2007/09/13 16:11:34 sync the SEE ALSO section with lm(4) Affected files ... .. //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#2 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#1 $ +.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#2 $ .\" $FreeBSD$ .\" $OpenBSD: it.4,v 1.8 2006/09/08 15:09:14 jmc Exp $ .\" @@ -77,6 +77,8 @@ .Pp For some devices, sensors' names and numbers will be different. .Sh SEE ALSO +.Xr systat 1 , +.Xr sysctl 3 , .Xr sensorsd 8 , .Xr sysctl 8 .Sh HISTORY From owner-p4-projects@FreeBSD.ORG Thu Sep 13 16:15:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12B6716A41A; Thu, 13 Sep 2007 16:15:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C15DC16A418 for ; Thu, 13 Sep 2007 16:15:22 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8665E13C459 for ; Thu, 13 Sep 2007 16:15:22 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DGFMdt017573 for ; Thu, 13 Sep 2007 16:15:22 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DGFMsE017570 for perforce@freebsd.org; Thu, 13 Sep 2007 16:15:22 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 16:15:22 GMT Message-Id: <200709131615.l8DGFMsE017570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 16:15:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=126367 Change 126367 by cnst@dale on 2007/09/13 16:14:21 add a template about FreeBSD to the history section Obtained from: ./lm.4 Affected files ... .. //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#2 $ +.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#3 $ .\" $FreeBSD$ .\" $OpenBSD: it.4,v 1.8 2006/09/08 15:09:14 jmc Exp $ .\" @@ -86,6 +86,9 @@ .Nm driver first appeared in .Ox 3.4 . +.Fx +support was added in +.Fx 7.XXX . .Sh AUTHORS .An -nosplit The From owner-p4-projects@FreeBSD.ORG Thu Sep 13 17:18:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F14216A421; Thu, 13 Sep 2007 17:18:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45D5E16A419 for ; Thu, 13 Sep 2007 17:18:46 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09ECA13C47E for ; Thu, 13 Sep 2007 17:18:46 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DHIjT0032915 for ; Thu, 13 Sep 2007 17:18:45 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DHIjox032912 for perforce@freebsd.org; Thu, 13 Sep 2007 17:18:45 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 17:18:45 GMT Message-Id: <200709131718.l8DHIjox032912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 17:18:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=126370 Change 126370 by cnst@dale on 2007/09/13 17:17:56 branch rc(8) files, in preparation for the /etc/rc.d/sensorsd Modelled after the rc.d addition of ftp-proxy. Affected files ... .. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#1 branch .. //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#1 branch .. //depot/projects/soc2007/cnst-sensors/share.man.man5/rc.conf.5#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 13 17:21:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 595A216A46C; Thu, 13 Sep 2007 17:21:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0727C16A421 for ; Thu, 13 Sep 2007 17:21:51 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCA3B13C458 for ; Thu, 13 Sep 2007 17:21:50 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DHLoTj033150 for ; Thu, 13 Sep 2007 17:21:50 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DHLojl033147 for perforce@freebsd.org; Thu, 13 Sep 2007 17:21:50 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 17:21:50 GMT Message-Id: <200709131721.l8DHLojl033147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 17:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=126371 Change 126371 by cnst@dale on 2007/09/13 17:21:23 support for linking /etc/rc.d Affected files ... .. //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#11 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#11 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $P4: //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#10 $ +# $P4: //depot/projects/soc2007/cnst-sensors/sensors.ln.sh#11 $ # Author: Constantine A. Murenin, 2007-07 # This file creates symbolic links for GSoC2007 cnst_sensors project @@ -35,7 +35,7 @@ for i in "etc" `find -s ./ -name "*.*" -type d` do SDIR=`echo $i | sed "s#[.]/##g"` #source directory - TDIR=`echo $SDIR | sed "s#[.]#/#g" | sed "s#^usr/#usr.#g"` #target directory + TDIR=`echo $SDIR | sed "s#[.]#/#g" | sed "s#^usr/#usr.#g" | sed "s#/rc/d#/rc.d#g"` #target directory # echo "Source directory: $SDIR; Target directory: $TDIR" for j in `find -s $SDIR -type f -and -not -path "*/CVS/*"` do From owner-p4-projects@FreeBSD.ORG Thu Sep 13 19:43:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4692716A421; Thu, 13 Sep 2007 19:43:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CC5416A41B for ; Thu, 13 Sep 2007 19:43:03 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02E0F13C428 for ; Thu, 13 Sep 2007 19:43:03 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DJh2U3046236 for ; Thu, 13 Sep 2007 19:43:02 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DJh21t046233 for perforce@freebsd.org; Thu, 13 Sep 2007 19:43:02 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 19:43:02 GMT Message-Id: <200709131943.l8DJh21t046233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 19:43:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=126373 Change 126373 by cnst@dale on 2007/09/13 19:42:03 add /etc/rc.d/sensorsd, modelled after ftpproxy and somewhat around powerd Affected files ... .. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#2 edit .. //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#2 edit .. //depot/projects/soc2007/cnst-sensors/etc.rc.d/sensorsd#1 add .. //depot/projects/soc2007/cnst-sensors/share.man.man5/rc.conf.5#2 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#2 (text+ko) ==== @@ -40,6 +40,8 @@ kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). +sensorsd_enable="NO" # Run sensorsd to monitor and log sensor state changes +sensorsd_flags="" # additional flags for sensorsd(8) tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp ==== //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#2 (text+ko) ==== @@ -33,7 +33,7 @@ random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ - serial sppp statd swap1 \ + sensorsd serial sppp statd swap1 \ syscons sysctl syslogd \ timed tmp \ ugidfw \ ==== //depot/projects/soc2007/cnst-sensors/share.man.man5/rc.conf.5#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.327 2007/09/06 21:00:48 mlaier Exp $ .\" -.Dd September 3, 2007 +.Dd September 13, 2007 .Dt RC.CONF 5 .Os .Sh NAME @@ -222,6 +222,22 @@ these are the flags to pass to the .Xr powerd 8 daemon. +.It Va sensorsd_enable +.Pq Vt bool +Set to +.Dq Li NO +by default. +Setting this to +.Dq Li YES +enables +.Xr sensorsd 8 , +a sensors monitoring and logging daemon. +.It Va sensorsd_flags +.Pq Vt str +Empty by default. +This variable contains additional flags passed to the +.Xr sensorsd 8 +program. .It Va tmpmfs Controls the creation of a .Pa /tmp @@ -3886,6 +3902,7 @@ .Xr rpc.statd 8 , .Xr rwhod 8 , .Xr savecore 8 , +.Xr sensorsd 8 , .Xr sshd 8 , .Xr swapon 8 , .Xr sysctl 8 , From owner-p4-projects@FreeBSD.ORG Thu Sep 13 19:52:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E37F16A498; Thu, 13 Sep 2007 19:52:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0913916A419 for ; Thu, 13 Sep 2007 19:52:16 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E30B613C458 for ; Thu, 13 Sep 2007 19:52:15 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DJqFHl049312 for ; Thu, 13 Sep 2007 19:52:15 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DJqF7S049309 for perforce@freebsd.org; Thu, 13 Sep 2007 19:52:15 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 19:52:15 GMT Message-Id: <200709131952.l8DJqF7S049309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 19:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=126374 Change 126374 by cnst@dale on 2007/09/13 19:51:24 the invalid flag usually means all fields are invalid, not just the value field Affected files ... .. //depot/projects/soc2007/cnst-sensors/sbin.sysctl/sysctl.c#10 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sbin.sysctl/sysctl.c#10 (text+ko) ==== @@ -418,14 +418,17 @@ return (1); } - if (s->flags & SENSOR_FINVALID) + if (s->flags & SENSOR_FINVALID) { /* * XXX: with this flag, the node should be entirely ignored, * but as the magic-based sysctl(8) is not too flexible, we * simply have to print out that the sensor is invalid. */ printf("invalid"); - else if (s->flags & SENSOR_FUNKNOWN) + return (0); + } + + if (s->flags & SENSOR_FUNKNOWN) printf("unknown"); else { switch (s->type) { From owner-p4-projects@FreeBSD.ORG Thu Sep 13 22:05:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C705816A41A; Thu, 13 Sep 2007 22:05:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D14216A418 for ; Thu, 13 Sep 2007 22:05:12 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75E1013C457 for ; Thu, 13 Sep 2007 22:05:12 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DM5CCI072407 for ; Thu, 13 Sep 2007 22:05:12 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DM5CLW072396 for perforce@freebsd.org; Thu, 13 Sep 2007 22:05:12 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 22:05:12 GMT Message-Id: <200709132205.l8DM5CLW072396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 22:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=126380 Change 126380 by cnst@dale on 2007/09/13 22:04:54 provide some example Affected files ... .. //depot/projects/soc2007/cnst-sensors/share.man.man4/coretemp.4#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/share.man.man4/coretemp.4#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/coretemp.4,v 1.1 2007/08/23 20:05:09 des Exp $ .\" -.Dd August 23, 2007 +.Dd September 13, 2007 .Dt CORETEMP 4 .Os .Sh NAME @@ -50,10 +50,17 @@ .Nm driver provides support for the on-die digital thermal sensor present in Intel Core and newer CPUs. -The values are available through the +.Pp +The values are exposed through the .Va HW_SENSORS .Xr sysctl 3 tree. +For example: +.Bd -literal -offset indent +%sysctl hw.sensors +hw.sensors.cpu0.temp0: 28.00 degC +hw.sensors.cpu1.temp0: 29.00 degC +.Ed .Sh SEE ALSO .Xr systat 1 , .Xr sysctl 3 , From owner-p4-projects@FreeBSD.ORG Thu Sep 13 22:16:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90BF016A41A; Thu, 13 Sep 2007 22:16:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5219E16A419 for ; Thu, 13 Sep 2007 22:16:28 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3ABBF13C442 for ; Thu, 13 Sep 2007 22:16:28 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DMGSa0073089 for ; Thu, 13 Sep 2007 22:16:28 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DMGRSW073086 for perforce@freebsd.org; Thu, 13 Sep 2007 22:16:27 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 22:16:27 GMT Message-Id: <200709132216.l8DMGRSW073086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 22:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=126381 Change 126381 by cnst@dale on 2007/09/13 22:16:16 I have ITE IT8716F-S in my PC CHIPS V21G mainboard. Whilst here, clean up some style. Affected files ... .. //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#4 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#3 $ +.\" $P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/it.4#4 $ .\" $FreeBSD$ .\" $OpenBSD: it.4,v 1.8 2006/09/08 15:09:14 jmc Exp $ .\" @@ -25,13 +25,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd 11 September 2007 +.Dd 13 September 2007 .Dt IT 4 .Os .Sh NAME .Nm it -.Nd ITE IT8705F, IT8712F, and SiS SiS950 temperature, voltage, -and fan sensor +.Nd ITE IT8705F/12F/16F and SiS SiS950 Super I/O Hardware Monitor .Sh SYNOPSIS .Cd "device isa" .Cd "device it" @@ -48,11 +47,13 @@ The .Nm driver provides support for the -.Tn IT8705F , IT8712F +.Tn IT8705F , IT8712F , IT8716F and .Tn SiS950 -hardware monitors to be used with the -.Xr sysctl 8 +hardware monitors. +The values are exposed through the +.Va HW_SENSORS +.Xr sysctl 3 interface. .Pp Most supported devices possess 15 sensors: From owner-p4-projects@FreeBSD.ORG Thu Sep 13 22:41:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98B0016A420; Thu, 13 Sep 2007 22:41:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F56316A418 for ; Thu, 13 Sep 2007 22:41:01 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5867313C45B for ; Thu, 13 Sep 2007 22:41:01 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DMf173074754 for ; Thu, 13 Sep 2007 22:41:01 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DMf17x074751 for perforce@freebsd.org; Thu, 13 Sep 2007 22:41:01 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 22:41:01 GMT Message-Id: <200709132241.l8DMf17x074751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 22:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=126383 Change 126383 by cnst@dale on 2007/09/13 22:40:00 sync, for the upcoming 2007-256 snapshot Affected files ... .. //depot/projects/soc2007/cnst-sensors/sensors.cvsdiff.sh#4 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sensors.cvsdiff.sh#4 (text+ko) ==== @@ -1,29 +1,43 @@ #!/bin/sh #this **cvs diff** script is **generated by sensors.ln.sh** DIRS="\ + sys/dev/it\ sys/dev/lm\ + sys/modules/it\ sys/modules/lm\ usr.sbin/sensorsd\ " FILES="\ etc/sensorsd.conf\ + etc/defaults/rc.conf\ + etc/rc.d/Makefile\ + etc/rc.d/sensorsd\ lib/libc/gen/sysctl.3\ sbin/sysctl/Makefile\ sbin/sysctl/sysctl.8\ sbin/sysctl/sysctl.c\ share/man/man4/Makefile\ + share/man/man4/coretemp.4\ + share/man/man4/it.4\ share/man/man4/lm.4\ + share/man/man5/rc.conf.5\ share/man/man9/Makefile\ share/man/man9/sensor_attach.9\ sys/amd64/conf/GENERIC.hints\ sys/conf/files\ + sys/conf/files.amd64\ + sys/conf/files.i386\ sys/dev/coretemp/coretemp.c\ + sys/dev/it/it.c\ + sys/dev/it/itvar.h\ sys/dev/lm/lm78.c\ sys/dev/lm/lm78_isa.c\ sys/dev/lm/lm78var.h\ sys/i386/conf/GENERIC.hints\ sys/kern/kern_sensors.c\ sys/kern/kern_sysctl.c\ + sys/modules/Makefile\ + sys/modules/it/Makefile\ sys/modules/lm/Makefile\ sys/sys/sensors.h\ sys/sys/sysctl.h\ From owner-p4-projects@FreeBSD.ORG Thu Sep 13 23:02:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F65816A420; Thu, 13 Sep 2007 23:02:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9C9C16A41A for ; Thu, 13 Sep 2007 23:02:29 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A355513C45E for ; Thu, 13 Sep 2007 23:02:29 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DN2Tpi076036 for ; Thu, 13 Sep 2007 23:02:29 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DN2Tv5076033 for perforce@freebsd.org; Thu, 13 Sep 2007 23:02:29 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 13 Sep 2007 23:02:29 GMT Message-Id: <200709132302.l8DN2Tv5076033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 126384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 23:02:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=126384 Change 126384 by cnst@dale on 2007/09/13 23:01:55 On this 256th day of 2007, it is my great pleasure to present a feature-complete port of the hardware sensors framework from OpenBSD to FreeBSD. Below is a complete `cvs diff` of cnst-sensors GSoC2007 project as of 2007-256. It includes the following components, listed below in the very same order as they are appearing in this diff: * sample configuration file for sensorsd * rc(8) script and glue code for sensorsd(8) * sysctl(3) doc fixes for CTL_HW tree * sysctl(3) documentation for hardware sensors * sysctl(8) documentation for hardware sensors * assorted KNF and bug-fixes for sysctl(8) * support for the sensor structure for sysctl(8) * coretemp(4) documentation * it(4) documentation * lm(4) documentation * rc.conf(5) documentation for starting sensorsd(8) * sensor_attach(9) et al documentation * coretemp(4) conversion to the hw.sensors framework * it(4) isa driver ported from OpenBSD * lm(4) isa driver ported from OpenBSD * /sys/kern/kern_sensors.c o sensor_attach(9) API for drivers to register ksensors o sensor_task_register(9) API for the update task o sysctl(3) glue code o hw.sensors shadow tree for sysctl(8) internal magic * assorted KNF and bug-fixes for /sys/kern/kern_sysctl.c * it(4) module for testing sensor_attach/detach et al * lm(4) module for testing sensor_attach/detach et al * * assorted bug-fixes and HW_SENSORS definition for * sensors display for systat(1), including all documentation * sensorsd(8) and all applicable documentation The userland part of the framework is entirely source-code compatible with OpenBSD 4.1, 4.2 and -current as of today. All sensor readings can be viewed with `sysctl hw.sensors`, monitored in semi-realtime with `systat -sensors` and also logged with `sensorsd`. Third-party tools, for example a plug-in for nagios, are also available. A separate patch for ports/sysutils/symon will be provided upon request. Submitted by: cnst@FreeBSD.org (Constantine A. Murenin) Obtained from: generated by sensors.cvsdiff.sh from //depot/projects/soc2007/cnst-sensors/ Sponsored by: Google Summer of Code 2007 Obtained from: http://mojo.ru/us/GSoC2007.cnst-sensors.2007-09-13.patch.gz Details at: http://cnst.livejournal.com/38421.html Affected files ... .. //depot/projects/soc2007/cnst-sensors/cnst-sensors.2007-09-13.patch#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 13 23:46:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 672D516A421; Thu, 13 Sep 2007 23:46:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AEB316A41B for ; Thu, 13 Sep 2007 23:46:27 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 254FF13C47E for ; Thu, 13 Sep 2007 23:46:27 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DNkRcs079786 for ; Thu, 13 Sep 2007 23:46:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DNkQDc079783 for perforce@freebsd.org; Thu, 13 Sep 2007 23:46:26 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 23:46:26 GMT Message-Id: <200709132346.l8DNkQDc079783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 23:46:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=126386 Change 126386 by kmacy@kmacy_home:ethng on 2007/09/13 23:45:46 fix bug in CHELSIO_GET_MEM, the user for the buffer isn't contiguous with the command Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#19 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#19 (text+ko) ==== @@ -2554,7 +2554,7 @@ * Read 256 bytes at a time as len can be large and we don't * want to use huge intermediate buffers. */ - useraddr = (uint8_t *)(t + 1); /* advance to start of buffer */ + useraddr = (uint8_t *)t->buf; while (t->len) { unsigned int chunk = min(t->len, sizeof(buf)); From owner-p4-projects@FreeBSD.ORG Thu Sep 13 23:48:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B999816A41B; Thu, 13 Sep 2007 23:48:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7779A16A419 for ; Thu, 13 Sep 2007 23:48:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6132513C458 for ; Thu, 13 Sep 2007 23:48:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8DNmUqO079874 for ; Thu, 13 Sep 2007 23:48:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8DNmT4I079871 for perforce@freebsd.org; Thu, 13 Sep 2007 23:48:29 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Sep 2007 23:48:29 GMT Message-Id: <200709132348.l8DNmT4I079871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2007 23:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=126387 Change 126387 by kmacy@kmacy_home:ethng on 2007/09/13 23:47:39 add support for WRC Affected files ... .. //depot/projects/ethng/src/usr.sbin/cxgbtool/Makefile#2 edit .. //depot/projects/ethng/src/usr.sbin/cxgbtool/cxgbtool.c#2 edit Differences ... ==== //depot/projects/ethng/src/usr.sbin/cxgbtool/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ SRCS= cxgbtool.c NO_MAN= CFLAGS+= -I${.CURDIR}/../../sys/dev/cxgb -I. -CFLAGS+= -DCONFIG_T3_REGS -DCHELSIO_INTERNAL +CFLAGS+= -DCONFIG_T3_REGS -DCHELSIO_INTERNAL -DWRC install: ==== //depot/projects/ethng/src/usr.sbin/cxgbtool/cxgbtool.c#2 (text+ko) ==== @@ -68,6 +68,41 @@ #include #include "version.h" +struct toetool_reg { + uint32_t cmd; + uint32_t addr; + uint32_t val; +}; + +struct toetool_mtus { + uint32_t cmd; + uint32_t nmtus; + uint16_t mtus[NMTUS]; +}; + +struct toetool_pm { + uint32_t cmd; + uint32_t tx_pg_sz; + uint32_t tx_num_pg; + uint32_t rx_pg_sz; + uint32_t rx_num_pg; + uint32_t pm_total; +}; + +struct toetool_tcam { + uint32_t cmd; + uint32_t tcam_size; + uint32_t nservers; + uint32_t nroutes; + uint32_t nfilters; +}; + +struct toetool_tcb { + uint32_t cmd; + uint32_t tcb_index; + uint32_t tcb_data[TCB_WORDS]; +}; + struct reg_info { const char *name; uint16_t addr; @@ -75,6 +110,80 @@ }; +struct toetool_tcam_word { + uint32_t cmd; + uint32_t addr; + uint32_t buf[3]; +}; + + +struct toetool_cntxt { + uint32_t cmd; + uint32_t cntxt_type; + uint32_t cntxt_id; + uint32_t data[4]; +}; + +struct toetool_desc { + uint32_t cmd; + uint32_t queue_num; + uint32_t idx; + uint32_t size; + uint8_t data[128]; +}; + +struct toetool_proto { + uint32_t cmd; + uint32_t data[5 * 128]; +}; + +struct toetool_qset_params { + uint32_t cmd; + uint32_t qset_idx; + int32_t txq_size[3]; + int32_t rspq_size; + int32_t fl_size[2]; + int32_t intr_lat; + int32_t polling; + int32_t lro; + int32_t cong_thres; + int32_t vector; + int32_t qnum; +}; + +struct toetool_trace { + uint32_t cmd; + uint32_t sip; + uint32_t sip_mask; + uint32_t dip; + uint32_t dip_mask; + uint16_t sport; + uint16_t sport_mask; + uint16_t dport; + uint16_t dport_mask; + uint32_t vlan:12; + uint32_t vlan_mask:12; + uint32_t intf:4; + uint32_t intf_mask:4; + uint8_t proto; + uint8_t proto_mask; + uint8_t invert_match:1; + uint8_t config_tx:1; + uint8_t config_rx:1; + uint8_t trace_tx:1; + uint8_t trace_rx:1; +}; + +struct toetool_pktsched_params { + uint32_t cmd; + uint8_t sched; + uint8_t idx; + uint8_t min; + uint8_t max; + uint8_t binding; +}; + + #include "reg_defs.c" #if defined(CONFIG_T3_REGS) # include "reg_defs_t3.c" @@ -447,7 +556,7 @@ if (revision == 0) return dump_regs_t3(argc, argv, start_arg, (uint32_t *)regs.data, is_pcie); - if (revision == 2) + if (revision == 2 || revision == 3) return dump_regs_t3b(argc, argv, start_arg, (uint32_t *)regs.data, is_pcie); } @@ -562,14 +671,14 @@ if (argc == start_arg) { op.cmd = TOETOOL_GETMTUTAB; - op.nmtus = MAX_NMTUS; + op.nmtus = NMTUS; if (doit(iff_name, &op) < 0) err(1, "get MTU table"); for (i = 0; i < op.nmtus; ++i) printf("%u ", op.mtus[i]); printf("\n"); - } else if (argc <= start_arg + MAX_NMTUS) { + } else if (argc <= start_arg + NMTUS) { op.cmd = TOETOOL_SETMTUTAB; op.nmtus = argc - start_arg; @@ -830,14 +939,10 @@ #define FBUF_WRAP_FSZ (FBUF_WRAP_SZ >> 3) #define MEM_CM_WRC_SIZE WRC_SIZE -typedef char int8_t; -typedef short int16_t; -typedef int int32_t; typedef long long _s64; typedef unsigned char _u8; typedef unsigned short _u16; typedef unsigned int _uint32_t; -typedef unsigned long long uint64_t; enum fw_ri_mpa_attrs { FW_RI_MPA_RX_MARKER_ENABLE = 0x1, @@ -1005,7 +1110,7 @@ static void print_wrc(unsigned int wrc_idx, struct wrc *p) { - u32 *buf = (u32 *)p; + uint32_t *buf = (uint32_t *)p; unsigned int i, j; printf("WRC STATE (raw)\n"); @@ -1094,7 +1199,7 @@ static int get_wrc(int argc, char *argv[], int start_arg, const char *iff_name) { - struct toetool_mem_range *op; + struct ch_mem_range op; uint64_t *p; uint32_t *buf; unsigned int idx, i = 0; @@ -1105,34 +1210,33 @@ if (get_int_arg(argv[start_arg], &idx)) return -1; - op = malloc(sizeof(*op) + MEM_CM_WRC_SIZE); - if (!op) + op.buf =malloc(MEM_CM_WRC_SIZE); + if (!op.buf) err(1, "get_wrc: malloc failed"); - op->cmd = TOETOOL_GET_MEM; - op->mem_id = MEM_CM; - op->addr = read_reg(iff_name, 0x28c) + CM_WRCONTEXT_OFFSET + + buf = (uint32_t *)op.buf; + op.mem_id = MEM_CM; + op.addr = read_reg(iff_name, 0x28c) + CM_WRCONTEXT_OFFSET + idx * MEM_CM_WRC_SIZE; - op->len = MEM_CM_WRC_SIZE; - buf = (uint32_t *)op->buf; + op.len = MEM_CM_WRC_SIZE; - if (doit(iff_name, op) < 0) + if (doit(iff_name, CHELSIO_GET_MEM, &op) < 0) err(1, "get_wrc"); - + /* driver manges with the data... put it back into the the FW's view */ - for (p = (uint64_t *)op->buf; - p < (uint64_t *)(op->buf + MEM_CM_WRC_SIZE); p++) { + for (p = (uint64_t *)op.buf; + p < (uint64_t *)(op.buf + MEM_CM_WRC_SIZE); p++) { uint64_t flit = *p; buf[i++] = htonl((uint32_t)(flit >> 32)); buf[i++] = htonl((uint32_t)flit); } - print_wrc(idx, (struct wrc *)op->buf); - print_wrc_zero(idx, (struct wrc *)op->buf); - print_wrc_history((struct wrc *)op->buf); + print_wrc(idx, (struct wrc *)op.buf); + print_wrc_zero(idx, (struct wrc *)op.buf); + print_wrc_history((struct wrc *)op.buf); - free(op); + free(buf); return 0; } #endif @@ -1737,7 +1841,8 @@ } } - if (argc < 3) usage(stderr); + if (argc < 3) + usage(stderr); iff_name = argv[1]; if (!strcmp(argv[2], "reg")) @@ -1757,11 +1862,12 @@ r = conf_tcam(argc, argv, 3, iff_name); else if (!strcmp(argv[2], "tcb")) r = get_tcb(argc, argv, 3, iff_name); +#endif #ifdef WRC - else if (!strcmp(argv[2], "wrc")) + else if (!strcmp(argv[2], "wrc")) r = get_wrc(argc, argv, 3, iff_name); #endif -#endif + else if (!strcmp(argv[2], "regdump")) r = dump_regs(argc, argv, 3, iff_name); #ifdef CHELSIO_INTERNAL From owner-p4-projects@FreeBSD.ORG Fri Sep 14 08:21:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4116D16A41B; Fri, 14 Sep 2007 08:21:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0061616A417 for ; Fri, 14 Sep 2007 08:21:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EED8913C45D for ; Fri, 14 Sep 2007 08:21:40 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8E8Le5Z042410 for ; Fri, 14 Sep 2007 08:21:40 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8E8LeLR042407 for perforce@freebsd.org; Fri, 14 Sep 2007 08:21:40 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 14 Sep 2007 08:21:40 GMT Message-Id: <200709140821.l8E8LeLR042407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 08:21:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=126399 Change 126399 by zec@zec_tpx32 on 2007/09/14 08:20:51 Hold th Giant across DEVICE_SUSPEND/RESUME in apm_do_suspend() since non-MPSAFE drivers need this. In particular this change allows for USB periperals to better survive suspend/resume cycles. Affected files ... .. //depot/projects/vimage/src/sys/i386/bios/apm.c#2 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/bios/apm.c#2 (text+ko) ==== @@ -485,7 +485,13 @@ apm_op_inprog = 0; sc->suspends = sc->suspend_countdown = 0; + /* + * Be sure to hold Giant across DEVICE_SUSPEND/RESUME since + * non-MPSAFE drivers need this. + */ + mtx_lock(&Giant); error = DEVICE_SUSPEND(root_bus); + mtx_unlock(&Giant); if (error) return; @@ -496,7 +502,9 @@ } else { /* Failure, 'resume' the system again */ apm_execute_hook(hook[APM_HOOK_RESUME]); + mtx_lock(&Giant); DEVICE_RESUME(root_bus); + mtx_unlock(&Giant); } return; } @@ -602,7 +610,9 @@ sc->suspending = 0; apm_execute_hook(hook[APM_HOOK_RESUME]); + mtx_lock(&Giant); DEVICE_RESUME(root_bus); + mtx_unlock(&Giant); return; } From owner-p4-projects@FreeBSD.ORG Fri Sep 14 19:03:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC88F16A469; Fri, 14 Sep 2007 19:03:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1BF116A418 for ; Fri, 14 Sep 2007 19:03:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A68F813C457 for ; Fri, 14 Sep 2007 19:03:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8EJ3Kxq022789 for ; Fri, 14 Sep 2007 19:03:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8EJ3KCm022786 for perforce@freebsd.org; Fri, 14 Sep 2007 19:03:20 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 14 Sep 2007 19:03:20 GMT Message-Id: <200709141903.l8EJ3KCm022786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 19:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=126405 Change 126405 by kmacy@kmacy_home:ethng on 2007/09/14 19:02:21 122915 - add contiguous allocator for UMA Affected files ... .. //depot/projects/ethng/src/sys/vm/uma.h#2 edit .. //depot/projects/ethng/src/sys/vm/uma_core.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/vm/uma.h#2 (text+ko) ==== @@ -482,6 +482,7 @@ */ void uma_zone_set_freef(uma_zone_t zone, uma_free freef); +void uma_zone_set_contig(uma_zone_t zone); /* * These flags are setable in the allocf and visable in the freef. ==== //depot/projects/ethng/src/sys/vm/uma_core.c#2 (text+ko) ==== @@ -957,6 +957,32 @@ return (p); } +static void * +uma_zone_contig_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + int malloc_flags; + + *flags = UMA_SLAB_PRIV; + malloc_flags = (wait ? M_WAITOK : M_NOWAIT); + + return (contigmalloc(bytes, M_DEVBUF, malloc_flags, 0x0ULL, + (vm_paddr_t)-1, 1, 0)); +} + +static void +uma_zone_contig_free(void *mem, int size, u_int8_t flags) +{ + contigfree(mem, size, M_DEVBUF); +} + +void +uma_zone_set_contig(uma_zone_t zone) +{ + uma_zone_set_allocf(zone, uma_zone_contig_alloc); + uma_zone_set_freef(zone, uma_zone_contig_free); + +} + /* * Allocates a number of pages from within an object * From owner-p4-projects@FreeBSD.ORG Fri Sep 14 19:07:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFCEB16A420; Fri, 14 Sep 2007 19:07:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97B6516A418 for ; Fri, 14 Sep 2007 19:07:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86A8E13C4B5 for ; Fri, 14 Sep 2007 19:07:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8EJ7QKm022965 for ; Fri, 14 Sep 2007 19:07:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8EJ7Qt8022962 for perforce@freebsd.org; Fri, 14 Sep 2007 19:07:26 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 14 Sep 2007 19:07:26 GMT Message-Id: <200709141907.l8EJ7Qt8022962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 19:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=126406 Change 126406 by kmacy@kmacy_home:ethng on 2007/09/14 19:06:48 switch jumbo9 and jumbo16 zones over to doing physically contigous allocations Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#3 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_mbuf.c#3 (text+ko) ==== @@ -227,6 +227,8 @@ if (nmbjumbo9 > 0) uma_zone_set_max(zone_jumbo9, nmbjumbo9); + uma_zone_set_contig(zone_jumbo9); + zone_jumbo16 = uma_zcreate(MBUF_JUMBO16_MEM_NAME, MJUM16BYTES, mb_ctor_clust, mb_dtor_clust, #ifdef INVARIANTS @@ -238,6 +240,8 @@ if (nmbjumbo16 > 0) uma_zone_set_max(zone_jumbo16, nmbjumbo16); + uma_zone_set_contig(zone_jumbo16); + zone_ext_refcnt = uma_zcreate(MBUF_EXTREFCNT_MEM_NAME, sizeof(u_int), NULL, NULL, NULL, NULL, From owner-p4-projects@FreeBSD.ORG Fri Sep 14 19:17:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF5AE16A46E; Fri, 14 Sep 2007 19:17:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9393116A46C for ; Fri, 14 Sep 2007 19:17:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 986EC13C48E for ; Fri, 14 Sep 2007 19:17:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8EJHdBX023522 for ; Fri, 14 Sep 2007 19:17:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8EJHdST023519 for perforce@freebsd.org; Fri, 14 Sep 2007 19:17:39 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 14 Sep 2007 19:17:39 GMT Message-Id: <200709141917.l8EJHdST023519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 19:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=126407 Change 126407 by kmacy@kmacy_home:ethng on 2007/09/14 19:17:23 make physically contigous jumbo frames a boot time option defaulting to on Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#4 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_mbuf.c#4 (text+ko) ==== @@ -99,6 +99,8 @@ int nmbjumbop; /* limits number of page size jumbo clusters */ int nmbjumbo9; /* limits number of 9k jumbo clusters */ int nmbjumbo16; /* limits number of 16k jumbo clusters */ +int jumbo_phys_contig = 1; /* jumbo frames are physically contiguous */ + struct mbstat mbstat; static void @@ -140,7 +142,8 @@ "Maximum number of mbuf 16k jumbo clusters allowed"); SYSCTL_STRUCT(_kern_ipc, OID_AUTO, mbstat, CTLFLAG_RD, &mbstat, mbstat, "Mbuf general information and statistics"); - +SYSCTL_INT(_kern_ipc, OID_AUTO, jumbo_phys_contig, CTLFLAG_RW, &jumbo_phys_contig, 1, + "jumbo frames are physically contiguous"); /* * Zones from which we allocate. */ @@ -227,7 +230,8 @@ if (nmbjumbo9 > 0) uma_zone_set_max(zone_jumbo9, nmbjumbo9); - uma_zone_set_contig(zone_jumbo9); + if (jumbo_phys_contig) + uma_zone_set_contig(zone_jumbo9); zone_jumbo16 = uma_zcreate(MBUF_JUMBO16_MEM_NAME, MJUM16BYTES, mb_ctor_clust, mb_dtor_clust, @@ -240,7 +244,8 @@ if (nmbjumbo16 > 0) uma_zone_set_max(zone_jumbo16, nmbjumbo16); - uma_zone_set_contig(zone_jumbo16); + if (jumbo_phys_contig) + uma_zone_set_contig(zone_jumbo16); zone_ext_refcnt = uma_zcreate(MBUF_EXTREFCNT_MEM_NAME, sizeof(u_int), NULL, NULL, From owner-p4-projects@FreeBSD.ORG Fri Sep 14 21:33:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 071DE16A41A; Fri, 14 Sep 2007 21:33:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B847C16A418 for ; Fri, 14 Sep 2007 21:33:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8F8C13C48A for ; Fri, 14 Sep 2007 21:33:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8ELXh7m042429 for ; Fri, 14 Sep 2007 21:33:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8ELXhJ3042414 for perforce@freebsd.org; Fri, 14 Sep 2007 21:33:43 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 14 Sep 2007 21:33:43 GMT Message-Id: <200709142133.l8ELXhJ3042414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 126408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 21:33:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=126408 Change 126408 by pgj@disznohal on 2007/09/14 21:32:42 Submit the initial Hungarian translation of Chapter 17: Security Event Auditing. Affected files ... .. //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#2 (text+ko) ==== @@ -1,22 +1,19 @@ - + - + Tom Rhodes - Written by + Írta: Robert @@ -25,503 +22,556 @@ - Security Event Auditing + Biztonsági események vizsgálata - Synopsis + Áttekintés AUDIT - Security Event Auditing + Biztonsági események vizsgálata MAC - FreeBSD 6.2-RELEASE and later include support for fine-grained - security event auditing. Event auditing allows the reliable, - fine-grained, and configurable logging of a variety of - security-relevant system events, including logins, configuration - changes, and file and network access. These log records can be - invaluable for live system monitoring, intrusion detection, and - postmortem analysis. &os; implements &sun;'s published - BSM API and file format, and is interoperable with - both &sun;'s &solaris; and &apple;'s &macos; X audit implementations. - - This chapter focuses on the installation and configuration of - Event Auditing. It explains audit policies, and provides an example - audit configuration. + A &os; 6.2-RELEASE és az azóta megjelent verziók támogatják a + biztonsági események aprólékos vizsgálatát. Ezzel egy megbízható, + részletes és jól konfigurálható naplózási rendszert társítanak a + rendszerben található biztonságot igénylõ események széles köréhez, + beleértve a bejelentkezéseket, a konfigurációs állományokban bekövetkezõ + változásokat, állomány- és hálózati hozzáféréseket. Az így létrehozott + naplóbejegyzések felbecsülhetetlen értékûnek bizonyulhatnak egy élõ + rendszer felügyelete során, vagy egy hálózati támadás észleléséhez, + esetleg egy összeomlás okainak kielemezéséhez. A &os; ehhez a &sun; + által kifejlesztett BSM technológia API-ját és + állományformátumát valósítja meg, és így képes együttmûködni a &sun; + &solaris; valamint az &apple; &macos; X bizonsági rendszereivel + egyaránt. + + Ebben a fejezetben a biztonsági események vizsgálatának + telepítéséhez és beállításához szükséges ismeretek tekintjük át. + Ennek keretében szó esik a vizsgálati házirendekrõl, valamint + mutatunk egy példát a vizsgálatok beállítására. + + A fejezet elolvasása során megismerjük: - After reading this chapter, you will know: - - What Event Auditing is and how it works. + mit jelent az események vizsgálata és hogyan + mûködik. - How to configure Event Auditing on &os; for users - and processes. + hogyan kell beállítani az események vizsgálatát &os;-n + a különbözõ felhasználók és programok esetén. - How to review the audit trail using the audit reduction and - review tools. + hogyan értelmezzük egy vizsgálati nyomokat a + vizsgálatot szûkítõ és -elemzõ segédprogramok segítségével. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + alapvetõ &unix;-os és &os;-s ismeretek + (). - Be familiar with the basics of kernel - configuration/compilation - (). + a rendszermag konfigurálásával és fordításával kapcsolatos + tudnivalók alapszintû ismerete (). - Have some familiarity with security and how it - pertains to &os; (). + az informatikai biztonság alapfogalmainak és annak a &os;-re + vonatkozó részleteinek minimális ismerete + (). - The audit facility in &os; 6.2 is experimental, and production - deployment should occur only after careful consideration of the - risks of deploying experimental software. Known limitations include - that not all security-relevant system events are currently auditable, - and that some login mechanisms, such as X11-based display managers - and third party daemons, do not properly configure auditing for user - login sessions. + A &os; 6.2-es verziójában jelenlevõ biztonsági vizsgálat még + csak kísérleti jelleggel szerepel, éles környezetben kizárólag csak + az ilyen fajta szoftverekkel kapcsolatos kockázatok tudatában és + elfogadásával javasolt használni. Ismert korlátozások: nem mindegyik + biztonságot érintõ esemény vizsgálható, mint mondjuk az egyes + bejelentkezési típusok, mivel azok nem megfelelõen hitelesítik + a belépõ felhasználókat. Ilyenek például az X11-alapú felületek és + az egyéb, erre a célra alkalmas, más által fejlesztett daemonok. - The security event auditing facility is able to generate very - detailed logs of system activity: on a busy system, trail file - data can be very large when configured for high detail, exceeding - gigabytes a week in some configurations. Administrators should take - into account disk space requirements associated with high volume - audit configurations. For example, it may be desirable to dedicate - a file system to the /var/audit tree so that - other file systems are not affected if the audit file system becomes - full. + A biztonsági események vizsgálata során a rendszer képes nagyon + részletes naplókat készíteni az érintett tevékenységekrõl. Így egy + kellõen forgalmas rendszeren az állománymozgások alapos nyomonkövetése + bizonyos konfigurációkon akár gigabyte-okat is kitehet hetente. A + rendszergazdáknak ezért mindig javasolt számolniuk a nagy forgalmú + események biztonsági vizsgálatának tárigényével. Például, emiatt + érdemes lehet egy egész állományrendszert szánni erre a feladatra a + /var/audit könyvtárban, és így a többi + állományrendszer nem látja kárát, ha véletlenül betelne ez a + terület. - Key Terms in this Chapter + A fejezet fontosabb fogalmai - Before reading this chapter, a few key audit-related terms must be - explained: + A fejezet elolvasása elõtt meg kell ismernünk néhány fontos + alapfogalmat: - event: An auditable event is any event - that can be logged using the audit subsystem. - Examples of security-relevant events include the creation of - a file, the building of a network connection, or a user logging in. - Events are either attributable, - meaning that they can be traced to an authenticated user, or - non-attributable if they cannot be. - Examples of non-attributable events are any events that occur - before authentication in the login process, such as bad password - attempts. + esemény: Vizsgálható eseménynek azt az + eseményt nevezzük, amely egy vizsgálati alrendszerben naplózható. + Biztonsági események lehetnek például: egy állomány létrehozása, + egy hálózati kapcsolat felépítése, vagy egy felhasználó + bejelentkezése. Egy esemény jellegzetes, ha + visszakövethetõ valamelyik hitelesített felhasználóhoz, vagy + nem jellegzetes, ha ez nem lehetséges. Nem + jellegzetes események lehet például minden olyan esemény, amely + egy bejelentkezési folyamat hitelesítési lépése elõtt történik, + ilyenek a hibás jelszóval történõ belépési kísérletek. - class: Event classes are named sets of - related events, and are used in selection expressions. Commonly - used classes of events include file creation (fc), - exec (ex) and login_logout - (lo). + osztály: Eseményosztálynak az összefüggõ + események névvel ellátott halmazát tekintjük, és szûrési + feltételekben használjuk õket. Általában alkalmazott osztályok: + file creation (fc, állománylétrehozás), + exec (ex, programindítás), és + login_logout (lo, ki- és bejelentkezés). - record: A record is an audit log entry - describing a security event. Records contain a record event type, - information on the subject (user) performing the action, - date and time information, information on any objects or - arguments, and a success or failure condition. + rekord: Rekordnak nevezzük a biztonsági + eseményeket leíró biztonsági naplóbejegyzéseket. A rekordok + tartalmazhatják a feljegyzett esemény típusát, az eseményt kiváltó + tevékenységet (felhasználót), a dátumot és az idõt, tetszõleges + objektum vagy paraméter értékét, feltételek teljesülését vagy + meghiúsulását. - trail: An audit trail, or log file, - consists of a series of audit records describing security - events. Typically, trails are in roughly chronological - order with respect to the time events completed. Only - authorized processes are allowed to commit records to the - audit trail. + nyom: Vizsgálati nyomnak vagy + naplóállománynak nevezzük a különféle biztonsági eseményeket + leíró vizsgálati rekordok sorozatát. A nyomok többnyire nagyjából + az események bekövetkezése szerinti idõrendben következnek. Csak + és kizárólag az erre felhatalmazott programok hozhatnak létre + rekordokat a vizsgálati nyomban. - selection expression: A selection - expression is a string containing a list of prefixes and audit - event class names used to match events. + szûrési feltétel: Szûrési + feltételnek nevezünk egy olyan sztringet, amelyet események + szûrésére használunk, és módosítókat valamint eseményosztályok + neveit tartalmazza. - preselection: The process by which the - system identifies which events are of interest to the administrator - in order to avoid generating audit records describing events that - are not of interest. The preselection configuration - uses a series of selection expressions to identify which classes - of events to audit for which users, as well as global settings - that apply to both authenticated and unauthenticated - processes. + elõválogatás: Elõválogatásnak nevezzük + a folyamatot, amelynek során a rendszer beazonosítja azokat az + eseményeket, amelyek a rendszergazda számára fontosak. Ezáltal + elkerülhetjük olyan vizsgálati rekordok generálását, amelyek + számunkra érdektelen eseményekrõl számolnak be. Az elõválogatás + szûrési feltételek sorát használja az adott felhasználókhoz + tartozó adott biztonsági események vizsgálatának beállításához, + akárcsak a hitelesített és a nem hitelesített programokat + értintõ globális beállítások meghatározásához. - reduction: The process by which records - from existing audit trails are selected for preservation, printing, - or analysis. Likewise, the process by which undesired audit - records are removed from the audit trail. Using reduction, - administrators can implement policies for the preservation of audit - data. For example, detailed audit trails might be kept for one - month, but after that, trails might be reduced in order to preserve - only login information for archival purposes. + leszûkítés: Leszûkítésnek nevezzük a + folyamatot, amelynek során a már meglevõ biztonsági rekordokból + válogatunk le tárolásra, nyomtatásra vagy elemzésre. Hasonlóan + ez a folyamat, ahol a szükségtelen rekordokat eltávolítjuk a + vizsgálatai nyomból. A leszûkítés segítségével a rendszergazdák + a vizsgálati adatok eltárolására alakíthatnak ki házirendet. + Például a részletesebb vizsgálati nyomokat érdemes egy hónapig + megtartani, ennek lejártával viszont már inkább ajánlott + leszûkíteni õket és archiválásra csak a bejelentkezési információkat + megtartani. - Installing Audit Support - - User space support for Event Auditing is installed as part of the - base &os; operating system as of 6.2-RELEASE. However, Event Auditing - support must be explicitly compiled into the kernel by adding the - following lines to the kernel configuration file: - + A vizsgálat támogatásának telepítése + + A eseményvizsgálathoz szükséges felhasználói programok a &os; + 6.2-RELEASE kiadásától kezdõdõen az alap operációs rendszer részét + képezik. Azonban az eseményvizsgálat használatához a rendszermagban is + be kell kapcsolnunk a megfelelõ támogatást, mégpedig a rendszermag + konfigurációs állományában az alábbi sor hozzáadásával: + options AUDIT - - Rebuild and reinstall - the kernel via the normal process explained in - . - - Once the kernel is built, installed, and the system has been - rebooted, enable the audit daemon by adding the following line to - &man.rc.conf.5;: - + + Fordítsuk és telepítsük újra a rendszermagot az + ben ismertetett folyamat szerint. + + Ahogy a rendszermagot sikerült lefordítanunk és telepítenünk, + valamint a rendszerünk is újraindult, indítsuk el a vizsgáló daemont + a következõ sor hozzáadásával a &man.rc.conf.5;-ban: + auditd_enable="YES" - - Audit support must then be started by a reboot, or by manually - starting the audit daemon: - + + A vizsgálatot innentõl ténylegesen egy ismételt újraindítással vagy + pedig az elõbb említett daemon manuális elindításával + aktiválhatjuk: + /etc/rc.d/auditd start - Audit Configuration + A vizsgálat beállítása - All configuration files for security audit are found in - /etc/security. The following - files must be present before the audit daemon is started: + A vizsgálatok beállításához szükséges összes konfigurációs állomány + a /etc/security könyvtárban + található. A következõ állományok vannak itt a daemon indítása + elõtt: - audit_class - Contains the - definitions of the audit classes. - + audit_class - a vizsgálati osztályok + definícióit tartalmazza. + - audit_control - Controls aspects - of the audit subsystem, such as default audit classes, - minimum disk space to leave on the audit log volume, - maximum audit trail size, etc. + audit_control - a vizsgálati alrendszer + különbözõ területei vezérli, többek közt az alapértelmezett + vizsgálati osztályokat, az vizsgálati adatok tárhelyén meghagyandó + minimális lemezterület, a vizsgálati nyom maximális mérete + stb. - audit_event - Textual names and - descriptions of system audit events, as well as a list of which - classes each event in. + audit_event - a rendszerben jelenlevõ + vizsgálati események szöveges megnevezése és leírása, valamint a + lista, hogy melyikük mely osztályban található. - audit_user - User-specific audit - requirements, which are combined with the global defaults at - login. + audit_user - felhasználónként változó + vizsgálati elvárások, kombinálva a bejelentkezéskor érvényes + globálisan alapértelmezett beállításokkal. - audit_warn - A customizable shell script - used by auditd to generate warning messages in exceptional - situations, such as when space for audit records is running low or - when the audit trail file has been rotated. + audit_warn - az + auditd által használt testreszabható + shell szkript, aminek segítségével a szélsõséges helyzetekben + figyelmeztetõ üzeneteket tudunk generálni, mint mondjuk amikor + a rekordok számára fenntartott hely elfogyóban van, vagy amikor a + nyomokat tartalmazó állományt archiváltuk. - Audit configuration files should be edited and maintained - carefully, as errors in configuration may result in improper - logging of events. + Az eseményvizsgálat konfigurációs állományait alapos körültekintés + mellett szabad szerkeszteni és karbantartani, mivel a bennük keletkezõ + hibák az események helytelen naplózását eredményezhetik. - Event Selection Expressions + Eseményszûrési feltételek - Selection expressions are used in a number of places in the - audit configuration to determine which events should be audited. - Expressions contain a list of event classes to match, each with - a prefix indicating whether matching records should be accepted - or ignored, and optionally to indicate if the entry is intended - to match successful or failed operations. Selection expressions - are evaluated from left to right, and two expressions are - combined by appending one onto the other. + Az eseményvizsgálati beállítások során számtalan helyen felbukkanak + a vizsgálni kívánt eseményeket meghatározó szûrési feltételek. Ezen + feltételek eseményosztályok felsorolását tartalmazzák, mindegyiküket + egy módosító vezeti be, ezzel jelezve, hogy az adott eseményosztályba + tartozó rekordokat tartsuk meg vagy vessük el. Esetleg utalhatnak arra + is, hogy vagy csak a sikerességet jelzõ rekordokat, vagy csak a + sikertelenséget jelzõ rekordokat szûrjük ki. A szûrési feltételek + balról jobbra értékelõdnek ki, és két kifejezés összefûzéssel + kombinálható. + + A most következõ lista tartalmazza a + audit_class állományban található alapértelmezett + eseményvizsgálati osztályokat: - The following list contains the default audit event classes - present in audit_class: - - - all - all - Match all - event classes. - + + all - all (mind) - + Minden eseményosztályra vonatkozik. + + + + ad - + administrive (adminisztrációs) - olyan + adminisztrációs tevékenységek, amelyek egyben az egész rendszeren + végrehajtódnak. + + + + ap - + application (alkalmazás) - az alkalmazások + által meghatározott tevékenység. + + + + cl - + file close (állomány lezárása) - a + close rendszerhívás meghívásának + vizsgálata. + + + + ex - + exec (programindítás) - egy program + indításának vizsgálata. A parancssorban átadott paraméterek és + a környezeti változók vizsgálatát a &man.audit.control.5; + vezérli a policy beállításhoz tartozó + argv és envv + paraméterek segítségével. + + + + fa - + file attribute access + (állományjellemzõk hozzáférése) - a rendszerbeli + objektumok jellemzõinek hozzáférésnek vizsgálata, mint pl. a + &man.stat.1;, &man.pathconf.2; és ehhez hasonló események. + - - ad - administrative - - Administrative actions performed on the system as a - whole. - - - - ap - application - - Application defined action. - + + fc - + file create (állomány létrehozása) - + állományt eredményezõ események vizsgálata. + + + + fd - + file delete (állomány törlése) - + állományt törlõ események vizsgálata. + + + + fm - + file attribute modify (állományjellemzõk + módosítása) - állományok jellemzõit megváltoztató + események vizsgálata, mint mondjuk a &man.chown.8;, + &man.chflags.1;, &man.flock.2; stb. + + + + fr - + file read (állományolvasás) - + állományok olvasásra történõ megnyitásával, olvasásával + stb. kapcsolatos események vizsgálata. + + + + fw - + file write (állományírás) - + állományok írásra történõ megnyitásával, írásával, + módosításával stb. kapcsolatos események vizsgálata. + + + + io - + ioctl - a &man.ioctl.2; rendszerhívást + használó események vizsgálata. + + + + ip - + ipc - a folyamatok közti kommunikáció + különféle formáinak, beleértve a POSIX csövek és System V + IPC mûveleteinek vizsgálata. + + + + lo - + login_logout (ki- és bejelentkezés) - + a rendszerben megjelenõ &man.login.1; és &man.logout.1; + események vizsgálata. + + + + na - + non attributable (nem jellegzetes) - + a nem jellegzetes események vizsgálata. + + + + no - + invalid class (érvénytelen osztály) - + egyetlen biztonsági eseményt sem tartalmaz. + + + + nt - + network (hálózat) - + a hálózathoz tartozó események vizsgálata, mint pl. a + &man.connect.2; és &man.accept.2;. + + + + ot - + other (egyéb) - + más egyéb események vizsgálata. + + + + pc - + process (folyamat) - a folyamatokkal + kapcsolatos mûveletek, mint például a &man.exec.3; és + &man.exit.3; vizsgálata. + - - cl - file close - - Audit calls to the close system - call. - - - - ex - exec - Audit - program execution. Auditing of command line arguments and - environmental variables is controlled via &man.audit.control.5; - using the argv and envv - parameters to the policy setting. - - - - fa - file attribute access - - Audit the access of object attributes such as - &man.stat.1;, &man.pathconf.2; and similar events. - - - - fc - file create - - Audit events where a file is created as a result. - - - - fd - file delete - - Audit events where file deletion occurs. - - - - fm - file attribute modify - - Audit events where file attribute modification occurs, - such as &man.chown.8;, &man.chflags.1;, &man.flock.2;, - etc. - - - - fr - file read - - Audit events in which data is read, files are opened for - reading, etc. - - - - fw - file write - - Audit events in which data is written, files are written - or modified, etc. - - - - io - ioctl - Audit - use of the &man.ioctl.2; system call. - - - - ip - ipc - Audit - various forms of Inter-Process Communication, including POSIX - pipes and System V IPC operations. - - - - lo - login_logout - - Audit &man.login.1; and &man.logout.1; events occurring - on the system. - - - - na - non attributable - - Audit non-attributable events. - - - - no - invalid class - - Match no audit events. - - - - nt - network - - Audit events related to network actions, such as - &man.connect.2; and &man.accept.2;. - - - - ot - other - - Audit miscellaneous events. - - - - pc - process - - Audit process operations, such as &man.exec.3; and - &man.exit.3;. - - + + Az imént felsorolt eseményosztályok az + audit_class és audit_event + állományok módosításával igény szerint testreszabhatóak. + + A listában szereplõ minden egyes eseményosztályhoz tartozik + még egy módosító is, amely jelzi, hogy a sikeres vagy a sikertelen + mûveleteket kell-e szûrnünk, valamint hogy a bejegyzés az adott + típust vagy osztályt hozzáadja vagy elveszi az adott + szûrésbõl. - These audit event classes may be customized by modifying the - audit_class and - audit_event configuration files. - - Each audit class in the list is combined with a prefix - indicating whether successful/failed operations are matched, and - whether the entry is adding or removing matching for the class - and type. - - - (none) Audit both successful and failed instances of the - event. - - - - + Audit successful events in this - class. - - - - - Audit failed events in this - class. - + + + (üres) az adott típusból mind a sikereseket és mind a + sikerteleneket feljegyzi. + + + + + az eseményosztályba tartozó sikeres + eseményeket vizsgálja csak. + + + + - az eseményosztályba tartozó sikertelen + eseményeket vizsgálja csak. + + + + ^ az eseményosztályból sem a sikereseket, + sem pedig a sikerteleneket nem vizsgálja. + + + + ^+ az eseményosztályból nem vizsgálja a + sikeres eseményeket. + + + + ^- az eseményosztályból nem vizsgálja a + sikertelen eseményeket. + - - ^ Audit neither successful nor failed - events in this class. - - - - ^+ Do not audit successful events in this - class. - - - - ^- Do not audit failed events in this - class. - - + + Az alábbi példa egy olyan szûrési feltételt mutat be, amely + a ki/bejelentkezések közül megadja a sikereset és a sikerteleneket, + viszont a programindítások közül csak a sikereseket: - The following example selection string selects both successful - and failed login/logout events, but only successful execution - events: - lo,+ex - Configuration Files - - In most cases, administrators will need to modify only two files - when configuring the audit system: audit_control - and audit_user. The first controls system-wide - audit properties and policies; the second may be used to fine-tune - auditing by user. + A konfigurációs állományok + + A vizsgálati rendszer beállításához az esetek túlnyomó részében + a rendszergazdáknak csupán két állományt kell módosítaniuk: ezek az + audit_control és az + audit_user. Az elõbbi felelõs a rendszerszintû + vizsgálati jellemzõkért és házirendekért, míg az utóbbi az igények + felhasználókénti finomhangolásához használható. - The <filename>audit_control</filename> File + Az <filename>audit_control</filename> állomány + + Az audit_control állomány határozza meg a + vizsgálati alrendszer alapértelmezéseit. Ezt az állományt + megnyitva a következõket láthatjuk: - The audit_control file specifies a number - of defaults for the audit subsystem. Viewing the contents of this - file, we see the following: - - dir:/var/audit + dir:/var/audit flags:lo minfree:20 naflags:lo policy:cnt filesz:0 - The option is used to set one or more - directories where audit logs will be stored. If more than one - directory entry appears, they will be used in order as they fill. - It is common to configure audit so that audit logs are stored on - a dedicated file system, in order to prevent interference between - the audit subsystem and other subsystems if the file system fills. - - - The field sets the system-wide default - preselection mask for attributable events. In the example above, - successful and failed login and logout events are audited for all - users. - - The option defines the minimum - percentage of free space for the file system where the audit trail - is stored. When this threshold is exceeded, a warning will be - generated. The above example sets the minimum free space to - twenty percent. + A opciót használjuk a vizsgálati naplók + tárolására szolgáló egy vagy több könyvtár megadására. Ha egynél + több könyvtárra vonatkozó bejegyzés található az állományban, akkor + azok a megadás sorrendjében kerülnek feltöltésre. Nagyon gyakori + az a beállítás, ahol a vizsgálati naplókat egy erre a célra külön + kialakított állományrendszeren tárolják, megelõzve ezzel az + állományrendszer betelésekor keletkezõ problémákat a többi + alrendszerben. + + A mezõ egy rendszerszintû + alapértelmezett elõválogatási maszkot határoz meg a jellegzetes + események számára. A fenti példában a sikeres és sikertelen ki- + és bejelentkezéseket mindegyik felhasználó esetén + vizsgáljuk. + + A opció megszabja a vizsgálati nyom + tárolására szánt állományrendszeren a minimális szabad helyet, + a teljes kapacitás százalékában. Amint ezt a küszöböt túllépjük, + egy figyelmeztetés fog generálódni. A fenti példa a minimálisan + szükséges rendelkezésre álló helyet húsz százalékra + állítja. + + A opció megadja azokat az + eseményosztályokat, amelyeket vizsgálni kell a nem jellegzetes + események, mind mondjuk a bejelentkezési folyamatok vagy + rendszerdaemonok esetén. + + A opció a vizsgálat különbözõ + szempontjait irányító házirendbeli beállítások vesszõvel + elválasztott listáját tartalmazza. Az alapértelmezett + cnt beállítás azt adja meg, hogy a rendszer + a felmerülõ vizsgálati hibák ellenére is folytassa tovább a + mûködését (erõsen javasolt a használata). A másik gyakorta + alkalmazott beállítás az argv, amellyel a + rendszer a parancsvégrehajtás részeként az &man.execve.2; + rendszerhívás parancssori paramétereit is megvizsgálja. + + A opció meghatározza a + vizsgálati nyom automatikus szétvágása és archiválása elõtti + maximális méretét, byte-ban. Az alapértelmezett értéke a 0, + amely kikapcsolja ezt az archiválást. Ha az itt megadott + állományméret nem nulla és a minimálisan elvárt 512 kb alatt + van, akkor a rendszer figyelmen kívül hagyja és errõl egy + figyelmeztetést ad. - The option specifies audit classes to - be audited for non-attributed events, such as the login process - and system daemons. - - The option specifies a comma-separated - list of policy flags controlling various aspects of audit - behavior. The default cnt flag indicates that - the system should continue running despite an auditing failure - (this flag is highly recommended). Another commonly used flag is - argv, which causes command line arguments to - the &man.execve.2; system call to be audited as part of command - execution. - - The option specifies the maximum size - in bytes to allow an audit trail file to grow to before - automatically terminating and rotating the trail file. The - default, 0, disables automatic log rotation. If the requested - file size is non-zero and below the minimum 512k, it will be - ignored and a log message will be generated. - The <filename>audit_user</filename> File + Az <filename>audit_user</filename> állomány + + Az audit_user állomány lehetõvé teszi a + rendszergazda számára, hogy az egyes felhasználók számára további + vizsgálati szigorításokat határozzon meg. Minden sor egy-egy + felhasználó vizsgálatának pontosítását adja meg két mezõ + segítségével: az elsõ közülük az alwaysaudit + mezõ, mely felsorolja azokat az eseményeket, amelyeket minden + esetben vizsgáni kell az adott felhasználó esetén, valamint a + második a neveraudit mezõ, mely az adott + felhasználó esetén a nem vizsgálandó eseményeket adja meg. + + A most következõ audit_user példában + vizsgáljuk a root felhasználó + ki/bejelentkezéseit és sikeres programindításait, valamint + a www felhasználó + állománylétrehozásait és sikeres programindításait. Ha a korábban + bemutatott audit_control példával együtt + használjuk, akkor észrevehetjük, hogy a lo + bejegyzés a root felhasználó esetén + redundáns, illetve ilyenkor a ki/bejelentkezést a + www felhasználó esetén is vizsgáljuk. - The audit_user file permits the - administrator to specify further audit requirements for specific - users. - Each line configures auditing for a user via two fields: the - first is the alwaysaudit field, which specifies - a set of events that should always be audited for the user, and - the second is the neveraudit field, which - specifies a set of events that should never be audited for the - user. - - The following example audit_user file - audits login/logout events and successful command execution for - the root user, and audits file creation and successful command - execution for the www user. - If used with the example audit_control file - above, the lo entry for root - is redundant, and login/logout events will also be audited for the - www user. - - root:lo,+ex:no + root:lo,+ex:no www:fc,+ex:no @@ -529,36 +579,40 @@ - Administering the Audit Subsystem + A vizsgálati alrendszer használata - Viewing Audit Trails - - Audit trails are stored in the BSM binary format, so tools must - be used to modify or convert to text. The &man.praudit.1; - command converts trail files to a simple text format; the - &man.auditreduce.1; command may be used to reduce the - audit trail file for analysis, archiving, or printing purposes. - auditreduce supports a variety of selection - parameters, including event type, event class, user, date or time of - the event, and the file path or object acted on. + A vizsgálati nyomok megtekintése + + A vizsgálati nyomok a BSM bináris formátumban tárolódnak, + ezért a tartalmának konvertálásához és módosításához külön + segédprogramokra van szükség. A &man.praudit.1; parancs a + nyomállományokat egyszerû szöveges formátumra alakítja, a + &man.auditreduce.1; parancs pedig a nyomok elemzéséhez, + archiválásához vagy nyomtatásához szükséges leszûkítéséket + végzi el. Az auditreduce a szûrési feltételek + paramétereinek széles skáláját kezeli, beleértve az eseménytípusokat, + -osztályokat, felhasználókat, események dátumát vagy idõpontját, + állományok elérési útvonalát vagy az általuk érintett >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 14 21:37:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EE0616A41B; Fri, 14 Sep 2007 21:37:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7056D16A417 for ; Fri, 14 Sep 2007 21:37:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E864313C457 for ; Fri, 14 Sep 2007 21:37:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8ELbNmk042552 for ; Fri, 14 Sep 2007 21:37:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8ELbNUx042544 for perforce@freebsd.org; Fri, 14 Sep 2007 21:37:23 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 14 Sep 2007 21:37:23 GMT Message-Id: <200709142137.l8ELbNUx042544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 126409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 21:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=126409 Change 126409 by pgj@disznohal on 2007/09/14 21:33:44 Submit the initial Hungarian translation of Bibliography. Affected files ... .. //depot/projects/docproj_hu/books/handbook/bibliography/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/bibliography/chapter.sgml#2 (text+ko) ==== @@ -1,667 +1,692 @@ - - Bibliography + + + + Irodalomjegyzék - While the manual pages provide the definitive reference for individual - pieces of the FreeBSD operating system, they are notorious for not - illustrating how to put the pieces together to make the whole operating - system run smoothly. For this, there is no substitute for a good book on - &unix; system administration and a good users' manual. + Míg a man oldalak a &os; operációs rendszer egyes önálló részeihez + adnak odaillõ hivatkozásokat, ismert a tény, hogy arról egyáltalán nem + szólnak, miképpen illeszkednek egymáshoz ezek az alkotóelemek, és + ezáltal hogyan mûködik maga az operációs rendszer. Erre a célra + egyedül csak egy jó &unix;-os rendszeradminisztrációs szakkönyv és + egy jó felhasználói kézikönyv alkalmas. - Books & Magazines Specific to FreeBSD + A &os;-rõl szóló könyvek és folyóiratok - International books & - Magazines: + Idegennyelvû könyvek és folyóiratok: - Using FreeBSD (in Traditional Chinese), - published by Drmaster - , 1997. ISBN 9-578-39435-7. + Using FreeBSD (kínai). + Drmaster, 1997. + ISBN 9-578-39435-7. - FreeBSD Unleashed (Simplified Chinese translation), published by - China Machine - Press. ISBN 7-111-10201-0. - + FreeBSD Unleashed (kínai fordítás). + China Machine Press. + ISBN 7-111-10201-0. - FreeBSD From Scratch First Edition (in Simplified Chinese), - published by China Machine Press. ISBN 7-111-07482-3. - + FreeBSD From Scratch (1. kiadás, kínai). + China Machine Press. + ISBN 7-111-07482-3. - FreeBSD From Scratch Second Edition (in Simplified Chinese), - published by China Machine Press. ISBN 7-111-10286-X. - + FreeBSD From Scratch (2. kiadás, kínai). + China Machine Press. + ISBN 7-111-10286-X. - FreeBSD Handbook Second Edition (Simplified Chinese translation), - published by Posts & - Telecom Press. ISBN 7-115-10541-3. - + FreeBSD Handbook (2. kiadás, kínai). + Posts & Telecom Press. + ISBN 7-115-10541-3. - FreeBSD 3.x Internet (in Simplified Chinese), published by - Tsinghua - University Press. ISBN 7-900625-66-6. + FreeBSD 3.x Internet (kínai). + Tsinghua University Press. + ISBN 7-900625-66-6. - FreeBSD & Windows (in Simplified Chinese), published by - China Railway - Publishing House. ISBN 7-113-03845-X + FreeBSD & Windows (kínai). + China Railway Publishing House. + ISBN 7-113-03845-X - FreeBSD Internet Services HOWTO (in Simplified Chinese), - published by China Railway Publishing House. ISBN 7-113-03423-3 + FreeBSD Internet Services HOWTO (kínai). + China Railway Publishing House. + ISBN 7-113-03423-3 - FreeBSD for PC 98'ers (in Japanese), published by SHUWA System - Co, LTD. ISBN 4-87966-468-5 C3055 P2900E. + FreeBSD for PC 98'ers (japán). + SHUWA System Co, LTD. + ISBN 4-87966-468-5 C3055 P2900E. - FreeBSD (in Japanese), published by CUTT. ISBN 4-906391-22-2 - C3055 P2400E. + FreeBSD (japán). + CUTT. + ISBN 4-906391-22-2 C3055 P2400E. - Complete Introduction to FreeBSD (in Japanese), published by Shoeisha Co., Ltd. ISBN 4-88135-473-6 P3600E. + Complete Introduction to FreeBSD (japán). + Shoeisha Co., Ltd. + ISBN 4-88135-473-6 P3600E. - Personal UNIX Starter Kit FreeBSD (in Japanese), published by ASCII. ISBN 4-7561-1733-3 P3000E. + Personal UNIX Starter Kit FreeBSD (japán). + ASCII. + ISBN 4-7561-1733-3 P3000E. - FreeBSD Handbook (Japanese translation), published by ASCII. ISBN 4-7561-1580-2 - P3800E. + FreeBSD Handbook (japán fordítás). + ASCII. + ISBN 4-7561-1580-2 P3800E. - FreeBSD mit Methode (in German), published by Computer und Literatur Verlag/Vertrieb Hanser, 1998. ISBN 3-932311-31-0. + FreeBSD mit Methode (német). + Computer und Literatur Verlag/Vertrieb Hanser, 1998. + ISBN 3-932311-31-0. - FreeBSD 4 - Installieren, Konfigurieren, Administrieren - (in German), published by Computer und Literatur Verlag, 2001. - ISBN 3-932311-88-4. + FreeBSD 4 - Installieren, Konfigurieren, Administrieren (német). + Computer und Literatur Verlag, 2001. + ISBN 3-932311-88-4. - FreeBSD 5 - Installieren, Konfigurieren, Administrieren - (in German), published by Computer und Literatur Verlag, 2003. - ISBN 3-936546-06-1. + FreeBSD 5 - Installieren, Konfigurieren, Administrieren (német). + Computer und Literatur Verlag, 2003. + ISBN 3-936546-06-1. - - FreeBSD de Luxe (in German), published by - Verlag Modere Industrie, - 2003. ISBN 3-8266-1343-0. - + FreeBSD de Luxe (német). + Verlag Modere Industrie, 2003. + ISBN 3-8266-1343-0. - FreeBSD - Install and Utilization Manual (in Japanese), published by - Mainichi Communications - Inc., 1998. ISBN 4-8399-0112-0. + FreeBSD Install and Utilization Manual (japán). + Mainichi Communications Inc., 1998. + ISBN 4-8399-0112-0. Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo - Building Internet - Server with FreeBSD (in Indonesia Language), - published by Elex Media Komputindo. + Building Internet Server with FreeBSD (indonéz nyelven). + Elex Media Komputindo. - Absolute BSD: The Ultimate Guide to FreeBSD (Traditional Chinese - translation), published by GrandTech Press, 2003. - ISBN 986-7944-92-5. + Absolute BSD: The Ultimate Guide to FreeBSD (kínai fordítás). + GrandTech Press, 2003. + ISBN 986-7944-92-5. - The FreeBSD 6.0 Book (in - Traditional Chinese), published by Drmaster, 2006. - ISBN 9-575-27878-X. + The FreeBSD 6.0 Book (kínai). + Drmaster, 2006. + ISBN 9-575-27878-X. - English language books & Magazines: + Angol nyelvû könyvek és folyóiratok: - Absolute - BSD: The Ultimate Guide to FreeBSD, published by - No Starch Press, 2002. - ISBN: 1886411743 + Absolute BSD: The Ultimate Guide to FreeBSD. + No Starch Press, 2002. + ISBN: 1886411743 - - The Complete FreeBSD, published by - O'Reilly, 2003. - ISBN: 0596005164 + The Complete FreeBSD. + O'Reilly, 2003. + ISBN: 0596005164 - The - FreeBSD Corporate Networker's Guide, published by - Addison-Wesley, 2000. - ISBN: 0201704811 + The FreeBSD Corporate Networker's Guide. + Addison-Wesley, 2000. + ISBN: 0201704811 - - FreeBSD: An Open-Source Operating System for Your Personal - Computer, published by The Bit Tree Press, 2001. - ISBN: 0971204500 + FreeBSD: An Open-Source Operating System for Your Personal Computer. + The Bit Tree Press, 2001. + ISBN: 0971204500 - Teach Yourself FreeBSD in 24 Hours, published by - Sams, 2002. - ISBN: 0672324245 + Teach Yourself FreeBSD in 24 Hours. + Sams, 2002. + ISBN: 0672324245 - FreeBSD 6 Unleashed, published by - Sams, 2006. - ISBN: 0672328755 + FreeBSD 6 Unleashed. + Sams, 2006. + ISBN: 0672328755 - FreeBSD: The Complete Reference, published by - McGrawHill, 2003. - ISBN: 0072224096 + FreeBSD: The Complete Reference. + McGrawHill, 2003. + ISBN: 0072224096 - Users' Guides + Felhasználói kézikönyvek - Computer Systems Research Group, UC Berkeley. 4.4BSD - User's Reference Manual. O'Reilly & Associates, - Inc., 1994. ISBN 1-56592-075-9 + Computer Systems Research Group, UC Berkeley. + 4.4BSD User's Reference Manual. + O'Reilly & Associates, Inc., 1994. + ISBN 1-56592-075-9 - Computer Systems Research Group, UC Berkeley. 4.4BSD - User's Supplementary Documents. O'Reilly & - Associates, Inc., 1994. ISBN 1-56592-076-7 + Computer Systems Research Group, UC Berkeley. + 4.4BSD User's Supplementary Documents. + O'Reilly & Associates, Inc., 1994. + ISBN 1-56592-076-7 - UNIX in a Nutshell. O'Reilly & - Associates, Inc., 1990. ISBN 093717520X + UNIX in a Nutshell. + O'Reilly & Associates, Inc., 1990. + ISBN 093717520X - Mui, Linda. What You Need To Know When You Can't Find - Your UNIX System Administrator. O'Reilly & - Associates, Inc., 1995. ISBN 1-56592-104-6 + Mui, Linda. + What You Need To Know When You Can't Find Your UNIX System Administrator. + O'Reilly & Associates, Inc., 1995. + ISBN 1-56592-104-6 - Ohio State University - has written a UNIX - Introductory Course which is available online in HTML and - PostScript format. + Ohio Állami Egyetemnek + van egy Alapozó &unix; kurzusa, + amely az Interneten keresztül is elérhetõ HTML és PostScript + formátumokban. - An Italian translation - of this document is available as part of the FreeBSD Italian - Documentation Project. + Ennek a dokumentumnak egy olasz + fordítása + is elérhetõ az Olasz &os; Dokumentációs Projekt keretében. - Jpman Project, Japan - FreeBSD Users Group. FreeBSD User's - Reference Manual (Japanese translation). Mainichi Communications - Inc., 1998. ISBN4-8399-0088-4 P3800E. + Jpman Project, Japanese &os; User's Group. + FreeBSD User's Reference Manual (japán fordítás). + Mainichi Communications Inc., 1998. + ISBN4-8399-0088-4 P3800E. - Edinburgh - University has written an Online Guide for - newcomers to the UNIX environment. + Az Edinburghi Egyetemenkészítettek az + újoncok számára egy Internetes kézikönyvet + a &unix; környezetekhez. - Administrators' Guides + Rendszeradminisztrátori kézikönyvek - Albitz, Paul and Liu, Cricket. DNS and - BIND, 4th Ed. O'Reilly & Associates, Inc., 2001. - ISBN 1-59600-158-4 + Albitz, Paul and Liu, Cricket. + DNS and BIND (4. kiadás). + O'Reilly & Associates, Inc., 2001. + ISBN 1-59600-158-4 - Computer Systems Research Group, UC Berkeley. 4.4BSD - System Manager's Manual. O'Reilly & Associates, - Inc., 1994. ISBN 1-56592-080-5 + Computer Systems Research Group, UC Berkeley. + 4.4BSD System Manager's Manual. + O'Reilly & Associates, Inc., 1994. + ISBN 1-56592-080-5 - Costales, Brian, et al. Sendmail, 2nd Ed. - O'Reilly & Associates, Inc., 1997. ISBN 1-56592-222-0 + Costales, Brian és mások. + Sendmail (2. kiadás). + O'Reilly & Associates, Inc., 1997. + ISBN 1-56592-222-0 - Frisch, Æleen. Essential System - Administration, 2nd Ed. O'Reilly & Associates, - Inc., 1995. ISBN 1-56592-127-5 + Frisch, Æleen. + Essential System Administration (2. kiadás). + O'Reilly & Associates, Inc., 1995. + ISBN 1-56592-127-5 - Hunt, Craig. TCP/IP Network - Administration, 2nd Ed. O'Reilly & Associates, Inc., - 1997. ISBN 1-56592-322-7 + Hunt, Craig. + TCP/IP Network Administration (2. kiadás). + O'Reilly & Associates, Inc., 1997. + ISBN 1-56592-322-7 - Nemeth, Evi. UNIX System Administration - Handbook. 3rd Ed. Prentice Hall, 2000. ISBN - 0-13-020601-6 + Nemeth, Evi. + UNIX System Administration Handbook (3. kiadás). + Prentice Hall, 2000. + ISBN 0-13-020601-6 - Stern, Hal Managing NFS and NIS O'Reilly - & Associates, Inc., 1991. ISBN 0-937175-75-7 + Stern, Hal. + Managing NFS and NIS. + O'Reilly & Associates, Inc., 1991. + ISBN 0-937175-75-7 - Jpman Project, Japan - FreeBSD Users Group. FreeBSD System - Administrator's Manual (Japanese translation). Mainichi Communications - Inc., 1998. ISBN4-8399-0109-0 P3300E. + Jpman Project, Japan FreeBSD Users Group. + FreeBSD System Administrator's Manual (japán fordítás). + Mainichi Communications Inc., 1998. + ISBN4-8399-0109-0 P3300E. - Dreyfus, Emmanuel. Cahiers - de l'Admin: BSD 2nd Ed. (in French), Eyrolles, 2004. - ISBN 2-212-11463-X + Dreyfus, Emmanuel. + Cahiers de l'Admin: BSD (2. kiadás, franciául). + Eyrolles, 2004. + ISBN 2-212-11463-X - Programmers' Guides + Programozói kézikönyvek - Asente, Paul, Converse, Diana, and Swick, Ralph. - X Window System Toolkit. Digital Press, - 1998. ISBN 1-55558-178-1 + Asente, Paul, Converse, Diana, and Swick, Ralph. + X Window System Toolkit. + Digital Press, 1998. + ISBN 1-55558-178-1 - Computer Systems Research Group, UC Berkeley. 4.4BSD - Programmer's Reference Manual. O'Reilly & - Associates, Inc., 1994. ISBN 1-56592-078-3 + Computer Systems Research Group, UC Berkeley. + 4.4BSD Programmer's Reference Manual. + O'Reilly & Associates, Inc., 1994. + ISBN 1-56592-078-3 - Computer Systems Research Group, UC Berkeley. 4.4BSD - Programmer's Supplementary Documents. O'Reilly & - Associates, Inc., 1994. ISBN 1-56592-079-1 + Computer Systems Research Group, UC Berkeley. + 4.4BSD Programmer's Supplementary Documents. + O'Reilly & Associates, Inc., 1994. + ISBN 1-56592-079-1 - Harbison, Samuel P. and Steele, Guy L. Jr. C: A - Reference Manual. 4th ed. Prentice Hall, 1995. - ISBN 0-13-326224-3 + Harbison, Samuel P. and Steele, Guy L. Jr. + C: A Reference Manual (4. kiadás). + Prentice Hall, 1995. + ISBN 0-13-326224-3 - Kernighan, Brian and Dennis M. Ritchie. The C - Programming Language. 2nd Ed. PTR Prentice Hall, 1988. - ISBN 0-13-110362-8 + Kernighan, Brian and Dennis M. Ritchie. + The C Programming Language (2. kiadás). + PTR Prentice Hall, 1988. + ISBN 0-13-110362-8 - Lehey, Greg. Porting UNIX Software. - O'Reilly & Associates, Inc., 1995. ISBN 1-56592-126-7 + Lehey, Greg. + Porting UNIX Software. + O'Reilly & Associates, Inc., 1995. + ISBN 1-56592-126-7 - Plauger, P. J. The Standard C Library. - Prentice Hall, 1992. ISBN 0-13-131509-9 + Plauger, P. J. + The Standard C Library. + Prentice Hall, 1992. + ISBN 0-13-131509-9 - Spinellis, Diomidis. Code - Reading: The Open Source Perspective. - Addison-Wesley, 2003. ISBN 0-201-79940-5 + Spinellis, Diomidis. + Code Reading: The Open Source Perspective. + Addison-Wesley, 2003. + ISBN 0-201-79940-5 - Spinellis, Diomidis. Code - Quality: The Open Source Perspective. - Addison-Wesley, 2006. ISBN 0-321-16607-8 + Spinellis, Diomidis. + Code Quality: The Open Source Perspective. + Addison-Wesley, 2006. + ISBN 0-321-16607-8 - Stevens, W. Richard and Stephen A. Rago. - Advanced Programming in the UNIX - Environment. 2nd Ed. - Reading, Mass. : Addison-Wesley, 2005. - ISBN 0-201-43307-9 + Stevens, W. Richard and Stephen A. Rago. + Advanced Programming in the &unix; Environment (2. kiadás). + Reading, Mass. : Addison-Wesley, 2005. + ISBN 0-201-43307-9 - Stevens, W. Richard. UNIX Network - Programming. 2nd Ed, PTR Prentice Hall, 1998. ISBN - 0-13-490012-X + Stevens, W. Richard. + &unix; Network Programming (2. kiadás), + PTR Prentice Hall, 1998. + ISBN 0-13-490012-X - Wells, Bill. Writing Serial Drivers for UNIX. - Dr. Dobb's Journal. 19(15), December 1994. - pp68-71, 97-99. + Wells, Bill. + Writing Serial Drivers for UNIX. + Dr. Dobb's Journal. + 19(15), 1994. december, 68-71. és 97-99. oldal. - Operating System Internals + Az operációs rendszerek belsõ mûködésérõl - Andleigh, Prabhat K. UNIX System - Architecture. Prentice-Hall, Inc., 1990. ISBN - 0-13-949843-5 + Andleigh, Prabhat K. + &unix; System Architecture. + Prentice-Hall, Inc., 1990. + ISBN 0-13-949843-5 - Jolitz, William. Porting UNIX to the 386. - Dr. Dobb's Journal. January 1991-July - 1992. + Jolitz, William. + Porting &unix; to the 386. + Dr. Dobb's Journal. + 1991. január - 1992. július. - Leffler, Samuel J., Marshall Kirk McKusick, Michael J Karels and - John Quarterman The Design and Implementation of the - 4.3BSD UNIX Operating System. Reading, Mass. : - Addison-Wesley, 1989. ISBN 0-201-06196-1 + Leffler, Samuel J., Marshall Kirk McKusick, Michael J Karels és John Quarterman. + The Design and Implementation of the 4.3BSD UNIX Operating System. + Reading, Mass. : Addison-Wesley, 1989. + ISBN 0-201-06196-1 - Leffler, Samuel J., Marshall Kirk McKusick, The Design - and Implementation of the 4.3BSD UNIX Operating System: Answer - Book. Reading, Mass. : Addison-Wesley, 1991. ISBN - 0-201-54629-9 + Leffler, Samuel J., Marshall Kirk McKusick. + The Design and Implementation of the 4.3BSD UNIX Operating System: Answer Book. + Reading, Mass. : Addison-Wesley, 1991. + ISBN 0-201-54629-9 - McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and - John Quarterman. The Design and Implementation of the - 4.4BSD Operating System. Reading, Mass. : - Addison-Wesley, 1996. ISBN 0-201-54979-4 + McKusick, Marshall Kirk, Keith Bostic, Michael J Karels és John Quarterman. + The Design and Implementation of the 4.4BSD Operating System. + Reading, Mass. : Addison-Wesley, 1996. + ISBN 0-201-54979-4 - (Chapter 2 of this book is available online as part of - the FreeBSD Documentation Project, and chapter 9 - here.) + (A könyv 2. fejezete elérhetõ + online + a &os; Dokumentációs Projekt részeként, valamint + + itt a 9. fejezet.) - Marshall Kirk McKusick, George V. Neville-Neil The - Design and Implementation of the FreeBSD Operating - System. Boston, Mass. : Addison-Wesley, 2004. - ISBN 0-201-70245-2 + Marshall Kirk McKusick, George V. Neville-Neil. + The Design and Implementation of the FreeBSD Operating System. + Boston, Mass. : Addison-Wesley, 2004. + ISBN 0-201-70245-2 - Stevens, W. Richard. TCP/IP Illustrated, Volume 1: - The Protocols. Reading, Mass. : Addison-Wesley, - 1996. ISBN 0-201-63346-9 + Stevens, W. Richard. + TCP/IP Illustrated, Vol 1: The Protocols. + Reading, Mass. : Addison-Wesley, 1996. + ISBN 0-201-63346-9 - Schimmel, Curt. Unix Systems for Modern - Architectures. Reading, Mass. : Addison-Wesley, 1994. - ISBN 0-201-63338-8 + Schimmel, Curt. + &unix; Systems for Modern Architectures. + Reading, Mass. : Addison-Wesley, 1994. + ISBN 0-201-63338-8 - Stevens, W. Richard. TCP/IP Illustrated, Volume 3: - TCP for Transactions, HTTP, NNTP and the UNIX Domain - Protocols. Reading, Mass. : Addison-Wesley, 1996. - ISBN 0-201-63495-3 + Stevens, W. Richard. + TCP/IP Illustrated, Vol 3: TCP for Transactions, HTTP, NNTP and the &unix; Domain Protocols. + Reading, Mass. : Addison-Wesley, 1996. + ISBN 0-201-63495-3 - Vahalia, Uresh. UNIX Internals -- The New - Frontiers. Prentice Hall, 1996. ISBN - 0-13-101908-2 + Vahalia, Uresh. + &unix; Internals — The New Frontiers. + Prentice Hall, 1996. + ISBN 0-13-101908-2 - Wright, Gary R. and W. Richard Stevens. TCP/IP - Illustrated, Volume 2: The Implementation. Reading, - Mass. : Addison-Wesley, 1995. ISBN 0-201-63354-X + Wright, Gary R. és W. Richard Stevens. + TCP/IP Illustrated, Vol 2: The Implementation. + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-63354-X - Security Reference + Biztonságról szóló írások - Cheswick, William R. and Steven M. Bellovin. Firewalls - and Internet Security: Repelling the Wily Hacker. - Reading, Mass. : Addison-Wesley, 1995. ISBN - 0-201-63357-4 + Cheswick, William R. és Steven M. Bellovin. + Firewalls and Internet Security: Repelling the Wily Hacker. + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-63357-4 - Garfinkel, Simson and Gene Spafford. - Practical UNIX & Internet Security. - 2nd Ed. O'Reilly & Associates, Inc., 1996. ISBN - 1-56592-148-8 + Garfinkel, Simson és Gene Spafford. + Practical &unix; & Internet Security (2. kiadás). + O'Reilly & Associates, Inc., 1996. + ISBN 1-56592-148-8 - Garfinkel, Simson. PGP Pretty Good - Privacy O'Reilly & Associates, Inc., 1995. ISBN - 1-56592-098-8 + Garfinkel, Simson. + PGP Pretty Good Privacy. + O'Reilly & Associates, Inc., 1995. + ISBN 1-56592-098-8 - Hardware Reference + Hardverrel foglalkozó írások - Anderson, Don and Tom Shanley. Pentium Processor - System Architecture. 2nd Ed. Reading, Mass. : - Addison-Wesley, 1995. ISBN 0-201-40992-5 + Anderson, Don és Tom Shanley. + Pentium Processor System Architecture (2. kiadás). + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-40992-5 - Ferraro, Richard F. Programmer's Guide to the EGA, - VGA, and Super VGA Cards. 3rd ed. Reading, Mass. : - Addison-Wesley, 1995. ISBN 0-201-62490-7 + Ferraro, Richard F. + Programmer's Guide to the EGA, VGA, and Super VGA Cards (3. kiadás). + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-62490-7 - Intel Corporation publishes documentation on their CPUs, - chipsets and standards on their developer web site, - usually as PDF files. + Az &intel; által gyártott processzorokról és chipsetekrõl, + valamint az általuk kialakított szabványokról a + saját fejlesztõi oldalukon, + általában PDF állományok formájában kaphatunk információkat. - Shanley, Tom. 80486 System Architecture. - 3rd ed. Reading, Mass. : Addison-Wesley, 1995. ISBN - 0-201-40994-1 + Shanley, Tom. + 80486 System Architecture (3. kiadás). + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-40994-1 - Shanley, Tom. ISA System Architecture. - 3rd ed. Reading, Mass. : Addison-Wesley, 1995. ISBN - 0-201-40996-8 + Shanley, Tom. + ISA System Architecture (3. kiadás). + Reading, Mass. : Addison-Wesley, 1995. + ISBN 0-201-40996-8 - Shanley, Tom. PCI System Architecture. - 4th ed. Reading, Mass. : Addison-Wesley, 1999. ISBN - 0-201-30974-2 + Shanley, Tom. + PCI System Architecture (4. kiadás). + Reading, Mass. : Addison-Wesley, 1999. + ISBN 0-201-30974-2 - Van Gilluwe, Frank. The Undocumented PC, - 2nd Ed. Reading, Mass: Addison-Wesley Pub. Co., 1996. ISBN - 0-201-47950-8 + Van Gilluwe, Frank. + The Undocumented PC (2. kiadás). + Reading, Mass: Addison-Wesley Pub. Co., 1996. + ISBN 0-201-47950-8 - Messmer, Hans-Peter. The Indispensable PC Hardware - Book, 4th Ed. - Reading, Mass: Addison-Wesley Pub. Co., 2002. ISBN - 0-201-59616-4 + Messmer, Hans-Peter. + The Indispensable PC Hardware Book (4. kiadás). + Reading, Mass: Addison-Wesley Pub. Co., 2002. + ISBN 0-201-59616-4 - &unix; History + &unix; történelem - Lion, John Lion's Commentary on UNIX, 6th Ed. With - Source Code. ITP Media Group, 1996. ISBN - 1573980137 + Lion, John. + Lion's Commentary on &unix; (6. kiadás, forráskóddal). + ITP Media Group, 1996. + ISBN 1573980137 - Raymond, Eric S. The New Hacker's Dictionary, 3rd - edition. MIT Press, 1996. ISBN - 0-262-68092-0. Also known as the Jargon - File + Raymond, Eric S. + The New Hacker's Dictionary (3. kiadás). + MIT Press, 1996. + ISBN 0-262-68092-0. + Vagy Zsargon fájlként + is ismert. - Salus, Peter H. A quarter century of UNIX. - Addison-Wesley Publishing Company, Inc., 1994. ISBN - 0-201-54777-5 + Salus, Peter H. + A quarter century of &unix;. + Addison-Wesley Publishing Company, Inc., 1994. + ISBN 0-201-54777-5 - Simon Garfinkel, Daniel Weise, Steven Strassmann. The - UNIX-HATERS Handbook. IDG Books Worldwide, Inc., - 1994. ISBN 1-56884-203-1. Out of print, but available - online. + Simon Garfinkel, Daniel Weise, Steven Strassmann. + The &unix;-HATERS Handbook. + IDG Books Worldwide, Inc., 1994. + ISBN 1-56884-203-1. + Kifogyott, de elérhetõ + ezen + a linken. - Don Libes, Sandy Ressler Life with UNIX - — special edition. Prentice-Hall, Inc., 1989. ISBN - 0-13-536657-7 + Don Libes, Sandy Ressler. + Life with &unix; — különkiadás. + Prentice-Hall, Inc., 1989. + ISBN 0-13-536657-7 - The BSD family tree. - - or /usr/share/misc/bsd-family-tree - on a FreeBSD machine. + The BSD family tree. + + vagy egy telepített &os; rendszeren a + /usr/share/misc/bsd-family-tree + állomány. - The BSD Release Announcements collection. - 1997. + The BSD Release Announcements collection. 1997. + - Networked Computer Science Technical Reports - Library. + Networked Computer Science Technical Reports Library. + - Old BSD releases from the Computer Systems Research - group (CSRG). - : - The 4CD set covers all BSD versions from 1BSD to 4.4BSD and - 4.4BSD-Lite2 (but not 2.11BSD, unfortunately). The last - disk also holds the final sources plus the SCCS files. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 15 16:56:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1299816A420; Sat, 15 Sep 2007 16:56:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0B5016A41B for ; Sat, 15 Sep 2007 16:56:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0F8B13C45D for ; Sat, 15 Sep 2007 16:56:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FGuWh9084430 for ; Sat, 15 Sep 2007 16:56:32 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FGuWJd084427 for perforce@freebsd.org; Sat, 15 Sep 2007 16:56:32 GMT (envelope-from gabor@freebsd.org) Date: Sat, 15 Sep 2007 16:56:32 GMT Message-Id: <200709151656.l8FGuWJd084427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 126426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 16:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=126426 Change 126426 by gabor@gabor_server on 2007/09/15 16:55:34 IFC Affected files ... .. //depot/projects/docproj_hu/books/handbook/advanced-networking/chapter.sgml#2 integrate Differences ... ==== //depot/projects/docproj_hu/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2859,6 +2859,194 @@ + + + + + Andrew + Thompson + Written by + + + + Link Aggregation and Failover + + lagg + failover + fec + lacp + loadbalance + roundrobin + + + Introduction + The &man.lagg.4; interface allows aggregation of multiple network + interfaces as one virtual interface for the purpose of providing + fault-tolerance and high-speed links. + + + + Operating Modes + + + + failover + + + Sends and receives traffic only through the master port. If the + master port becomes unavailable, the next active port is used. The + first interface added is the master port; any interfaces added after + that are used as failover devices. + + + + fec + + + Supports Cisco EtherChannel. This is a static setup and does not + negotiate aggregation with the peer or exchange frames to monitor the + link, if the switch supports LACP then that should be used + instead. + + Balances outgoing traffic across the active ports based on hashed + protocol header information and accepts incoming traffic from any + active port. The hash includes the Ethernet source and destination + address, and, if available, the VLAN tag, and the IPv4/IPv6 source + and destination address. + + + + lacp + + + Supports the IEEE 802.3ad Link Aggregation Control Protocol + (LACP) and the Marker Protocol. LACP will negotiate a set of + aggregable links with the peer in to one or more Link Aggregated + Groups. Each LAG is composed of ports of the same speed, set to + full-duplex operation. The traffic will be balanced across the ports + in the LAG with the greatest total speed, in most cases there will + only be one LAG which contains all ports. In the event of changes in + physical connectivity, Link Aggregation will quickly converge to a + new configuration. + + Balances outgoing traffic across the active ports based on hashed + protocol header information and accepts incoming traffic from any + active port. The hash includes the Ethernet source and destination + address, and, if available, the VLAN tag, and the IPv4/IPv6 source + and destination address. + + + + loadbalance + + + This is an alias of fec mode. + + + + roundrobin + + + Distributes outgoing traffic using a round-robin scheduler + through all active ports and accepts incoming traffic from any active + port. This mode will violate Ethernet frame ordering and should be + used with caution. + + + + + + + Examples + + + LACP aggregation with a Cisco switch + + This example connects two interfaces on a &os; machine to the + switch as a single load balanced and fault tolerant link. More interfaces + can be added to increase throughput and fault tolerance. Since frame + ordering is mandatory on Ethernet links then any traffic between two + stations always flows over the same physical link limiting the maximum + speed to that of one interface. The transmit algorithm attempts to use as + much information as it can to distinguish different traffic flows and + balance across the available interfaces. + + On the Cisco switch add the interfaces to the channel group. + + interface FastEthernet0/1 + channel-group 1 mode active + channel-protocol lacp +! +interface FastEthernet0/2 + channel-group 1 mode active + channel-protocol lacp +! + + On the &os; machine create the lagg interface. + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + + View the interface status from ifconfig; ports marked as + ACTIVE are part of the active aggregation group + that has been negotiated with the remote switch and traffic will be + transmitted and received. Use the verbose output of &man.ifconfig.8; + to view the LAG identifiers. + + lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:05:5d:71:8d:b8 + media: Ethernet autoselect + status: active + laggproto lacp + laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> + laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> + + The switch will show which ports are active. For more detail use + show lacp neighbor detail. + + switch# show lacp neighbor +Flags: S - Device is requesting Slow LACPDUs + F - Device is requesting Fast LACPDUs + A - Device is in Active mode P - Device is in Passive mode + +Channel group 1 neighbors + +Partner's information: + + LACP port Oper Port Port +Port Flags Priority Dev ID Age Key Number State +Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D +Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D + + + + Failover mode + + Failover mode can be used to switch over to another interface if + the link is lost on the master. + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 + + lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:05:5d:71:8d:b8 + media: Ethernet autoselect + status: active + laggproto failover + laggport: fxp1 flags=0<> + laggport: fxp0 flags=5<MASTER,ACTIVE> + + Traffic will be transmitted and received on + fxp0. If the link is lost on + fxp0 then fxp1 will + become the active link. If the link is restored on the master + interface then it will once again become the active link. + + + + From owner-p4-projects@FreeBSD.ORG Sat Sep 15 19:40:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C341D16A4E1; Sat, 15 Sep 2007 19:40:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B89F16A4D6 for ; Sat, 15 Sep 2007 19:40:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E34513C442 for ; Sat, 15 Sep 2007 19:40:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FJemIB097557 for ; Sat, 15 Sep 2007 19:40:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FJelcx097554 for perforce@freebsd.org; Sat, 15 Sep 2007 19:40:47 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 19:40:47 GMT Message-Id: <200709151940.l8FJelcx097554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 19:40:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=126436 Change 126436 by kmacy@kmacy_home:ethng on 2007/09/15 19:40:01 Allow architectures to define their own contigmalloc2 variant - this makes it possible for them to simply use the direct map rather than mapping each page on allocate and unmapping on free Affected files ... .. //depot/projects/ethng/src/sys/vm/vm_contig.c#2 edit .. //depot/projects/ethng/src/sys/vm/vm_extern.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/vm/vm_contig.c#2 (text+ko) ==== @@ -183,7 +183,8 @@ vm_page_unlock_queues(); } -static void * +#ifndef VM_MD_CONTIG +void * contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags) { vm_object_t object = kernel_object; @@ -220,6 +221,17 @@ return ((void *)addr); } +void +contigfree(void *addr, unsigned long size, struct malloc_type *type) +{ + vm_pindex_t npgs; + + npgs = round_page(size) >> PAGE_SHIFT; + kmem_free(kernel_map, (vm_offset_t)addr, size); + malloc_type_freed(type, npgs << PAGE_SHIFT); +} +#endif + void * contigmalloc( unsigned long size, /* should be size_t here and for malloc() */ @@ -280,12 +292,3 @@ return (ret); } -void -contigfree(void *addr, unsigned long size, struct malloc_type *type) -{ - vm_pindex_t npgs; - - npgs = round_page(size) >> PAGE_SHIFT; - kmem_free(kernel_map, (vm_offset_t)addr, size); - malloc_type_freed(type, npgs << PAGE_SHIFT); -} ==== //depot/projects/ethng/src/sys/vm/vm_extern.h#2 (text+ko) ==== @@ -96,5 +96,7 @@ void vm_thread_new_altkstack(struct thread *td, int pages); void vm_thread_swapin(struct thread *td); void vm_thread_swapout(struct thread *td); + +void *contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags); #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Sep 15 19:41:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73AAD16A421; Sat, 15 Sep 2007 19:41:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 512A016A417 for ; Sat, 15 Sep 2007 19:41:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3428B13C442 for ; Sat, 15 Sep 2007 19:41:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FJfnCL097759 for ; Sat, 15 Sep 2007 19:41:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FJfn3Q097756 for perforce@freebsd.org; Sat, 15 Sep 2007 19:41:49 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 19:41:49 GMT Message-Id: <200709151941.l8FJfn3Q097756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 19:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=126437 Change 126437 by kmacy@kmacy_home:ethng on 2007/09/15 19:41:10 switch x86_64 over to allocating kva for contigmalloc out of the direct map Affected files ... .. //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#2 edit .. //depot/projects/ethng/src/sys/amd64/include/vmparam.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -566,3 +566,23 @@ return 1; } + +void * +contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags) +{ + return (void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); +} + +void +contigfree(void *addr, unsigned long size, struct malloc_type *type) +{ + vm_pindex_t npgs; + vm_page_t m; + int i; + + npgs = round_page(size) >> PAGE_SHIFT; + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)addr)); + for (i = 0; i < npgs; i++, m++) + vm_page_free(m); + malloc_type_freed(type, npgs << PAGE_SHIFT); +} ==== //depot/projects/ethng/src/sys/amd64/include/vmparam.h#2 (text+ko) ==== @@ -185,4 +185,10 @@ #define VM_INITIAL_PAGEIN 16 #endif +/* + * We provide a machine specific contiguous mapping function + * which uses the direct map + */ +#define VM_MD_CONTIG + #endif /* _MACHINE_VMPARAM_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Sep 15 19:51:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DEAD16A420; Sat, 15 Sep 2007 19:51:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC10B16A419 for ; Sat, 15 Sep 2007 19:51:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADF8D13C468 for ; Sat, 15 Sep 2007 19:51:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FJp4NS098165 for ; Sat, 15 Sep 2007 19:51:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FJp4GN098162 for perforce@freebsd.org; Sat, 15 Sep 2007 19:51:04 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 19:51:04 GMT Message-Id: <200709151951.l8FJp4GN098162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 19:51:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126439 Change 126439 by kmacy@kmacy_home:ethng on 2007/09/15 19:50:28 make the jumbo phys contig sysctl read only skip call to uma_find_refcnt if the result is not going to be used Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#5 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_mbuf.c#5 (text+ko) ==== @@ -142,7 +142,7 @@ "Maximum number of mbuf 16k jumbo clusters allowed"); SYSCTL_STRUCT(_kern_ipc, OID_AUTO, mbstat, CTLFLAG_RD, &mbstat, mbstat, "Mbuf general information and statistics"); -SYSCTL_INT(_kern_ipc, OID_AUTO, jumbo_phys_contig, CTLFLAG_RW, &jumbo_phys_contig, 1, +SYSCTL_INT(_kern_ipc, OID_AUTO, jumbo_phys_contig, CTLFLAG_RD, &jumbo_phys_contig, 1, "jumbo frames are physically contiguous"); /* * Zones from which we allocate. @@ -435,10 +435,11 @@ break; } - m = (struct mbuf *)arg; - refcnt = uma_find_refcnt(zone, mem); - *refcnt = 1; - if (m != NULL) { + + if (arg != NULL) { + refcnt = uma_find_refcnt(zone, mem); + *refcnt = 1; + m = (struct mbuf *)arg; m->m_ext.ext_buf = (caddr_t)mem; m->m_data = m->m_ext.ext_buf; m->m_flags |= M_EXT; From owner-p4-projects@FreeBSD.ORG Sat Sep 15 20:03:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0905816A420; Sat, 15 Sep 2007 20:03:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D49BB16A41A for ; Sat, 15 Sep 2007 20:03:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B653A13C4A7 for ; Sat, 15 Sep 2007 20:03:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FK3KBG000223 for ; Sat, 15 Sep 2007 20:03:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FK3KqN000220 for perforce@freebsd.org; Sat, 15 Sep 2007 20:03:20 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 20:03:20 GMT Message-Id: <200709152003.l8FK3KqN000220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 20:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=126440 Change 126440 by kmacy@kmacy_home:ethng on 2007/09/15 20:02:28 allocate larger mbufs if appropriate and physical contiguity is enabled Affected files ... .. //depot/projects/ethng/src/sys/kern/uipc_mbuf.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/uipc_mbuf.c#2 (text+ko) ==== @@ -109,9 +109,18 @@ /* Loop and append maximum sized mbufs to the chain tail. */ while (len > 0) { + int clsize = MJUMPAGESIZE; + + if (jumbo_phys_contig) { + if (len >= MJUM9BYTES) + clsize = MJUM16BYTES; + else if (len >= MJUMPAGESIZE) + clsize = MJUM9BYTES; + } + if (len > MCLBYTES) mb = m_getjcl(how, type, (flags & M_PKTHDR), - MJUMPAGESIZE); + clsize); else if (len >= MINCLSIZE) mb = m_getcl(how, type, (flags & M_PKTHDR)); else if (flags & M_PKTHDR) From owner-p4-projects@FreeBSD.ORG Sat Sep 15 20:04:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 525EE16A420; Sat, 15 Sep 2007 20:04:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3EF616A419 for ; Sat, 15 Sep 2007 20:04:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D557213C442 for ; Sat, 15 Sep 2007 20:04:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FK4McB000281 for ; Sat, 15 Sep 2007 20:04:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FK4MKI000278 for perforce@freebsd.org; Sat, 15 Sep 2007 20:04:22 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 20:04:22 GMT Message-Id: <200709152004.l8FK4MKI000278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 20:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=126441 Change 126441 by kmacy@kmacy_home:ethng on 2007/09/15 20:04:04 put ether_input on a diet for the common case, move most error handling to the end of the function Affected files ... .. //depot/projects/ethng/src/sys/net/if_ethersubr.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -512,58 +512,36 @@ struct ether_header *eh; u_short etype; - if ((ifp->if_flags & IFF_UP) == 0) { - m_freem(m); - return; - } + if ((ifp->if_flags & IFF_UP) == 0) + goto out; + #ifdef DIAGNOSTIC if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { if_printf(ifp, "discard frame at !IFF_DRV_RUNNING\n"); - m_freem(m); - return; + goto out; } #endif /* * Do consistency checks to verify assumptions * made by code past this point. */ - if ((m->m_flags & M_PKTHDR) == 0) { - if_printf(ifp, "discard frame w/o packet header\n"); - ifp->if_ierrors++; - m_freem(m); - return; - } - if (m->m_len < ETHER_HDR_LEN) { - /* XXX maybe should pullup? */ - if_printf(ifp, "discard frame w/o leading ethernet " - "header (len %u pkt len %u)\n", - m->m_len, m->m_pkthdr.len); - ifp->if_ierrors++; - m_freem(m); - return; - } + if ((m->m_flags & M_PKTHDR) == 0) + goto err_out_print; + if (m->m_len < ETHER_HDR_LEN) + goto err_out_print; + eh = mtod(m, struct ether_header *); etype = ntohs(eh->ether_type); #ifdef DIAGNOSTIC if (m->m_pkthdr.len > ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS) && (ifp->if_capenable & IFCAP_LRO) == 0) { - if_printf(ifp, "discard oversize frame " - "(ether type %x flags %x len %u > max %lu)\n", - etype, m->m_flags, m->m_pkthdr.len, - ETHER_MAX_FRAME(ifp, etype, - m->m_flags & M_HASFCS)); - ifp->if_ierrors++; - m_freem(m); - return; + goto err_out_print } #endif - if (m->m_pkthdr.rcvif == NULL) { - if_printf(ifp, "discard frame w/o interface pointer\n"); - ifp->if_ierrors++; - m_freem(m); - return; - } + if (m->m_pkthdr.rcvif == NULL) + goto err_out_print; + #ifdef DIAGNOSTIC if (m->m_pkthdr.rcvif != ifp) { if_printf(ifp, "Warning, frame marked as received on %s\n", @@ -605,10 +583,8 @@ ifp->if_ibytes += m->m_pkthdr.len; /* Allow monitor mode to claim this frame, after stats are updated. */ - if (ifp->if_flags & IFF_MONITOR) { - m_freem(m); - return; - } + if (ifp->if_flags & IFF_MONITOR) + goto out; /* Handle input from a lagg(4) port */ if (ifp->if_type == IFT_IEEE8023ADLAG) { @@ -635,9 +611,7 @@ #ifdef DIAGNOSTIC if_printf(ifp, "cannot pullup VLAN header\n"); #endif - ifp->if_ierrors++; - m_freem(m); - return; + goto err_out; } evl = mtod(m, struct ether_vlan_header *); @@ -704,6 +678,33 @@ random_harvest(m, 16, 3, 0, RANDOM_NET); ether_demux(ifp, m); + return; +err_out_print: + eh = mtod(m, struct ether_header *); + etype = ntohs(eh->ether_type); + + if ((m->m_flags & M_PKTHDR) == 0) + if_printf(ifp, "discard frame w/o packet header\n"); + if (m->m_len < ETHER_HDR_LEN) + if_printf(ifp, "discard frame w/o leading ethernet " + "header (len %u pkt len %u)\n", + m->m_len, m->m_pkthdr.len); +#ifdef DIAGNOSTIC + if (m->m_pkthdr.len > + ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS) && + (ifp->if_capenable & IFCAP_LRO) == 0) + if_printf(ifp, "discard oversize frame " + "(ether type %x flags %x len %u > max %lu)\n", + etype, m->m_flags, m->m_pkthdr.len, + ETHER_MAX_FRAME(ifp, etype, + m->m_flags & M_HASFCS)); +#endif + if (m->m_pkthdr.rcvif == NULL) + if_printf(ifp, "discard frame w/o interface pointer\n"); +err_out: + ifp->if_ierrors++; +out: + m_freem(m); } /* From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:02:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838F716A41A; Sat, 15 Sep 2007 21:02:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 260C216A418 for ; Sat, 15 Sep 2007 21:02:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 042E413C458 for ; Sat, 15 Sep 2007 21:02:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL2hGv012665 for ; Sat, 15 Sep 2007 21:02:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL2hwF012662 for perforce@freebsd.org; Sat, 15 Sep 2007 21:02:43 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:02:43 GMT Message-Id: <200709152102.l8FL2hwF012662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:02:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=126446 Change 126446 by kmacy@kmacy_home:ethng on 2007/09/15 21:02:32 move refcnt into cluster and tune prefetching slightly Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#19 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#19 (text+ko) ==== @@ -141,11 +141,18 @@ }; struct rx_sw_desc { /* SW state per Rx descriptor */ - void *cl; - bus_dmamap_t map; - int flags; + union { + void *cl; + uint32_t *ref; + } u; + uint8_t *data; + bus_dmamap_t map; + int flags; }; +#define rxsd_cl u.cl +#define rxsd_ref u.ref + struct txq_state { unsigned int compl; unsigned int gen; @@ -356,8 +363,12 @@ memcpy(mtod(m, uint8_t *), resp->imm_data, len); break; case RSPQ_EOP: - memcpy(cl, resp->imm_data, len); - m_iovappend(m, cl, MSIZE, len, 0); + memcpy(cl, resp->imm_data, len); + /* + * XXX + */ + panic("bad append"); + m_iovappend(m, cl, MSIZE, len, 0, NULL); break; default: bogus_imm++; @@ -534,6 +545,7 @@ struct rx_desc *d = &q->desc[q->pidx]; struct refill_fl_cb_arg cb_arg; void *cl; + uint32_t *ref; int err; cb_arg.error = 0; @@ -541,10 +553,12 @@ /* * We only allocate a cluster, mbuf allocation happens after rx */ - if ((cl = m_cljget(NULL, M_DONTWAIT, q->buf_size)) == NULL) { + if ((cl = m_cljget(NULL, M_DONTWAIT, q->zone)) == NULL) { log(LOG_WARNING, "Failed to allocate cluster\n"); goto done; } + ref = cl; + if ((sd->flags & RX_SW_DESC_MAP_CREATED) == 0) { if ((err = bus_dmamap_create(q->entry_tag, 0, &sd->map))) { log(LOG_WARNING, "bus_dmamap_create failed %d\n", err); @@ -553,7 +567,8 @@ } sd->flags |= RX_SW_DESC_MAP_CREATED; } - err = bus_dmamap_load(q->entry_tag, sd->map, cl, q->buf_size, + + err = bus_dmamap_load(q->entry_tag, sd->map, (uint32_t *)cl + 1, q->buf_size, refill_fl_cb, &cb_arg, 0); if (err != 0 || cb_arg.error) { @@ -565,7 +580,8 @@ } sd->flags |= RX_SW_DESC_INUSE; - sd->cl = cl; + sd->rxsd_cl = cl; + sd->data = (uint8_t *)(sd->rxsd_ref + 1); d->addr_lo = htobe32(cb_arg.seg.ds_addr & 0xffffffff); d->addr_hi = htobe32(((uint64_t)cb_arg.seg.ds_addr >>32) & 0xffffffff); d->len_gen = htobe32(V_FLD_GEN1(q->gen)); @@ -607,9 +623,9 @@ if (d->flags & RX_SW_DESC_INUSE) { bus_dmamap_unload(q->entry_tag, d->map); bus_dmamap_destroy(q->entry_tag, d->map); - uma_zfree(q->zone, d->cl); + uma_zfree(q->zone, d->rxsd_cl); } - d->cl = NULL; + d->rxsd_cl = NULL; if (++cidx == q->size) cidx = 0; } @@ -1250,7 +1266,7 @@ uint32_t wr_hi, wr_lo, sgl_flits; struct tx_desc *txd; - DPRINTF("t3_encap port_id=%d qsidx=%d ", p->port_id, p->first_qset); + #if defined(IFNET_MULTIQUEUE) && defined(STRICT_AFFINITY) KASSERT(qs->qs_cpuid == curcpu, ("cpu qset mismatch cpuid=%d curcpu=%d", qs->qs_cpuid, curcpu)); @@ -1263,7 +1279,8 @@ txsd = &txq->sdesc[txq->pidx]; txd = &txq->desc[txq->pidx]; - DPRINTF("mlen=%d txpkt_intf=%d tx_chan=%d\n", mlen, p->txpkt_intf, p->tx_chan); + DPRINTF("t3_encap port_id=%d qsidx=%d ", p->port_id, p->first_qset); + DPRINTF("mlen=%d txpkt_intf=%d tx_chan=%d\n", m[0]->m_pkthdr.len, p->txpkt_intf, p->tx_chan); /* * XXX handle checksum, TSO, and VLAN here * @@ -1779,7 +1796,7 @@ { struct tx_sw_desc *txsd; unsigned int cidx; - int i, reclaimed, nbufs; + int i, iter, reclaimed, nbufs; #ifdef T3_TRACE T3_TRACE2(sc->tb[q->cntxt_id & 7], @@ -1787,10 +1804,16 @@ #endif cidx = q->cidx; txsd = &q->sdesc[cidx]; + prefetch(txsd); reclaimed = nbufs = 0; - - for (reclaimed = 0; reclaimed < reclaimable;) { - DPRINTF("cidx=%d d=%p\n", cidx, d); + for (iter = reclaimed = 0; reclaimed < reclaimable; iter++) { + if ((iter & 0x1) == 0) { + prefetch(txsd + 1); + prefetch(txsd + 2); + prefetch(txsd + 3); + prefetch(txsd + 4); + } + DPRINTF("cidx=%d d=%p\n", cidx, txsd); if (txsd->count > 0) { if (nbufs + txsd->count > m_vec_size) break; @@ -1798,13 +1821,17 @@ bus_dmamap_unload(q->entry_tag, txsd->map); txsd->flags &= ~TX_SW_DESC_MAPPED; } - if (m_get_priority(txsd->m[0]) == cidx) { - for (i = 0; i < txsd->count; i++, nbufs++) - m_vec[nbufs] = txsd->m[i]; - txsd->count = 0; - } else { + for (i = 0; i < txsd->count; i++, nbufs++) { + prefetch(txsd->m[i]); + m_vec[nbufs] = txsd->m[i]; + } + txsd->count = 0; + +#ifdef DIAGNOSTIC + if (m_get_priority(txsd->m[0]) != cidx) printf("pri=%d cidx=%d\n", (int)m_get_priority(txsd->m[0]), cidx); - } +#endif + } else q->txq_skipped++; @@ -2254,13 +2281,18 @@ q->txq[TXQ_ETH].stop_thres = nports * flits_to_desc(sgl_len(TX_MAX_SEGS + 1) + 3); - q->fl[0].buf_size = MCLBYTES; + q->fl[0].buf_size = MCLBYTES - sizeof(uint32_t); q->fl[0].zone = zone_clust; q->fl[0].type = EXT_CLUSTER; - q->fl[1].buf_size = MJUMPAGESIZE; - q->fl[1].zone = zone_jumbop; - q->fl[1].type = EXT_JUMBOP; - + if (jumbo_phys_contig) { + q->fl[1].buf_size = MJUM9BYTES - sizeof(uint32_t); + q->fl[1].zone = zone_jumbo9; + q->fl[1].type = EXT_JUMBO9; + } else { + q->fl[1].buf_size = MJUMPAGESIZE - sizeof(uint32_t); + q->fl[1].zone = zone_jumbop; + q->fl[1].type = EXT_JUMBOP; + } q->lro.enabled = lro_default; mtx_lock(&sc->sge.reg_lock); @@ -2372,7 +2404,9 @@ /* * adjust after conversion to mbuf chain */ - m_adj(m, sizeof(*cpl) + ethpad); + m->m_pkthdr.len -= (sizeof(*cpl) + ethpad); + m->m_len -= (sizeof(*cpl) + ethpad); + m->m_data += (sizeof(*cpl) + ethpad); (*ifp->if_input)(ifp, m); } @@ -2406,17 +2440,24 @@ uint32_t len = G_RSPD_LEN(len_cq); uint32_t flags = ntohl(r->flags); uint8_t sopeop = G_RSPD_SOP_EOP(flags); + uint32_t *ref; int ret = 0; - prefetch(sd->cl); + prefetch(sd->rxsd_cl); fl->credits--; bus_dmamap_sync(fl->entry_tag, sd->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(fl->entry_tag, sd->map); - m_cljset(m, sd->cl, fl->type); + ref = sd->rxsd_ref; + m_cljset(m, sd->rxsd_cl, fl->type, sd->rxsd_ref); + *ref = 1; m->m_len = len; - + /* + * bump past the refcnt address + */ + m->m_data = sd->data; + switch(sopeop) { case RSPQ_SOP_EOP: DBG(DBG_RX, ("get_packet: SOP-EOP m %p\n", m)); @@ -2474,9 +2515,11 @@ uint32_t flags = ntohl(r->flags); uint8_t sopeop = G_RSPD_SOP_EOP(flags); void *cl; + uint32_t *ref = NULL; int ret = 0; - - prefetch(sd->cl); + + prefetch((sd + 1)->rxsd_cl); + prefetch((sd + 2)->rxsd_cl); DPRINTF("rx cpu=%d\n", curcpu); fl->credits--; @@ -2484,17 +2527,22 @@ if (recycle_enable && len <= SGE_RX_COPY_THRES && sopeop == RSPQ_SOP_EOP) { cl = mtod(m, void *); - memcpy(cl, sd->cl, len); + memcpy(cl, sd->data, len); recycle_rx_buf(adap, fl, fl->cidx); } else { - cl = sd->cl; bus_dmamap_unload(fl->entry_tag, sd->map); + cl = sd->rxsd_cl; + ref = sd->rxsd_ref; } + switch(sopeop) { case RSPQ_SOP_EOP: DBG(DBG_RX, ("get_packet: SOP-EOP m %p\n", m)); - if (cl == sd->cl) - m_cljset(m, cl, fl->type); + if (cl == sd->rxsd_cl) { + m_cljset(m, cl, fl->type, ref); + *ref = 1; + m->m_data = sd->data; + } m->m_len = m->m_pkthdr.len = len; ret = 1; goto done; @@ -2513,8 +2561,8 @@ ret = 1; break; } - m_iovappend(m, cl, fl->buf_size, len, 0); - + m_iovappend(m, cl, fl->buf_size, len, sizeof(uint32_t), ref); + *ref = 1; done: if (++fl->cidx == fl->size) fl->cidx = 0; @@ -2710,7 +2758,7 @@ if (eop) { prefetch(mtod(rspq->rspq_mh.mh_head, uint8_t *)); - prefetch(mtod(rspq->rspq_mh.mh_head, uint8_t *) + L1_CACHE_BYTES); + prefetch(mtod(rspq->rspq_mh.mh_head, uint8_t *) + L1_CACHE_BYTES); if (eth) { t3_rx_eth_lro(adap, rspq, rspq->rspq_mh.mh_head, ethpad, From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:03:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C9116A46B; Sat, 15 Sep 2007 21:03:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22D3516A41B for ; Sat, 15 Sep 2007 21:03:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC33013C474 for ; Sat, 15 Sep 2007 21:03:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL3jpb013920 for ; Sat, 15 Sep 2007 21:03:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL3jRY013917 for perforce@freebsd.org; Sat, 15 Sep 2007 21:03:45 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:03:45 GMT Message-Id: <200709152103.l8FL3jRY013917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:03:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=126447 Change 126447 by kmacy@kmacy_home:ethng on 2007/09/15 21:03:30 128 bytes are fetched to cache on a memory access Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#7 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#7 (text+ko) ==== @@ -146,7 +146,7 @@ #define wmb() __asm volatile("sfence" ::: "memory") #define smp_mb() mb() -#define L1_CACHE_BYTES 64 +#define L1_CACHE_BYTES 128 static __inline void prefetch(void *x) { From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:04:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A117316A420; Sat, 15 Sep 2007 21:04:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6912F16A419 for ; Sat, 15 Sep 2007 21:04:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 463EA13C45E for ; Sat, 15 Sep 2007 21:04:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL4mK9013955 for ; Sat, 15 Sep 2007 21:04:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL4lV5013952 for perforce@freebsd.org; Sat, 15 Sep 2007 21:04:47 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:04:47 GMT Message-Id: <200709152104.l8FL4lV5013952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:04:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=126448 Change 126448 by kmacy@kmacy_home:ethng on 2007/09/15 21:04:17 inline critical_{enter, exit} Affected files ... .. //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#3 edit .. //depot/projects/ethng/src/sys/sys/proc.h#2 edit .. //depot/projects/ethng/src/sys/sys/systm.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ethng/src/sys/sys/proc.h#2 (text+ko) ==== @@ -913,6 +913,46 @@ struct thread *thread_find(struct proc *p, lwpid_t tid); void thr_exit1(void); +#include +#include +#include "opt_sched.h" + +/* + * Kernel thread preemption implementation. Critical sections mark + * regions of code in which preemptions are not allowed. + */ +static __inline void +critical_enter(void) +{ + struct thread *td; + + td = curthread; + td->td_critnest++; + CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td, + (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest); +} + +static __inline void +critical_exit(void) +{ + struct thread *td; + + td = curthread; + KASSERT(td->td_critnest != 0, + ("critical_exit: td_critnest == 0")); +#ifdef PREEMPTION + if (td->td_critnest == 1) { + td->td_critnest = 0; + if (td->td_owepreempt) + critical_exit_owepreempt(td); + } else +#endif + td->td_critnest--; + + CTR4(KTR_CRITICAL, "critical_exit by thread %p (%ld, %s) to %d", td, + (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest); +} + #endif /* _KERNEL */ #endif /* !_SYS_PROC_H_ */ ==== //depot/projects/ethng/src/sys/sys/systm.h#2 (text+ko) ==== @@ -151,8 +151,7 @@ void cpu_boot(int); void cpu_rootconf(void); -void critical_enter(void); -void critical_exit(void); +void critical_exit_owepreempt(struct thread *td); void init_param1(void); void init_param2(long physpages); void init_param3(long kmempages); @@ -184,6 +183,7 @@ #define HD_OMIT_HEX (1 << 17) #define HD_OMIT_CHARS (1 << 18) + #define ovbcopy(f, t, l) bcopy((f), (t), (l)) void bcopy(const void *from, void *to, size_t len) __nonnull(1) __nonnull(2); void bzero(void *buf, size_t len) __nonnull(1); From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:05:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F0E16A420; Sat, 15 Sep 2007 21:05:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E6C916A41A for ; Sat, 15 Sep 2007 21:05:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33F0D13C459 for ; Sat, 15 Sep 2007 21:05:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL5odh014041 for ; Sat, 15 Sep 2007 21:05:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL5nDH014038 for perforce@freebsd.org; Sat, 15 Sep 2007 21:05:49 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:05:49 GMT Message-Id: <200709152105.l8FL5nDH014038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=126449 Change 126449 by kmacy@kmacy_home:ethng on 2007/09/15 21:05:39 account for inline critical_{enter,exit} being in proc.h Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#4 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#4 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #ifdef CONFIG_DEFINED #include From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:06:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E47716A421; Sat, 15 Sep 2007 21:06:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B19E16A419 for ; Sat, 15 Sep 2007 21:06:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0990613C458 for ; Sat, 15 Sep 2007 21:06:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL6psD014084 for ; Sat, 15 Sep 2007 21:06:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL6pea014081 for perforce@freebsd.org; Sat, 15 Sep 2007 21:06:51 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:06:51 GMT Message-Id: <200709152106.l8FL6pea014081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:06:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=126450 Change 126450 by kmacy@kmacy_home:ethng on 2007/09/15 21:06:41 pass ref to iovappend to avoid lookup Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#3 (text+ko) ==== @@ -78,7 +78,7 @@ } static __inline void -m_iovappend(struct mbuf *m, uint8_t *cl, int size, int len, int offset) +m_iovappend(struct mbuf *m, uint8_t *cl, int size, int len, int offset, volatile uint32_t *ref) { struct mbuf_vec *mv = mtomv(m); struct mbuf_iovec *iov; @@ -96,6 +96,7 @@ iov->mi_base = cl; iov->mi_len = len; iov->mi_offset = offset; + iov->mi_refcnt = ref; m->m_pkthdr.len += len; m->m_len += len; mv->mv_count++; @@ -128,6 +129,8 @@ { struct mbuf *n = m->m_next; + prefetch(n); + m->m_pkthdr.rss_hash = 0; if (m->m_flags & M_IOVEC) ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#2 (text+ko) ==== @@ -79,6 +79,7 @@ { int i, offset, type, first, len; uint8_t *cl; + volatile uint32_t *ref; struct mbuf *m0, *head = NULL; struct mbuf_vec *mv; @@ -101,6 +102,7 @@ type = mbuf_vec_get_type(mv, i); cl = mv->mv_vec[i].mi_base; offset = mv->mv_vec[i].mi_offset; + ref = mv->mv_vec[i].mi_refcnt; len = mv->mv_vec[i].mi_len; if (__predict_false(type == EXT_MBUF)) { m0 = (struct mbuf *)cl; @@ -118,10 +120,10 @@ } m0->m_flags = 0; - m_cljset(m0, (uint8_t *)cl, type); + m_cljset(m0, (uint8_t *)cl, type, ref); m0->m_len = mv->mv_vec[i].mi_len; if (offset) - m_adj(m0, offset); + m->m_data += offset; skip_cluster: m0->m_next = head; m->m_len -= m0->m_len; @@ -129,11 +131,12 @@ } offset = mv->mv_vec[first].mi_offset; cl = mv->mv_vec[first].mi_base; + ref = mv->mv_vec[first].mi_refcnt; type = mbuf_vec_get_type(mv, first); m->m_flags &= ~(M_IOVEC); - m_cljset(m, cl, type); + m_cljset(m, cl, type, ref); if (offset) - m_adj(m, offset); + m->m_data += offset; m->m_next = head; head = m; M_SANITY(m, 0); From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:08:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 924B916A420; Sat, 15 Sep 2007 21:08:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58CBD16A41A for ; Sat, 15 Sep 2007 21:08:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36C2A13C458 for ; Sat, 15 Sep 2007 21:08:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FL8tlC014199 for ; Sat, 15 Sep 2007 21:08:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL8sMi014196 for perforce@freebsd.org; Sat, 15 Sep 2007 21:08:54 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:08:54 GMT Message-Id: <200709152108.l8FL8sMi014196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=126451 Change 126451 by kmacy@kmacy_home:ethng on 2007/09/15 21:08:33 add jumbo_phys_contig knob pass ref to cljset past zone to cljget Affected files ... .. //depot/projects/ethng/src/sys/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/mbuf.h#4 (text+ko) ==== @@ -351,7 +351,7 @@ static __inline struct mbuf *m_getclr(int how, short type); /* XXX */ static __inline struct mbuf *m_free(struct mbuf *m); static __inline void m_clget(struct mbuf *m, int how); -static __inline void *m_cljget(struct mbuf *m, int how, int size); +static __inline void *m_cljget(struct mbuf *m, int how, uma_zone_t zone); static __inline void m_chtype(struct mbuf *m, short new_type); void mb_free_ext(struct mbuf *); static __inline struct mbuf *m_last(struct mbuf *m); @@ -530,21 +530,19 @@ * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES. */ static __inline void * -m_cljget(struct mbuf *m, int how, int size) +m_cljget(struct mbuf *m, int how, uma_zone_t zone) { - uma_zone_t zone; if (m && m->m_flags & M_EXT) printf("%s: %p mbuf already has cluster\n", __func__, m); if (m != NULL) m->m_ext.ext_buf = NULL; - zone = m_getzone(size); return (uma_zalloc_arg(zone, m, how)); } static __inline void -m_cljset(struct mbuf *m, void *cl, int type) +m_cljset(struct mbuf *m, void *cl, int type, volatile uint32_t *ref) { uma_zone_t zone; int size; @@ -577,7 +575,7 @@ m->m_ext.ext_free = m->m_ext.ext_args = NULL; m->m_ext.ext_size = size; m->m_ext.ext_type = type; - m->m_ext.ref_cnt = uma_find_refcnt(zone, cl); + m->m_ext.ref_cnt = ref; m->m_flags |= M_EXT; } @@ -723,6 +721,7 @@ extern int max_protohdr; /* Largest protocol header */ extern struct mbstat mbstat; /* General mbuf stats/infos */ extern int nmbclusters; /* Maximum number of clusters */ +extern int jumbo_phys_contig; struct uio; From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:10:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B260B16A41B; Sat, 15 Sep 2007 21:10:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 861A616A418 for ; Sat, 15 Sep 2007 21:10:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64A8313C465 for ; Sat, 15 Sep 2007 21:10:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FLAwK0014374 for ; Sat, 15 Sep 2007 21:10:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FLAwLI014370 for perforce@freebsd.org; Sat, 15 Sep 2007 21:10:58 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:10:58 GMT Message-Id: <200709152110.l8FLAwLI014370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:10:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=126452 Change 126452 by kmacy@kmacy_home:ethng on 2007/09/15 21:10:48 replace non inline critical_{enter,exit} with critical_exit_owepreempt Affected files ... .. //depot/projects/ethng/src/sys/kern/kern_switch.c#3 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/kern_switch.c#3 (text+ko) ==== @@ -161,46 +161,15 @@ return (td); } -/* - * Kernel thread preemption implementation. Critical sections mark - * regions of code in which preemptions are not allowed. - */ void -critical_enter(void) +critical_exit_owepreempt(struct thread *td) { - struct thread *td; - - td = curthread; - td->td_critnest++; - CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td, - (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest); -} - -void -critical_exit(void) -{ - struct thread *td; - - td = curthread; - KASSERT(td->td_critnest != 0, - ("critical_exit: td_critnest == 0")); -#ifdef PREEMPTION - if (td->td_critnest == 1) { - td->td_critnest = 0; - if (td->td_owepreempt) { - td->td_critnest = 1; - thread_lock(td); - td->td_critnest--; - SCHED_STAT_INC(switch_owepreempt); - mi_switch(SW_INVOL|SW_PREEMPT, NULL); - thread_unlock(td); - } - } else -#endif - td->td_critnest--; - - CTR4(KTR_CRITICAL, "critical_exit by thread %p (%ld, %s) to %d", td, - (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest); + td->td_critnest = 1; + thread_lock(td); + td->td_critnest--; + SCHED_STAT_INC(switch_owepreempt); + mi_switch(SW_INVOL|SW_PREEMPT, NULL); + thread_unlock(td); } /* From owner-p4-projects@FreeBSD.ORG Sat Sep 15 23:26:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01AAC16A419; Sat, 15 Sep 2007 23:26:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5BAD16A420 for ; Sat, 15 Sep 2007 23:26:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 926D913C467 for ; Sat, 15 Sep 2007 23:26:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FNQwGj024219 for ; Sat, 15 Sep 2007 23:26:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FNQwPq024216 for perforce@freebsd.org; Sat, 15 Sep 2007 23:26:58 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 23:26:58 GMT Message-Id: <200709152326.l8FNQwPq024216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 23:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=126455 Change 126455 by kmacy@kmacy_home:ethng on 2007/09/15 23:26:15 skip busdma rx setup on x86 increases rx throughput by about 15% on udp netperf recv Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#20 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#20 (text+ko) ==== @@ -83,7 +83,7 @@ #define SGE_RX_SM_BUF_SIZE 1536 #define SGE_RX_DROP_THRES 16 -#define SGE_RX_COPY_THRES 128 +#define SGE_RX_COPY_THRES MHLEN /* * Period of the Tx buffer reclaim timer. This timer does not need to run @@ -518,6 +518,7 @@ qs->rspq.polling = 0 /* p->polling */; } +#if !defined(__i386__) && !defined(__amd64__) static void refill_fl_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -528,7 +529,7 @@ cb_arg->nseg = nseg; } - +#endif /** * refill_fl - refill an SGE free-buffer list * @sc: the controller softc @@ -567,7 +568,7 @@ } sd->flags |= RX_SW_DESC_MAP_CREATED; } - +#if !defined(__i386__) && !defined(__amd64__) err = bus_dmamap_load(q->entry_tag, sd->map, (uint32_t *)cl + 1, q->buf_size, refill_fl_cb, &cb_arg, 0); @@ -578,7 +579,9 @@ */ return; } - +#else + cb_arg.seg.ds_addr = pmap_kextract((vm_offset_t)((uint32_t *)cl + 1)); +#endif sd->flags |= RX_SW_DESC_INUSE; sd->rxsd_cl = cl; sd->data = (uint8_t *)(sd->rxsd_ref + 1);