PERFORCE change 126215 for review
Kip Macy
kmacy at FreeBSD.org
Sun Sep 9 00:49:01 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126215
Change 126215 by kmacy at 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 <bsd.own.mk>
@@ -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 at 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 <sys/cdefs.h>
-__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 <sys/mman.h>
#include <sys/param.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/types.h>
#include <sys/elf32.h>
@@ -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 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.320 2007/09/02 09:15:08 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.323 2007/09/09 01:32:36 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -31,6 +31,17 @@
<year>2007</year>
<holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
+
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.amd;
+ &tm-attrib.ibm;
+ &tm-attrib.intel;
+ &tm-attrib.sparc;
+ &tm-attrib.sun;
+ &tm-attrib.general;
+ </legalnotice>
+
</articleinfo>
<sect1 id="intro">
@@ -38,10 +49,10 @@
<para>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.</para>
+ 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.</para>
</sect1>
@@ -56,7 +67,7 @@
<title>amd64</title>
<para>Since mid-2003 &os;/&arch.amd64; has supported the AMD64
- (<quote>Hammer</quote>) and Intel EM64T architecture,
+ (<quote>Hammer</quote>) 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 @@
<itemizedlist>
<listitem>
- <para>AMD Athlon64 (<quote>Clawhammer</quote>).</para>
+ <para>&amd.athlon;64 (<quote>Clawhammer</quote>).</para>
</listitem>
<listitem>
- <para>AMD Opteron (<quote>Sledgehammer</quote>).</para>
+ <para>&amd.opteron; (<quote>Sledgehammer</quote>).</para>
</listitem>
<listitem>
- <para>Intel 64-bit Xeon (<quote>Nacona</quote>).
+ <para>&intel; 64-bit &xeon; (<quote>Nacona</quote>).
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.</para>
+ with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets.</para>
</listitem>
<listitem>
- <para>Intel Pentium 4 Processor supporting Intel EM64T
+ <para>&intel; &pentium; 4 Processor supporting &intel; EM64T
(<quote>Prescott</quote>).
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.</para>
</listitem>
</itemizedlist>
- <para>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
+ <para>&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
<quote>64-bit extension technology</quote> or <quote>IA-32e</quote>.</para>
<para>The largest tested
@@ -128,17 +139,17 @@
list all combinations of equipment supported by &os;.
Nevertheless, some general guidelines are presented here.</para>
- <para>Almost all i386-compatible processors with a floating point unit
+ <para>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.</para>
<para>There is a wide variety of motherboards available for this
@@ -153,7 +164,7 @@
&a.smp; may yield some clues.</para>
<para>&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
<literal>options SMP</literal> feature enabled will
automatically detect the additional logical processors. The
default &os; scheduler treats the logical processors the same as
@@ -187,7 +198,7 @@
<para>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 @@
<para>Currently supported processors are the
<ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">
- Itanium</ulink> and the
+ &itanium;</ulink> and the
<ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">
- Itanium 2</ulink>.</para>
+ &itanium; 2</ulink>.</para>
<para>Supported chipsets include:</para>
<itemizedlist>
@@ -227,10 +238,10 @@
<para>HP zx1</para>
</listitem>
<listitem>
- <para>Intel 460GX</para>
+ <para>&intel; 460GX</para>
</listitem>
<listitem>
- <para>Intel E8870</para>
+ <para>&intel; E8870</para>
</listitem>
</itemizedlist>
@@ -250,9 +261,9 @@
<sect2 id="proc-pc98">
<title>pc98</title>
- <para>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
+ <para>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.</para>
<para>NEC FC-9801/9821 series, and NEC SV-98 series
@@ -289,11 +300,15 @@
<title>sparc64</title>
<para>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 <ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</ulink>.</para>
<para>SMP is supported on all systems with more than 1 processor.</para>
+ <para>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.</para>
+
<para>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 @@
<itemizedlist>
<listitem>
- <para>Blade 100</para>
+ <para>&sun.blade; 100</para>
</listitem>
<listitem>
- <para>Blade 150</para>
+ <para>&sun.blade; 150</para>
</listitem>
<listitem>
- <para>Enterprise 220R</para>
+ <para>&sun.enterprise; 220R</para>
</listitem>
<listitem>
- <para>Enterprise 250</para>
+ <para>&sun.enterprise; 250</para>
</listitem>
<listitem>
- <para>Enterprise 420R</para>
+ <para>&sun.enterprise; 420R</para>
</listitem>
<listitem>
- <para>Enterprise 450</para>
+ <para>&sun.enterprise; 450</para>
</listitem>
<listitem>
- <para>Fire V100</para>
+ <para>&sun.fire; V100</para>
</listitem>
<listitem>
- <para>Fire V120</para>
+ <para>&sun.fire; V120</para>
</listitem>
<listitem>
- <para>Netra t1 105</para>
+ <para>&netra; t1 105</para>
</listitem>
<listitem>
- <para>Netra T1 AC200/DC200</para>
+ <para>&netra; T1 AC200/DC200</para>
</listitem>
<listitem>
- <para>Netra t 1100</para>
+ <para>&netra; t 1100</para>
</listitem>
<listitem>
- <para>Netra t 1120</para>
+ <para>&netra; t 1120</para>
</listitem>
<listitem>
- <para>Netra t 1125</para>
+ <para>&netra; t 1125</para>
</listitem>
<listitem>
- <para>Netra t 1400/1405</para>
+ <para>&netra; t 1400/1405</para>
</listitem>
<listitem>
- <para>Netra 120</para>
+ <para>&netra; 120</para>
</listitem>
<listitem>
- <para>Netra X1</para>
+ <para>&netra; X1</para>
</listitem>
<listitem>
- <para>SPARCEngine Ultra AXi</para>
+ <para>&sparcengine; Ultra AXi</para>
</listitem>
<listitem>
- <para>SPARCEngine Ultra AXmp</para>
+ <para>&sparcengine; Ultra AXmp</para>
</listitem>
<listitem>
- <para>Ultra 1 (serial console)</para>
+ <para>&sun.ultra; 1</para>
</listitem>
<listitem>
- <para>Ultra 1E</para>
+ <para>&sun.ultra; 1E</para>
</listitem>
<listitem>
- <para>Ultra 2</para>
+ <para>&sun.ultra; 2</para>
</listitem>
<listitem>
- <para>Ultra 5</para>
+ <para>&sun.ultra; 5</para>
</listitem>
<listitem>
- <para>Ultra 10</para>
+ <para>&sun.ultra; 10</para>
</listitem>
<listitem>
- <para>Ultra 30</para>
+ <para>&sun.ultra; 30</para>
</listitem>
<listitem>
- <para>Ultra 60</para>
+ <para>&sun.ultra; 60</para>
</listitem>
<listitem>
- <para>Ultra 80</para>
+ <para>&sun.ultra; 80</para>
</listitem>
</itemizedlist>
<para>The following systems are partially supported by &os;. In particular
- the onboard scsi controller in sbus systems is not supported.</para>
+ the onboard SCSI controller in sbus systems is not supported.</para>
<itemizedlist>
<listitem>
- <para>Enterprise 3500</para>
+ <para>&sun.enterprise; 3500</para>
</listitem>
<listitem>
- <para>Enterprise 4500</para>
+ <para>&sun.enterprise; 4500</para>
</listitem>
</itemizedlist>
<para>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.</para>
<itemizedlist>
<listitem>
- <para>All systems containing UltraSPARC III processor(s).</para>
+ <para>All systems containing &ultrasparc; III processor(s).</para>
</listitem>
</itemizedlist>
</sect2>
@@ -754,6 +769,8 @@
<para>[&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz wireless adapters (&man.ray.4; driver)
</para>
+ &hwlist.rum;
+
<para>[&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 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1061 2007/08/24 15:18:42 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1062 2007/09/06 19:53:06 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -308,6 +308,9 @@
<para>The &man.apm.4; suspend/resume support has been improved.</para>
+ <para>The &man.cpufreq.4; CPU frequency control framework is now
+ enabled in the <filename>GENERIC</filename> kernel.</para>
+
<para>Security event auditing is now supported in the &os; kernel,
and is enabled by the <literal>AUDIT</literal> kernel
configuration option. The option is enabled in the
@@ -315,8 +318,9 @@
in the &man.audit.4; manual page.</para>
<para>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.</para>
+ &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.</para>
<para>The <literal>options COMPAT_43</literal> kernel
configuration option has been deemed unnecessary and has been
@@ -934,6 +938,10 @@
have been included in the <filename>GENERIC</filename>
kernel by default.</para>
+ <para>[&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.</para>
+
<para>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 @@
<para>The &man.ng.ether.4; Netgraph node no longer overwrites
the MAC address of outgoing frames by default. &merged;</para>
+ <para>The &man.ng.h4.4; Netgraph node is now MPSAFE.</para>
+
<para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;.
&merged;</para>
+ <para>The &man.ng.ppp.4; Netgraph node is now MPSAFE. &merged;</para>
+
<para>A new &man.ng.pred1.4; Netgraph node type has been added
to implement Predictor-1 PPP compression. &merged;</para>
@@ -1536,10 +1548,6 @@
<para>The &man.bsnmpd.1; utility now supports the Host Resources
MIB described in RFC 2790. &merged;</para>
- <para>&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.</para>
-
<para>The &man.cmp.1; utility now supports an <option>-h</option>
flag to compare the symbolic link itself rather than the
file that the link points to. &merged;</para>
@@ -1881,6 +1889,10 @@
<para>These lines need to have the word <literal>auth</literal>
replaced with the word <literal>account</literal>.</para>
+ <para>&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.</para>
+
<para>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 <bsd.prog.mk>
==== //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 <sys/cdefs.h>
-__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 <sys/ioctl.h>
#include <sys/stdint.h>
@@ -40,6 +40,7 @@
#include <fcntl.h>
#include <ctype.h>
#include <err.h>
+#include <libutil.h>
#include <cam/cam.h>
#include <cam/cam_debug.h>
@@ -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) <<<
More information about the p4-projects
mailing list