svn commit: r228986 - in head: share/man/man4 sys/net

[Lawrence Stewart]

Author: lstewart
Date: Fri Dec 30 08:57:58 2011
New Revision: 228986
URL: http://svn.freebsd.org/changeset/base/228986

Log:
  - Introduce the net.bpf.tscfg sysctl tree and associated code so as to make 
one
aspect of time stamp configuration per interface rather than per BPF
descriptor. Prior to this, the order in which BPF devices were opened and 
the
per descriptor time stamp configuration settings could cause 
non-deterministic
and unintended behaviour with respect to time stamping. With the new 
scheme, a
BPF attached interface's tscfg sysctl entry can be set to "default", "none",
"fast", "normal" or "external". Setting "default" means use the system 
default
option (set with the net.bpf.tscfg.default sysctl), "none" means do not
generate time stamps for tapped packets, "fast" means generate time stamps 
for
tapped packets using a hz granularity system clock read, "normal" means
generate time stamps for tapped packets using a full timecounter granularity
system clock read and "external" (currently unimplemented) means use the 
time
stamp provided with the packet from an underlying source.
  
  - Utilise the recently introduced sysclock_getsnapshot() and
sysclock_snap2bintime() KPIs to ensure the system clock is only read once 
per
packet, regardless of the number of BPF descriptors and time stamp formats
requested. Use the per BPF attached interface time stamp configuration to
control if sysclock_getsnapshot() is called and whether the system clock 
read
is fast or normal. The per BPF descriptor time stamp configuration is then
used to control how the system clock snapshot is converted to a bintime by
sysclock_snap2bintime().
  
  - Remove all FAST related BPF descriptor flag variants. Performing a "fast"
read of the system clock is now controlled per BPF attached interface using
the net.bpf.tscfg sysctl tree.
  
  - Update the bpf.4 man page.
  
  Committed on behalf of Julien Ridoux and Darryl Veitch from the University of
  Melbourne, Australia, as part of the FreeBSD Foundation funded "Feed-Forward
  Clock Synchronization Algorithms" project.
  
  For more information, see http://www.synclab.org/radclock/
  
  In collaboration with:Julien Ridoux (jridoux at unimelb edu au)

Modified:
  head/share/man/man4/bpf.4
  head/sys/net/bpf.c
  head/sys/net/bpf.h

Modified: head/share/man/man4/bpf.4
==
--- head/share/man/man4/bpf.4   Fri Dec 30 06:24:59 2011(r228985)
+++ head/share/man/man4/bpf.4   Fri Dec 30 08:57:58 2011(r228986)
@@ -49,7 +49,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 15, 2010
+.Dd December 30, 2011
 .Dt BPF 4
 .Os
 .Sh NAME
@@ -516,61 +516,48 @@ by default.
 .It Dv BIOCSTSTAMP
 .It Dv BIOCGTSTAMP
 .Pq Li u_int
-Set or get format and resolution of the time stamps returned by BPF.
+Set or get the format and resolution of time stamps returned by BPF.
+The per-BPF descriptor configuration provided by the
+.Dv BIOCSTSTAMP
+IOCTL complements the per-interface time stamp configuration detailed in the
+.Sx CONFIGURATION
+section.
+.Pp
 Set to
-.Dv BPF_T_MICROTIME ,
-.Dv BPF_T_MICROTIME_FAST ,
-.Dv BPF_T_MICROTIME_MONOTONIC ,
+.Dv BPF_T_MICROTIME
 or
-.Dv BPF_T_MICROTIME_MONOTONIC_FAST
+.Dv BPF_T_MICROTIME_MONOTONIC
 to get time stamps in 64-bit
 .Vt struct timeval
 format.
 Set to
-.Dv BPF_T_NANOTIME ,
-.Dv BPF_T_NANOTIME_FAST ,
-.Dv BPF_T_NANOTIME_MONOTONIC ,
+.Dv BPF_T_NANOTIME
 or
-.Dv BPF_T_NANOTIME_MONOTONIC_FAST
+.Dv BPF_T_NANOTIME_MONOTONIC
 to get time stamps in 64-bit
 .Vt struct timespec
 format.
 Set to
-.Dv BPF_T_BINTIME ,
-.Dv BPF_T_BINTIME_FAST ,
-.Dv BPF_T_NANOTIME_MONOTONIC ,
+.Dv BPF_T_BINTIME
 or
-.Dv BPF_T_BINTIME_MONOTONIC_FAST
+.Dv BPF_T_BINTIME_MONOTONIC
 to get time stamps in 64-bit
 .Vt struct bintime
 format.
 Set to
 .Dv BPF_T_NONE
-to ignore time stamp.
+to not set a time stamp.
+By default, time stamps are initilized to
+.Dv BPF_T_MICROTIME .
+.Pp
 All 64-bit time stamp formats are wrapped in
 .Vt struct bpf_ts .
 The
-.Dv BPF_T_MICROTIME_FAST ,
-.Dv BPF_T_NANOTIME_FAST ,
-.Dv BPF_T_BINTIME_FAST ,
-.Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
-.Dv BPF_T_NANOTIME_MONOTONIC_FAST ,
-and
-.Dv BPF_T_BINTIME_MONOTONIC_FAST
-are analogs of corresponding formats without _FAST suffix but do not perform
-a full time counter query, so their accuracy is one timer tick.
-The
 .Dv BPF_T_MICROTIME_MONOTONIC ,
 .Dv BPF_T_NANOTIME_MONOTONIC ,
-.Dv BPF_T_BINTIME_MONOTONIC ,
-.Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
-.Dv BPF_T_NANOTIME_MONOTONIC_FAST ,
 and
-.Dv BPF_T_BINTIME_MONOTONIC_FAST
+.Dv BPF_T_BINTIME_MONOTONIC
 store the time elapsed since kernel boot.
-This setting is initialized to
-.Dv BPF_T_MICROTIME
-by default.
 .It Dv BIOCFEEDBACK
 .Pq Li u_int
 Set packet feedback mode.
@@ -692,14 +679,14 @@ Currently,
 .Vt bpf_hdr
 is used when the time stamp is set to
 .Dv BPF_T_MICROTIME ,
-.Dv BPF_T_MICROTIME_FAST ,
 

Re: svn commit: r228878 - head/include

[Ed Schouten]

Hello Sean,

* Sean C. Farley , 20111230 03:54:
> I just thought of this while reviewing the change:  should
> __bool_true_false_are_defined be set only if __cplusplus is not set?
> It should be set for C99, but I wonder if it should be set for C++.

Even if the C++ standard doesn't mention it at all, I think it doesn't
mean it is forbidden to define it. It starts with __[a-z], so it is in
the reserved namespace.

> Also, is there a style requirement that the guard for a header file
> be based off of the name of the file?  I did not see anything obvious
> for this within style(9), but I am curious.

I am not aware of this.

-- 
 Ed Schouten 
 WWW: http://80386.nl/


pgph8x4OkkxTz.pgp
Description: PGP signature

svn commit: r228987 - head/sys/mips/conf

[Adrian Chadd]

Author: adrian
Date: Fri Dec 30 09:39:24 2011
New Revision: 228987
URL: http://svn.freebsd.org/changeset/base/228987

Log:
  Add a couple of missing wlan modules.

Modified:
  head/sys/mips/conf/AR71XX_BASE

Modified: head/sys/mips/conf/AR71XX_BASE
==
--- head/sys/mips/conf/AR71XX_BASE  Fri Dec 30 08:57:58 2011
(r228986)
+++ head/sys/mips/conf/AR71XX_BASE  Fri Dec 30 09:39:24 2011
(r228987)
@@ -25,7 +25,7 @@ hints "AR71XX_BASE.hints"
 makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols
 
 # Also build these as modules, just to ensure the build gets tested.
-makeoptionsMODULES_OVERRIDE="wlan wlan_xauth wlan_acl wlan_wep wlan_tkip 
wlan_ccmp ath ath_pci"
+makeoptionsMODULES_OVERRIDE="wlan wlan_xauth wlan_acl wlan_wep wlan_tkip 
wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci"
 
 optionsDDB
 optionsKDB
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228988 - head/sys/mips/conf

[Adrian Chadd]

Author: adrian
Date: Fri Dec 30 09:48:35 2011
New Revision: 228988
URL: http://svn.freebsd.org/changeset/base/228988

Log:
  Add a configuration file for the Atheros PB47 reference board.
  This is an AR71xx based board with 8MB flash, 64MB RAM, a
  Mini-PCI+ slot (see below) and a single 10/100/1000baseT
  ethernet port.  It also has two USB ports.
  
  This is an easier board than most to add as it doesn't have a
  switch PHY on-board.  This made it (mostly) trivial to craft a
  working configuration.
  
  Things to note:
  
  * This, like most other reference boards, use uboot rather then
redboot.  It means that you typically have to manually flash
both the kernel and rootfs partitions.
  
  * Since there's currently no (nice) way to extract out the
ethernet MAC and RAM from the uboot environment, the RAM
will default to 32mb and the MAC will be something very
incorrect.   I'll try to fix this up in a subsequent commit
or two, even if it's just some hard-coded nonsense in
ar71xx_machdep.c for now.
  
  * The board is designed for a specific model of mini-PCI+
NIC which never made it into production.  Normal mini-PCI
NICs will work fine; if you happen to have the NIC in question
then it will work fine with this board.

Added:
  head/sys/mips/conf/PB47   (contents, props changed)
  head/sys/mips/conf/PB47.hints   (contents, props changed)

Added: head/sys/mips/conf/PB47
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/conf/PB47 Fri Dec 30 09:48:35 2011(r228988)
@@ -0,0 +1,51 @@
+#
+# Atheros PB47 reference board.
+#
+# * one MiniPCI+ slot (modified to allow two idsel lines
+#   on the one slot, for a specific kind of internal-only
+#   NIC;
+# * one XMII slot
+# * One ethernet PHY
+# * Akros Silicon AS1834
+# * 8MB NOR SPI flash
+# * 64MB RAM
+#
+# $FreeBSD$
+#
+
+include"AR71XX_BASE"
+ident  "PB47"
+hints  "PB47.hints"
+
+# Enable the uboot environment stuff rather then the
+# redboot stuff.
+optionsAR71XX_ENV_UBOOT
+
+# XXX TODO: add uboot boot parameter parsing to extract MAC, RAM.
+# Right now it will just detect 32mb out of 64mb, as well as
+# return a garbage MAC address.
+
+# don't compile these in - the default flash area for kernel space
+# is only 1.2 megabytes.  To keep the flash allocation in line with
+# what the documentation says for this board, we'll just have to keep
+# the kernel smaller than that.
+nodevice wlan, wlan_wep, wlan_ccmp, wlan_tkip, wlan_xauth
+nodevice ath, ath_pci, ath_hal, ath_rate_sample
+
+# Since the module build doesn't like TDMA..
+nooptions  IEEE80211_SUPPORT_TDMA
+
+# For DOS - enable if required
+#options   GEOM_PART_BSD
+#options   GEOM_PART_MBR
+#options   MSDOSFS
+
+# uzip - to boot natively from flash
+device geom_uzip
+optionsGEOM_UZIP
+
+# Used for the static uboot partition map
+device geom_map
+
+# Boot off of the rootfs, as defined in the geom_map setup.
+optionsROOTDEVNAME=\"ufs:map/rootfs.uzip\"

Added: head/sys/mips/conf/PB47.hints
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/conf/PB47.hints   Fri Dec 30 09:48:35 2011
(r228988)
@@ -0,0 +1,79 @@
+
+# $FreeBSD$
+
+# There's two interfaces, but only one socket is populated.
+#
+# There's an AR8021 PHY attached to arge1.
+#
+# XXX TODO: figure out where to extract the MAC from.
+hint.arge.1.phymask=0x01
+
+# XXX TODO: pass in hints for the GPIO -> LED mapping for the
+# minipci slot.  The specific customer reference design NIC
+# wires GPIO5 from each AR9220 to one of two GPIO pins on the
+# MiniPCI bus.  However, this may be very specific to the NIC
+# being used.
+
+# The default flash layout:
+# uboot: 192k
+# env: 64k
+# rootfs: 6144k
+# uimage (kernel): 1728k
+# caldata: 64k
+#
+# We steal 64k from the end of rootfs to store the local config.
+
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x
+hint.map.0.end=0x3
+hint.map.0.name="uboot"
+hint.map.0.readonly=1
+
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x0003
+hint.map.1.end=0x0004
+hint.map.1.name="uboot-env"
+hint.map.1.readonly=1
+
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x0004
+hint.map.2.end=0x0063
+hint.map.2.name="rootfs"
+hint.map.2.readonly=1
+
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x0063
+hint.map.3.end=0x0064
+hint.map.3.name="cfg"
+hint.map.3.readonly=0
+
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x0064
+hint.map.4.end=0x007f
+hint.map.4.name="kernel"
+hint.map.4.readonly=1
+
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x007f
+hint.map.5.end=0x0080
+hint.map.5.name="art"
+hint.map.5.readonly=1
+
+# Don't flip on anything that isn't

svn commit: r228989 - head/lib

[Robert Watson]

Author: rwatson
Date: Fri Dec 30 10:45:00 2011
New Revision: 228989
URL: http://svn.freebsd.org/changeset/base/228989

Log:
  Fix typo in Makefile comment.
  
  MFC after:3 days

Modified:
  head/lib/Makefile

Modified: head/lib/Makefile
==
--- head/lib/Makefile   Fri Dec 30 09:48:35 2011(r228988)
+++ head/lib/Makefile   Fri Dec 30 10:45:00 2011(r228989)
@@ -8,7 +8,7 @@
 #
 # csu must be built before all shared libaries for ELF.
 # libc must be built before all other shared libraries.
-# libbsm must be built before ibauditd.
+# libbsm must be built before libauditd.
 # libcom_err must be built before libpam.
 # libcrypt must be built before libpam.
 # libkvm must be built before libdevstat.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnmp...

[Ulrich Spoerlein]

Author: uqs
Date: Fri Dec 30 10:58:14 2011
New Revision: 228990
URL: http://svn.freebsd.org/changeset/base/228990

Log:
  Spelling fixes for usr.sbin/

Modified:
  head/usr.sbin/IPXrouted/sap_input.c
  head/usr.sbin/IPXrouted/sap_tables.c
  head/usr.sbin/adduser/adduser.sh
  head/usr.sbin/bluetooth/btpand/event.h
  head/usr.sbin/bluetooth/sdpd/server.c
  head/usr.sbin/bootparamd/bootparamd/README
  head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
  head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
  head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
  head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
  head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
  head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
  head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
  head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c
  head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt
  head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
  head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
  head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
  head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
  head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
  head/usr.sbin/cron/cron/do_command.c
  head/usr.sbin/cron/doc/CHANGES
  head/usr.sbin/cron/doc/MAIL
  head/usr.sbin/cron/lib/entry.c
  head/usr.sbin/edquota/edquota.c
  head/usr.sbin/fwcontrol/fwcontrol.c
  head/usr.sbin/fwcontrol/fwmpegts.c
  head/usr.sbin/ifmcstat/ifmcstat.c
  head/usr.sbin/inetd/builtins.c
  head/usr.sbin/kbdmap/kbdmap.c
  head/usr.sbin/kgmon/kgmon.c
  head/usr.sbin/lpr/common_source/rmjob.c
  head/usr.sbin/lpr/lpc/cmds.c
  head/usr.sbin/lpr/lpd/printjob.c
  head/usr.sbin/lpr/pac/pac.c
  head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
  head/usr.sbin/makefs/cd9660/cd9660_write.c
  head/usr.sbin/makefs/cd9660/iso9660_rrip.c
  head/usr.sbin/makefs/ffs.c
  head/usr.sbin/makefs/ffs/ffs_subr.c
  head/usr.sbin/makefs/walk.c
  head/usr.sbin/mount_portalfs/cred.c
  head/usr.sbin/mount_portalfs/pt_pipe.c
  head/usr.sbin/mount_portalfs/pt_tcplisten.c
  head/usr.sbin/mountd/mountd.c
  head/usr.sbin/moused/moused.c
  head/usr.sbin/mptutil/mpt_config.c
  head/usr.sbin/newsyslog/newsyslog.c
  head/usr.sbin/nscd/protocol.h
  head/usr.sbin/ntp/doc/ntp.conf.5
  head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  head/usr.sbin/pc-sysinstall/backend/functions-parse.sh
  head/usr.sbin/pciconf/pciconf.c
  head/usr.sbin/pkg_install/README
  head/usr.sbin/pkg_install/add/add.h
  head/usr.sbin/pkg_install/add/extract.c
  head/usr.sbin/pkg_install/add/futil.c
  head/usr.sbin/pkg_install/add/main.c
  head/usr.sbin/pkg_install/add/perform.c
  head/usr.sbin/pkg_install/add/pkg_add.1
  head/usr.sbin/pkg_install/create/create.h
  head/usr.sbin/pkg_install/create/main.c
  head/usr.sbin/pkg_install/create/perform.c
  head/usr.sbin/pkg_install/create/pkg_create.1
  head/usr.sbin/pkg_install/create/pl.c
  head/usr.sbin/pkg_install/delete/delete.h
  head/usr.sbin/pkg_install/delete/main.c
  head/usr.sbin/pkg_install/delete/perform.c
  head/usr.sbin/pkg_install/delete/pkg_delete.1
  head/usr.sbin/pkg_install/info/info.h
  head/usr.sbin/pkg_install/info/main.c
  head/usr.sbin/pkg_install/info/perform.c
  head/usr.sbin/pkg_install/info/show.c
  head/usr.sbin/pkg_install/lib/deps.c
  head/usr.sbin/pkg_install/lib/exec.c
  head/usr.sbin/pkg_install/lib/file.c
  head/usr.sbin/pkg_install/lib/global.c
  head/usr.sbin/pkg_install/lib/lib.h
  head/usr.sbin/pkg_install/lib/match.c
  head/usr.sbin/pkg_install/lib/msg.c
  head/usr.sbin/pkg_install/lib/pen.c
  head/usr.sbin/pkg_install/lib/plist.c
  head/usr.sbin/pkg_install/lib/str.c
  head/usr.sbin/pkg_install/lib/url.c
  head/usr.sbin/pkg_install/version/main.c
  head/usr.sbin/pkg_install/version/perform.c
  head/usr.sbin/pkg_install/version/version.h
  head/usr.sbin/pmcstat/pmcpl_calltree.c
  head/usr.sbin/pmcstat/pmcpl_gprof.c
  head/usr.sbin/pmcstat/pmcstat.c
  head/usr.sbin/pmcstat/pmcstat_log.c
  head/usr.sbin/ppp/cbcp.c
  head/usr.sbin/ppp/chat.h
  head/usr.sbin/ppp/command.c
  head/usr.sbin/ppp/mp.c
  head/usr.sbin/ppp/ppp.8.m4
  head/usr.sbin/ppp/vjcomp.c
  head/usr.sbin/pw/cpdir.c
  head/usr.sbin/route6d/route6d.c
  head/usr.sbin/rpc.lockd/kern.c
  head/usr.sbin/rpc.lockd/lockd_lock.c
  head/usr.sbin/rpcbind/check_bound.c
  head/usr.sbin/rpcbind/rpcbind.c
  head/usr.sbin/rtadvd/config.c
  head/usr.sbin/rtadvd/rtadvd.c
  head/usr.sbin/rtsold/rtsold.8
  head/usr.sbin/sade/label.c
  head/usr.sbin/tcpdump/tcpdump/tcpdump.1
  head/usr.sbin/timed/timed/CHANGES
  head/usr.sbin/vidcontrol/vidcontrol.c
  head/usr.sbin/wpa/hostapd/driver_freebsd.c
  head/usr.sbin/ypserv/yp_access.c

Modified: head/usr.sbin/IPXrouted/sap_input.c
==
--- head/usr.sbin/IPXrouted/sap_input.c Fri Dec 30 10:45:00 2011
(r228989)
+++ head/usr.sbin/IPXrouted/sap_input.

svn commit: r228991 - in head/usr.bin: brandelf calendar/calendars logins sockstat unzip whereis

[Ulrich Spoerlein]

Author: uqs
Date: Fri Dec 30 10:59:15 2011
New Revision: 228991
URL: http://svn.freebsd.org/changeset/base/228991

Log:
  Reencode files from latin1 to UTF-8.
  
  This makes a tiny percentage of entries in calendars ugly for latin1
  users, but fixes them for UTF-8 users.
  
  This badly needs a solution involving locale-dependent re-encoding.

Modified:
  head/usr.bin/brandelf/brandelf.c
  head/usr.bin/calendar/calendars/calendar.birthday
  head/usr.bin/calendar/calendars/calendar.freebsd
  head/usr.bin/calendar/calendars/calendar.history
  head/usr.bin/calendar/calendars/calendar.music
  head/usr.bin/logins/logins.1
  head/usr.bin/logins/logins.c
  head/usr.bin/sockstat/sockstat.1
  head/usr.bin/sockstat/sockstat.c
  head/usr.bin/unzip/unzip.1
  head/usr.bin/unzip/unzip.c
  head/usr.bin/whereis/pathnames.h
  head/usr.bin/whereis/whereis.c

Modified: head/usr.bin/brandelf/brandelf.c
==
--- head/usr.bin/brandelf/brandelf.cFri Dec 30 10:58:14 2011
(r228990)
+++ head/usr.bin/brandelf/brandelf.cFri Dec 30 10:59:15 2011
(r228991)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2000, 2001 David O'Brien
- * Copyright (c) 1996 S�ren Schmidt
+ * Copyright (c) 1996 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/usr.bin/calendar/calendars/calendar.birthday
==
--- head/usr.bin/calendar/calendars/calendar.birthday   Fri Dec 30 10:58:14 
2011(r228990)
+++ head/usr.bin/calendar/calendars/calendar.birthday   Fri Dec 30 10:59:15 
2011(r228991)
@@ -291,7 +291,7 @@
 12/12  E.G. Robinson born, 1893
 12/14  George Washington dies, 1799
 12/17  William Safire (Safir) born, 1929
-12/18  Konrad Zuse died in H�nfeld, 1995
+12/18  Konrad Zuse died in Hünfeld, 1995
 12/20  Carl Sagan died, 1996
 12/21  Benjamin Disraeli born, 1804
 12/22  Giacomo Puccini born, 1858

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdFri Dec 30 10:58:14 
2011(r228990)
+++ head/usr.bin/calendar/calendars/calendar.freebsdFri Dec 30 10:59:15 
2011(r228991)
@@ -326,7 +326,7 @@
 11/28  Stanislav Sedov  born in Chelyabinsk, USSR, 1985
 12/01  Hajimu Umemoto  born in Nara, Japan, 1961
 12/01  Alexey Dokuchaev  born in Magadan, USSR, 1980
-12/02  Ermal Lu�i  born in Tirane, Albania, 1980
+12/02  Ermal Luçi  born in Tirane, Albania, 1980
 12/03  Diane Bruce  born in Ottawa, Ontario, Canada, 1952
 12/05  Ivan Voras  born in Slavonski Brod, Croatia, 1981
 12/06  Stefan Farfeleder  born in Wien, Austria, 1980

Modified: head/usr.bin/calendar/calendars/calendar.history
==
--- head/usr.bin/calendar/calendars/calendar.historyFri Dec 30 10:58:14 
2011(r228990)
+++ head/usr.bin/calendar/calendars/calendar.historyFri Dec 30 10:59:15 
2011(r228991)
@@ -302,7 +302,7 @@
 09/11  Terrorists destroy World Trade Center in New York, 2001
 09/12  German paratroopers rescue Mussolini from captivity in Rome, 1943
 09/12  Germany annexes Sudetenland, 1938
-09/13  58� C (136.4� F) measured at el Azizia, Libya, 1922
+09/13  58 °C (136.4 °F) measured at el Azizia, Libya, 1922
 09/13  British defeat the French at the Plains of Abraham, just outside the 
walls of Quebec City, 1759
 09/13  Building of Hadrian's Wall begun, 122
 09/13  Chiang Kai-Shek becomes president of China, 1943

Modified: head/usr.bin/calendar/calendars/calendar.music
==
--- head/usr.bin/calendar/calendars/calendar.music  Fri Dec 30 10:58:14 
2011(r228990)
+++ head/usr.bin/calendar/calendars/calendar.music  Fri Dec 30 10:59:15 
2011(r228991)
@@ -225,7 +225,7 @@
 12/08  Jim Morrison is born in Melbourne, Florida, 1943
 12/08  John Lennon is shot and killed in New York City, 1980
 12/09  The Who's "Tommy" premieres in London, 1973
-12/11  (Louis) Hector Berlioz born in La-C�te-Saint-Andr�, 1803
+12/11  (Louis) Hector Berlioz born in La-Côte-Saint-André, 1803
 12/13  Ted Nugent, the motor city madman, born in Detroit, 1949
 12/15  Thomas Edison receives patent on the phonograph, 1877
 12/16  Don McLean's "American Pie" is released, 1971

Modified: head/usr.bin/logins/logins.1
==
--- head/usr.bin/logins/logins.1Fri Dec 30 10:58:14 2011
(r228990)
+++ head/usr.bin/logins/logins.1Fri Dec 30 10:59:15 2011
(r228991)
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Co�dan Sm�rgrav
+.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in

svn commit: r228992 - in head/usr.bin: csup finger fstat indent ipcs lex limits locate/locate login mail make man ncplogin netstat pr rpcgen rpcinfo systat talk tip/tip top vgrind xlint/lint1 xlint...

[Ulrich Spoerlein]

Author: uqs
Date: Fri Dec 30 11:02:40 2011
New Revision: 228992
URL: http://svn.freebsd.org/changeset/base/228992

Log:
  Spelling fixes for usr.bin/

Modified:
  head/usr.bin/csup/fixups.c
  head/usr.bin/csup/mux.c
  head/usr.bin/csup/rcsfile.c
  head/usr.bin/finger/finger.c
  head/usr.bin/fstat/fstat.c
  head/usr.bin/indent/indent.c
  head/usr.bin/indent/io.c
  head/usr.bin/ipcs/ipc.c
  head/usr.bin/ipcs/ipc.h
  head/usr.bin/lex/NEWS
  head/usr.bin/lex/flexdef.h
  head/usr.bin/lex/tblcmp.c
  head/usr.bin/limits/limits.c
  head/usr.bin/locate/locate/locate.c
  head/usr.bin/locate/locate/util.c
  head/usr.bin/login/login_fbtab.c
  head/usr.bin/mail/head.c
  head/usr.bin/mail/main.c
  head/usr.bin/mail/util.c
  head/usr.bin/make/GNode.h
  head/usr.bin/make/arch.c
  head/usr.bin/make/buf.c
  head/usr.bin/make/for.c
  head/usr.bin/make/job.c
  head/usr.bin/make/main.c
  head/usr.bin/make/str.c
  head/usr.bin/make/var.c
  head/usr.bin/man/man.sh
  head/usr.bin/ncplogin/ncplogin.c
  head/usr.bin/netstat/ipx.c
  head/usr.bin/pr/pr.c
  head/usr.bin/rpcgen/rpc_svcout.c
  head/usr.bin/rpcinfo/rpcinfo.c
  head/usr.bin/systat/icmp6.c
  head/usr.bin/talk/ctl_transact.c
  head/usr.bin/talk/invite.c
  head/usr.bin/tip/tip/tip.h
  head/usr.bin/top/machine.c
  head/usr.bin/vgrind/extern.h
  head/usr.bin/vgrind/vfontedpr.c
  head/usr.bin/xlint/lint1/decl.c
  head/usr.bin/xlint/lint1/emit1.c
  head/usr.bin/xlint/lint1/func.c
  head/usr.bin/xlint/lint1/mem1.c
  head/usr.bin/xlint/lint2/chk.c
  head/usr.bin/xlint/lint2/read.c
  head/usr.bin/xlint/xlint/xlint.c
  head/usr.bin/yacc/NEW_FEATURES
  head/usr.bin/yacc/reader.c

Modified: head/usr.bin/csup/fixups.c
==
--- head/usr.bin/csup/fixups.c  Fri Dec 30 10:59:15 2011(r228991)
+++ head/usr.bin/csup/fixups.c  Fri Dec 30 11:02:40 2011(r228992)
@@ -38,7 +38,7 @@
 /*
  * A synchronized queue to implement fixups.  The updater thread adds
  * fixup requests to the queue with fixups_put() when a checksum
- * mismatch error occured.  It then calls fixups_close() when he's
+ * mismatch error occurred.  It then calls fixups_close() when he's
  * done requesting fixups.  The detailer thread gets the fixups with
  * fixups_get() and then send the requests to the server.
  *

Modified: head/usr.bin/csup/mux.c
==
--- head/usr.bin/csup/mux.c Fri Dec 30 10:59:15 2011(r228991)
+++ head/usr.bin/csup/mux.c Fri Dec 30 11:02:40 2011(r228992)
@@ -680,7 +680,7 @@ mux_init(struct mux *m)
 
 /*
  * Close all the channels, terminate the sender and receiver thread.
- * This is an important function because it is used everytime we need
+ * This is an important function because it is used every time we need
  * to wake up all the worker threads to abort the program.
  *
  * This function accepts an error message that will be printed if the

Modified: head/usr.bin/csup/rcsfile.c
==
--- head/usr.bin/csup/rcsfile.c Fri Dec 30 10:59:15 2011(r228991)
+++ head/usr.bin/csup/rcsfile.c Fri Dec 30 11:02:40 2011(r228992)
@@ -1254,8 +1254,8 @@ rcsfile_insertsorteddelta(struct rcsfile
 /*
  * Insert a delta into the correct place in branch. A trunk branch will have
  * different ordering scheme and be sorted by revision number, but a normal
- * branch will be sorted by date to maintain compability with branches that is
- * "hand-hacked".
+ * branch will be sorted by date to maintain compatibility with branches that
+ * is "hand-hacked".
  */
 static void
 rcsfile_insertdelta(struct branch *b, struct delta *d, int trunk)

Modified: head/usr.bin/finger/finger.c
==
--- head/usr.bin/finger/finger.cFri Dec 30 10:59:15 2011
(r228991)
+++ head/usr.bin/finger/finger.cFri Dec 30 11:02:40 2011
(r228992)
@@ -299,8 +299,8 @@ userlist(int argc, char **argv)
goto net;
 
/*
-* Mark any arguments beginning with '/' as invalid so that we 
-* don't accidently confuse them with expansions from finger.conf
+* Mark any arguments beginning with '/' as invalid so that we
+* don't accidentally confuse them with expansions from finger.conf
 */
for (p = argv, ip = used; *p; ++p, ++ip)
if (**p == '/') {

Modified: head/usr.bin/fstat/fstat.c
==
--- head/usr.bin/fstat/fstat.c  Fri Dec 30 10:59:15 2011(r228991)
+++ head/usr.bin/fstat/fstat.c  Fri Dec 30 11:02:40 2011(r228992)
@@ -150,7 +150,7 @@ do_fstat(int argc, char **argv)
if (getfname(*argv))
checkfile = 1;
}
-   if (!checkfile) /* file(s) specified, bu

svn commit: r228993 - in head/share: doc/IPv6 termcap

[Ulrich Spoerlein]

Author: uqs
Date: Fri Dec 30 11:11:54 2011
New Revision: 228993
URL: http://svn.freebsd.org/changeset/base/228993

Log:
  Spelling fixes for share/

Modified:
  head/share/doc/IPv6/IMPLEMENTATION
  head/share/termcap/termcap.src

Modified: head/share/doc/IPv6/IMPLEMENTATION
==
--- head/share/doc/IPv6/IMPLEMENTATION  Fri Dec 30 11:02:40 2011
(r228992)
+++ head/share/doc/IPv6/IMPLEMENTATION  Fri Dec 30 11:11:54 2011
(r228993)
@@ -1404,7 +1404,7 @@ both definitions.  As an userland progra
 dealing with it is to:
 (1) ensure ss_family and/or ss_len are available on the platform, by using
 GNU autoconf,
-(2) have -Dss_family=__ss_family to unify all occurences (including header
+(2) have -Dss_family=__ss_family to unify all occurrences (including header
 file) into __ss_family, or
 (3) never touch __ss_family.  cast to sockaddr * and use sa_family like:
struct sockaddr_storage ss;
@@ -1414,7 +1414,7 @@ dealing with it is to:
 
 Some of IPv6 transition technologies embed IPv4 address into IPv6 address.
 These specifications themselves are fine, however, there can be certain
-set of attacks enabled by these specifications.  Recent speicifcation
+set of attacks enabled by these specifications.  Recent specification
 documents covers up those issues, however, there are already-published RFCs
 that does not have protection against those (like using source address of
 :::127.0.0.1 to bypass "reject packet from remote" filter).
@@ -1441,7 +1441,7 @@ compatible is very rare.  You should tak
 
 If we see IPv6 packets with IPv4 mapped address (:::0.0.0.0/96) in the
 header in dual-stack environment (not in SIIT environment), they indicate
-that someone is trying to inpersonate IPv4 peer.  The packet should be dropped.
+that someone is trying to impersonate IPv4 peer.  The packet should be dropped.
 
 IPv6 specifications do not talk very much about IPv6 unspecified address (::)
 in the IPv6 source address field.  Clarification is in progress.
@@ -1456,10 +1456,10 @@ Here are couple of comments:
 - The following examples are seemingly illegal.  It seems that there's general
   consensus among ipngwg for those.  (1) Mobile IPv6 home address option,
   (2) offlink packets (so routers should not forward them).
-  KAME implmements (2) already.
+  KAME implements (2) already.
 
 KAME code is carefully written to avoid such incidents.  More specifically,
-KAME kernel will reject packets with certain source/dstination address in IPv6
+KAME kernel will reject packets with certain source/destination address in IPv6
 base header, or IPv6 routing header.  Also, KAME default configuration file
 is written carefully, to avoid those attacks.
 
@@ -1552,7 +1552,7 @@ KAME implementation treats them as follo
 1.17 DNS resolver
 
 KAME ships with modified DNS resolver, in libinet6.a.
-libinet6.a has a comple of extensions against libc DNS resolver:
+libinet6.a has a couple of extensions against libc DNS resolver:
 - Can take "options insecure1" and "options insecure2" in /etc/resolv.conf,
   which toggles RES_INSECURE[12] option flag bit.
 - EDNS0 receive buffer size notification support.  It can be enabled by
@@ -1870,7 +1870,7 @@ Tunnel mode works basically fine, but co
 - Path MTU discovery does not work across IPv6 IPsec tunnel gateway due to
   insufficient code.
 
-AH specificaton does not talk much about "multiple AH on a packet" case.
+AH specification does not talk much about "multiple AH on a packet" case.
 We incrementally compute AH checksum, from inside to outside.  Also, we
 treat inner AH to be immutable.
 For example, if we are to create the following packet:
@@ -1890,8 +1890,8 @@ to randomly pad packets shorter than N b
 or equal to N.  Note that N does not include ESP authentication data length.
 Also note that the random padding is not included in TCP segment
 size computation.  Negative value will turn off the functionality.
-Recommeded value for N is like 128, or 256.  If you use a too big number
-as N, you may experience inefficiency due to fragmented packtes.
+Recommended value for N is like 128, or 256.  If you use a too big number
+as N, you may experience inefficiency due to fragmented packets.
 
 4.4 IPComp handling
 
@@ -2097,7 +2097,7 @@ RFC2401 defines IPsec tunnel mode, withi
 defines tunnel mode packet encapsulation/decapsulation on its own, and
 does not refer other tunnelling specifications.  Since RFC2401 advocates
 filter-based SPD database matches, it would be natural for us to implement
-IPsec IPsec tunnel mode as filters - not as pseudo interfaces.
+IPsec tunnel mode as filters - not as pseudo interfaces.
 
 There are some people who are trying to separate IPsec "tunnel mode" from
 the IPsec itself.  They would like to implement IPsec transport mode only,
@@ -2110,7 +2110,7 @@ interpretation.
 
 The KAME stack implements can be configured in two ways.  You may need
 to recompile your kern

svn commit: r228994 - in head/sys: conf modules/ipfilter modules/nxge modules/xfs

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 13:16:59 2011
New Revision: 228994
URL: http://svn.freebsd.org/changeset/base/228994

Log:
  Disable several instances instances of clang's -Wself-assign warning.
  All of these are harmless, and are in fact used to shut up warnings from
  lint.
  
  While here, remove -Wno-missing-prototypes from the xfs module
  Makefile, as I could not reproduce those warnings either with gcc or
  clang.
  
  MFC after:1 week

Modified:
  head/sys/conf/files
  head/sys/conf/kern.mk
  head/sys/modules/ipfilter/Makefile
  head/sys/modules/nxge/Makefile
  head/sys/modules/xfs/Makefile

Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri Dec 30 11:11:54 2011(r228993)
+++ head/sys/conf/files Fri Dec 30 13:16:59 2011(r228994)
@@ -304,7 +304,7 @@ contrib/dev/acpica/utilities/utxface.c  
 contrib/dev/acpica/utilities/utxferror.c   optional acpi
 #contrib/dev/acpica/utilities/utxfmutex.c  optional acpi
 contrib/ipfilter/netinet/fil.c optional ipfilter inet \
-   compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
@@ -316,11 +316,11 @@ contrib/ipfilter/netinet/ip_log.c option
 contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
-   compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
-   compile-with "${NORMAL_C} -Wno-error -I$S/contrib/ipfilter"
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-error 
-I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
@@ -1522,17 +1522,25 @@ dev/ncv/ncr53c500.c optional ncv
 dev/ncv/ncr53c500_pccard.c optional ncv pccard
 dev/netmap/netmap.coptional netmap
 dev/nge/if_nge.c   optional nge
-dev/nxge/if_nxge.c optional nxge
-dev/nxge/xgehal/xgehal-device.coptional nxge
+dev/nxge/if_nxge.c optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
+dev/nxge/xgehal/xgehal-device.coptional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-mm.coptional nxge
 dev/nxge/xgehal/xge-queue.coptional nxge
-dev/nxge/xgehal/xgehal-driver.coptional nxge
-dev/nxge/xgehal/xgehal-ring.c  optional nxge
-dev/nxge/xgehal/xgehal-channel.c   optional nxge
-dev/nxge/xgehal/xgehal-fifo.c  optional nxge
-dev/nxge/xgehal/xgehal-stats.c optional nxge
+dev/nxge/xgehal/xgehal-driver.coptional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
+dev/nxge/xgehal/xgehal-ring.c  optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
+dev/nxge/xgehal/xgehal-channel.c   optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
+dev/nxge/xgehal/xgehal-fifo.c  optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
+dev/nxge/xgehal/xgehal-stats.c optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nxge/xgehal/xgehal-config.coptional nxge
-dev/nxge/xgehal/xgehal-mgmt.c  optional nxge
+dev/nxge/xgehal/xgehal-mgmt.c  optional nxge \
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
 dev/nmdm/nmdm.coptional nmdm
 dev/nsp/nsp.c  optional nsp
 dev/nsp/nsp_pccard.c   optional nsp pccard
@@ -3478,7 +3486,7 @@ gnu/fs/xfs/FreeBSD/xfs_sysctl.c   optional
 gnu/fs/xfs/FreeBSD/xfs_fs_subr.c   optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD 
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
 gnu/fs/xfs/FreeBSD/xfs_ioctl.c optional xfs \
-   compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD 
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+   compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/gnu/fs/xfs/FreeBSD 
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
 gnu/fs/xfs/FreeBSD/support/debug.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD 
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
 gnu/fs/xfs/FreeBSD/support/ktrace.coptional xfs \

Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk   Fri Dec 30 11:11:54 2011(r228993)
+++ head/sys/conf/kern.mk

svn commit: r228999 - svnadmin/conf

[Ken Smith]

Author: kensmith
Date: Fri Dec 30 14:30:16 2011
New Revision: 228999
URL: http://svn.freebsd.org/changeset/base/228999

Log:
  Release the code freeze on stable/9.
  
  Approved by:  core (implicit)

Modified:
  svnadmin/conf/approvers

Modified: svnadmin/conf/approvers
==
--- svnadmin/conf/approvers Fri Dec 30 13:53:04 2011(r228998)
+++ svnadmin/conf/approvers Fri Dec 30 14:30:16 2011(r228999)
@@ -17,7 +17,7 @@
 # $FreeBSD$
 #
 #^head/re
-^stable/9/ re
+#^stable/9/re
 #^stable/8/re
 #^stable/7/re
 ^releng/9.0/   re
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229000 - head/sbin/dhclient

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Fri Dec 30 14:33:08 2011
New Revision: 229000
URL: http://svn.freebsd.org/changeset/base/229000

Log:
  Invalid Domain Search option isn't considered as a fatal error
  
  In the original Domain Search option patch, an invalid option value
  would cause the whole lease to be rejected. However, DHCP servers who
  emit such an invalid value are more common than I thought. With this new
  patch, just the option is rejected, not the entire lease.
  
  PR:   bin/163431
  Submitted by: Fabian Keil  (earlier version)
  Reviewed by:  Fabian Keil 
  Sponsored by: Yakaz (http://www.yakaz.com)

Modified:
  head/sbin/dhclient/options.c

Modified: head/sbin/dhclient/options.c
==
--- head/sbin/dhclient/options.cFri Dec 30 14:30:16 2011
(r228999)
+++ head/sbin/dhclient/options.cFri Dec 30 14:33:08 2011
(r229000)
@@ -211,7 +211,7 @@ parse_option_buffer(struct packet *packe
 void
 expand_domain_search(struct packet *packet)
 {
-   int offset, expanded_len;
+   int offset, expanded_len, next_domain_len;
struct option_data *option;
unsigned char *domain_search, *cursor;
 
@@ -224,9 +224,13 @@ expand_domain_search(struct packet *pack
expanded_len = 0;
offset = 0;
while (offset < option->len) {
+   next_domain_len = find_search_domain_name_len(option, &offset);
+   if (next_domain_len < 0)
+   /* The Domain Search option value is invalid. */
+   return;
+
/* We add 1 for the space between domain names. */
-   expanded_len +=
-   find_search_domain_name_len(option, &offset) + 1;
+   expanded_len += next_domain_len + 1;
}
if (expanded_len > 0)
/* Remove 1 for the superfluous trailing space. */
@@ -271,8 +275,9 @@ find_search_domain_name_len(struct optio
/* This is a pointer to another list of labels. */
if (i + 1 >= option->len) {
/* The pointer is truncated. */
-   error("Truncated pointer in DHCP Domain "
+   warning("Truncated pointer in DHCP Domain "
"Search option.");
+   return (-1);
}
 
pointer = ((label_len & ~(0xC0)) << 8) +
@@ -282,8 +287,9 @@ find_search_domain_name_len(struct optio
 * The pointer must indicates a prior
 * occurance.
 */
-   error("Invalid forward pointer in DHCP Domain "
-   "Search option compression.");
+   warning("Invalid forward pointer in DHCP "
+   "Domain Search option compression.");
+   return (-1);
}
 
pointed_len = find_search_domain_name_len(option,
@@ -295,7 +301,9 @@ find_search_domain_name_len(struct optio
}
 
if (i + label_len >= option->len) {
-   error("Truncated label in DHCP Domain Search option.");
+   warning("Truncated label in DHCP Domain Search "
+   "option.");
+   return (-1);
}
 
/*
@@ -308,9 +316,9 @@ find_search_domain_name_len(struct optio
i += label_len + 1;
}
 
-   error("Truncated DHCP Domain Search option.");
+   warning("Truncated DHCP Domain Search option.");
 
-   return (0);
+   return (-1);
 }
 
 void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229001 - head/tools/regression/sbin/dhclient

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Fri Dec 30 14:41:47 2011
New Revision: 229001
URL: http://svn.freebsd.org/changeset/base/229001

Log:
  Adapt testsuite following change in Domain Search error handling
  
  In this testsuite, warning() and error() have the same behaviour.
  
  PR:   bin/163431
  Sponsored by: Yakaz (http://www.yakaz.com)

Modified:
  head/tools/regression/sbin/dhclient/fake.c

Modified: head/tools/regression/sbin/dhclient/fake.c
==
--- head/tools/regression/sbin/dhclient/fake.c  Fri Dec 30 14:33:08 2011
(r229000)
+++ head/tools/regression/sbin/dhclient/fake.c  Fri Dec 30 14:41:47 2011
(r229001)
@@ -32,7 +32,11 @@ warning(char *fmt, ...)
va_end(ap);
fprintf(stderr, "\n");
 
-   return ret;
+   /*
+* The original warning() would return "ret" here. We do this to
+* check warnings explicitely.
+*/
+   longjmp(env, 1);
 }
 
 int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229002 - head/sbin/dhclient

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Fri Dec 30 14:46:53 2011
New Revision: 229002
URL: http://svn.freebsd.org/changeset/base/229002

Log:
  Set svn:executable on dhclient-script
  
  Sponsored by: Yakaz (http://www.yakaz.com)

Modified:
Directory Properties:
  head/sbin/dhclient/dhclient-script   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229003 - head/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Fri Dec 30 15:41:28 2011
New Revision: 229003
URL: http://svn.freebsd.org/changeset/base/229003

Log:
  style(9), whitespace and spelling nits.

Modified:
  head/sys/netgraph/ng_base.c

Modified: head/sys/netgraph/ng_base.c
==
--- head/sys/netgraph/ng_base.c Fri Dec 30 14:46:53 2011(r229002)
+++ head/sys/netgraph/ng_base.c Fri Dec 30 15:41:28 2011(r229003)
@@ -1,7 +1,3 @@
-/*
- * ng_base.c
- */
-
 /*-
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
  * All rights reserved.
@@ -333,18 +329,18 @@ ng_alloc_node(void)
 
 #define NG_FREE_HOOK(hook) \
do {\
-   mtx_lock(&ng_nodelist_mtx); \
+   mtx_lock(&ng_nodelist_mtx); \
LIST_INSERT_HEAD(&ng_freehooks, hook, hk_hooks);\
hook->hk_magic = 0; \
-   mtx_unlock(&ng_nodelist_mtx);   \
+   mtx_unlock(&ng_nodelist_mtx);   \
} while (0)
 
 #define NG_FREE_NODE(node) \
do {\
-   mtx_lock(&ng_nodelist_mtx); \
+   mtx_lock(&ng_nodelist_mtx); \
LIST_INSERT_HEAD(&ng_freenodes, node, nd_nodes);\
node->nd_magic = 0; \
-   mtx_unlock(&ng_nodelist_mtx);   \
+   mtx_unlock(&ng_nodelist_mtx);   \
} while (0)
 
 #else /* NETGRAPH_DEBUG */ /*--*/
@@ -670,8 +666,8 @@ ng_make_node_common(struct ng_type *type
break;
}
}
-   LIST_INSERT_HEAD(&V_ng_ID_hash[NG_IDHASH_FN(node->nd_ID)],
-   node, nd_idnodes);
+   LIST_INSERT_HEAD(&V_ng_ID_hash[NG_IDHASH_FN(node->nd_ID)], node,
+   nd_idnodes);
mtx_unlock(&ng_idhash_mtx);
 
/* Done */
@@ -824,7 +820,7 @@ ng_node2ID(node_p node)
 /
 
 /*
- * Assign a node a name. Once assigned, the name cannot be changed.
+ * Assign a node a name.
  */
 int
 ng_name_node(node_p node, const char *name)
@@ -921,27 +917,21 @@ ng_decodeidname(const char *name)
u_long val;
 
/* Check for proper length, brackets, no leading junk */
-   if ((len < 3)
-   || (name[0] != '[')
-   || (name[len - 1] != ']')
-   || (!isxdigit(name[1]))) {
+   if ((len < 3) || (name[0] != '[') || (name[len - 1] != ']') ||
+   (!isxdigit(name[1])))
return ((ng_ID_t)0);
-   }
 
/* Decode number */
val = strtoul(name + 1, &eptr, 16);
-   if ((eptr - name != len - 1)
-   || (val == ULONG_MAX)
-   || (val == 0)) {
+   if ((eptr - name != len - 1) || (val == ULONG_MAX) || (val == 0))
return ((ng_ID_t)0);
-   }
-   return (ng_ID_t)val;
+
+   return ((ng_ID_t)val);
 }
 
 /*
  * Remove a name from a node. This should only be called
  * when shutting down and removing the node.
- * IF we allow name changing this may be more resurrected.
  */
 void
 ng_unname(node_p node)
@@ -1045,8 +1035,8 @@ ng_findhook(node_p node, const char *nam
if (node->nd_type->findhook != NULL)
return (*node->nd_type->findhook)(node, name);
LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) {
-   if (NG_HOOK_IS_VALID(hook)
-   && (strcmp(NG_HOOK_NAME(hook), name) == 0))
+   if (NG_HOOK_IS_VALID(hook) &&
+   (strcmp(NG_HOOK_NAME(hook), name) == 0))
return (hook);
}
return (NULL);
@@ -1182,12 +1172,12 @@ ng_newtype(struct ng_type *tp)
const size_t namelen = strlen(tp->name);
 
/* Check version and type name fields */
-   if ((tp->version != NG_ABI_VERSION)
-   || (namelen == 0)
-   || (namelen >= NG_TYPESIZ)) {
+   if ((tp->version != NG_ABI_VERSION) || (namelen == 0) ||
+   (namelen >= NG_TYPESIZ)) {
TRAP_ERROR();
if (tp->version != NG_ABI_VERSION) {
-   printf("Netgraph: Node type rejected. ABI mismatch. 
Suggest recompile\n");
+   printf("Netgraph: Node type rejected. ABI mismatch. "
+   "Suggest recompile\n");
}
return (EINVAL);
}
@@ -1635,8 +1625,8 @@ ng_path_parse(char *addr, char **nodep, 
  * return the destination node.
  */
 int
-ng_path2noderef(node_p here, const char *address,
-

Re: svn commit: r228878 - head/include

[Sean C. Farley]

On Thu, 29 Dec 2011, m...@freebsd.org wrote:


On Thu, Dec 29, 2011 at 6:54 PM, Sean C. Farley  wrote:

On Sun, 25 Dec 2011, Ed Schouten wrote:


Author: ed
Date: Sun Dec 25 20:15:41 2011
New Revision: 228878
URL: http://svn.freebsd.org/changeset/base/228878

Log:
 Remove unneeded guard.

 There is no reason why  needs an include guard. It is already
 protected by __bool_true_false_are_defined.

Modified:
 head/include/stdbool.h

Modified: head/include/stdbool.h

==
--- head/include/stdbool.h      Sun Dec 25 18:15:31 2011        (r228877)
+++ head/include/stdbool.h      Sun Dec 25 20:15:41 2011        (r228878)
@@ -26,9 +26,6 @@
 * $FreeBSD$
 */

-#ifndef _STDBOOL_H_
-#define        _STDBOOL_H_
-
#ifndef __bool_true_false_are_defined
#define __bool_true_false_are_defined   1

@@ -44,5 +41,3 @@ typedef       int     _Bool;

#endif /* !__cplusplus */
#endif /* __bool_true_false_are_defined */
-
-#endif /* !_STDBOOL_H_ */



I just thought of this while reviewing the change:  should 
__bool_true_false_are_defined be set only if __cplusplus is not set? 
It should be set for C99, but I wonder if it should be set for C++.


My quick googling didn't show anything at all about the C++ standard 
and stdbool.h or __bool_true_false_are_defined.  It was probably 
originally set because bool, true, and false are all C++ keywords so 
certain code that wanted to ifdef on them didn't also need to check 
__cplusplus.


I did not find anything definitive either.

Also, is there a style requirement that the guard for a header file 
be based off of the name of the file?  I did not see anything obvious 
for this within style(9), but I am curious.


I think it's just common use to make sure different headers use a 
different include guard, so they only protect their contents, not any 
other file's.  The C standard only mentions the symbols bool, true, 
false, and __bool_true_false_are_defined in regards to stdbool.h.


Thank you.  I asked since I have only really noticed filename-based 
guards in the tree although not all are this way (i.e., bsdxml.h uses 
Expat_INCLUDED).


Sean
--
s...@freebsd.org___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228878 - head/include

[Sean C. Farley]

On Fri, 30 Dec 2011, Ed Schouten wrote:


Hello Sean,

* Sean C. Farley , 20111230 03:54:

I just thought of this while reviewing the change:  should
__bool_true_false_are_defined be set only if __cplusplus is not set?
It should be set for C99, but I wonder if it should be set for C++.


Even if the C++ standard doesn't mention it at all, I think it doesn't
mean it is forbidden to define it. It starts with __[a-z], so it is in
the reserved namespace.


I am fine with it.  I found many variations of stdbool.h with some 
wrapping __bool_true_false_are_defined within the __cplusplus check 
(e.g., glibc) and some that did not.  glibc may have it because 
stdbool.h is included from cstdbool and stdbool.h in 
/usr/include/c++/4.2/tr1/.



Also, is there a style requirement that the guard for a header file
be based off of the name of the file?  I did not see anything obvious
for this within style(9), but I am curious.


I am not aware of this.


I am not aware of it either, hence, my question.  It was just something 
to which I have grown accustomed.  Using __bool_true_false_are_defined 
as the guard works.


Sean
--
s...@freebsd.org
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229004 - head/sys/compat/ndis

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 17:18:09 2011
New Revision: 229004
URL: http://svn.freebsd.org/changeset/base/229004

Log:
  In sys/compat/ndis/subr_ntoskrnl.c, change the RtlFillMemory function
  definition from K&R to ANSI, to avoid a clang warning about the uint8_t
  parameter being promoted to int, which is not compatible with the type
  declared in the earlier prototype.
  
  MFC after:1 week

Modified:
  head/sys/compat/ndis/subr_ntoskrnl.c

Modified: head/sys/compat/ndis/subr_ntoskrnl.c
==
--- head/sys/compat/ndis/subr_ntoskrnl.cFri Dec 30 15:41:28 2011
(r229003)
+++ head/sys/compat/ndis/subr_ntoskrnl.cFri Dec 30 17:18:09 2011
(r229004)
@@ -3016,10 +3016,7 @@ RtlSecureZeroMemory(dst, len)
 }
 
 static void
-RtlFillMemory(dst, len, c)
-   void*dst;
-   size_t  len;
-   uint8_t c;
+RtlFillMemory(void *dst, size_t len, uint8_t c)
 {
memset(dst, c, len);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228878 - head/include

[David Chisnall]

On 30 Dec 2011, at 16:52, Sean C. Farley wrote:

>> My quick googling didn't show anything at all about the C++ standard and 
>> stdbool.h or __bool_true_false_are_defined.  It was probably originally set 
>> because bool, true, and false are all C++ keywords so certain code that 
>> wanted to ifdef on them didn't also need to check __cplusplus.
> 
> I did not find anything definitive either.

It's usually a better idea to check the spec than Google...

stdbool.h is not part of the C++ standard, and so it is free to contain 
anything in C++ mode, just as any other non-standard header is.  The  
header is defined by the C++11 spec as containing JUST the 
__bool_true_false_are_defined macro.  The purpose of this header in C++ mode is 
to allow the inclusion of C++ headers that expect to be able to use true and 
false and guard this by the use of the __bool_true_false_are_defined macro.

David___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229005 - stable/9/sys/fs/procfs

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 17:54:33 2011
New Revision: 229005
URL: http://svn.freebsd.org/changeset/base/229005

Log:
  MFC r227104:
  Fix typo.

Modified:
  stable/9/sys/fs/procfs/procfs_status.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/fs/procfs/procfs_status.c
==
--- stable/9/sys/fs/procfs/procfs_status.c  Fri Dec 30 17:18:09 2011
(r229004)
+++ stable/9/sys/fs/procfs/procfs_status.c  Fri Dec 30 17:54:33 2011
(r229005)
@@ -175,7 +175,7 @@ procfs_doproccmdline(PFS_FILL_ARGS)
/*
 * If we are using the ps/cmdline caching, use that.  Otherwise
 * revert back to the old way which only implements full cmdline
-* for the currept process and just p->p_comm for all other
+* for the current process and just p->p_comm for all other
 * processes.
 * Note that if the argv is no longer available, we deliberately
 * don't fall back on p->p_comm or return an error: the authentic
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229006 - stable/8/sys/fs/procfs

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:02:14 2011
New Revision: 229006
URL: http://svn.freebsd.org/changeset/base/229006

Log:
  MFC r227104:
  Fix typo.

Modified:
  stable/8/sys/fs/procfs/procfs_status.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/fs/procfs/procfs_status.c
==
--- stable/8/sys/fs/procfs/procfs_status.c  Fri Dec 30 17:54:33 2011
(r229005)
+++ stable/8/sys/fs/procfs/procfs_status.c  Fri Dec 30 18:02:14 2011
(r229006)
@@ -175,7 +175,7 @@ procfs_doproccmdline(PFS_FILL_ARGS)
/*
 * If we are using the ps/cmdline caching, use that.  Otherwise
 * revert back to the old way which only implements full cmdline
-* for the currept process and just p->p_comm for all other
+* for the current process and just p->p_comm for all other
 * processes.
 * Note that if the argv is no longer available, we deliberately
 * don't fall back on p->p_comm or return an error: the authentic
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229007 - head/sys/i386/xen

[Alan Cox]

Author: alc
Date: Fri Dec 30 18:16:15 2011
New Revision: 229007
URL: http://svn.freebsd.org/changeset/base/229007

Log:
  Merge r216333 and r216555 from the native pmap
When r207410 eliminated the acquisition and release of the page queues
lock from pmap_extract_and_hold(), it didn't take into account that
pmap_pte_quick() sometimes requires the page queues lock to be held.
This change reimplements pmap_extract_and_hold() such that it no
longer uses pmap_pte_quick(), and thus never requires the page queues
lock.
  
  Merge r177525 from the native pmap
Prevent the overflow in the calculation of the next page directory.
The overflow causes the wraparound with consequent corruption of the
(almost) whole address space mapping.
  
  Strictly speaking, r177525 is not required by the Xen pmap because the
  hypervisor steals the uppermost region of the normal kernel address
  space.  I am nonetheless merging it in order to reduce the number of
  unnecessary differences between the native and Xen pmap implementations.
  
  Tested by:sbruno

Modified:
  head/sys/i386/xen/pmap.c

Modified: head/sys/i386/xen/pmap.c
==
--- head/sys/i386/xen/pmap.cFri Dec 30 18:02:14 2011(r229006)
+++ head/sys/i386/xen/pmap.cFri Dec 30 18:16:15 2011(r229007)
@@ -1122,7 +1122,7 @@ vm_page_t
 pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
 {
pd_entry_t pde;
-   pt_entry_t pte;
+   pt_entry_t pte, *ptep;
vm_page_t m;
vm_paddr_t pa;
 
@@ -1142,21 +1142,17 @@ retry:
vm_page_hold(m);
}
} else {
-   sched_pin();
-   pte = PT_GET(pmap_pte_quick(pmap, va));
-   if (*PMAP1)
-   PT_SET_MA(PADDR1, 0);
-   if ((pte & PG_V) &&
+   ptep = pmap_pte(pmap, va);
+   pte = PT_GET(ptep);
+   pmap_pte_release(ptep);
+   if (pte != 0 &&
((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) {
if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME,
-   &pa)) {
-   sched_unpin();
+   &pa))
goto retry;
-   }
m = PHYS_TO_VM_PAGE(pte & PG_FRAME);
vm_page_hold(m);
}
-   sched_unpin();
}
}
PA_UNLOCK_COND(pa);
@@ -2316,6 +2312,8 @@ pmap_remove(pmap_t pmap, vm_offset_t sva
 * Calculate index for next page table.
 */
pdnxt = (sva + NBPDR) & ~PDRMASK;
+   if (pdnxt < sva)
+   pdnxt = eva;
if (pmap->pm_stats.resident_count == 0)
break;
 
@@ -2471,6 +2469,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
u_int pdirindex;
 
pdnxt = (sva + NBPDR) & ~PDRMASK;
+   if (pdnxt < sva)
+   pdnxt = eva;
 
pdirindex = sva >> PDRSHIFT;
ptpaddr = pmap->pm_pdir[pdirindex];
@@ -3172,6 +3172,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
("pmap_copy: invalid to pmap_copy page tables"));
 
pdnxt = (addr + NBPDR) & ~PDRMASK;
+   if (pdnxt < addr)
+   pdnxt = end_addr;
ptepindex = addr >> PDRSHIFT;
 
srcptepaddr = PT_GET(&src_pmap->pm_pdir[ptepindex]);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229008 - stable/9/lib/libc/amd64/gen

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:18:06 2011
New Revision: 229008
URL: http://svn.freebsd.org/changeset/base/229008

Log:
  MFC r227023:
  Make sure that stack is 16-byte aligned before calling a function,
  as it is required by amd64 ABI. Add a comment for the places were
  the stack is accidentally properly aligned already.
  
  PR:   amd64/162214

Modified:
  stable/9/lib/libc/amd64/gen/setjmp.S
  stable/9/lib/libc/amd64/gen/sigsetjmp.S
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/amd64/gen/setjmp.S
==
--- stable/9/lib/libc/amd64/gen/setjmp.SFri Dec 30 18:16:15 2011
(r229007)
+++ stable/9/lib/libc/amd64/gen/setjmp.SFri Dec 30 18:18:06 2011
(r229008)
@@ -54,6 +54,7 @@ ENTRY(setjmp)
movq$1,%rdi /* SIG_BLOCK   */
movq$0,%rsi /* (sigset_t*)set  */
leaq72(%rcx),%rdx   /* 9,10; (sigset_t*)oset */
+   /* stack is 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
popq%rdi
movq%rdi,%rcx
@@ -81,7 +82,9 @@ ENTRY(__longjmp)
movq$3,%rdi /* SIG_SETMASK */
leaq72(%rdx),%rsi   /* (sigset_t*)set  */
movq$0,%rdx /* (sigset_t*)oset */
+   subq$0x8,%rsp   /* make the stack 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
+   addq$0x8,%rsp
popq%rsi
popq%rdi/* jmpbuf */
movq%rdi,%rdx

Modified: stable/9/lib/libc/amd64/gen/sigsetjmp.S
==
--- stable/9/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:16:15 2011
(r229007)
+++ stable/9/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:18:06 2011
(r229008)
@@ -62,6 +62,7 @@ ENTRY(sigsetjmp)
movq$1,%rdi /* SIG_BLOCK   */
movq$0,%rsi /* (sigset_t*)set  */
leaq72(%rcx),%rdx   /* 9,10 (sigset_t*)oset */
+   /* stack is 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
popq%rdi
 2: movq%rdi,%rcx
@@ -90,7 +91,9 @@ ENTRY(__siglongjmp)
movq$3,%rdi /* SIG_SETMASK */
leaq72(%rdx),%rsi   /* (sigset_t*)set  */
movq$0,%rdx /* (sigset_t*)oset */
+   subq$0x8,%rsp   /* make the stack 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
+   addq$0x8,%rsp
popq%rsi
popq%rdi/* jmpbuf */
 2: movq%rdi,%rdx
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229009 - stable/9/lib/libc/i386/gen

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:20:44 2011
New Revision: 229009
URL: http://svn.freebsd.org/changeset/base/229009

Log:
  MFC r227024:
  Despite official i386 ABI does not mandate any stack alignment besides
  the word alignment, some versions of gcc do require 16-byte alignment.
  Make sure the stack is 16-byte aligned before calling a subroutine.

Modified:
  stable/9/lib/libc/i386/gen/setjmp.S
  stable/9/lib/libc/i386/gen/sigsetjmp.S
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/i386/gen/setjmp.S
==
--- stable/9/lib/libc/i386/gen/setjmp.S Fri Dec 30 18:18:06 2011
(r229008)
+++ stable/9/lib/libc/i386/gen/setjmp.S Fri Dec 30 18:20:44 2011
(r229009)
@@ -51,12 +51,19 @@ __FBSDID("$FreeBSD$");
 ENTRY(setjmp)
movl4(%esp),%ecx
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
leal28(%ecx), %eax
pushl   %eax/* (sigset_t*)oset */
pushl   $0  /* (sigset_t*)set  */
pushl   $1  /* SIG_BLOCK   */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%ecx
movl0(%esp),%edx
@@ -76,12 +83,19 @@ END(setjmp)
 ENTRY(__longjmp)
movl4(%esp),%edx
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
pushl   $0  /* (sigset_t*)oset */
leal28(%edx), %eax
pushl   %eax/* (sigset_t*)set  */
pushl   $3  /* SIG_SETMASK */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%edx
movl8(%esp),%eax

Modified: stable/9/lib/libc/i386/gen/sigsetjmp.S
==
--- stable/9/lib/libc/i386/gen/sigsetjmp.S  Fri Dec 30 18:18:06 2011
(r229008)
+++ stable/9/lib/libc/i386/gen/sigsetjmp.S  Fri Dec 30 18:20:44 2011
(r229009)
@@ -60,12 +60,19 @@ ENTRY(sigsetjmp)
testl   %eax,%eax
jz  2f
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
leal28(%ecx), %eax
pushl   %eax/* (sigset_t*)oset */
pushl   $0  /* (sigset_t*)set  */
pushl   $1  /* SIG_BLOCK   */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%ecx
 2: movl0(%esp),%edx
@@ -87,12 +94,19 @@ ENTRY(__siglongjmp)
cmpl$0,44(%edx)
jz  2f
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
pushl   $0  /* (sigset_t*)oset */
leal28(%edx), %eax
pushl   %eax/* (sigset_t*)set  */
pushl   $3  /* SIG_SETMASK */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%edx
 2: movl8(%esp),%eax
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229010 - stable/8/lib/libc/amd64/gen

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:22:34 2011
New Revision: 229010
URL: http://svn.freebsd.org/changeset/base/229010

Log:
  MFC r227023:
  Make sure that stack is 16-byte aligned before calling a function,
  as it is required by amd64 ABI. Add a comment for the places were
  the stack is accidentally properly aligned already.
  
  PR:   amd64/162214

Modified:
  stable/8/lib/libc/amd64/gen/setjmp.S
  stable/8/lib/libc/amd64/gen/sigsetjmp.S
Directory Properties:
  stable/8/lib/libc/   (props changed)

Modified: stable/8/lib/libc/amd64/gen/setjmp.S
==
--- stable/8/lib/libc/amd64/gen/setjmp.SFri Dec 30 18:20:44 2011
(r229009)
+++ stable/8/lib/libc/amd64/gen/setjmp.SFri Dec 30 18:22:34 2011
(r229010)
@@ -54,6 +54,7 @@ ENTRY(setjmp)
movq$1,%rdi /* SIG_BLOCK   */
movq$0,%rsi /* (sigset_t*)set  */
leaq72(%rcx),%rdx   /* 9,10; (sigset_t*)oset */
+   /* stack is 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
popq%rdi
movq%rdi,%rcx
@@ -81,7 +82,9 @@ ENTRY(__longjmp)
movq$3,%rdi /* SIG_SETMASK */
leaq72(%rdx),%rsi   /* (sigset_t*)set  */
movq$0,%rdx /* (sigset_t*)oset */
+   subq$0x8,%rsp   /* make the stack 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
+   addq$0x8,%rsp
popq%rsi
popq%rdi/* jmpbuf */
movq%rdi,%rdx

Modified: stable/8/lib/libc/amd64/gen/sigsetjmp.S
==
--- stable/8/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:20:44 2011
(r229009)
+++ stable/8/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:22:34 2011
(r229010)
@@ -62,6 +62,7 @@ ENTRY(sigsetjmp)
movq$1,%rdi /* SIG_BLOCK   */
movq$0,%rsi /* (sigset_t*)set  */
leaq72(%rcx),%rdx   /* 9,10 (sigset_t*)oset */
+   /* stack is 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
popq%rdi
 2: movq%rdi,%rcx
@@ -90,7 +91,9 @@ ENTRY(__siglongjmp)
movq$3,%rdi /* SIG_SETMASK */
leaq72(%rdx),%rsi   /* (sigset_t*)set  */
movq$0,%rdx /* (sigset_t*)oset */
+   subq$0x8,%rsp   /* make the stack 16-byte aligned */
callPIC_PLT(CNAME(_sigprocmask))
+   addq$0x8,%rsp
popq%rsi
popq%rdi/* jmpbuf */
 2: movq%rdi,%rdx
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229011 - stable/8/lib/libc/i386/gen

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:29:09 2011
New Revision: 229011
URL: http://svn.freebsd.org/changeset/base/229011

Log:
  MFC r227024:
  Despite official i386 ABI does not mandate any stack alignment besides
  the word alignment, some versions of gcc do require 16-byte alignment.
  Make sure the stack is 16-byte aligned before calling a subroutine.

Modified:
  stable/8/lib/libc/i386/gen/setjmp.S
  stable/8/lib/libc/i386/gen/sigsetjmp.S
Directory Properties:
  stable/8/lib/libc/   (props changed)

Modified: stable/8/lib/libc/i386/gen/setjmp.S
==
--- stable/8/lib/libc/i386/gen/setjmp.S Fri Dec 30 18:22:34 2011
(r229010)
+++ stable/8/lib/libc/i386/gen/setjmp.S Fri Dec 30 18:29:09 2011
(r229011)
@@ -51,12 +51,19 @@ __FBSDID("$FreeBSD$");
 ENTRY(setjmp)
movl4(%esp),%ecx
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
leal28(%ecx), %eax
pushl   %eax/* (sigset_t*)oset */
pushl   $0  /* (sigset_t*)set  */
pushl   $1  /* SIG_BLOCK   */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%ecx
movl0(%esp),%edx
@@ -76,12 +83,19 @@ END(setjmp)
 ENTRY(__longjmp)
movl4(%esp),%edx
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
pushl   $0  /* (sigset_t*)oset */
leal28(%edx), %eax
pushl   %eax/* (sigset_t*)set  */
pushl   $3  /* SIG_SETMASK */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%edx
movl8(%esp),%eax

Modified: stable/8/lib/libc/i386/gen/sigsetjmp.S
==
--- stable/8/lib/libc/i386/gen/sigsetjmp.S  Fri Dec 30 18:22:34 2011
(r229010)
+++ stable/8/lib/libc/i386/gen/sigsetjmp.S  Fri Dec 30 18:29:09 2011
(r229011)
@@ -60,12 +60,19 @@ ENTRY(sigsetjmp)
testl   %eax,%eax
jz  2f
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
leal28(%ecx), %eax
pushl   %eax/* (sigset_t*)oset */
pushl   $0  /* (sigset_t*)set  */
pushl   $1  /* SIG_BLOCK   */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%ecx
 2: movl0(%esp),%edx
@@ -87,12 +94,19 @@ ENTRY(__siglongjmp)
cmpl$0,44(%edx)
jz  2f
PIC_PROLOGUE
+#ifdef PIC
+   subl$12,%esp/* make the stack 16-byte aligned */
+#endif
pushl   $0  /* (sigset_t*)oset */
leal28(%edx), %eax
pushl   %eax/* (sigset_t*)set  */
pushl   $3  /* SIG_SETMASK */
callPIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+   addl$24,%esp
+#else
addl$12,%esp
+#endif
PIC_EPILOGUE
movl4(%esp),%edx
 2: movl8(%esp),%eax
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229012 - stable/9/sys/vm

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 18:58:42 2011
New Revision: 229012
URL: http://svn.freebsd.org/changeset/base/229012

Log:
  MFC r228432:
  Fix printf.

Modified:
  stable/9/sys/vm/swap_pager.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/vm/swap_pager.c
==
--- stable/9/sys/vm/swap_pager.cFri Dec 30 18:29:09 2011
(r229011)
+++ stable/9/sys/vm/swap_pager.cFri Dec 30 18:58:42 2011
(r229012)
@@ -233,7 +233,7 @@ swap_reserve_by_cred(vm_ooffset_t incr, 
}
if (!res && ppsratecheck(&lastfail, &curfail, 1)) {
printf("uid %d, pid %d: swap reservation for %jd bytes 
failed\n",
-   curproc->p_pid, uip->ui_uid, incr);
+   uip->ui_uid, curproc->p_pid, incr);
}
 
 #ifdef RACCT
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229013 - stable/8/sys/vm

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 19:04:12 2011
New Revision: 229013
URL: http://svn.freebsd.org/changeset/base/229013

Log:
  MFC r228432:
  Fix printf.

Modified:
  stable/8/sys/vm/swap_pager.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/vm/swap_pager.c
==
--- stable/8/sys/vm/swap_pager.cFri Dec 30 18:58:42 2011
(r229012)
+++ stable/8/sys/vm/swap_pager.cFri Dec 30 19:04:12 2011
(r229013)
@@ -216,7 +216,7 @@ swap_reserve_by_uid(vm_ooffset_t incr, s
}
if (!res && ppsratecheck(&lastfail, &curfail, 1)) {
printf("uid %d, pid %d: swap reservation for %jd bytes 
failed\n",
-   curproc->p_pid, uip->ui_uid, incr);
+   uip->ui_uid, curproc->p_pid, incr);
}
 
return (res);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229014 - stable/9/sys/sys

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 19:18:13 2011
New Revision: 229014
URL: http://svn.freebsd.org/changeset/base/229014

Log:
  MFC r227392:
  Assert that _PRELE() is done for the held process.

Modified:
  stable/9/sys/sys/proc.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/sys/proc.h
==
--- stable/9/sys/sys/proc.h Fri Dec 30 19:04:12 2011(r229013)
+++ stable/9/sys/sys/proc.h Fri Dec 30 19:18:13 2011(r229014)
@@ -755,6 +755,7 @@ MALLOC_DECLARE(M_SUBPROC);
 } while (0)
 #define_PRELE(p) do {  
\
PROC_LOCK_ASSERT((p), MA_OWNED);\
+   PROC_ASSERT_HELD(p);\
(--(p)->p_lock);\
if (((p)->p_flag & P_WEXIT) && (p)->p_lock == 0)\
wakeup(&(p)->p_lock);   \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229015 - stable/8/sys/sys

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 19:24:53 2011
New Revision: 229015
URL: http://svn.freebsd.org/changeset/base/229015

Log:
  MFC r227392:
  Assert that _PRELE() is done for the held process.

Modified:
  stable/8/sys/sys/proc.h
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/sys/proc.h
==
--- stable/8/sys/sys/proc.h Fri Dec 30 19:18:13 2011(r229014)
+++ stable/8/sys/sys/proc.h Fri Dec 30 19:24:53 2011(r229015)
@@ -747,6 +747,7 @@ MALLOC_DECLARE(M_SUBPROC);
 } while (0)
 #define_PRELE(p) do {  
\
PROC_LOCK_ASSERT((p), MA_OWNED);\
+   PROC_ASSERT_HELD(p);\
(--(p)->p_lock);\
if (((p)->p_flag & P_WEXIT) && (p)->p_lock == 0)\
wakeup(&(p)->p_lock);   \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Ben Kaduk]

On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
> Author: uqs
> Date: Fri Dec 30 10:58:14 2011
> New Revision: 228990
> URL: http://svn.freebsd.org/changeset/base/228990
>
> Log:
>  Spelling fixes for usr.sbin/
>
> Modified: head/usr.sbin/bluetooth/sdpd/server.c
> ==
> --- head/usr.sbin/bluetooth/sdpd/server.c       Fri Dec 30 10:45:00 2011      
>   (r228989)
> +++ head/usr.sbin/bluetooth/sdpd/server.c       Fri Dec 30 10:58:14 2011      
>   (r228990)
> @@ -334,7 +334,7 @@ server_accept_client(server_p srv, int32
>                 * The minimum L2CAP MTU is 43 bytes. That means we need
>                 * 65536 / 43 = ~1524 chunks to transfer maximum packet
>                 * size with minimum MTU. The "rsp_cs" field in fd_idx_t
> -                * is 11 bit wide that gives us upto 2048 chunks.
> +                * is 11 bit wide that gives us up to 2048 chunks.

Should be "11 bits", no?

>                 */
>
>                if (omtu < NG_L2CAP_MTU_MINIMUM) {
>
> Modified: head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt
> ==
> --- head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt     Fri 
> Dec 30 10:45:00 2011        (r228989)
> +++ head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt     Fri 
> Dec 30 10:58:14 2011        (r228990)
> @@ -82,8 +82,8 @@ WlanMgmtReasonCode ::= TEXTUAL-CONVENTIO
>                    associationLeave(8),
>                    associationNotAuthenticated(9),
>  -- XXX: TODO - FIXME
> -                   dissasocPwrcapBad(10),
> -                   dissasocSuperchanBad(11),
> +                   disassocPwrcapBad(10),
> +                   disassocSuperchanBad(11),

This file looks like it might be intended to be machine-readable -- I
would worry about changing it without test/review.
Perhaps this spelling "error" is even the reason for the XXX comment above.

>                    ieInvalid(13),
>                    micFailure(14),
>                    fourWayHandshakeTimeout(15),
> @@ -579,10 +579,10 @@ wlanIfaceCountryCode OBJECT-TYPE
>        interface is operating include all environments in the specified
>        country.
>
> -       2. an ASCII 'O' character, if the country's regulastions are for
> +       2. an ASCII 'O' character, if the country's regulations are for
>        Outdoor environment only.
>
> -       3. an ASCII 'I' character, if the country's regulastions are for
> +       3. an ASCII 'I' character, if the country's regulations are for
>        Indoor environment only."
>     ::= { wlanIfaceConfigEntry 2 }
>
> @@ -634,7 +634,7 @@ wlanIfaceFastFrames OBJECT-TYPE
>     DESCRIPTION
>        "The value of this object controls whether use of Atheros Fast
>        Frames is enabled when when communicating with another Fast
> -       Frames-capable station. The value is only meaningfull for
> +       Frames-capable station. The value is only meaningful for
>        interfaces that support Atheros Fast Frames."
>     ::= { wlanIfaceConfigEntry 7 }
>
> @@ -645,7 +645,7 @@ wlanIfaceDturbo OBJECT-TYPE
>     DESCRIPTION
>        "The value of this object controls whether use of Atheros Dynamic
>        Turbo mode is enabled when when communicating with another Dynamic
> -       Turbo-capable station. The value is only meaningfull for interfaces
> +       Turbo-capable station. The value is only meaningful for interfaces
>        that support Atheros Dynamic Turbo mode."
>     ::= { wlanIfaceConfigEntry 8 }
>
> @@ -731,7 +731,7 @@ wlanIfaceBeaconMissedThreshold OBJECT-TY
>     MAX-ACCESS read-write
>     STATUS     current
>     DESCRIPTION
> -       "The value of this object specifies the number of consequtive missed
> +       "The value of this object specifies the number of consecutive missed
>        beacons before an interface operating in station mode will attempt
>        to search for a new access point."
>     DEFVAL     { 7 }
> @@ -788,7 +788,7 @@ wlanIfaceDynamicWds OBJECT-TYPE
>     STATUS     current
>     DESCRIPTION
>        "The value of this object specifies whether Dynamic WDS (DWDS)
> -       support is enabled. The value is only meaningfull for interfaces
> +       support is enabled. The value is only meaningful for interfaces
>        that support Dynamic WDS."
>     ::= { wlanIfaceConfigEntry 21 }
>
> @@ -798,7 +798,7 @@ wlanIfacePowerSave OBJECT-TYPE
>     STATUS     current
>     DESCRIPTION
>        "The value of this object specifies whether powersave operation
> -       is enabled. The value is only meaningfull for interfaces that
> +       is enabled. The value is only meaningful for interfaces that
>        support powersave operation."
>     ::= { wlanIfaceConfigEntry 22 }
>
> @@ -809,7 +809,7 @@ wlanIfaceApBridge OBJECT-TYPE
>     DESCRIPTION
>        "The value of this object specifies whether packets between
>        wireless clie

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Alexey Dokuchaev]

On Fri, Dec 30, 2011 at 02:43:22PM -0500, Ben Kaduk wrote:
> On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
> > -                * is 11 bit wide that gives us upto 2048 chunks.
> > +                * is 11 bit wide that gives us up to 2048 chunks.
> 
> Should be "11 bits", no?

I'm not a native speaker, but I think "11 bit wide" is correct here.  I
could have probably got into specifics, but simple googling for "16 ton shit
dropped on me" yielded 525M results, while the same phrase with "tons" only
18,9M.  :-^

./danfe
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229016 - stable/9/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 19:58:06 2011
New Revision: 229016
URL: http://svn.freebsd.org/changeset/base/229016

Log:
  MFC r228178:
  If alloc_unr() call in the pipe_create() failed, then pipe->pipe_ino is
  -1. But, because ino_t is unsigned, this case was not covered by the
  test ino > 0 in pipeclose(), leading to the free_unr(-1). Fix it by
  explicitely comparing with 0 and -1.
  
  Do no access freed memory, the inode number was cached to prevent access
  to cpipe after it possibly was freed, but I failed to commit the right
  patch.

Modified:
  stable/9/sys/kern/sys_pipe.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/sys_pipe.c
==
--- stable/9/sys/kern/sys_pipe.cFri Dec 30 19:24:53 2011
(r229015)
+++ stable/9/sys/kern/sys_pipe.cFri Dec 30 19:58:06 2011
(r229016)
@@ -1554,8 +1554,8 @@ pipeclose(cpipe)
} else
PIPE_UNLOCK(cpipe);
 
-   if (ino > 0)
-   free_unr(pipeino_unr, cpipe->pipe_ino);
+   if (ino != 0 && ino != (ino_t)-1)
+   free_unr(pipeino_unr, ino);
 }
 
 /*ARGSUSED*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn: head/sys/netinet

[Maxim Sobolev]

Won't this break whole lot of third-party software, which expects 
FreeBSD to be slightly different in this regards? Just curious.


-Maxim

On 10/7/2011 6:43 AM, Andre Oppermann wrote:

Author: andre
Date: Fri Oct  7 13:43:01 2011
New Revision: 226105
URL: http://svn.freebsd.org/changeset/base/226105

Log:
   Add back the IP header length to the total packet length field on
   raw IP sockets.  It was deducted in ip_input() in preparation for
   protocols interested only in the payload.

   On raw sockets the IP header should be delivered as it at came in
   from the network except for the byte order swaps in some fields.

   This brings us in line with all other OS'es that provide raw
   IP sockets.

   Reported by: Matthew Cini Sarreo
   MFC after: 3 days

Modified:
   head/sys/netinet/raw_ip.c

Modified: head/sys/netinet/raw_ip.c
==
--- head/sys/netinet/raw_ip.c   Fri Oct  7 13:16:21 2011(r226104)
+++ head/sys/netinet/raw_ip.c   Fri Oct  7 13:43:01 2011(r226105)
@@ -289,6 +289,13 @@ rip_input(struct mbuf *m, int off)
last = NULL;

ifp = m->m_pkthdr.rcvif;
+   /*
+* Add back the IP header length which was
+* removed by ip_input().  Raw sockets do
+* not modify the packet except for some
+* byte order swaps.
+*/
+   ip->ip_len += off;

hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr,
ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask);




___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229017 - stable/9/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 19:59:54 2011
New Revision: 229017
URL: http://svn.freebsd.org/changeset/base/229017

Log:
  MFC r228375:
  Typo.

Modified:
  stable/9/libexec/rtld-elf/rtld.h
Directory Properties:
  stable/9/libexec/rtld-elf/   (props changed)

Modified: stable/9/libexec/rtld-elf/rtld.h
==
--- stable/9/libexec/rtld-elf/rtld.hFri Dec 30 19:58:06 2011
(r229016)
+++ stable/9/libexec/rtld-elf/rtld.hFri Dec 30 19:59:54 2011
(r229017)
@@ -246,7 +246,7 @@ typedef struct Struct_Obj_Entry {
 
 /* Flags to be passed into symlook_ family of functions. */
 #define SYMLOOK_IN_PLT 0x01/* Lookup for PLT symbol */
-#define SYMLOOK_DLSYM  0x02/* Return newes versioned symbol. Used by
+#define SYMLOOK_DLSYM  0x02/* Return newest versioned symbol. Used by
   dlsym. */
 
 /* Flags for load_object(). */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Harti Brandt]

On Fri, 30 Dec 2011, Ben Kaduk wrote:

BK>On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
BK>> Author: uqs
BK>> Date: Fri Dec 30 10:58:14 2011
BK>> New Revision: 228990
BK>> URL: http://svn.freebsd.org/changeset/base/228990
BK>>
BK>> Log:
BK>>  Spelling fixes for usr.sbin/
BK>>

[snip]

BK>> Modified: head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt
BK>> 
==
BK>> --- head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt     
Fri Dec 30 10:45:00 2011        (r228989)
BK>> +++ head/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt     
Fri Dec 30 10:58:14 2011        (r228990)
BK>> @@ -82,8 +82,8 @@ WlanMgmtReasonCode ::= TEXTUAL-CONVENTIO
BK>>                    associationLeave(8),
BK>>                    associationNotAuthenticated(9),
BK>>  -- XXX: TODO - FIXME
BK>> -                   dissasocPwrcapBad(10),
BK>> -                   dissasocSuperchanBad(11),
BK>> +                   disassocPwrcapBad(10),
BK>> +                   disassocSuperchanBad(11),
BK>
BK>This file looks like it might be intended to be machine-readable -- I
BK>would worry about changing it without test/review.
BK>Perhaps this spelling "error" is even the reason for the XXX comment above.

Absolutely. If there is a spelling error in an SNMP MIB outside comments 
or description strings it must stay there. Otherwise applications reading 
that file will break.

This is also true for the corresponding .def file.

harti___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229018 - stable/8/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:01:26 2011
New Revision: 229018
URL: http://svn.freebsd.org/changeset/base/229018

Log:
  MFC r228375:
  Typo.

Modified:
  stable/8/libexec/rtld-elf/rtld.h
Directory Properties:
  stable/8/libexec/rtld-elf/   (props changed)

Modified: stable/8/libexec/rtld-elf/rtld.h
==
--- stable/8/libexec/rtld-elf/rtld.hFri Dec 30 19:59:54 2011
(r229017)
+++ stable/8/libexec/rtld-elf/rtld.hFri Dec 30 20:01:26 2011
(r229018)
@@ -239,7 +239,7 @@ typedef struct Struct_Obj_Entry {
 
 /* Flags to be passed into symlook_ family of functions. */
 #define SYMLOOK_IN_PLT 0x01/* Lookup for PLT symbol */
-#define SYMLOOK_DLSYM  0x02/* Return newes versioned symbol. Used by
+#define SYMLOOK_DLSYM  0x02/* Return newest versioned symbol. Used by
   dlsym. */
 
 /* Flags for load_object(). */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn: head/sys/netinet

[Gleb Smirnoff]

On Fri, Dec 30, 2011 at 11:23:45AM -0800, Maxim Sobolev wrote:
M> Won't this break whole lot of third-party software, which expects 
M> FreeBSD to be slightly different in this regards? Just curious.

Yes it does. And until FreeBSD 10.0-RELEASE there is time to fix
this software (at least in ports).

The MFC to stable/9 of r226105 was back out.

M> -Maxim
M> 
M> On 10/7/2011 6:43 AM, Andre Oppermann wrote:
M> > Author: andre
M> > Date: Fri Oct  7 13:43:01 2011
M> > New Revision: 226105
M> > URL: http://svn.freebsd.org/changeset/base/226105
M> >
M> > Log:
M> >Add back the IP header length to the total packet length field on
M> >raw IP sockets.  It was deducted in ip_input() in preparation for
M> >protocols interested only in the payload.
M> >
M> >On raw sockets the IP header should be delivered as it at came in
M> >from the network except for the byte order swaps in some fields.
M> >
M> >This brings us in line with all other OS'es that provide raw
M> >IP sockets.
M> >
M> >Reported by: Matthew Cini Sarreo
M> >MFC after: 3 days
M> >
M> > Modified:
M> >head/sys/netinet/raw_ip.c
M> >
M> > Modified: head/sys/netinet/raw_ip.c
M> > 
==
M> > --- head/sys/netinet/raw_ip.c  Fri Oct  7 13:16:21 2011
(r226104)
M> > +++ head/sys/netinet/raw_ip.c  Fri Oct  7 13:43:01 2011
(r226105)
M> > @@ -289,6 +289,13 @@ rip_input(struct mbuf *m, int off)
M> >last = NULL;
M> >
M> >ifp = m->m_pkthdr.rcvif;
M> > +  /*
M> > +   * Add back the IP header length which was
M> > +   * removed by ip_input().  Raw sockets do
M> > +   * not modify the packet except for some
M> > +   * byte order swaps.
M> > +   */
M> > +  ip->ip_len += off;
M> >
M> >hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr,
M> >ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask);
M> >
M> >

-- 
Totus tuus, Glebius.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Glen Barber]

On Fri, Dec 30, 2011 at 07:54:44PM +, Alexey Dokuchaev wrote:
> On Fri, Dec 30, 2011 at 02:43:22PM -0500, Ben Kaduk wrote:
> > On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
> > > -                * is 11 bit wide that gives us upto 2048 chunks.
> > > +                * is 11 bit wide that gives us up to 2048 chunks.
> > 
> > Should be "11 bits", no?
> 
> I'm not a native speaker, but I think "11 bit wide" is correct here.  I
> could have probably got into specifics, but simple googling for "16 ton shit
> dropped on me" yielded 525M results, while the same phrase with "tons" only
> 18,9M.  :-^
> 

Considering the full context, maybe it would be better written as:

rsp_cs is an 11 bit wide field that gives ...

Glen



pgpH0KgCuIWRV.pgp
Description: PGP signature

svn commit: r229019 - stable/9/sys/ddb

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:06:43 2011
New Revision: 229019
URL: http://svn.freebsd.org/changeset/base/229019

Log:
  MFC r228376:
  Typo.

Modified:
  stable/9/sys/ddb/db_thread.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ddb/db_thread.c
==
--- stable/9/sys/ddb/db_thread.cFri Dec 30 20:01:26 2011
(r229018)
+++ stable/9/sys/ddb/db_thread.cFri Dec 30 20:06:43 2011
(r229019)
@@ -109,7 +109,7 @@ db_show_threads(db_expr_t addr, boolean_
  * Lookup a thread based on a db expression address.  We assume that the
  * address was parsed in hexadecimal.  We reparse the address in decimal
  * first and try to treat it as a thread ID to find an associated thread.
- * If that fails and check_pid is true, we terat the decimal value as a
+ * If that fails and check_pid is true, we treat the decimal value as a
  * PID.  If that matches a process, we return the first thread in that
  * process.  Otherwise, we treat the addr as a pointer to a thread.
  */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228992 - in head/usr.bin: csup finger fstat indent ipcs lex limits locate/locate login mail make man ncplogin netstat pr rpcgen rpcinfo systat talk tip/tip top vgrind xlint/lint1 xlin

[Ben Kaduk]

On Fri, Dec 30, 2011 at 6:02 AM, Ulrich Spoerlein  wrote:
> Author: uqs
> Date: Fri Dec 30 11:02:40 2011
> New Revision: 228992
> URL: http://svn.freebsd.org/changeset/base/228992
>
> Log:
>  Spelling fixes for usr.bin/
>
>
> Modified: head/usr.bin/lex/NEWS
> ==
> --- head/usr.bin/lex/NEWS       Fri Dec 30 10:59:15 2011        (r228991)
> +++ head/usr.bin/lex/NEWS       Fri Dec 30 11:02:40 2011        (r228992)
> @@ -1,3 +1,5 @@
> +$FreeBSD$
> +

NEWS feels pretty similar to CHANGES, to me (viz r228990's comments)

>  Changes between release 2.5.4 (11Sep96) and release 2.5.3:
>
>        - Fixed a bug introduced in 2.5.3 that blew it when a call
> @@ -944,7 +946,7 @@ Changes between 2.3 (full) release of 28
>          given.  To specify an end-of-file action for just the initial
>          state, use <>.
>
> -       - -d debug output is now contigent on the global yy_flex_debug
> +       - -d debug output is now contingent on the global yy_flex_debug
>          being set to a non-zero value, which it is by default.
>
>        - A new macro, YY_USER_INIT, is provided for the user to specify
> @@ -987,7 +989,7 @@ Changes between 2.3 (full) release of 28
>        - yy_switch_to_buffer() can be used in the yywrap() macro/routine.
>
>        - flex scanners do not use stdio for their input, and hence when
> -         writing an interactive scanner one must explictly call fflush()
> +         writing an interactive scanner one must explicitly call fflush()
>          after writing out a prompt.
>
>        - flex scanner can be made reentrant (after a fashion) by using
>
> Modified: head/usr.bin/locate/locate/util.c
> ==
> --- head/usr.bin/locate/locate/util.c   Fri Dec 30 10:59:15 2011        
> (r228991)
> +++ head/usr.bin/locate/locate/util.c   Fri Dec 30 11:02:40 2011        
> (r228992)
> @@ -218,11 +218,11 @@ tolower_word(word)
>
>
>  /*
> - * Read integer from mmap pointer.
> - * Essential a simple  ``return *(int *)p'' but avoid sigbus
> + * Read integer from mmap pointer.
> + * Essential a simple  ``return *(int *)p'' but avoid sigbus

I feel like this wants to be "Essentially ... avoids".
(Also, is trailing whitespace really "spelling"?)

>  * for integer alignment (SunOS 4.x, 5.x).
>  *
> - * Convert network byte order to host byte order if neccessary.
> + * Convert network byte order to host byte order if necessary.
>  * So we can read on FreeBSD/i386 (little endian) a locate database
>  * which was built on SunOS/sparc (big endian).
>  */
> @@ -254,7 +254,7 @@ getwm(p)
>  /*
>  * Read integer from stream.
>  *
> - * Convert network byte order to host byte order if neccessary.
> + * Convert network byte order to host byte order if necessary.
>  * So we can read on FreeBSD/i386 (little endian) a locate database
>  * which was built on SunOS/sparc (big endian).
>  */
>
> Modified: head/usr.bin/mail/main.c
> ==
> --- head/usr.bin/mail/main.c    Fri Dec 30 10:59:15 2011        (r228991)
> +++ head/usr.bin/mail/main.c    Fri Dec 30 11:02:40 2011        (r228992)
> @@ -259,7 +259,7 @@ Usage: %s [-dEiInv] [-s subject] [-c cc-
>                if (ef == NULL)
>                        ef = "%";
>                if (setfile(ef) <= 0)
> -                       /* Either an error has occured, or no mail */
> +                       /* Either an error has occurted, or no mail */

Just "occurred", no?

>                        exit(1);
>                else
>                        exit(0);
>
> Modified: head/usr.bin/mail/util.c
> ==
> --- head/usr.bin/mail/util.c    Fri Dec 30 10:59:15 2011        (r228991)
> +++ head/usr.bin/mail/util.c    Fri Dec 30 11:02:40 2011        (r228992)
> @@ -550,7 +550,7 @@ newname:
>  }
>
>  /*
> - * Count the occurances of c in str
> + * Count the occurrances of c in str

"occurrences", again.

>  */
>  int
>  charcount(char *str, int c)
>
> Modified: head/usr.bin/talk/ctl_transact.c
> ==
> --- head/usr.bin/talk/ctl_transact.c    Fri Dec 30 10:59:15 2011        
> (r228991)
> +++ head/usr.bin/talk/ctl_transact.c    Fri Dec 30 11:02:40 2011        
> (r228992)
> @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)ctl_tr
>
>  /*
>  * SOCKDGRAM is unreliable, so we must repeat messages if we have
> - * not recieved an acknowledgement within a reasonable amount
> + * not received an acknowledgement within a reasonable amount

Merriam-Webster thinks it's "acknowledgment", but I always have to
double-check this one.

>  * of time
>  */
>  void
>
> Modified: head/usr.bin/yacc/NEW_FEATURES
> ==
> --- head/usr.bin/yacc/NEW_FEATURES      Fri Dec 

svn commit: r229020 - stable/8/sys/ddb

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:12:50 2011
New Revision: 229020
URL: http://svn.freebsd.org/changeset/base/229020

Log:
  MFC r228376:
  Typo.

Modified:
  stable/8/sys/ddb/db_thread.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/ddb/db_thread.c
==
--- stable/8/sys/ddb/db_thread.cFri Dec 30 20:06:43 2011
(r229019)
+++ stable/8/sys/ddb/db_thread.cFri Dec 30 20:12:50 2011
(r229020)
@@ -109,7 +109,7 @@ db_show_threads(db_expr_t addr, boolean_
  * Lookup a thread based on a db expression address.  We assume that the
  * address was parsed in hexadecimal.  We reparse the address in decimal
  * first and try to treat it as a thread ID to find an associated thread.
- * If that fails and check_pid is true, we terat the decimal value as a
+ * If that fails and check_pid is true, we treat the decimal value as a
  * PID.  If that matches a process, we return the first thread in that
  * process.  Otherwise, we treat the addr as a pointer to a thread.
  */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Colin Percival]

On 12/30/11 11:54, Alexey Dokuchaev wrote:
> On Fri, Dec 30, 2011 at 02:43:22PM -0500, Ben Kaduk wrote:
>> On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
>>> -* is 11 bit wide that gives us upto 2048 chunks.
>>> +* is 11 bit wide that gives us up to 2048 chunks.
>>
>> Should be "11 bits", no?
> 
> I'm not a native speaker, but I think "11 bit wide" is correct here.

I am a native speaker, and it's "11 bits wide".  English is an odd language:
An "11 bit wide field" is "11 bits wide".  (Similarly, a 45 *foot* long bus
is 45 *feet* long.)

-- 
Colin Percival
Security Officer, FreeBSD | freebsd.org | The power to serve
Founder / author, Tarsnap | tarsnap.com | Online backups for the truly paranoid
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r227652 - in head: share/man/man4 sys/dev/virtio sys/dev/virtio/balloon sys/dev/virtio/block sys/dev/virtio/network sys/dev/virtio/pci sys/modules sys/modules/virtio sys/modules/virtio

[Slawa Olhovchenkov]

On Fri, Nov 18, 2011 at 05:43:43AM +, Peter Grehan wrote:

> Author: grehan
> Date: Fri Nov 18 05:43:43 2011
> New Revision: 227652
> URL: http://svn.freebsd.org/changeset/base/227652
> 
> Log:
>   Import virtio base, PCI front-end, and net/block/balloon drivers.
>   Tested on Qemu/KVM, VirtualBox, and BHyVe.
>   
>   Currently built as modules-only on i386/amd64. Man pages not yet hooked
>   up, pending review.
>   
>   Submitted by:   Bryan Venteicher  bryanv at daemoninthecloset dot org
>   Reviewed by:bz
>   MFC after:  4 weeks or so

MFC ready?
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229021 - stable/9/sys/fs/procfs

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:21:53 2011
New Revision: 229021
URL: http://svn.freebsd.org/changeset/base/229021

Log:
  MFC r227393:
  Lock the thread lock around block that retrieves td_wmesg. Otherwise,
  procfs could see a thread with assigned td_wchan but still NULL td_wmesg.

Modified:
  stable/9/sys/fs/procfs/procfs_status.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/fs/procfs/procfs_status.c
==
--- stable/9/sys/fs/procfs/procfs_status.c  Fri Dec 30 20:12:50 2011
(r229020)
+++ stable/9/sys/fs/procfs/procfs_status.c  Fri Dec 30 20:21:53 2011
(r229021)
@@ -113,12 +113,14 @@ procfs_doprocstatus(PFS_FILL_ARGS)
}
 
tdfirst = FIRST_THREAD_IN_PROC(p);
+   thread_lock(tdfirst);
if (tdfirst->td_wchan != NULL) {
KASSERT(tdfirst->td_wmesg != NULL,
("wchan %p has no wmesg", tdfirst->td_wchan));
wmesg = tdfirst->td_wmesg;
} else
wmesg = "nochan";
+   thread_unlock(tdfirst);
 
if (p->p_flag & P_INMEM) {
struct timeval start, ut, st;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229022 - stable/8/sys/fs/procfs

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:24:52 2011
New Revision: 229022
URL: http://svn.freebsd.org/changeset/base/229022

Log:
  MFC r227393:
  Lock the thread lock around block that retrieves td_wmesg. Otherwise,
  procfs could see a thread with assigned td_wchan but still NULL td_wmesg.

Modified:
  stable/8/sys/fs/procfs/procfs_status.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/fs/procfs/procfs_status.c
==
--- stable/8/sys/fs/procfs/procfs_status.c  Fri Dec 30 20:21:53 2011
(r229021)
+++ stable/8/sys/fs/procfs/procfs_status.c  Fri Dec 30 20:24:52 2011
(r229022)
@@ -113,12 +113,14 @@ procfs_doprocstatus(PFS_FILL_ARGS)
}
 
tdfirst = FIRST_THREAD_IN_PROC(p);
+   thread_lock(tdfirst);
if (tdfirst->td_wchan != NULL) {
KASSERT(tdfirst->td_wmesg != NULL,
("wchan %p has no wmesg", tdfirst->td_wchan));
wmesg = tdfirst->td_wmesg;
} else
wmesg = "nochan";
+   thread_unlock(tdfirst);
 
if (p->p_flag & P_INMEM) {
struct timeval start, ut, st;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228990 - in head/usr.sbin: IPXrouted adduser bluetooth/btpand bluetooth/sdpd bootparamd/bootparamd bsnmpd/modules/snmp_bridge bsnmpd/modules/snmp_hostres bsnmpd/modules/snmp_wlan bsnm

[Garrett Cooper]

2011/12/30 Alexey Dokuchaev :
> On Fri, Dec 30, 2011 at 02:43:22PM -0500, Ben Kaduk wrote:
>> On Fri, Dec 30, 2011 at 5:58 AM, Ulrich Spoerlein  wrote:
>> > -                * is 11 bit wide that gives us upto 2048 chunks.
>> > +                * is 11 bit wide that gives us up to 2048 chunks.
>>
>> Should be "11 bits", no?
>
> I'm not a native speaker, but I think "11 bit wide" is correct here.  I
> could have probably got into specifics, but simple googling for "16 ton shit
> dropped on me" yielded 525M results, while the same phrase with "tons" only
> 18,9M.  :-^

bits is correct because it's the plural form of the word, but the
sentence sounds off even with that change.

This sounds better:

"is 11-bits wide, which gives us up to 2048 chunks"

The only question that lingers in my mind, is what does "chunks"
qualify (buffer chunks? chunks of gold? chunks of rocca chocolate
bars? etc)?

Thanks,
-Garrett
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229023 - in stable/9/sys: amd64/amd64 amd64/include i386/i386 i386/include

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:35:13 2011
New Revision: 229023
URL: http://svn.freebsd.org/changeset/base/229023

Log:
  MFC r227399:
  Attempt to improve formatting and content of several comments for
  amd64 and i386 MD code.

Modified:
  stable/9/sys/amd64/amd64/trap.c
  stable/9/sys/amd64/include/signal.h
  stable/9/sys/amd64/include/ucontext.h
  stable/9/sys/i386/i386/trap.c
  stable/9/sys/i386/include/signal.h
  stable/9/sys/i386/include/ucontext.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/trap.c
==
--- stable/9/sys/amd64/amd64/trap.c Fri Dec 30 20:24:52 2011
(r229022)
+++ stable/9/sys/amd64/amd64/trap.c Fri Dec 30 20:35:13 2011
(r229023)
@@ -900,9 +900,9 @@ cpu_fetch_syscall_args(struct thread *td
 #include "../../kern/subr_syscall.c"
 
 /*
- * syscall -   system call request C handler
- *
- * A system call is essentially treated as a trap.
+ * System call handler for native binaries.  The trap frame is already
+ * set up by the assembler trampoline and a pointer to it is saved in
+ * td_frame.
  */
 void
 amd64_syscall(struct thread *td, int traced)

Modified: stable/9/sys/amd64/include/signal.h
==
--- stable/9/sys/amd64/include/signal.h Fri Dec 30 20:24:52 2011
(r229022)
+++ stable/9/sys/amd64/include/signal.h Fri Dec 30 20:35:13 2011
(r229023)
@@ -47,18 +47,14 @@ typedef long sig_atomic_t;
 #include   /* codes for SIGILL, SIGFPE */
 
 /*
- * Only the kernel should need these old type definitions.
- */
-/*
  * Information pushed on stack when a signal is delivered.
  * This is used by the kernel to restore state following
  * execution of the signal handler.  It is also made available
  * to the handler to allow it to restore state properly if
  * a non-standard exit is performed.
- */
-/*
- * The sequence of the fields/registers in struct sigcontext should match
- * those in mcontext_t.
+ *
+ * The sequence of the fields/registers after sc_mask in struct
+ * sigcontext must match those in mcontext_t and struct trapframe.
  */
 struct sigcontext {
struct __sigset sc_mask;/* signal mask to restore */
@@ -93,8 +89,8 @@ struct sigcontext {
longsc_ss;
longsc_len; /* sizeof(mcontext_t) */
/*
-* XXX - See  and  for
-*   the following fields.
+* See  and  for the following
+* fields.
 */
longsc_fpformat;
longsc_ownedfp;

Modified: stable/9/sys/amd64/include/ucontext.h
==
--- stable/9/sys/amd64/include/ucontext.h   Fri Dec 30 20:24:52 2011
(r229022)
+++ stable/9/sys/amd64/include/ucontext.h   Fri Dec 30 20:35:13 2011
(r229023)
@@ -41,12 +41,13 @@
 
 typedef struct __mcontext {
/*
-* The first 24 fields must match the definition of
-* sigcontext. So that we can support sigcontext
-* and ucontext_t at the same time.
+* The definition of mcontext_t must match the layout of
+* struct sigcontext after the sc_mask member.  This is so
+* that we can support sigcontext and ucontext_t at the same
+* time.
 */
-   __register_tmc_onstack; /* XXX - sigcontext compat. */
-   __register_tmc_rdi; /* machine state (struct 
trapframe) */
+   __register_tmc_onstack; /* XXX - sigcontext compat. */
+   __register_tmc_rdi; /* machine state (struct trapframe) */
__register_tmc_rsi;
__register_tmc_rdx;
__register_tmc_rcx;

Modified: stable/9/sys/i386/i386/trap.c
==
--- stable/9/sys/i386/i386/trap.c   Fri Dec 30 20:24:52 2011
(r229022)
+++ stable/9/sys/i386/i386/trap.c   Fri Dec 30 20:35:13 2011
(r229023)
@@ -1065,9 +1065,8 @@ cpu_fetch_syscall_args(struct thread *td
 #include "../../kern/subr_syscall.c"
 
 /*
- * syscall -   system call request C handler
- *
- * A system call is essentially treated as a trap.
+ * syscall - system call request C handler.  A system call is
+ * essentially treated as a trap by reusing the frame layout.
  */
 void
 syscall(struct trapframe *frame)

Modified: stable/9/sys/i386/include/signal.h
==
--- stable/9/sys/i386/include/signal.h  Fri Dec 30 20:24:52 2011
(r229022)
+++ stable/9/sys/i386/include/signal.h  Fri Dec 30 20:35:13 2011
(r229023)
@@ -46,16 +46,17 @@ typedef int sig_atomic_t;
 #include   /* codes for SIGILL, SIGFPE */
 
 /*
- * Only the kernel should need these old type definitions.
- */
-#if defined(_KERNEL) && defined(COMP

svn commit: r229024 - head/lib/libc/gen

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 20:41:24 2011
New Revision: 229024
URL: http://svn.freebsd.org/changeset/base/229024

Log:
  Add some additional const poison after r228972.  The 'mapping' array in
  lib/libc/gen/strtofflags.c became const, but gcc did not warn about
  assigning its members to non-const pointers.  Clang warned about this
  with:
  
  lib/libc/gen/strtofflags.c:98:12: error: assigning to 'char *' from 'const 
char *' discards qualifiers [-Werror,-Wincompatible-pointer-types]
  for (sp = mapping[i].invert ? mapping[i].name :
  ^ ~
  
  Reviewed by:  jilles

Modified:
  head/lib/libc/gen/strtofflags.c

Modified: head/lib/libc/gen/strtofflags.c
==
--- head/lib/libc/gen/strtofflags.c Fri Dec 30 20:35:13 2011
(r229023)
+++ head/lib/libc/gen/strtofflags.c Fri Dec 30 20:41:24 2011
(r229024)
@@ -82,7 +82,8 @@ fflagstostr(flags)
u_long flags;
 {
char *string;
-   char *sp, *dp;
+   const char *sp;
+   char *dp;
u_long setflags;
int i;
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229025 - stable/9/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:45:40 2011
New Revision: 229025
URL: http://svn.freebsd.org/changeset/base/229025

Log:
  MFC r227443:
  Guard against the unlikely case of the alias path containing the '%' symbols.

Modified:
  stable/9/sys/kern/kern_conf.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_conf.c
==
--- stable/9/sys/kern/kern_conf.c   Fri Dec 30 20:41:24 2011
(r229024)
+++ stable/9/sys/kern/kern_conf.c   Fri Dec 30 20:45:40 2011
(r229025)
@@ -1016,7 +1016,7 @@ make_dev_physpath_alias(int flags, struc
old_alias = NULL;
ret = 0;
} else {
-   ret = make_dev_alias_p(flags, cdev, pdev, devfspath);
+   ret = make_dev_alias_p(flags, cdev, pdev, "%s", devfspath);
}
 out:
if (old_alias != NULL)  
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229026 - stable/9/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:52:56 2011
New Revision: 229026
URL: http://svn.freebsd.org/changeset/base/229026

Log:
  MFC r227444:
  Style.

Modified:
  stable/9/sys/kern/kern_conf.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_conf.c
==
--- stable/9/sys/kern/kern_conf.c   Fri Dec 30 20:45:40 2011
(r229025)
+++ stable/9/sys/kern/kern_conf.c   Fri Dec 30 20:52:56 2011
(r229026)
@@ -1009,8 +1009,7 @@ make_dev_physpath_alias(int flags, struc
}
 
sprintf(devfspath, "%s/%s", physpath, pdev->si_name);
-   if (old_alias != NULL
-&& strcmp(old_alias->si_name, devfspath) == 0) {
+   if (old_alias != NULL && strcmp(old_alias->si_name, devfspath) == 0) {
/* Retain the existing alias. */
*cdev = old_alias;
old_alias = NULL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229027 - stable/9/lib/libc/sys

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:55:38 2011
New Revision: 229027
URL: http://svn.freebsd.org/changeset/base/229027

Log:
  MFC r227622:
  Fix typo.

Modified:
  stable/9/lib/libc/sys/stat.2
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/sys/stat.2
==
--- stable/9/lib/libc/sys/stat.2Fri Dec 30 20:52:56 2011
(r229026)
+++ stable/9/lib/libc/sys/stat.2Fri Dec 30 20:55:38 2011
(r229027)
@@ -28,7 +28,7 @@
 .\" @(#)stat.2 8.4 (Berkeley) 5/1/95
 .\" $FreeBSD$
 .\"
-.Dd March 28, 2010
+.Dd November 17, 2011
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -411,7 +411,7 @@ and
 system calls are expected to conform to
 .St -p1003.1-90 .
 The
-.Fn fchownat
+.Fn fstatat
 system call follows The Open Group Extended API Set 2 specification.
 .Sh HISTORY
 The
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229028 - stable/8/lib/libc/sys

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 20:57:36 2011
New Revision: 229028
URL: http://svn.freebsd.org/changeset/base/229028

Log:
  MFC r227622:
  Fix typo.

Modified:
  stable/8/lib/libc/sys/stat.2
Directory Properties:
  stable/8/lib/libc/   (props changed)

Modified: stable/8/lib/libc/sys/stat.2
==
--- stable/8/lib/libc/sys/stat.2Fri Dec 30 20:55:38 2011
(r229027)
+++ stable/8/lib/libc/sys/stat.2Fri Dec 30 20:57:36 2011
(r229028)
@@ -28,7 +28,7 @@
 .\" @(#)stat.2 8.4 (Berkeley) 5/1/95
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd November 17, 2011
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -405,7 +405,7 @@ and
 system calls are expected to conform to
 .St -p1003.1-90 .
 The
-.Fn fchownat
+.Fn fstatat
 system call follows The Open Group Extended API Set 2 specification.
 .Sh HISTORY
 The
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229029 - stable/9

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 21:00:02 2011
New Revision: 229029
URL: http://svn.freebsd.org/changeset/base/229029

Log:
  MFC r227120:
  
  Make it possible to set CC and CXX (and optionally, AS and LD) in
  make.conf(5), while allowing the build32 stage on 64-bit architectures
  to still override them, so that stage can successfully build 32-bit
  compatibility libraries.
  
  Explanation:
  1) The build32 stage sets environment variables CC, CXX, AS and LD for
 its sub-make, to add 32-bit specific flags (-m32 and such).
  2) The sub-make reads sys.mk, encounters CC?= and CXX?= assignments, so
 does not alter them.
  3) After some other stuff, sys.mk reads /etc/make.conf.  When you have
 "CC=xxx" and "CXX=yyy" statements in there, they will *override* the
 build32-supplied CC/CXX values, nullifying the 32-bit specific flags.
  4) Thus all objects get built as 64-bit anyway, and since LD is usually
 not set in make.conf, it still has the 32-bit flags!
  5) Now, whenever something is linked, you will get a "ld: Relocatable
 linking with relocations from format elf64-x86-64-freebsd (foo.o) to
 format elf32-i386-freebsd (bar.o) is not supported" error.
  
  Fix this by adding "-ECC -ECXX -EAS -ELD" to the build32 sub-make
  invocation, which forces those environment variables to always override
  any assignment in makefiles.  Thus making it possible to simply set:
  
  CC=my-cc
  CXX=my-c++
  
  in your make.conf, or specify a path, even:
  
  CC=/usr/local/bin/other-cc
  CXX=/usr/local/bin/other-c++
  
  Note this was never a problem on i386, since it has no build32 stage.
  
  Silence from: current@

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1  Fri Dec 30 20:57:36 2011(r229028)
+++ stable/9/Makefile.inc1  Fri Dec 30 21:00:02 2011(r229029)
@@ -313,7 +313,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR
 
 LIB32WMAKE=${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
-   -DWITHOUT_HTML -DNO_CTF -DNO_LINT DESTDIR=${LIB32TMP}
+   -DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
+   DESTDIR=${LIB32TMP}
 LIB32IMAKE=${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
 .endif
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229030 - stable/9/sys/conf

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 21:01:14 2011
New Revision: 229030
URL: http://svn.freebsd.org/changeset/base/229030

Log:
  MFC r227816:
  Remove the wrong comment about ufs not being loadable.
  Note that only root filesystem module needs to be available
  before root is mounted.

Modified:
  stable/9/sys/conf/NOTES
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/conf/NOTES
==
--- stable/9/sys/conf/NOTES Fri Dec 30 21:00:02 2011(r229029)
+++ stable/9/sys/conf/NOTES Fri Dec 30 21:01:14 2011(r229030)
@@ -965,11 +965,10 @@ options   ZERO_COPY_SOCKETS
 # FILESYSTEM OPTIONS
 
 #
-# Only the root, /usr, and /tmp filesystems need be statically
-# compiled; everything else will be automatically loaded at mount
-# time.  (Exception: the UFS family--- FFS --- cannot
-# currently be demand-loaded.)  Some people still prefer to statically
-# compile other filesystems as well.
+# Only the root filesystem needs to be statically compiled or preloaded
+# as module; everything else will be automatically loaded at mount
+# time.  Some people still prefer to statically compile other
+# filesystems as well.
 #
 # NB: The PORTAL filesystem is known to be buggy, and WILL panic your
 # system if you attempt to do anything with it.  It is included here
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229031 - stable/8/sys/conf

[Konstantin Belousov]

Author: kib
Date: Fri Dec 30 21:02:32 2011
New Revision: 229031
URL: http://svn.freebsd.org/changeset/base/229031

Log:
  MFC r227816:
  Remove the wrong comment about ufs not being loadable.
  Note that only root filesystem module needs to be available
  before root is mounted.

Modified:
  stable/8/sys/conf/NOTES
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/conf/NOTES
==
--- stable/8/sys/conf/NOTES Fri Dec 30 21:01:14 2011(r229030)
+++ stable/8/sys/conf/NOTES Fri Dec 30 21:02:32 2011(r229031)
@@ -947,11 +947,10 @@ options   ZERO_COPY_SOCKETS
 # FILESYSTEM OPTIONS
 
 #
-# Only the root, /usr, and /tmp filesystems need be statically
-# compiled; everything else will be automatically loaded at mount
-# time.  (Exception: the UFS family--- FFS --- cannot
-# currently be demand-loaded.)  Some people still prefer to statically
-# compile other filesystems as well.
+# Only the root filesystem needs to be statically compiled or preloaded
+# as module; everything else will be automatically loaded at mount
+# time.  Some people still prefer to statically compile other
+# filesystems as well.
 #
 # NB: The PORTAL filesystem is known to be buggy, and WILL panic your
 # system if you attempt to do anything with it.  It is included here
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229032 - head/sys/modules/cfi

[Marius Strobl]

Author: marius
Date: Fri Dec 30 21:22:10 2011
New Revision: 229032
URL: http://svn.freebsd.org/changeset/base/229032

Log:
  Add header required by cfi_bus_fdt.c.

Modified:
  head/sys/modules/cfi/Makefile

Modified: head/sys/modules/cfi/Makefile
==
--- head/sys/modules/cfi/Makefile   Fri Dec 30 21:02:32 2011
(r229031)
+++ head/sys/modules/cfi/Makefile   Fri Dec 30 21:22:10 2011
(r229032)
@@ -7,10 +7,10 @@ SRCS=   ${_cfi_bus} cfi_core.c cfi_dev.c
 SRCS+=  bus_if.h device_if.h opt_cfi.h
 
 .if ${MACHINE} == "arm"
-_cfi_bus= cfi_bus_fdt.c cfi_bus_ixp4xx.c
+_cfi_bus=  cfi_bus_fdt.c cfi_bus_ixp4xx.c ofw_bus_if.h
 .endif
 .if ${MACHINE} == "powerpc"
-_cfi_bus= cfi_bus_fdt.c
+_cfi_bus=  cfi_bus_fdt.c ofw_bus_if.h
 .endif
 
 opt_cfi.h:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229033 - stable/9/usr.bin/make

[Jilles Tjoelker]

Author: jilles
Date: Fri Dec 30 21:27:51 2011
New Revision: 229033
URL: http://svn.freebsd.org/changeset/base/229033

Log:
  MFC r227121: make(1): obj dirs are physical paths so write `pwd -P`
  rather than `pwd`.
  
  Regular pwd may return a pathname containing symlinks, but make does not use
  such pathnames.

Modified:
  stable/9/usr.bin/make/make.1
Directory Properties:
  stable/9/usr.bin/make/   (props changed)

Modified: stable/9/usr.bin/make/make.1
==
--- stable/9/usr.bin/make/make.1Fri Dec 30 21:22:10 2011
(r229032)
+++ stable/9/usr.bin/make/make.1Fri Dec 30 21:27:51 2011
(r229033)
@@ -32,7 +32,7 @@
 .\"@(#)make.1  8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd December 29, 2008
+.Dd November 5, 2011
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -631,7 +631,7 @@ The following directories are tried in o
 .Pp
 .Bl -enum -compact
 .It
-${MAKEOBJDIRPREFIX}/`pwd`
+${MAKEOBJDIRPREFIX}/`pwd -P`
 .It
 ${MAKEOBJDIR}
 .It
@@ -639,7 +639,7 @@ obj.${MACHINE}
 .It
 obj
 .It
-/usr/obj/`pwd`
+/usr/obj/`pwd -P`
 .El
 .Pp
 The first directory that
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229034 - stable/8/usr.bin/make

[Jilles Tjoelker]

Author: jilles
Date: Fri Dec 30 21:33:19 2011
New Revision: 229034
URL: http://svn.freebsd.org/changeset/base/229034

Log:
  MFC r227121: make(1): obj dirs are physical paths so write `pwd -P`
  rather than `pwd`.
  
  Regular pwd may return a pathname containing symlinks, but make does not use
  such pathnames.

Modified:
  stable/8/usr.bin/make/make.1
Directory Properties:
  stable/8/usr.bin/make/   (props changed)

Modified: stable/8/usr.bin/make/make.1
==
--- stable/8/usr.bin/make/make.1Fri Dec 30 21:27:51 2011
(r229033)
+++ stable/8/usr.bin/make/make.1Fri Dec 30 21:33:19 2011
(r229034)
@@ -32,7 +32,7 @@
 .\"@(#)make.1  8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd December 29, 2008
+.Dd November 5, 2011
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -601,7 +601,7 @@ The following directories are tried in o
 .Pp
 .Bl -enum -compact
 .It
-${MAKEOBJDIRPREFIX}/`pwd`
+${MAKEOBJDIRPREFIX}/`pwd -P`
 .It
 ${MAKEOBJDIR}
 .It
@@ -609,7 +609,7 @@ obj.${MACHINE}
 .It
 obj
 .It
-/usr/obj/`pwd`
+/usr/obj/`pwd -P`
 .El
 .Pp
 The first directory that
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229035 - stable/7/usr.bin/make

[Jilles Tjoelker]

Author: jilles
Date: Fri Dec 30 21:46:30 2011
New Revision: 229035
URL: http://svn.freebsd.org/changeset/base/229035

Log:
  MFC r227121: make(1): obj dirs are physical paths so write `pwd -P`
  rather than `pwd`.
  
  Regular pwd may return a pathname containing symlinks, but make does not use
  such pathnames.

Modified:
  stable/7/usr.bin/make/make.1
Directory Properties:
  stable/7/usr.bin/make/   (props changed)

Modified: stable/7/usr.bin/make/make.1
==
--- stable/7/usr.bin/make/make.1Fri Dec 30 21:33:19 2011
(r229034)
+++ stable/7/usr.bin/make/make.1Fri Dec 30 21:46:30 2011
(r229035)
@@ -32,7 +32,7 @@
 .\"@(#)make.1  8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd December 29, 2008
+.Dd November 5, 2011
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -601,7 +601,7 @@ The following directories are tried in o
 .Pp
 .Bl -enum -compact
 .It
-${MAKEOBJDIRPREFIX}/`pwd`
+${MAKEOBJDIRPREFIX}/`pwd -P`
 .It
 ${MAKEOBJDIR}
 .It
@@ -609,7 +609,7 @@ obj.${MACHINE}
 .It
 obj
 .It
-/usr/obj/`pwd`
+/usr/obj/`pwd -P`
 .El
 .Pp
 The first directory that
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229036 - stable/9/bin/sh

[Jilles Tjoelker]

Author: jilles
Date: Fri Dec 30 21:50:16 2011
New Revision: 229036
URL: http://svn.freebsd.org/changeset/base/229036

Log:
  MFC r227122: sh(1): Improve documentation of field splitting.
  
  This describes the POSIX-compliant splitting algorithm that first appeared
  in 8.0.

Modified:
  stable/9/bin/sh/sh.1
Directory Properties:
  stable/9/bin/sh/   (props changed)

Modified: stable/9/bin/sh/sh.1
==
--- stable/9/bin/sh/sh.1Fri Dec 30 21:46:30 2011(r229035)
+++ stable/9/bin/sh/sh.1Fri Dec 30 21:50:16 2011(r229036)
@@ -32,7 +32,7 @@
 .\"from: @(#)sh.1  8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2011
+.Dd November 5, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1160,6 +1160,11 @@ of alphabetics, numerics, and underscore
 The first letter of a variable name must not be numeric.
 A parameter can also be denoted by a number
 or a special character as explained below.
+.Pp
+Assignments are expanded differently from other words:
+tilde expansion is also performed after the equals sign and after any colon
+and usernames are also terminated by colons,
+and field splitting and pathname expansion are not performed.
 .Ss Positional Parameters
 A positional parameter is a parameter denoted by a number greater than zero.
 The shell sets these initially to the values of its command line
@@ -1273,11 +1278,15 @@ used in tilde expansion and as a default
 built-in.
 .It Va IFS
 Input Field Separators.
-This is normally set to
+The default value is
 .Aq space ,
 .Aq tab ,
 and
-.Aq newline .
+.Aq newline
+in that order.
+This default also applies if
+.Va IFS
+is unset, but not if it is set to the empty string.
 See the
 .Sx White Space Splitting
 section for more details.
@@ -1423,12 +1432,12 @@ part of the name.
 If a parameter expansion occurs inside double-quotes:
 .Bl -enum
 .It
-Pathname expansion is not performed on the results of the
-expansion.
-.It
 Field splitting is not performed on the results of the
 expansion, with the exception of the special parameter
 .Va @ .
+.It
+Pathname expansion is not performed on the results of the
+expansion.
 .El
 .Pp
 In addition, a parameter expansion can be modified by using one of the
@@ -1641,16 +1650,51 @@ and contain integer constants.
 .Pp
 The result of the expression is substituted in decimal.
 .Ss White Space Splitting (Field Splitting)
-After parameter expansion, command substitution, and
+In certain contexts,
+after parameter expansion, command substitution, and
 arithmetic expansion the shell scans the results of
 expansions and substitutions that did not occur in double-quotes for
 field splitting and multiple fields can result.
 .Pp
-The shell treats each character of the
+Characters in
+.Va IFS
+that are whitespace
+.Po
+.Aq space ,
+.Aq tab ,
+and
+.Aq newline
+.Pc
+are treated differently from other characters in
+.Va IFS .
+.Pp
+Whitespace in
+.Va IFS
+at the beginning or end of a word is discarded.
+.Pp
+Subsequently, a field is delimited by either
+.Bl -enum
+.It
+a non-whitespace character in
+.Va IFS
+with any whitespace in
+.Va IFS
+surrounding it, or
+.It
+one or more whitespace characters in
+.Va IFS .
+.El
+.Pp
+If a word ends with a non-whitespace character in
+.Va IFS ,
+there is no empty field after this character.
+.Pp
+If no field is delimited, the word is discarded.
+In particular, if a word consists solely of an unquoted substitution
+and the result of the substitution is null,
+it is removed by field splitting even if
 .Va IFS
-variable as a delimiter and uses
-the delimiters to split the results of parameter expansion and command
-substitution into fields.
+is null.
 .Ss Pathname Expansion (File Name Generation)
 Unless the
 .Fl f
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229037 - in stable/9: gnu/lib/libstdc++ lib/clang/include/llvm/Config

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:07:04 2011
New Revision: 229037
URL: http://svn.freebsd.org/changeset/base/229037

Log:
  MFC r227215:
  
When one attempts to compile the tree with -march=i386, which also used
to be gcc's default before r198344, calls to atomic builtins will not be
expanded inline.  Instead, they will be generated as calls to external
functions (e.g. __sync_fetch_and_add_N), leading to linking errors later
on.
  
Put in a seatbelt that disables use of atomic builtins in libstdc++ and
llvm, when tuning specifically for the real i386 CPU.  This does not
protect against all possible issues, but it is better than nothing.
  
  MFC r227538:
  
LLVM uses atomic operations, which are not supported on i386 and GCC
emits calls for them, rather than expanding them inline.  Older FreeBSD
versions compile for i386 by default and as such we end up with
unresolved symbols when we build LLVM's TableGen utility as a build
tool on them.  Add the functions that GCC emits here, but don't bother
to make them atomic. Such is not needed.
  
Submitted by:   marcel
  
  MFC r227636:
  
Revert r227538, since it doesn't compile with clang at all (it doesn't
allow the built-in operations to be redefined, at least not without
excessive force).
  
Instead, just disable LLVM's support for atomic operations for now.
Nothing in either clang or the tablegen tools currently depends on it.
  
This still allows users of head built before r198344 to upgrade to
top-of-head seamlessly.

Modified:
  stable/9/gnu/lib/libstdc++/config.h
  stable/9/lib/clang/include/llvm/Config/config.h
  stable/9/lib/clang/include/llvm/Config/llvm-config.h
Directory Properties:
  stable/9/gnu/lib/   (props changed)
  stable/9/lib/clang/   (props changed)
  stable/9/tools/   (props changed)

Modified: stable/9/gnu/lib/libstdc++/config.h
==
--- stable/9/gnu/lib/libstdc++/config.h Fri Dec 30 21:50:16 2011
(r229036)
+++ stable/9/gnu/lib/libstdc++/config.h Fri Dec 30 22:07:04 2011
(r229037)
@@ -671,7 +671,7 @@
 /* #undef VERSION */
 
 /* Define if builtin atomic operations are supported on this host. */
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__amd64__) || (defined(__i386__) && !defined(__tune_i386__))
 #define _GLIBCXX_ATOMIC_BUILTINS 1
 #endif
 

Modified: stable/9/lib/clang/include/llvm/Config/config.h
==
--- stable/9/lib/clang/include/llvm/Config/config.h Fri Dec 30 21:50:16 
2011(r229036)
+++ stable/9/lib/clang/include/llvm/Config/config.h Fri Dec 30 22:07:04 
2011(r229037)
@@ -552,7 +552,7 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#define LLVM_HAS_ATOMICS 1
+#define LLVM_HAS_ATOMICS 0
 
 /* Host triple we were built on */
 /* #undef LLVM_HOSTTRIPLE */

Modified: stable/9/lib/clang/include/llvm/Config/llvm-config.h
==
--- stable/9/lib/clang/include/llvm/Config/llvm-config.hFri Dec 30 
21:50:16 2011(r229036)
+++ stable/9/lib/clang/include/llvm/Config/llvm-config.hFri Dec 30 
22:07:04 2011(r229037)
@@ -34,7 +34,7 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#define LLVM_HAS_ATOMICS 1
+#define LLVM_HAS_ATOMICS 0
 
 /* Host triple we were built on */
 /* #undef LLVM_HOSTTRIPLE */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229038 - stable/8/bin/sh

[Jilles Tjoelker]

Author: jilles
Date: Fri Dec 30 22:07:15 2011
New Revision: 229038
URL: http://svn.freebsd.org/changeset/base/229038

Log:
  MFC r227122: sh(1): Improve documentation of field splitting.
  
  This describes the POSIX-compliant splitting algorithm that first appeared
  in 8.0.

Modified:
  stable/8/bin/sh/sh.1
Directory Properties:
  stable/8/bin/sh/   (props changed)

Modified: stable/8/bin/sh/sh.1
==
--- stable/8/bin/sh/sh.1Fri Dec 30 22:07:04 2011(r229037)
+++ stable/8/bin/sh/sh.1Fri Dec 30 22:07:15 2011(r229038)
@@ -32,7 +32,7 @@
 .\"from: @(#)sh.1  8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd June 24, 2011
+.Dd November 5, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1045,6 +1045,11 @@ of alphabetics, numerics, and underscore
 The first letter of a variable name must not be numeric.
 A parameter can also be denoted by a number
 or a special character as explained below.
+.Pp
+Assignments are expanded differently from other words:
+tilde expansion is also performed after the equals sign and after any colon
+and usernames are also terminated by colons,
+and field splitting and pathname expansion are not performed.
 .Ss Positional Parameters
 A positional parameter is a parameter denoted by a number greater than zero.
 The shell sets these initially to the values of its command line
@@ -1154,11 +1159,15 @@ used in tilde expansion and as a default
 built-in.
 .It Va IFS
 Input Field Separators.
-This is normally set to
+The default value is
 .Aq space ,
 .Aq tab ,
 and
-.Aq newline .
+.Aq newline
+in that order.
+This default also applies if
+.Va IFS
+is unset, but not if it is set to the empty string.
 See the
 .Sx White Space Splitting
 section for more details.
@@ -1291,12 +1300,12 @@ part of the name.
 If a parameter expansion occurs inside double-quotes:
 .Bl -enum
 .It
-Pathname expansion is not performed on the results of the
-expansion.
-.It
 Field splitting is not performed on the results of the
 expansion, with the exception of the special parameter
 .Va @ .
+.It
+Pathname expansion is not performed on the results of the
+expansion.
 .El
 .Pp
 In addition, a parameter expansion can be modified by using one of the
@@ -1495,16 +1504,51 @@ This is a bug.
 .Pp
 The result of the expression is substituted in decimal.
 .Ss White Space Splitting (Field Splitting)
-After parameter expansion, command substitution, and
+In certain contexts,
+after parameter expansion, command substitution, and
 arithmetic expansion the shell scans the results of
 expansions and substitutions that did not occur in double-quotes for
 field splitting and multiple fields can result.
 .Pp
-The shell treats each character of the
+Characters in
+.Va IFS
+that are whitespace
+.Po
+.Aq space ,
+.Aq tab ,
+and
+.Aq newline
+.Pc
+are treated differently from other characters in
+.Va IFS .
+.Pp
+Whitespace in
+.Va IFS
+at the beginning or end of a word is discarded.
+.Pp
+Subsequently, a field is delimited by either
+.Bl -enum
+.It
+a non-whitespace character in
+.Va IFS
+with any whitespace in
+.Va IFS
+surrounding it, or
+.It
+one or more whitespace characters in
+.Va IFS .
+.El
+.Pp
+If a word ends with a non-whitespace character in
+.Va IFS ,
+there is no empty field after this character.
+.Pp
+If no field is delimited, the word is discarded.
+In particular, if a word consists solely of an unquoted substitution
+and the result of the substitution is null,
+it is removed by field splitting even if
 .Va IFS
-variable as a delimiter and uses
-the delimiters to split the results of parameter expansion and command
-substitution into fields.
+is null.
 .Ss Pathname Expansion (File Name Generation)
 Unless the
 .Fl f
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229039 - in stable/9/contrib/llvm/tools/clang: include/clang/Basic lib/Sema

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:17:10 2011
New Revision: 229039
URL: http://svn.freebsd.org/changeset/base/229039

Log:
  MFC r227735:
  
  Pull in r144110 from upstream clang trunk:
  
  Mark the overloaded atomic builtins as having custom type checking,
  which they do. This avoids all of the default argument promotions that
  we (1) don't want, and (2) undo during that custom type checking, and
  makes sure that we don't run into trouble during template
  instantiation. Fixes llvm/clang PR11320.

Modified:
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==
--- stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:07:15 2011(r229038)
+++ stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:17:10 2011(r229039)
@@ -480,111 +480,111 @@ BUILTIN(__builtin_alloca, "v*z"   , "n")
 // FIXME: These assume that char -> i8, short -> i16, int -> i32,
 // long long -> i64.
 
-BUILTIN(__sync_fetch_and_add, "v.", "")
-BUILTIN(__sync_fetch_and_add_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_add_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_add_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_add_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_add_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_sub, "v.", "")
-BUILTIN(__sync_fetch_and_sub_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_sub_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_sub_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_sub_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_sub_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_or, "v.", "")
-BUILTIN(__sync_fetch_and_or_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_or_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_or_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_or_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_or_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_and, "v.", "")
-BUILTIN(__sync_fetch_and_and_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_and_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_and_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_and_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_and_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_fetch_and_xor, "v.", "")
-BUILTIN(__sync_fetch_and_xor_1, "ccD*c.", "n")
-BUILTIN(__sync_fetch_and_xor_2, "ssD*s.", "n")
-BUILTIN(__sync_fetch_and_xor_4, "iiD*i.", "n")
-BUILTIN(__sync_fetch_and_xor_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_fetch_and_xor_16, "LLLiLLLiD*LLLi.", "n")
-
-
-BUILTIN(__sync_add_and_fetch, "v.", "")
-BUILTIN(__sync_add_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_add_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_add_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_add_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_add_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_sub_and_fetch, "v.", "")
-BUILTIN(__sync_sub_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_sub_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_sub_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_sub_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_sub_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_or_and_fetch, "v.", "")
-BUILTIN(__sync_or_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_or_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_or_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_or_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_or_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_and_and_fetch, "v.", "")
-BUILTIN(__sync_and_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_and_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_and_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_and_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_and_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_xor_and_fetch, "v.", "")
-BUILTIN(__sync_xor_and_fetch_1, "ccD*c.", "n")
-BUILTIN(__sync_xor_and_fetch_2, "ssD*s.", "n")
-BUILTIN(__sync_xor_and_fetch_4, "iiD*i.", "n")
-BUILTIN(__sync_xor_and_fetch_8, "LLiLLiD*LLi.", "n")
-BUILTIN(__sync_xor_and_fetch_16, "LLLiLLLiD*LLLi.", "n")
-
-BUILTIN(__sync_bool_compare_and_swap, "v.", "")
-BUILTIN(__sync_bool_compare_and_swap_1, "bcD*cc.", "n")
-BUILTIN(__sync_bool_compare_and_swap_2, "bsD*ss.", "n")
-BUILTIN(__sync_bool_compare_and_swap_4, "biD*ii.", "n")
-BUILTIN(__sync_bool_compare_and_swap_8, "bLLiD*LLiLLi.", "n")
-BUILTIN(__sync_bool_compare_and_swap_16, "bLLLiD*LLLiLLLi.", "n")
-
-BUILTIN(__sync_val_compare_and_swap, "v.", "")
-BUILTIN(__sync_val_compare_and_swap_1, "ccD*cc.", "n")
-BUILTIN(__sync_val_compare_and_swap_2, "ssD*ss.", "n")
-BUILTIN(__sync_val_compare_and_swap_4, "iiD*ii.", "n")
-BUILTIN(__sync_val_compare_and_swap_8, "LLiLLiD*LLiLLi.", "n")
-BUILTIN(__sync_val_compare_and_swap_16, "LLLiLLLiD*LLLiLLLi.", "n")
-
-BUILTI

svn commit: r229040 - stable/9/contrib/llvm/tools/clang/include/clang/Basic

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:27:26 2011
New Revision: 229040
URL: http://svn.freebsd.org/changeset/base/229040

Log:
  MFC r227736:
  
  Pull in r144237 from upstream clang trunk:
  
  Fix the signature of __sigsetjmp and sigsetjmp.  This eliminates
  incorrect warnings about the prototypes of these functions.

Modified:
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==
--- stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:17:10 2011(r229039)
+++ stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:27:26 2011(r229040)
@@ -679,9 +679,9 @@ LIBBUILTIN(vfork, "i","fj", 
 // it here to avoid having two identical LIBBUILTIN entries.
 #undef setjmp
 LIBBUILTIN(_setjmp, "iJ", "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(__sigsetjmp, "iJi","fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(__sigsetjmp, "iSJi",   "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(sigsetjmp, "iJi",  "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(sigsetjmp, "iSJi", "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(setjmp_syscall, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(savectx, "iJ", "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(qsetjmp, "iJ", "fj",   "setjmp.h", ALL_LANGUAGES)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229041 - in stable/9/contrib/llvm/tools/clang: include/clang/AST include/clang/Basic include/clang/Serialization lib/AST lib/Sema lib/Serialization

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:30:21 2011
New Revision: 229041
URL: http://svn.freebsd.org/changeset/base/229041

Log:
  MFC r227737:
  
  Pull in r144505 from upstream clang trunk:
  
  Fix the signature of the getcontext builtin, eliminating incorrect
  warnings about its prototype.
  
  This also adds a -W(no-)builtin-requires-header option, which can be
  used to enable or disable warnings of this kind.

Modified:
  stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
  stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  stable/9/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
  stable/9/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
  stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
==
--- stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTContext.hFri Dec 
30 22:27:26 2011(r229040)
+++ stable/9/contrib/llvm/tools/clang/include/clang/AST/ASTContext.hFri Dec 
30 22:30:21 2011(r229041)
@@ -229,6 +229,9 @@ class ASTContext : public llvm::RefCount
   /// \brief The type for the C sigjmp_buf type.
   TypeDecl *sigjmp_bufDecl;
 
+  /// \brief The type for the C ucontext_t type.
+  TypeDecl *ucontext_tDecl;
+
   /// \brief Type for the Block descriptor for Blocks CodeGen.
   ///
   /// Since this is only used for generation of debug info, it is not
@@ -955,6 +958,18 @@ public:
 return QualType();
   }
 
+  /// \brief Set the type for the C ucontext_t type.
+  void setucontext_tDecl(TypeDecl *ucontext_tDecl) {
+this->ucontext_tDecl = ucontext_tDecl;
+  }
+
+  /// \brief Retrieve the C ucontext_t type.
+  QualType getucontext_tType() const {
+if (ucontext_tDecl)
+  return getTypeDeclType(ucontext_tDecl);
+return QualType();
+  }
+
   /// \brief The result type of logical operations, '<', '>', '!=', etc.
   QualType getLogicalOperationType() const {
 return getLangOptions().CPlusPlus ? BoolTy : IntTy;
@@ -1099,7 +1114,8 @@ public:
   enum GetBuiltinTypeError {
 GE_None,  //< No error
 GE_Missing_stdio, //< Missing a type from 
-GE_Missing_setjmp //< Missing a type from 
+GE_Missing_setjmp,//< Missing a type from 
+GE_Missing_ucontext   //< Missing a type from 
   };
 
   /// GetBuiltinType - Return the type for the specified builtin.  If 

Modified: stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
==
--- stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:27:26 2011(r229040)
+++ stable/9/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def  Fri Dec 
30 22:30:21 2011(r229041)
@@ -39,6 +39,7 @@
 //  P -> FILE
 //  J -> jmp_buf
 //  SJ -> sigjmp_buf
+//  K -> ucontext_t
 //  . -> "...".  This may only occur at the end of the function list.
 //
 // Types may be prefixed with the following modifiers:
@@ -685,7 +686,7 @@ LIBBUILTIN(sigsetjmp, "iSJi", "fj", 
 LIBBUILTIN(setjmp_syscall, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(savectx, "iJ", "fj",   "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(qsetjmp, "iJ", "fj",   "setjmp.h", ALL_LANGUAGES)
-LIBBUILTIN(getcontext, "iJ",  "fj",   "setjmp.h", ALL_LANGUAGES)
+LIBBUILTIN(getcontext, "iK*", "fj",   "setjmp.h", ALL_LANGUAGES)
 
 LIBBUILTIN(_longjmp, "vJi",   "fr","setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(siglongjmp, "vSJi","fr","setjmp.h", ALL_LANGUAGES)

Modified: 
stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
==
--- stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td   
Fri Dec 30 22:27:26 2011(r229040)
+++ stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td   
Fri Dec 30 22:30:21 2011(r229041)
@@ -26,6 +26,7 @@ def : DiagGroup<"attributes">;
 def : DiagGroup<"bad-function-cast">;
 def Availability : DiagGroup<"availability">;
 def BoolConversions : DiagGroup<"bool-conversions">;
+def BuiltinRequiresHeader : DiagGroup<"builtin-requires-header">;
 def CXXCompat: DiagGroup<"c++-compat">;
 def CastAlign : DiagGroup<"cast-align">;
 def : DiagGroup<"cast-qual">;

Modified: 
stable/9/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
==

svn commit: r229042 - in stable/9: contrib/llvm/lib/CodeGen contrib/llvm/lib/CodeGen/AsmPrinter contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/lib/Target/ARM contrib/llvm/lib/Target/CppBackend ...

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:40:17 2011
New Revision: 229042
URL: http://svn.freebsd.org/changeset/base/229042

Log:
  MFC r228379:
  
Upgrade our copy of llvm/clang to 3.0 release.  Release notes can be
found at: http://llvm.org/releases/3.0/docs/ReleaseNotes.html
  
  MFC r228383:
  
Use the correct upstream revision number for llvm/clang 3.0 release.
  
The r145546 revision is from branches/release_30, the r145349 revision
is from tags/RELEASE_30/final.

Added:
  stable/9/lib/clang/include/MipsGenCodeEmitter.inc
 - copied unchanged from r228379, 
head/lib/clang/include/MipsGenCodeEmitter.inc
Modified:
  stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  stable/9/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp
  stable/9/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  stable/9/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMCallingConv.td
  stable/9/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  stable/9/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td
  stable/9/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp
  stable/9/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  stable/9/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
  stable/9/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp
  stable/9/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td
  stable/9/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
  stable/9/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h
  stable/9/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  stable/9/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  stable/9/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  stable/9/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
  stable/9/lib/clang/include/clang/Basic/Version.inc
  stable/9/lib/clang/libllvmmipscodegen/Makefile
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)
  stable/9/lib/clang/   (props changed)

Modified: stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
==
--- stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp   Fri Dec 
30 22:30:21 2011(r229041)
+++ stable/9/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp   Fri Dec 
30 22:40:17 2011(r229042)
@@ -527,18 +527,20 @@ bool CompileUnit::addConstantValue(DIE *
 
   // Get the raw data form of the large APInt.
   const APInt Val = CI->getValue();
-  const char *Ptr = (const char*)Val.getRawData();
+  const uint64_t *Ptr64 = Val.getRawData();
 
   int NumBytes = Val.getBitWidth() / 8; // 8 bits per byte.
   bool LittleEndian = Asm->getTargetData().isLittleEndian();
-  int Incr = (LittleEndian ? 1 : -1);
-  int Start = (LittleEndian ? 0 : NumBytes - 1);
-  int Stop = (LittleEndian ? NumBytes : -1);
 
   // Output the constant to DWARF one byte at a time.
-  for (; Start != Stop; Start += Incr)
-addUInt(Block, 0, dwarf::DW_FORM_data1,
-(unsigned char)0xFF & Ptr[Start]);
+  for (int i = 0; i < NumBytes; i++) {
+uint8_t c;
+if (LittleEndian)
+  c = Ptr64[i / 8] >> (8 * (i & 7));
+else
+  c = Ptr64[(NumBytes - 1 - i) / 8] >> (8 * ((NumBytes - 1 - i) & 7));
+addUInt(Block, 0, dwarf::DW_FORM_data1, c);
+  }
 
   addBlock(Die, dwarf::DW_AT_const_value, 0, Block);
   return true;

Modified: stable/9/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp
==
--- stable/9/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp Fri Dec 30 
22:30:21 2011(r229041)
+++ stable/9/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp Fri Dec 30 
22:40:17 2011(r229042)
@@ -119,7 +119,8 @@ LLVMTargetMachine::LLVMTargetMachine(con
   // we'll crash later.
   // Provide the user with a useful error message about what's wrong.
   assert(AsmInfo && "MCAsmInfo not initialized."
-"Make sure you include the 

svn commit: r229043 - stable/9/sys/cam/scsi

[Matthew D Fleming]

Author: mdf
Date: Fri Dec 30 22:42:22 2011
New Revision: 229043
URL: http://svn.freebsd.org/changeset/base/229043

Log:
  MFC r228442:
  
  Do not use the sometimes-reserved word 'bool' for a variable name.

Modified:
  stable/9/sys/cam/scsi/scsi_xpt.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_xpt.c
==
--- stable/9/sys/cam/scsi/scsi_xpt.cFri Dec 30 22:40:17 2011
(r229042)
+++ stable/9/sys/cam/scsi/scsi_xpt.cFri Dec 30 22:42:22 2011
(r229043)
@@ -1811,14 +1811,14 @@ scsi_find_quirk(struct cam_ed *device)
 static int
 sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS)
 {
-   int error, bool;
+   int error, val;
 
-   bool = cam_srch_hi;
-   error = sysctl_handle_int(oidp, &bool, 0, req);
+   val = cam_srch_hi;
+   error = sysctl_handle_int(oidp, &val, 0, req);
if (error != 0 || req->newptr == NULL)
return (error);
-   if (bool == 0 || bool == 1) {
-   cam_srch_hi = bool;
+   if (val == 0 || val == 1) {
+   cam_srch_hi = val;
return (0);
} else {
return (EINVAL);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229045 - stable/9/tools/build/mk

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:54:19 2011
New Revision: 229045
URL: http://svn.freebsd.org/changeset/base/229045

Log:
  MFC r228409:
  
  Add more files to cleanup with 'make delete-old' when WITHOUT_CLANG is
  in effect.

Modified:
  stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/9/tools/   (props changed)

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc   Fri Dec 30 22:50:16 
2011(r229044)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc   Fri Dec 30 22:54:19 
2011(r229045)
@@ -627,6 +627,8 @@ OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
+OLD_FILES+=usr/bin/clang-cpp
+OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
@@ -634,6 +636,39 @@ OLD_FILES+=usr/include/clang/2.8/mmintri
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
+OLD_DIRS+=usr/include/clang/2.8
+OLD_FILES+=usr/include/clang/2.9/emmintrin.h
+OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
+OLD_FILES+=usr/include/clang/2.9/mmintrin.h
+OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
+OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
+OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
+OLD_DIRS+=usr/include/clang/2.9
+OLD_FILES+=usr/include/clang/3.0/altivec.h
+OLD_FILES+=usr/include/clang/3.0/avxintrin.h
+OLD_FILES+=usr/include/clang/3.0/emmintrin.h
+OLD_FILES+=usr/include/clang/3.0/immintrin.h
+OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
+OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
+OLD_FILES+=usr/include/clang/3.0/mmintrin.h
+OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
+OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
+OLD_FILES+=usr/include/clang/3.0/smmintrin.h
+OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
+OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
+OLD_FILES+=usr/include/clang/3.0/x86intrin.h
+OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
+OLD_DIRS+=usr/include/clang/3.0
+OLD_DIRS+=usr/include/clang
+OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
+OLD_DIRS+=usr/share/doc/llvm/clang
+OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
+OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
+OLD_DIRS+=usr/share/doc/llvm
+OLD_FILES+=usr/share/man/man1/clang.1.gz
+OLD_FILES+=usr/share/man/man1/clang++.1.gz
+OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
+OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 .endif
 
 .if ${MK_CPP} == no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229046 - stable/9/contrib/libstdc++/include/debug

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 22:59:00 2011
New Revision: 229046
URL: http://svn.freebsd.org/changeset/base/229046

Log:
  MFC r228328:
  
  Make it possible to use the debug versions of std::map and std::multimap
  with clang, by removing two unneeded using declarations.  Otherwise, you
  would get errors similar to:
  
  /usr/include/c++/4.2/debug/map.h:77:20: error: dependent using declaration 
resolved to type without 'typename'
using _Base::value_compare;
   ^
  
  N.B.: Take care when you actually use the debug versions of any
  libstdc++ header.  They are more likely to contain problems, because
  they are exercised far less often, and since the standard library
  complexity guarantees don't always apply anymore, compile times can
  drastically increase.

Modified:
  stable/9/contrib/libstdc++/include/debug/map.h
  stable/9/contrib/libstdc++/include/debug/multimap.h
Directory Properties:
  stable/9/contrib/libstdc++/   (props changed)

Modified: stable/9/contrib/libstdc++/include/debug/map.h
==
--- stable/9/contrib/libstdc++/include/debug/map.h  Fri Dec 30 22:54:19 
2011(r229045)
+++ stable/9/contrib/libstdc++/include/debug/map.h  Fri Dec 30 22:59:00 
2011(r229046)
@@ -74,8 +74,6 @@ namespace __debug
   typedef std::reverse_iterator   reverse_iterator;
   typedef std::reverse_iterator const_reverse_iterator;
 
-  using _Base::value_compare;
-
   // 23.3.1.1 construct/copy/destroy:
   explicit map(const _Compare& __comp = _Compare(),
   const _Allocator& __a = _Allocator())

Modified: stable/9/contrib/libstdc++/include/debug/multimap.h
==
--- stable/9/contrib/libstdc++/include/debug/multimap.h Fri Dec 30 22:54:19 
2011(r229045)
+++ stable/9/contrib/libstdc++/include/debug/multimap.h Fri Dec 30 22:59:00 
2011(r229046)
@@ -74,8 +74,6 @@ namespace __debug
   typedef std::reverse_iteratorreverse_iterator;
   typedef std::reverse_iterator  const_reverse_iterator;
 
-  using _Base::value_compare;
-
   // 23.3.1.1 construct/copy/destroy:
   explicit multimap(const _Compare& __comp = _Compare(),
const _Allocator& __a = _Allocator())
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229047 - in stable/9/lib/libthr/arch: amd64/include i386/include

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 23:41:24 2011
New Revision: 229047
URL: http://svn.freebsd.org/changeset/base/229047

Log:
  MFC r228536:
  
  The TCB_GET32() and TCB_GET64() macros in the i386 and amd64-specific
  versions of pthread_md.h have a special case of dereferencing a null
  pointer.  Clang warns about this with:
  
  In file included from lib/libthr/arch/i386/i386/pthread_md.c:36:
  lib/libthr/arch/i386/include/pthread_md.h:96:10: error: indirection of 
non-volatile null pointer will be deleted, not trap [-Werror,-Wnull-dereference]
return (TCB_GET32(tcb_self));
^~~
  lib/libthr/arch/i386/include/pthread_md.h:73:13: note: expanded from:
: "m" (*(u_int *)(__tcb_offset(name;\
   ^~
  lib/libthr/arch/i386/include/pthread_md.h:96:10: note: consider using 
__builtin_trap() or qualifying pointer with 'volatile'
  
  Since this indirection is done relative to the fs or gs segment, to
  retrieve thread-specific data, it is an exception to the rule.
  
  Therefore, add a volatile qualifier to tell the compiler we really want
  to dereference a zero address.

Modified:
  stable/9/lib/libthr/arch/amd64/include/pthread_md.h
  stable/9/lib/libthr/arch/i386/include/pthread_md.h
Directory Properties:
  stable/9/lib/libthr/   (props changed)

Modified: stable/9/lib/libthr/arch/amd64/include/pthread_md.h
==
--- stable/9/lib/libthr/arch/amd64/include/pthread_md.h Fri Dec 30 22:59:00 
2011(r229046)
+++ stable/9/lib/libthr/arch/amd64/include/pthread_md.h Fri Dec 30 23:41:24 
2011(r229047)
@@ -71,7 +71,7 @@ struct tcb {
u_long __i; \
__asm __volatile("movq %%fs:%1, %0" \
: "=r" (__i)\
-   : "m" (*(u_long *)(__tcb_offset(name;   \
+   : "m" (*(volatile u_long *)(__tcb_offset(name;  \
__result = (__tcb_type(name))__i;   \
\
__result;   \

Modified: stable/9/lib/libthr/arch/i386/include/pthread_md.h
==
--- stable/9/lib/libthr/arch/i386/include/pthread_md.h  Fri Dec 30 22:59:00 
2011(r229046)
+++ stable/9/lib/libthr/arch/i386/include/pthread_md.h  Fri Dec 30 23:41:24 
2011(r229047)
@@ -70,7 +70,7 @@ struct tcb {
u_int __i;  \
__asm __volatile("movl %%gs:%1, %0" \
: "=r" (__i)\
-   : "m" (*(u_int *)(__tcb_offset(name;\
+   : "m" (*(volatile u_int *)(__tcb_offset(name;   \
__result = (__tcb_type(name))__i;   \
\
__result;   \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229049 - head/sbin/bsdlabel

[Maxim Sobolev]

Author: sobomax
Date: Sat Dec 31 00:09:33 2011
New Revision: 229049
URL: http://svn.freebsd.org/changeset/base/229049

Log:
  Use in-label sectorsize to determine position of the label when
  writing label into a file image. The most common use - putting disklabel
  into ISO file. Before this change the label would always go to
  the offset 512, while geom_part code expects it to be in the 1st
  sector (i.e. 2048 incase of ISO). BSD disklabels provide good and
  lightweight way to logically split livecds. It is non-intrusive as
  far as ISO9660 goes (both boot-wise and metadata-wise) and
  completely transparent to anything but BSD, so you can have
  BSD-specific area appended after regular ISO.
  
  And with a little bit of GEOM trickery you can do even more
  interesting stuff with it.
  
  For example we make "hybrid" bootable CDs using this method.
  We create bootable ISO with kernel and such and append UFS
  image compressed with UZIP and it works like a charm. We put
  label based on the offsef of the BSD part into the ISO. The kernel
  boots off normal ISO9660 part, tastes label attaches it,
  tastes UZIP, attaches it and finally mounts UFS using GEOM_LABEL.
  This provides much better way of eliminating waste than doing
  "crunched" build.
  
  MFC after:1 month

Modified:
  head/sbin/bsdlabel/bsdlabel.c

Modified: head/sbin/bsdlabel/bsdlabel.c
==
--- head/sbin/bsdlabel/bsdlabel.c   Sat Dec 31 00:03:13 2011
(r229048)
+++ head/sbin/bsdlabel/bsdlabel.c   Sat Dec 31 00:09:33 2011
(r229049)
@@ -400,7 +400,7 @@ writelabel(void)
for (i = 0; i < lab.d_npartitions; i++)
if (lab.d_partitions[i].p_size)
lab.d_partitions[i].p_offset += lba_offset;
-   bsd_disklabel_le_enc(bootarea + labeloffset + labelsoffset * secsize,
+   bsd_disklabel_le_enc(bootarea + labeloffset + labelsoffset * 
lab.d_secsize,
lp);
 
fd = open(specname, O_RDWR);
@@ -434,7 +434,7 @@ writelabel(void)
gctl_ro_param(grq, "class", -1, "BSD");
gctl_ro_param(grq, "geom", -1, pname);
gctl_ro_param(grq, "label", 148+16*8,
-   bootarea + labeloffset + labelsoffset * secsize);
+   bootarea + labeloffset + labelsoffset * lab.d_secsize);
errstr = gctl_issue(grq);
if (errstr != NULL) {
warnx("%s", errstr);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228986 - in head: share/man/man4 sys/net

[Adrian Chadd]

This just broke wlan. Please consider fixing this patch :)


Adrian

*** Interface: wlan0: start
can't re-use a leaf (wlan0)!
panic: bpfattach tscfgoid
KDB: enter: panic
[ thread pid 166 tid 100048 ]Stopped at  kdb_enter+0x4c: lui at,0x8048
db>
db> bt
Tracing pid 166 tid 100048 td 0x80c37900
db_trace_thread+30 (?,?,?,?) ra 80074cc0 sp c40075f0 sz 24
80074bac+114 (0,?,,?) ra 8007427c sp c4007608 sz 32
80073ef4+388 (?,?,?,?) ra 80074400 sp c4007628 sz 168
db_command_loop+70 (?,?,?,?) ra 80076ac4 sp c40076d0 sz 24
800769d0+f4 (?,?,?,?) ra 801b7560 sp c40076e8 sz 424
kdb_trap+110 (?,?,?,?) ra 8035c7ec sp c4007890 sz 48
trap+bf4 (?,?,?,?) ra 80354560 sp c40078c0 sz 184
MipsKernGenException+134 (0,4,803c089c,113) ra 801b72d8 sp c4007978 sz 200
kdb_enter+4c (?,?,?,?) ra 8017f88c sp c4007a40 sz 24
panic+11c (?,0,80706500,0) ra 802304b8 sp c4007a58 sz 40
bpfattach2+cc (?,?,?,?) ra 802305e0 sp c4007a80 sz 64
bpfattach+10 (?,?,?,?) ra 802448ec sp c4007ac0 sz 24
ether_ifattach+d0 (?,?,?,?) ra 8025f0ac sp c4007ad8 sz 32
ieee80211_vap_attach+104 (?,?,?,?) ra 8007ffe8 sp c4007af8 sz 96
8007f960+688 (?,?,0,?) ra 8026a39c sp c4007b58 sz 88
8026a22c+170 (?,?,?,?) ra 802430dc sp c4007bb0 sz 88
ifc_simple_create+80 (?,?,?,?) ra 80242b04 sp c4007c08 sz 64
80242ab0+54 (?,?,?,?) ra 80242d78 sp c4007c48 sz 40
if_clone_create+a8 (?,?,?,?) ra 8023bdd4 sp c4007c70 sz 40
ifioctl+3a4 (?,?,80c7f460,80c37900) ra 801d8070 sp c4007c98 sz 144
soo_ioctl+3b0 (?,?,?,?) ra 801d2804 sp c4007d28 sz 40
kern_ioctl+248 (?,?,?,?) ra 801d29ac sp c4007d50 sz 64
sys_ioctl+130 (?,?,?,?) ra 8035c3ec sp c4007d90 sz 56
trap+7f4 (?,?,?,?) ra 8035475c sp c4007dc8 sz 184
MipsUserGenException+10c (?,?,?,4061d590) ra 0 sp c4007e80 sz 0
pid 166
db> reset


On 30 December 2011 00:57, Lawrence Stewart  wrote:
> Author: lstewart
> Date: Fri Dec 30 08:57:58 2011
> New Revision: 228986
> URL: http://svn.freebsd.org/changeset/base/228986
>
> Log:
>  - Introduce the net.bpf.tscfg sysctl tree and associated code so as to make 
> one
>    aspect of time stamp configuration per interface rather than per BPF
>    descriptor. Prior to this, the order in which BPF devices were opened and 
> the
>    per descriptor time stamp configuration settings could cause 
> non-deterministic
>    and unintended behaviour with respect to time stamping. With the new 
> scheme, a
>    BPF attached interface's tscfg sysctl entry can be set to "default", 
> "none",
>    "fast", "normal" or "external". Setting "default" means use the system 
> default
>    option (set with the net.bpf.tscfg.default sysctl), "none" means do not
>    generate time stamps for tapped packets, "fast" means generate time stamps 
> for
>    tapped packets using a hz granularity system clock read, "normal" means
>    generate time stamps for tapped packets using a full timecounter 
> granularity
>    system clock read and "external" (currently unimplemented) means use the 
> time
>    stamp provided with the packet from an underlying source.
>
>  - Utilise the recently introduced sysclock_getsnapshot() and
>    sysclock_snap2bintime() KPIs to ensure the system clock is only read once 
> per
>    packet, regardless of the number of BPF descriptors and time stamp formats
>    requested. Use the per BPF attached interface time stamp configuration to
>    control if sysclock_getsnapshot() is called and whether the system clock 
> read
>    is fast or normal. The per BPF descriptor time stamp configuration is then
>    used to control how the system clock snapshot is converted to a bintime by
>    sysclock_snap2bintime().
>
>  - Remove all FAST related BPF descriptor flag variants. Performing a "fast"
>    read of the system clock is now controlled per BPF attached interface using
>    the net.bpf.tscfg sysctl tree.
>
>  - Update the bpf.4 man page.
>
>  Committed on behalf of Julien Ridoux and Darryl Veitch from the University of
>  Melbourne, Australia, as part of the FreeBSD Foundation funded "Feed-Forward
>  Clock Synchronization Algorithms" project.
>
>  For more information, see http://www.synclab.org/radclock/
>
>  In collaboration with:        Julien Ridoux (jridoux at unimelb edu au)
>
> Modified:
>  head/share/man/man4/bpf.4
>  head/sys/net/bpf.c
>  head/sys/net/bpf.h
>
> Modified: head/share/man/man4/bpf.4
> ==
> --- head/share/man/man4/bpf.4   Fri Dec 30 06:24:59 2011        (r228985)
> +++ head/share/man/man4/bpf.4   Fri Dec 30 08:57:58 2011        (r228986)
> @@ -49,7 +49,7 @@
>  .\"
>  .\" $FreeBSD$
>  .\"
> -.Dd June 15, 2010
> +.Dd December 30, 2011
>  .Dt BPF 4
>  .Os
>  .Sh NAME
> @@ -516,61 +516,48 @@ by default.
>  .It Dv BIOCSTSTAMP
>  .It Dv BIOCGTSTAMP
>  .Pq Li u_int
> -Set or get format and resolution of the time stamps returned by BPF.
> +Set or get the format and resolution of time stamps returned by BPF.
> +The per-BPF descriptor configuration provided by the
> +.Dv BIOCSTSTAMP
> +IOCTL complements the 

Re: svn: head/sys/netinet

[Maxim Sobolev]

On 12/30/2011 12:02 PM, Gleb Smirnoff wrote:

On Fri, Dec 30, 2011 at 11:23:45AM -0800, Maxim Sobolev wrote:
M>  Won't this break whole lot of third-party software, which expects
M>  FreeBSD to be slightly different in this regards? Just curious.

Yes it does. And until FreeBSD 10.0-RELEASE there is time to fix
this software (at least in ports).

The MFC to stable/9 of r226105 was back out.


Well, I am just curious how critical it is to get it resolved and is 
there any way to avoid ABI breakage. Software compiled for 9.x won't run 
on 10.x even when fitted with the proper compat libs, as far as I can 
tell and not all software can be easily recompiled.


There are also other places where BSD have subtle differences with 
almost any other nix flavor out there. Not accepting sun_len = 0 in the 
unix domain sockets is one of those places that comes to mind. Other 
systems just do strlen() of sun_path, while BSD does EINVAL. And we've 
been living with this for decades.


-Maxim
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn: head/sys/netinet

[Maxim Sobolev]

On 12/30/2011 4:17 PM, Maxim Sobolev wrote:

M>  Won't this break whole lot of third-party software, which expects
M>  FreeBSD to be slightly different in this regards? Just curious.

Yes it does. And until FreeBSD 10.0-RELEASE there is time to fix
this software (at least in ports).

The MFC to stable/9 of r226105 was back out.


Well, I am just curious how critical it is to get it resolved and is
there any way to avoid ABI breakage. Software compiled for 9.x won't run
on 10.x even when fitted with the proper compat libs, as far as I can
tell and not all software can be easily recompiled.


P.S. It should be trivial to put some COMPAT_8/COMPAT_9 shims based on 
the version of the ELF image (i.e. detect if the binary is < than 
FreeBSD 10.


-Maxim
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229052 - stable/9/sys/dev/bce

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 00:44:11 2011
New Revision: 229052
URL: http://svn.freebsd.org/changeset/base/229052

Log:
  MFC r226123:
BCE_MISC_ID register of BCM5716 returns the same id of BCM5709 so
remove explicit checks for BCM5716.
The BCM5709 and BCM5716 chips are virtually indistinguishable by
software except for the PCI device ID.  The two chips differ in
that BCM5709 supports TCP/IP and iSCSI offload in Windows while
the BCM5716 doesn't.
While I'm here remove now unused definition of BCE_CHIP_NUM_5716
and BCE_CHIP_ID_5716_C0.

Modified:
  stable/9/sys/dev/bce/if_bce.c
  stable/9/sys/dev/bce/if_bcereg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/bce/if_bce.c
==
--- stable/9/sys/dev/bce/if_bce.c   Sat Dec 31 00:35:11 2011
(r229051)
+++ stable/9/sys/dev/bce/if_bce.c   Sat Dec 31 00:44:11 2011
(r229052)
@@ -1112,8 +1112,7 @@ bce_attach(device_t dev)
DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI "
"interrupt.\n", __FUNCTION__);
sc->bce_flags |= BCE_USING_MSI_FLAG;
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716))
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709)
sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG;
sc->bce_irq_rid = 1;
sc->bce_intr = bce_intr;
@@ -1730,8 +1729,7 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid
 
offset = ctx_offset + cid_addr;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_READ_REQ));
 
@@ -1783,8 +1781,7 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid
BCE_PRINTF("%s(): Invalid CID address: 0x%08X.\n",
__FUNCTION__, cid_addr));
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_DATA, ctx_val);
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_WRITE_REQ));
@@ -2469,8 +2466,7 @@ bce_init_nvram(struct bce_softc *sc)
 
DBENTER(BCE_VERBOSE_NVRAM);
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->bce_flash_info = &flash_5709;
goto bce_init_nvram_get_flash_size;
}
@@ -3224,8 +3220,7 @@ bce_dma_free(struct bce_softc *sc)
 
 
/* Free, unmap and destroy all context memory pages. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
for (i = 0; i < sc->ctx_pages; i++ ) {
if (sc->ctx_block[i] != NULL) {
bus_dmamem_free(
@@ -3564,8 +3559,7 @@ bce_dma_alloc(device_t dev)
__FUNCTION__, (uintmax_t) sc->stats_block_paddr);
 
/* BCM5709 uses host memory as cache for context memory. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->ctx_pages = 0x2000 / BCM_PAGE_SIZE;
if (sc->ctx_pages == 0)
sc->ctx_pages = 1;
@@ -4206,8 +4200,7 @@ bce_init_rxp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE_RXP_SCRATCH;
cpu_reg.mips_view_base = 0x800;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
fw.ver_major = bce_RXP_b09FwReleaseMajor;
fw.ver_minor = bce_RXP_b09FwReleaseMinor;
fw.ver_fix = bce_RXP_b09FwReleaseFix;
@@ -4305,8 +4298,7 @@ bce_init_txp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE

svn commit: r229053 - in stable/8/sys: conf dev/bce

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 00:46:06 2011
New Revision: 229053
URL: http://svn.freebsd.org/changeset/base/229053

Log:
  MFC r226123:
BCE_MISC_ID register of BCM5716 returns the same id of BCM5709 so
remove explicit checks for BCM5716.
The BCM5709 and BCM5716 chips are virtually indistinguishable by
software except for the PCI device ID.  The two chips differ in
that BCM5709 supports TCP/IP and iSCSI offload in Windows while
the BCM5716 doesn't.
While I'm here remove now unused definition of BCE_CHIP_NUM_5716
and BCE_CHIP_ID_5716_C0.

Modified:
  stable/8/sys/dev/bce/if_bce.c
  stable/8/sys/dev/bce/if_bcereg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.32   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.64   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/bce/if_bce.c
==
--- stable/8/sys/dev/bce/if_bce.c   Sat Dec 31 00:44:11 2011
(r229052)
+++ stable/8/sys/dev/bce/if_bce.c   Sat Dec 31 00:46:06 2011
(r229053)
@@ -796,8 +796,7 @@ bce_attach(device_t dev)
DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI "
"interrupt.\n", __FUNCTION__);
sc->bce_flags |= BCE_USING_MSI_FLAG;
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716))
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709)
sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG;
sc->bce_irq_rid = 1;
sc->bce_intr = bce_intr;
@@ -1450,8 +1449,7 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid
 
offset = ctx_offset + cid_addr;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_READ_REQ));
 
@@ -1503,8 +1501,7 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid
BCE_PRINTF("%s(): Invalid CID address: 0x%08X.\n",
__FUNCTION__, cid_addr));
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_DATA, ctx_val);
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_WRITE_REQ));
@@ -2189,8 +2186,7 @@ bce_init_nvram(struct bce_softc *sc)
 
DBENTER(BCE_VERBOSE_NVRAM);
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->bce_flash_info = &flash_5709;
goto bce_init_nvram_get_flash_size;
}
@@ -2892,8 +2888,7 @@ bce_dma_free(struct bce_softc *sc)
 
 
/* Free, unmap and destroy all context memory pages. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
for (i = 0; i < sc->ctx_pages; i++ ) {
if (sc->ctx_block[i] != NULL) {
bus_dmamem_free(
@@ -3232,8 +3227,7 @@ bce_dma_alloc(device_t dev)
__FUNCTION__, (uintmax_t) sc->stats_block_paddr);
 
/* BCM5709 uses host memory as cache for context memory. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->ctx_pages = 0x2000 / BCM_PAGE_SIZE;
if (sc->ctx_pages == 0)
sc->ctx_pages = 1;
@@ -3876,8 +3870,7 @@ bce_init_rxp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE_RXP_SCRATCH;
cpu_reg.mips_view_base = 0x800;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
fw.ver_major = bce_RXP_b09FwReleaseMajor;
fw.ver_minor = bce_RXP_b09FwReleaseMinor;
fw.ver_fix = bce_RXP_b09FwReleaseFix;
@@ -3975,8 +3968,7 @@ bce_init_txp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE_TXP_SCRATCH;
cpu_reg.mips_view_base = 0x800;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
fw.ver_major = bce_TXP_b09FwReleaseMajor;
fw.ver_m

svn commit: r229054 - stable/7/sys/dev/bce

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 00:47:54 2011
New Revision: 229054
URL: http://svn.freebsd.org/changeset/base/229054

Log:
  MFC r226123:
BCE_MISC_ID register of BCM5716 returns the same id of BCM5709 so
remove explicit checks for BCM5716.
The BCM5709 and BCM5716 chips are virtually indistinguishable by
software except for the PCI device ID.  The two chips differ in
that BCM5709 supports TCP/IP and iSCSI offload in Windows while
the BCM5716 doesn't.
While I'm here remove now unused definition of BCE_CHIP_NUM_5716
and BCE_CHIP_ID_5716_C0.

Modified:
  stable/7/sys/dev/bce/if_bce.c
  stable/7/sys/dev/bce/if_bcereg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/bce/if_bce.c
==
--- stable/7/sys/dev/bce/if_bce.c   Sat Dec 31 00:46:06 2011
(r229053)
+++ stable/7/sys/dev/bce/if_bce.c   Sat Dec 31 00:47:54 2011
(r229054)
@@ -796,8 +796,7 @@ bce_attach(device_t dev)
DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI "
"interrupt.\n", __FUNCTION__);
sc->bce_flags |= BCE_USING_MSI_FLAG;
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716))
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709)
sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG;
sc->bce_irq_rid = 1;
sc->bce_intr = bce_intr;
@@ -1450,8 +1449,7 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid
 
offset = ctx_offset + cid_addr;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_READ_REQ));
 
@@ -1503,8 +1501,7 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid
BCE_PRINTF("%s(): Invalid CID address: 0x%08X.\n",
__FUNCTION__, cid_addr));
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
 
REG_WR(sc, BCE_CTX_CTX_DATA, ctx_val);
REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | 
BCE_CTX_CTX_CTRL_WRITE_REQ));
@@ -2189,8 +2186,7 @@ bce_init_nvram(struct bce_softc *sc)
 
DBENTER(BCE_VERBOSE_NVRAM);
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->bce_flash_info = &flash_5709;
goto bce_init_nvram_get_flash_size;
}
@@ -2892,8 +2888,7 @@ bce_dma_free(struct bce_softc *sc)
 
 
/* Free, unmap and destroy all context memory pages. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
for (i = 0; i < sc->ctx_pages; i++ ) {
if (sc->ctx_block[i] != NULL) {
bus_dmamem_free(
@@ -3232,8 +3227,7 @@ bce_dma_alloc(device_t dev)
__FUNCTION__, (uintmax_t) sc->stats_block_paddr);
 
/* BCM5709 uses host memory as cache for context memory. */
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
sc->ctx_pages = 0x2000 / BCM_PAGE_SIZE;
if (sc->ctx_pages == 0)
sc->ctx_pages = 1;
@@ -3876,8 +3870,7 @@ bce_init_rxp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE_RXP_SCRATCH;
cpu_reg.mips_view_base = 0x800;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
fw.ver_major = bce_RXP_b09FwReleaseMajor;
fw.ver_minor = bce_RXP_b09FwReleaseMinor;
fw.ver_fix = bce_RXP_b09FwReleaseFix;
@@ -3975,8 +3968,7 @@ bce_init_txp_cpu(struct bce_softc *sc)
cpu_reg.spad_base = BCE_TXP_SCRATCH;
cpu_reg.mips_view_base = 0x800;
 
-   if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
-   (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
+   if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) {
fw.ver_major = bce_TXP_b09FwReleaseMajor;
fw.ver_minor = bce_TXP_b09FwReleaseMinor;
fw.ver_fix = bce_TXP_b09FwReleaseFix;
@@ -4073,8 +4065,7 @@ bce_init_tpat_cpu(struct bce_softc *sc)
cpu_reg.spad_base = 

svn commit: r229057 - in stable/9/sys: dev/age dev/alc dev/ale dev/lge dev/msk dev/nfe dev/nge dev/nve dev/re dev/sge dev/sis dev/vge dev/vr dev/vte mips/atheros mips/idt pci

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:07:01 2011
New Revision: 229057
URL: http://svn.freebsd.org/changeset/base/229057

Log:
  MFC r226478:
Close a race where SIOCGIFMEDIA ioctl get inconsistent link status.
Because driver is accessing a common MII structure in
mii_pollstat(), updating user supplied structure should be done
before dropping a driver lock.
  
Reported by:Karim (fodillemlinkarimi <> gmail dot com)

Modified:
  stable/9/sys/dev/age/if_age.c
  stable/9/sys/dev/alc/if_alc.c
  stable/9/sys/dev/ale/if_ale.c
  stable/9/sys/dev/lge/if_lge.c
  stable/9/sys/dev/msk/if_msk.c
  stable/9/sys/dev/nfe/if_nfe.c
  stable/9/sys/dev/nge/if_nge.c
  stable/9/sys/dev/nve/if_nve.c
  stable/9/sys/dev/re/if_re.c
  stable/9/sys/dev/sge/if_sge.c
  stable/9/sys/dev/sis/if_sis.c
  stable/9/sys/dev/vge/if_vge.c
  stable/9/sys/dev/vr/if_vr.c
  stable/9/sys/dev/vte/if_vte.c
  stable/9/sys/mips/atheros/if_arge.c
  stable/9/sys/mips/idt/if_kr.c
  stable/9/sys/pci/if_rl.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/age/if_age.c
==
--- stable/9/sys/dev/age/if_age.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/age/if_age.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -282,9 +282,9 @@ age_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->age_miibus);
 
mii_pollstat(mii);
-   AGE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   AGE_UNLOCK(sc);
 }
 
 /*

Modified: stable/9/sys/dev/alc/if_alc.c
==
--- stable/9/sys/dev/alc/if_alc.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/alc/if_alc.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -349,9 +349,9 @@ alc_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->alc_miibus);
 
mii_pollstat(mii);
-   ALC_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALC_UNLOCK(sc);
 }
 
 static int

Modified: stable/9/sys/dev/ale/if_ale.c
==
--- stable/9/sys/dev/ale/if_ale.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/ale/if_ale.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -270,9 +270,9 @@ ale_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->ale_miibus);
 
mii_pollstat(mii);
-   ALE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALE_UNLOCK(sc);
 }
 
 static int

Modified: stable/9/sys/dev/lge/if_lge.c
==
--- stable/9/sys/dev/lge/if_lge.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/lge/if_lge.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -1430,9 +1430,9 @@ lge_ifmedia_sts(ifp, ifmr)
LGE_LOCK(sc);
mii = device_get_softc(sc->lge_miibus);
mii_pollstat(mii);
-   LGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   LGE_UNLOCK(sc);
 
return;
 }

Modified: stable/9/sys/dev/msk/if_msk.c
==
--- stable/9/sys/dev/msk/if_msk.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/msk/if_msk.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -995,9 +995,9 @@ msk_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc_if->msk_miibus);
 
mii_pollstat(mii);
-   MSK_IF_UNLOCK(sc_if);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   MSK_IF_UNLOCK(sc_if);
 }
 
 static int

Modified: stable/9/sys/dev/nfe/if_nfe.c
==
--- stable/9/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:06:51 2011
(r229056)
+++ stable/9/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:07:01 2011
(r229057)
@@ -2952,10 +2952,10 @@ nfe_ifmedia_sts(struct ifnet *ifp

svn commit: r229058 - in stable/8/sys: conf dev/age dev/alc dev/ale dev/lge dev/msk dev/nfe dev/nge dev/nve dev/re dev/sge dev/sis dev/vge dev/vr dev/vte mips/atheros mips/idt pci

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:08:31 2011
New Revision: 229058
URL: http://svn.freebsd.org/changeset/base/229058

Log:
  MFC r226478:
Close a race where SIOCGIFMEDIA ioctl get inconsistent link status.
Because driver is accessing a common MII structure in
mii_pollstat(), updating user supplied structure should be done
before dropping a driver lock.
  
Reported by:Karim (fodillemlinkarimi <> gmail dot com)

Modified:
  stable/8/sys/dev/age/if_age.c
  stable/8/sys/dev/alc/if_alc.c
  stable/8/sys/dev/ale/if_ale.c
  stable/8/sys/dev/lge/if_lge.c
  stable/8/sys/dev/msk/if_msk.c
  stable/8/sys/dev/nfe/if_nfe.c
  stable/8/sys/dev/nge/if_nge.c
  stable/8/sys/dev/nve/if_nve.c
  stable/8/sys/dev/re/if_re.c
  stable/8/sys/dev/sge/if_sge.c
  stable/8/sys/dev/sis/if_sis.c
  stable/8/sys/dev/vge/if_vge.c
  stable/8/sys/dev/vr/if_vr.c
  stable/8/sys/dev/vte/if_vte.c
  stable/8/sys/mips/atheros/if_arge.c
  stable/8/sys/mips/idt/if_kr.c
  stable/8/sys/pci/if_rl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.32   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.64   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/age/if_age.c
==
--- stable/8/sys/dev/age/if_age.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/age/if_age.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -282,9 +282,9 @@ age_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->age_miibus);
 
mii_pollstat(mii);
-   AGE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   AGE_UNLOCK(sc);
 }
 
 /*

Modified: stable/8/sys/dev/alc/if_alc.c
==
--- stable/8/sys/dev/alc/if_alc.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/alc/if_alc.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -349,9 +349,9 @@ alc_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->alc_miibus);
 
mii_pollstat(mii);
-   ALC_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALC_UNLOCK(sc);
 }
 
 static int

Modified: stable/8/sys/dev/ale/if_ale.c
==
--- stable/8/sys/dev/ale/if_ale.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/ale/if_ale.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -270,9 +270,9 @@ ale_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->ale_miibus);
 
mii_pollstat(mii);
-   ALE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALE_UNLOCK(sc);
 }
 
 static int

Modified: stable/8/sys/dev/lge/if_lge.c
==
--- stable/8/sys/dev/lge/if_lge.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/lge/if_lge.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -1430,9 +1430,9 @@ lge_ifmedia_sts(ifp, ifmr)
LGE_LOCK(sc);
mii = device_get_softc(sc->lge_miibus);
mii_pollstat(mii);
-   LGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   LGE_UNLOCK(sc);
 
return;
 }

Modified: stable/8/sys/dev/msk/if_msk.c
==
--- stable/8/sys/dev/msk/if_msk.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/msk/if_msk.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -995,9 +995,9 @@ msk_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc_if->msk_miibus);
 
mii_pollstat(mii);
-   MSK_IF_UNLOCK(sc_if);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   MSK_IF_UNLOCK(sc_if);
 }
 
 static int

Modified: stable/8/sys/dev/nfe/if_nfe.c
==
--- stable/8/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:07:01 2011
(r229057)
+++ stable/8/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:08:31 2011
(r229058)
@@ -2952,10 +2952,10 @@ nfe_ifmedia_sts(struct ifnet *ifp, struc
NFE_LOCK(sc);
mii = device_get_softc(sc->nfe_miibus);
mii_pollstat(mii);
-   NFE_UNLOCK(sc);
 
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   NFE_UNLOCK(sc);
 }
 
 

Modified: stable/8/sys/dev/nge/if_nge.c

svn commit: r229059 - in stable/7/sys: dev/age dev/alc dev/ale dev/lge dev/msk dev/nfe dev/nge dev/nve dev/re dev/sge dev/sis dev/vge dev/vr dev/vte pci

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:10:29 2011
New Revision: 229059
URL: http://svn.freebsd.org/changeset/base/229059

Log:
  MFC r226478:
Close a race where SIOCGIFMEDIA ioctl get inconsistent link status.
Because driver is accessing a common MII structure in
mii_pollstat(), updating user supplied structure should be done
before dropping a driver lock.
  
Reported by:Karim (fodillemlinkarimi <> gmail dot com)

Modified:
  stable/7/sys/dev/age/if_age.c
  stable/7/sys/dev/alc/if_alc.c
  stable/7/sys/dev/ale/if_ale.c
  stable/7/sys/dev/lge/if_lge.c
  stable/7/sys/dev/msk/if_msk.c
  stable/7/sys/dev/nfe/if_nfe.c
  stable/7/sys/dev/nge/if_nge.c
  stable/7/sys/dev/nve/if_nve.c
  stable/7/sys/dev/re/if_re.c
  stable/7/sys/dev/sge/if_sge.c
  stable/7/sys/dev/sis/if_sis.c
  stable/7/sys/dev/vge/if_vge.c
  stable/7/sys/dev/vr/if_vr.c
  stable/7/sys/dev/vte/if_vte.c
  stable/7/sys/pci/if_rl.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/age/if_age.c
==
--- stable/7/sys/dev/age/if_age.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/age/if_age.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -282,9 +282,9 @@ age_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->age_miibus);
 
mii_pollstat(mii);
-   AGE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   AGE_UNLOCK(sc);
 }
 
 /*

Modified: stable/7/sys/dev/alc/if_alc.c
==
--- stable/7/sys/dev/alc/if_alc.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/alc/if_alc.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -349,9 +349,9 @@ alc_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->alc_miibus);
 
mii_pollstat(mii);
-   ALC_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALC_UNLOCK(sc);
 }
 
 static int

Modified: stable/7/sys/dev/ale/if_ale.c
==
--- stable/7/sys/dev/ale/if_ale.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/ale/if_ale.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -270,9 +270,9 @@ ale_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->ale_miibus);
 
mii_pollstat(mii);
-   ALE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+   ALE_UNLOCK(sc);
 }
 
 static int

Modified: stable/7/sys/dev/lge/if_lge.c
==
--- stable/7/sys/dev/lge/if_lge.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/lge/if_lge.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -1433,9 +1433,9 @@ lge_ifmedia_sts(ifp, ifmr)
LGE_LOCK(sc);
mii = device_get_softc(sc->lge_miibus);
mii_pollstat(mii);
-   LGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   LGE_UNLOCK(sc);
 
return;
 }

Modified: stable/7/sys/dev/msk/if_msk.c
==
--- stable/7/sys/dev/msk/if_msk.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/msk/if_msk.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -995,9 +995,9 @@ msk_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc_if->msk_miibus);
 
mii_pollstat(mii);
-   MSK_IF_UNLOCK(sc_if);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   MSK_IF_UNLOCK(sc_if);
 }
 
 static int

Modified: stable/7/sys/dev/nfe/if_nfe.c
==
--- stable/7/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/nfe/if_nfe.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -2943,10 +2943,10 @@ nfe_ifmedia_sts(struct ifnet *ifp, struc
NFE_LOCK(sc);
mii = device_get_softc(sc->nfe_miibus);
mii_pollstat(mii);
-   NFE_UNLOCK(sc);
 
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   NFE_UNLOCK(sc);
 }
 
 

Modified: stable/7/sys/dev/nge/if_nge.c
==
--- stable/7/sys/dev/nge/if_nge.c   Sat Dec 31 01:08:31 2011
(r229058)
+++ stable/7/sys/dev/nge/if_nge.c   Sat Dec 31 01:10:29 2011
(r229059)
@@ -227

svn commit: r229060 - stable/9/sys/dev/usb/net

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:22:16 2011
New Revision: 229060
URL: http://svn.freebsd.org/changeset/base/229060

Log:
  MFC r226479:
Close a race where SIOCGIFMEDIA ioctl get inconsistent link status.
Because driver is accessing a common MII structure in
mii_pollstat(), updating user supplied structure should be done
before dropping a driver lock.
  
Reported by:Karim (fodillemlinkarimi <> gmail dot com)

Modified:
  stable/9/sys/dev/usb/net/if_aue.c
  stable/9/sys/dev/usb/net/if_axe.c
  stable/9/sys/dev/usb/net/if_mos.c
  stable/9/sys/dev/usb/net/if_rue.c
  stable/9/sys/dev/usb/net/if_udav.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/usb/net/if_aue.c
==
--- stable/9/sys/dev/usb/net/if_aue.c   Sat Dec 31 01:10:29 2011
(r229059)
+++ stable/9/sys/dev/usb/net/if_aue.c   Sat Dec 31 01:22:16 2011
(r229060)
@@ -1032,9 +1032,9 @@ aue_ifmedia_sts(struct ifnet *ifp, struc
 
AUE_LOCK(sc);
mii_pollstat(mii);
-   AUE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   AUE_UNLOCK(sc);
 }
 
 /*

Modified: stable/9/sys/dev/usb/net/if_axe.c
==
--- stable/9/sys/dev/usb/net/if_axe.c   Sat Dec 31 01:10:29 2011
(r229059)
+++ stable/9/sys/dev/usb/net/if_axe.c   Sat Dec 31 01:22:16 2011
(r229060)
@@ -452,9 +452,9 @@ axe_ifmedia_sts(struct ifnet *ifp, struc
 
AXE_LOCK(sc);
mii_pollstat(mii);
-   AXE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   AXE_UNLOCK(sc);
 }
 
 static void

Modified: stable/9/sys/dev/usb/net/if_mos.c
==
--- stable/9/sys/dev/usb/net/if_mos.c   Sat Dec 31 01:10:29 2011
(r229059)
+++ stable/9/sys/dev/usb/net/if_mos.c   Sat Dec 31 01:22:16 2011
(r229060)
@@ -551,10 +551,10 @@ mos_ifmedia_sts(struct ifnet *ifp, struc
 
MOS_LOCK(sc);
mii_pollstat(mii);
-   MOS_UNLOCK(sc);
 
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   MOS_UNLOCK(sc);
 }
 
 static void

Modified: stable/9/sys/dev/usb/net/if_rue.c
==
--- stable/9/sys/dev/usb/net/if_rue.c   Sat Dec 31 01:10:29 2011
(r229059)
+++ stable/9/sys/dev/usb/net/if_rue.c   Sat Dec 31 01:22:16 2011
(r229060)
@@ -889,9 +889,9 @@ rue_ifmedia_sts(struct ifnet *ifp, struc
 
RUE_LOCK(sc);
mii_pollstat(mii);
-   RUE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   RUE_UNLOCK(sc);
 }
 
 static void

Modified: stable/9/sys/dev/usb/net/if_udav.c
==
--- stable/9/sys/dev/usb/net/if_udav.c  Sat Dec 31 01:10:29 2011
(r229059)
+++ stable/9/sys/dev/usb/net/if_udav.c  Sat Dec 31 01:22:16 2011
(r229060)
@@ -751,9 +751,9 @@ udav_ifmedia_status(struct ifnet *ifp, s
 
UDAV_LOCK(sc);
mii_pollstat(mii);
-   UDAV_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   UDAV_UNLOCK(sc);
 }
 
 static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229061 - stable/9/sys/dev/et

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:30:43 2011
New Revision: 229061
URL: http://svn.freebsd.org/changeset/base/229061

Log:
  MFC r226480-226481:
  r226480:
Add missing driver lock in media status handler.
  
  r226481:
Make sure to report media change status to caller. Previously it
always reported success.

Modified:
  stable/9/sys/dev/et/if_et.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/et/if_et.c
==
--- stable/9/sys/dev/et/if_et.c Sat Dec 31 01:22:16 2011(r229060)
+++ stable/9/sys/dev/et/if_et.c Sat Dec 31 01:30:43 2011(r229061)
@@ -518,9 +518,7 @@ et_ifmedia_upd_locked(struct ifnet *ifp)
 
LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
PHY_RESET(miisc);
-   mii_mediachg(mii);
-
-   return (0);
+   return (mii_mediachg(mii));
 }
 
 static int
@@ -542,9 +540,11 @@ et_ifmedia_sts(struct ifnet *ifp, struct
struct et_softc *sc = ifp->if_softc;
struct mii_data *mii = device_get_softc(sc->sc_miibus);
 
+   ET_LOCK(sc);
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   ET_UNLOCK(sc);
 }
 
 static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229062 - in stable/8/sys: conf dev/et

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:32:06 2011
New Revision: 229062
URL: http://svn.freebsd.org/changeset/base/229062

Log:
  MFC r226480-226481:
  r226480:
Add missing driver lock in media status handler.
  
  r226481:
Make sure to report media change status to caller. Previously it
always reported success.

Modified:
  stable/8/sys/dev/et/if_et.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.32   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.64   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/et/if_et.c
==
--- stable/8/sys/dev/et/if_et.c Sat Dec 31 01:30:43 2011(r229061)
+++ stable/8/sys/dev/et/if_et.c Sat Dec 31 01:32:06 2011(r229062)
@@ -519,9 +519,7 @@ et_ifmedia_upd_locked(struct ifnet *ifp)
 
LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
mii_phy_reset(miisc);
-   mii_mediachg(mii);
-
-   return (0);
+   return (mii_mediachg(mii));
 }
 
 static int
@@ -543,9 +541,11 @@ et_ifmedia_sts(struct ifnet *ifp, struct
struct et_softc *sc = ifp->if_softc;
struct mii_data *mii = device_get_softc(sc->sc_miibus);
 
+   ET_LOCK(sc);
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   ET_UNLOCK(sc);
 }
 
 static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229063 - stable/7/sys/dev/et

[Pyun YongHyeon]

Author: yongari
Date: Sat Dec 31 01:33:25 2011
New Revision: 229063
URL: http://svn.freebsd.org/changeset/base/229063

Log:
  MFC r226480-226481:
  r226480:
Add missing driver lock in media status handler.
  
  r226481:
Make sure to report media change status to caller. Previously it
always reported success.

Modified:
  stable/7/sys/dev/et/if_et.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/et/if_et.c
==
--- stable/7/sys/dev/et/if_et.c Sat Dec 31 01:32:06 2011(r229062)
+++ stable/7/sys/dev/et/if_et.c Sat Dec 31 01:33:25 2011(r229063)
@@ -519,9 +519,7 @@ et_ifmedia_upd_locked(struct ifnet *ifp)
 
LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
mii_phy_reset(miisc);
-   mii_mediachg(mii);
-
-   return (0);
+   return (mii_mediachg(mii));
 }
 
 static int
@@ -543,9 +541,11 @@ et_ifmedia_sts(struct ifnet *ifp, struct
struct et_softc *sc = ifp->if_softc;
struct mii_data *mii = device_get_softc(sc->sc_miibus);
 
+   ET_LOCK(sc);
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+   ET_UNLOCK(sc);
 }
 
 static void
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229065 - stable/8/sys/cam/scsi

[Matthew D Fleming]

Author: mdf
Date: Sat Dec 31 03:02:59 2011
New Revision: 229065
URL: http://svn.freebsd.org/changeset/base/229065

Log:
  MFC r228442:
  
  Do not use the sometimes-reserved word 'bool' for a variable name.

Modified:
  stable/8/sys/cam/scsi/scsi_xpt.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_xpt.c
==
--- stable/8/sys/cam/scsi/scsi_xpt.cSat Dec 31 02:08:51 2011
(r229064)
+++ stable/8/sys/cam/scsi/scsi_xpt.cSat Dec 31 03:02:59 2011
(r229065)
@@ -1462,14 +1462,14 @@ scsi_find_quirk(struct cam_ed *device)
 static int
 sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS)
 {
-   int error, bool;
+   int error, val;
 
-   bool = cam_srch_hi;
-   error = sysctl_handle_int(oidp, &bool, 0, req);
+   val = cam_srch_hi;
+   error = sysctl_handle_int(oidp, &val, 0, req);
if (error != 0 || req->newptr == NULL)
return (error);
-   if (bool == 0 || bool == 1) {
-   cam_srch_hi = bool;
+   if (val == 0 || val == 1) {
+   cam_srch_hi = val;
return (0);
} else {
return (EINVAL);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229067 - in head: . sys/sys

[David E. O'Brien]

Author: obrien
Date: Sat Dec 31 04:38:04 2011
New Revision: 229067
URL: http://svn.freebsd.org/changeset/base/229067

Log:
  Happy 2012 to FreeBSD users in Samoa.

Modified:
  head/COPYRIGHT
  head/sys/sys/copyright.h

Modified: head/COPYRIGHT
==
--- head/COPYRIGHT  Sat Dec 31 04:05:13 2011(r229066)
+++ head/COPYRIGHT  Sat Dec 31 04:38:04 2011(r229067)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: head/sys/sys/copyright.h
==
--- head/sys/sys/copyright.hSat Dec 31 04:05:13 2011(r229066)
+++ head/sys/sys/copyright.hSat Dec 31 04:38:04 2011(r229067)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2011 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2012 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   "Copyright (c) 1992-2011 The FreeBSD Project.\n"
+   "Copyright (c) 1992-2012 The FreeBSD Project.\n"
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229068 - in stable/9: . sys/sys

[David E. O'Brien]

Author: obrien
Date: Sat Dec 31 04:42:17 2011
New Revision: 229068
URL: http://svn.freebsd.org/changeset/base/229068

Log:
  MFC 229067: Happy 2012 to FreeBSD users in Samoa.

Modified:
  stable/9/COPYRIGHT
  stable/9/sys/sys/copyright.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/COPYRIGHT
==
--- stable/9/COPYRIGHT  Sat Dec 31 04:38:04 2011(r229067)
+++ stable/9/COPYRIGHT  Sat Dec 31 04:42:17 2011(r229068)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: stable/9/sys/sys/copyright.h
==
--- stable/9/sys/sys/copyright.hSat Dec 31 04:38:04 2011
(r229067)
+++ stable/9/sys/sys/copyright.hSat Dec 31 04:42:17 2011
(r229068)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2011 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2012 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   "Copyright (c) 1992-2011 The FreeBSD Project.\n"
+   "Copyright (c) 1992-2012 The FreeBSD Project.\n"
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229069 - in stable/8: . sys/sys

[David E. O'Brien]

Author: obrien
Date: Sat Dec 31 04:47:00 2011
New Revision: 229069
URL: http://svn.freebsd.org/changeset/base/229069

Log:
  MF9 r229068: Happy 2012 to FreeBSD users in Samoa.

Modified:
  stable/8/COPYRIGHT   (contents, props changed)
  stable/8/sys/sys/copyright.h
Directory Properties:
  stable/8/   (props changed)
  stable/8/sys/   (props changed)

Modified: stable/8/COPYRIGHT
==
--- stable/8/COPYRIGHT  Sat Dec 31 04:42:17 2011(r229068)
+++ stable/8/COPYRIGHT  Sat Dec 31 04:47:00 2011(r229069)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: stable/8/sys/sys/copyright.h
==
--- stable/8/sys/sys/copyright.hSat Dec 31 04:42:17 2011
(r229068)
+++ stable/8/sys/sys/copyright.hSat Dec 31 04:47:00 2011
(r229069)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2011 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2012 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   "Copyright (c) 1992-2011 The FreeBSD Project.\n"
+   "Copyright (c) 1992-2012 The FreeBSD Project.\n"
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229070 - head/sys/contrib/octeon-sdk

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat Dec 31 05:24:21 2011
New Revision: 229070
URL: http://svn.freebsd.org/changeset/base/229070

Log:
  - CAPK-0100 board's USB timer is 12MHz

Modified:
  head/sys/contrib/octeon-sdk/cvmx-helper-board.c

Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Sat Dec 31 04:47:00 
2011(r229069)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Sat Dec 31 05:24:21 
2011(r229070)
@@ -866,6 +866,9 @@ cvmx_helper_board_usb_clock_types_t __cv
 case CVMX_BOARD_TYPE_CUST_LANNER_MR320:
 case CVMX_BOARD_TYPE_CUST_LANNER_MR321X:
 #endif
+#if defined(OCTEON_BOARD_CAPK_0100ND)
+   case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
+#endif
 return USB_CLOCK_TYPE_CRYSTAL_12;
 }
 return USB_CLOCK_TYPE_REF_48;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229071 - head/sys/contrib/octeon-sdk

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat Dec 31 05:25:42 2011
New Revision: 229071
URL: http://svn.freebsd.org/changeset/base/229071

Log:
  - Properly clean state structure in cvmx_usb_initialize

Modified:
  head/sys/contrib/octeon-sdk/cvmx-usb.c

Modified: head/sys/contrib/octeon-sdk/cvmx-usb.c
==
--- head/sys/contrib/octeon-sdk/cvmx-usb.c  Sat Dec 31 05:24:21 2011
(r229070)
+++ head/sys/contrib/octeon-sdk/cvmx-usb.c  Sat Dec 31 05:25:42 2011
(r229071)
@@ -654,7 +654,7 @@ cvmx_usb_status_t cvmx_usb_initialize(cv
 }
 }
 
-memset(usb, 0, sizeof(usb));
+memset(usb, 0, sizeof(*usb));
 usb->init_flags = flags;
 
 /* Initialize the USB state structure */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229072 - head/sys/mips/cavium/usb

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat Dec 31 05:45:10 2011
New Revision: 229072
URL: http://svn.freebsd.org/changeset/base/229072

Log:
  - Pass proper endpoint number (without direction flag) to
 cvmx_usb_open_pipe

Modified:
  head/sys/mips/cavium/usb/octusb.c

Modified: head/sys/mips/cavium/usb/octusb.c
==
--- head/sys/mips/cavium/usb/octusb.c   Sat Dec 31 05:25:42 2011
(r229071)
+++ head/sys/mips/cavium/usb/octusb.c   Sat Dec 31 05:45:10 2011
(r229072)
@@ -162,7 +162,7 @@ octusb_host_alloc_endpoint(struct octusb
&sc->sc_port[td->qh->port_index].state,
0,
td->qh->dev_addr,
-   td->qh->ep_num,
+   td->qh->ep_num & UE_ADDR,
octusb_convert_speed(td->qh->dev_speed),
td->qh->max_packet_size,
octusb_convert_ep_type(td->qh->ep_type),
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228986 - in head: share/man/man4 sys/net

[Lawrence Stewart]

On 12/31/11 11:13, Adrian Chadd wrote:

This just broke wlan. Please consider fixing this patch :)


Adrian

*** Interface: wlan0: start
can't re-use a leaf (wlan0)!
panic: bpfattach tscfgoid
KDB: enter: panic
[ thread pid 166 tid 100048 ]Stopped at  kdb_enter+0x4c: lui at,0x8048
db>
db>  bt
Tracing pid 166 tid 100048 td 0x80c37900
db_trace_thread+30 (?,?,?,?) ra 80074cc0 sp c40075f0 sz 24
80074bac+114 (0,?,,?) ra 8007427c sp c4007608 sz 32
80073ef4+388 (?,?,?,?) ra 80074400 sp c4007628 sz 168
db_command_loop+70 (?,?,?,?) ra 80076ac4 sp c40076d0 sz 24
800769d0+f4 (?,?,?,?) ra 801b7560 sp c40076e8 sz 424
kdb_trap+110 (?,?,?,?) ra 8035c7ec sp c4007890 sz 48
trap+bf4 (?,?,?,?) ra 80354560 sp c40078c0 sz 184
MipsKernGenException+134 (0,4,803c089c,113) ra 801b72d8 sp c4007978 sz 200
kdb_enter+4c (?,?,?,?) ra 8017f88c sp c4007a40 sz 24
panic+11c (?,0,80706500,0) ra 802304b8 sp c4007a58 sz 40
bpfattach2+cc (?,?,?,?) ra 802305e0 sp c4007a80 sz 64
bpfattach+10 (?,?,?,?) ra 802448ec sp c4007ac0 sz 24
ether_ifattach+d0 (?,?,?,?) ra 8025f0ac sp c4007ad8 sz 32
ieee80211_vap_attach+104 (?,?,?,?) ra 8007ffe8 sp c4007af8 sz 96
8007f960+688 (?,?,0,?) ra 8026a39c sp c4007b58 sz 88
8026a22c+170 (?,?,?,?) ra 802430dc sp c4007bb0 sz 88
ifc_simple_create+80 (?,?,?,?) ra 80242b04 sp c4007c08 sz 64
80242ab0+54 (?,?,?,?) ra 80242d78 sp c4007c48 sz 40
if_clone_create+a8 (?,?,?,?) ra 8023bdd4 sp c4007c70 sz 40
ifioctl+3a4 (?,?,80c7f460,80c37900) ra 801d8070 sp c4007c98 sz 144
soo_ioctl+3b0 (?,?,?,?) ra 801d2804 sp c4007d28 sz 40
kern_ioctl+248 (?,?,?,?) ra 801d29ac sp c4007d50 sz 64
sys_ioctl+130 (?,?,?,?) ra 8035c3ec sp c4007d90 sz 56
trap+7f4 (?,?,?,?) ra 8035475c sp c4007dc8 sz 184
MipsUserGenException+10c (?,?,?,4061d590) ra 0 sp c4007e80 sz 0
pid 166
db>  reset


I've managed to reproduce this on my wifi enabled laptop with r228986 
MFCed to a 9-stable kernel. I can't reproduce the panic with regular 
interfaces, pseudo interfaces (e.g. lo0 and pflog0) or vlans (which also 
have a relationship with an underlying physical interface) i.e. this is 
VAP/net80211 specific as far as I can tell.


The problem is that bpfattach2() is being called twice with the same 
interface name i.e. "wlan0".


I added a debug printf and call to kdb_backtrace() after the 
SYSCTL_ADD_PROC() call in bpfattach2() to see the code paths which are 
calling into the function. Here's what I see when the kernel runs on my 
laptop (I've added inline comments between "## ##"):


Added tscfg OID for interface wlan0
KDB: stack backtrace:
#0 0x808680ce at kdb_backtrace+0x5e
#1 0x808da5b4 at bpfattach2+0xb4
#2 0x808fbe06 at ieee80211_vap_setup+0x266
#3 0x80740205 at wpi_vap_create+0x95
#4 0x809047fb at wlan_clone_create+0x16b
#5 0x808e6079 at ifc_simple_create+0x89
#6 0x808e5cc5 at if_clone_createif+0x65
#7 0x808e4546 at ifioctl+0x306
#8 0x80879755 at kern_ioctl+0x115
#9 0x8087998d at sys_ioctl+0xfd
#10 0x80b17d60 at amd64_syscall+0x450
#11 0x80b03497 at Xfast_syscall+0xf7

## Here it has successfully added the net.bpf.tscfg.wlan0 sysctl entry 
for wlan0 ##


can't re-use a leaf (wlan0)!

## Here SYSCTL_ADD_PROC() failed because leaf name is already used ##

panic: bpfattach tscfgoid
cpuid = 1
KDB: stack backtrace:
#0 0x808680ce at kdb_backtrace+0x5e
#1 0x80832c87 at panic+0x187
#2 0x808da6f6 at bpfattach2+0x1f6
#3 0x808e72ee at ether_ifattach+0xae
#4 0x808fd0a5 at ieee80211_vap_attach+0xb5
#5 0x8074023c at wpi_vap_create+0xcc
#6 0x809047fb at wlan_clone_create+0x16b
#7 0x808e6079 at ifc_simple_create+0x89
#8 0x808e5cc5 at if_clone_createif+0x65
#9 0x808e4546 at ifioctl+0x306
#10 0x80879755 at kern_ioctl+0x115
#11 0x8087998d at sys_ioctl+0xfd
#12 0x80b17d60 at amd64_syscall+0x450
#13 0x80b03497 at Xfast_syscall+0xf7



So after a bit of digging, ieee80211_vap_setup() calls 
ieee80211_radiotap_vattach(), which explicitly calls bpfattach2(), and 
then a subsequent call to ieee80211_vap_attach() indirectly calls into 
bpfattach2() via the call to ether_ifattach().


This smells like a net80211 bug to me. I'm guessing, but I would suspect 
ieee80211_vap_setup() shouldn't call ieee80211_radiotap_vattach() and 
should let ieee80211_vap_attach() handle the BPF attachment via the call 
to ether_ifattach().


Thoughts?

Cheers,
Lawrence
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228986 - in head: share/man/man4 sys/net

[Adrian Chadd]

Please file a PR for me? :)


Adrian

On 30 December 2011 23:02, Lawrence Stewart  wrote:
> On 12/31/11 11:13, Adrian Chadd wrote:
>>
>> This just broke wlan. Please consider fixing this patch :)
>>
>>
>> Adrian
>>
>> *** Interface: wlan0: start
>> can't re-use a leaf (wlan0)!
>> panic: bpfattach tscfgoid
>> KDB: enter: panic
>> [ thread pid 166 tid 100048 ]Stopped at      kdb_enter+0x4c: lui
>> at,0x8048
>> db>
>> db>  bt
>> Tracing pid 166 tid 100048 td 0x80c37900
>> db_trace_thread+30 (?,?,?,?) ra 80074cc0 sp c40075f0 sz 24
>> 80074bac+114 (0,?,,?) ra 8007427c sp c4007608 sz 32
>> 80073ef4+388 (?,?,?,?) ra 80074400 sp c4007628 sz 168
>> db_command_loop+70 (?,?,?,?) ra 80076ac4 sp c40076d0 sz 24
>> 800769d0+f4 (?,?,?,?) ra 801b7560 sp c40076e8 sz 424
>> kdb_trap+110 (?,?,?,?) ra 8035c7ec sp c4007890 sz 48
>> trap+bf4 (?,?,?,?) ra 80354560 sp c40078c0 sz 184
>> MipsKernGenException+134 (0,4,803c089c,113) ra 801b72d8 sp c4007978 sz 200
>> kdb_enter+4c (?,?,?,?) ra 8017f88c sp c4007a40 sz 24
>> panic+11c (?,0,80706500,0) ra 802304b8 sp c4007a58 sz 40
>> bpfattach2+cc (?,?,?,?) ra 802305e0 sp c4007a80 sz 64
>> bpfattach+10 (?,?,?,?) ra 802448ec sp c4007ac0 sz 24
>> ether_ifattach+d0 (?,?,?,?) ra 8025f0ac sp c4007ad8 sz 32
>> ieee80211_vap_attach+104 (?,?,?,?) ra 8007ffe8 sp c4007af8 sz 96
>> 8007f960+688 (?,?,0,?) ra 8026a39c sp c4007b58 sz 88
>> 8026a22c+170 (?,?,?,?) ra 802430dc sp c4007bb0 sz 88
>> ifc_simple_create+80 (?,?,?,?) ra 80242b04 sp c4007c08 sz 64
>> 80242ab0+54 (?,?,?,?) ra 80242d78 sp c4007c48 sz 40
>> if_clone_create+a8 (?,?,?,?) ra 8023bdd4 sp c4007c70 sz 40
>> ifioctl+3a4 (?,?,80c7f460,80c37900) ra 801d8070 sp c4007c98 sz 144
>> soo_ioctl+3b0 (?,?,?,?) ra 801d2804 sp c4007d28 sz 40
>> kern_ioctl+248 (?,?,?,?) ra 801d29ac sp c4007d50 sz 64
>> sys_ioctl+130 (?,?,?,?) ra 8035c3ec sp c4007d90 sz 56
>> trap+7f4 (?,?,?,?) ra 8035475c sp c4007dc8 sz 184
>> MipsUserGenException+10c (?,?,?,4061d590) ra 0 sp c4007e80 sz 0
>> pid 166
>> db>  reset
>
>
> I've managed to reproduce this on my wifi enabled laptop with r228986 MFCed
> to a 9-stable kernel. I can't reproduce the panic with regular interfaces,
> pseudo interfaces (e.g. lo0 and pflog0) or vlans (which also have a
> relationship with an underlying physical interface) i.e. this is
> VAP/net80211 specific as far as I can tell.
>
> The problem is that bpfattach2() is being called twice with the same
> interface name i.e. "wlan0".
>
> I added a debug printf and call to kdb_backtrace() after the
> SYSCTL_ADD_PROC() call in bpfattach2() to see the code paths which are
> calling into the function. Here's what I see when the kernel runs on my
> laptop (I've added inline comments between "## ##"):
>
> Added tscfg OID for interface wlan0
> KDB: stack backtrace:
> #0 0x808680ce at kdb_backtrace+0x5e
> #1 0x808da5b4 at bpfattach2+0xb4
> #2 0x808fbe06 at ieee80211_vap_setup+0x266
> #3 0x80740205 at wpi_vap_create+0x95
> #4 0x809047fb at wlan_clone_create+0x16b
> #5 0x808e6079 at ifc_simple_create+0x89
> #6 0x808e5cc5 at if_clone_createif+0x65
> #7 0x808e4546 at ifioctl+0x306
> #8 0x80879755 at kern_ioctl+0x115
> #9 0x8087998d at sys_ioctl+0xfd
> #10 0x80b17d60 at amd64_syscall+0x450
> #11 0x80b03497 at Xfast_syscall+0xf7
>
> ## Here it has successfully added the net.bpf.tscfg.wlan0 sysctl entry for
> wlan0 ##
>
>
> can't re-use a leaf (wlan0)!
>
> ## Here SYSCTL_ADD_PROC() failed because leaf name is already used ##
>
> panic: bpfattach tscfgoid
> cpuid = 1
> KDB: stack backtrace:
> #0 0x808680ce at kdb_backtrace+0x5e
> #1 0x80832c87 at panic+0x187
> #2 0x808da6f6 at bpfattach2+0x1f6
> #3 0x808e72ee at ether_ifattach+0xae
> #4 0x808fd0a5 at ieee80211_vap_attach+0xb5
> #5 0x8074023c at wpi_vap_create+0xcc
> #6 0x809047fb at wlan_clone_create+0x16b
> #7 0x808e6079 at ifc_simple_create+0x89
> #8 0x808e5cc5 at if_clone_createif+0x65
> #9 0x808e4546 at ifioctl+0x306
> #10 0x80879755 at kern_ioctl+0x115
> #11 0x8087998d at sys_ioctl+0xfd
> #12 0x80b17d60 at amd64_syscall+0x450
> #13 0x80b03497 at Xfast_syscall+0xf7
>
>
>
> So after a bit of digging, ieee80211_vap_setup() calls
> ieee80211_radiotap_vattach(), which explicitly calls bpfattach2(), and then
> a subsequent call to ieee80211_vap_attach() indirectly calls into
> bpfattach2() via the call to ether_ifattach().
>
> This smells like a net80211 bug to me. I'm guessing, but I would suspect
> ieee80211_vap_setup() shouldn't call ieee80211_radiotap_vattach() and should
> let ieee80211_vap_attach() handle the BPF attachment via the call to
> ether_ifattach().
>
> Thoughts?
>
> Cheers,
> Lawrence
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.o

svn commit: r229073 - in head: share/man/man4 sys/net

[Lawrence Stewart]

Author: lstewart
Date: Sat Dec 31 07:21:28 2011
New Revision: 229073
URL: http://svn.freebsd.org/changeset/base/229073

Log:
  Revert r228986 until it can be reworked to avoid panicing the kernel when the
  same interface is attached multiple times with different DLTs, as is done in
  net80211 for example.
  
  Reported by:  adrian

Modified:
  head/share/man/man4/bpf.4
  head/sys/net/bpf.c
  head/sys/net/bpf.h

Modified: head/share/man/man4/bpf.4
==
--- head/share/man/man4/bpf.4   Sat Dec 31 05:45:10 2011(r229072)
+++ head/share/man/man4/bpf.4   Sat Dec 31 07:21:28 2011(r229073)
@@ -49,7 +49,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 30, 2011
+.Dd June 15, 2010
 .Dt BPF 4
 .Os
 .Sh NAME
@@ -516,48 +516,61 @@ by default.
 .It Dv BIOCSTSTAMP
 .It Dv BIOCGTSTAMP
 .Pq Li u_int
-Set or get the format and resolution of time stamps returned by BPF.
-The per-BPF descriptor configuration provided by the
-.Dv BIOCSTSTAMP
-IOCTL complements the per-interface time stamp configuration detailed in the
-.Sx CONFIGURATION
-section.
-.Pp
+Set or get format and resolution of the time stamps returned by BPF.
 Set to
-.Dv BPF_T_MICROTIME
+.Dv BPF_T_MICROTIME ,
+.Dv BPF_T_MICROTIME_FAST ,
+.Dv BPF_T_MICROTIME_MONOTONIC ,
 or
-.Dv BPF_T_MICROTIME_MONOTONIC
+.Dv BPF_T_MICROTIME_MONOTONIC_FAST
 to get time stamps in 64-bit
 .Vt struct timeval
 format.
 Set to
-.Dv BPF_T_NANOTIME
+.Dv BPF_T_NANOTIME ,
+.Dv BPF_T_NANOTIME_FAST ,
+.Dv BPF_T_NANOTIME_MONOTONIC ,
 or
-.Dv BPF_T_NANOTIME_MONOTONIC
+.Dv BPF_T_NANOTIME_MONOTONIC_FAST
 to get time stamps in 64-bit
 .Vt struct timespec
 format.
 Set to
-.Dv BPF_T_BINTIME
+.Dv BPF_T_BINTIME ,
+.Dv BPF_T_BINTIME_FAST ,
+.Dv BPF_T_NANOTIME_MONOTONIC ,
 or
-.Dv BPF_T_BINTIME_MONOTONIC
+.Dv BPF_T_BINTIME_MONOTONIC_FAST
 to get time stamps in 64-bit
 .Vt struct bintime
 format.
 Set to
 .Dv BPF_T_NONE
-to not set a time stamp.
-By default, time stamps are initilized to
-.Dv BPF_T_MICROTIME .
-.Pp
+to ignore time stamp.
 All 64-bit time stamp formats are wrapped in
 .Vt struct bpf_ts .
 The
+.Dv BPF_T_MICROTIME_FAST ,
+.Dv BPF_T_NANOTIME_FAST ,
+.Dv BPF_T_BINTIME_FAST ,
+.Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
+.Dv BPF_T_NANOTIME_MONOTONIC_FAST ,
+and
+.Dv BPF_T_BINTIME_MONOTONIC_FAST
+are analogs of corresponding formats without _FAST suffix but do not perform
+a full time counter query, so their accuracy is one timer tick.
+The
 .Dv BPF_T_MICROTIME_MONOTONIC ,
 .Dv BPF_T_NANOTIME_MONOTONIC ,
+.Dv BPF_T_BINTIME_MONOTONIC ,
+.Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
+.Dv BPF_T_NANOTIME_MONOTONIC_FAST ,
 and
-.Dv BPF_T_BINTIME_MONOTONIC
+.Dv BPF_T_BINTIME_MONOTONIC_FAST
 store the time elapsed since kernel boot.
+This setting is initialized to
+.Dv BPF_T_MICROTIME
+by default.
 .It Dv BIOCFEEDBACK
 .Pq Li u_int
 Set packet feedback mode.
@@ -679,14 +692,14 @@ Currently,
 .Vt bpf_hdr
 is used when the time stamp is set to
 .Dv BPF_T_MICROTIME ,
+.Dv BPF_T_MICROTIME_FAST ,
 .Dv BPF_T_MICROTIME_MONOTONIC ,
+.Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
 or
 .Dv BPF_T_NONE
-for backward compatibility reasons.
-Otherwise,
+for backward compatibility reasons.  Otherwise,
 .Vt bpf_xhdr
-is used.
-However,
+is used.  However,
 .Vt bpf_hdr
 may be deprecated in the near future.
 Suitable precautions
@@ -939,48 +952,6 @@ array initializers:
 .Fn BPF_STMT opcode operand
 and
 .Fn BPF_JUMP opcode operand true_offset false_offset .
-.Sh CONFIGURATION
-Per-interface BPF time stamp configuration is possible via the
-.Va net.bpf.tscfg
-.Xr sysctl 8
-tree which provides the following variables:
-.Bl -tag -width "" -offset indent
-.It Va net.bpf.tscfg.default
-The default time stamp configuration setting used by all BPF attached 
interfaces
-which have not been explicitly changed.
-Valid values are "none", "fast", "normal" and "external".
-The default is "normal".
-.It Va net.bpf.tscfg.
-The time stamp configuration setting used by a specific BPF attached interface.
-There will be a separate entry in the
-.Va net.bpf.tscfg
-sysctl tree for each BPF attached interface.
-Valid values are "default", "none", "fast", "normal" and "external".
-The default is "default", which means the system wide default setting specified
-by the
-.Va net.bpf.tscfg.default
-sysctl is used.
-.El
-.Pp
-The meaning of each per-interface time stamp configuration option is as 
follows:
-.Bl -tag -width "" -offset indent
-.It none   
-Do not generate a time stamp for all packets tapped from this interface.
-.It fast   
-Generate a time stamp for all packets tapped from this interface by doing a 
fast
-read of the system clock.
-Fast reads have a granularity equivalent to the underlying kernel tick rate.
-.It normal
-Generate a time stamp for all packets tapped from this interface by doing a 
full
-read of the system clock.
-Full reads are slower than fast reads, but provide full hardware time counter
-granularity for the time stamp.
-.It external
-Some

Re: svn: head/sys/netinet

[Kostik Belousov]

On Fri, Dec 30, 2011 at 04:25:09PM -0800, Maxim Sobolev wrote:
> On 12/30/2011 4:17 PM, Maxim Sobolev wrote:
> >>M>  Won't this break whole lot of third-party software, which expects
> >>M>  FreeBSD to be slightly different in this regards? Just curious.
> >>
> >>Yes it does. And until FreeBSD 10.0-RELEASE there is time to fix
> >>this software (at least in ports).
> >>
> >>The MFC to stable/9 of r226105 was back out.
> >
> >Well, I am just curious how critical it is to get it resolved and is
> >there any way to avoid ABI breakage. Software compiled for 9.x won't run
> >on 10.x even when fitted with the proper compat libs, as far as I can
> >tell and not all software can be easily recompiled.
> 
> P.S. It should be trivial to put some COMPAT_8/COMPAT_9 shims based on 
> the version of the ELF image (i.e. detect if the binary is < than 
> FreeBSD 10.
What exactly do you mean by 'version of the ELF image' ? ABI note tag ?
What do you propose to do if older call comes from dso, or a library
statically linked in the main binary ?


pgpUH5eBDQ8i7.pgp
Description: PGP signature