From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 00:29:15 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 213E4896;
 Sun, 23 Dec 2012 00:29:15 +0000 (UTC)
 (envelope-from rysto32@gmail.com)
Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com
 [209.85.212.50])
 by mx1.freebsd.org (Postfix) with ESMTP id 722288FC0A;
 Sun, 23 Dec 2012 00:29:14 +0000 (UTC)
Received: by mail-vb0-f50.google.com with SMTP id fr13so6391513vbb.23
 for <multiple recipients>; Sat, 22 Dec 2012 16:29:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=b/UpEzbkNc5vb5e7obAI0wXI6I3d6P5dEh0akz1Bqm0=;
 b=yAPibNdt8AF7Twom2j/MCJmSSzuqoNeKP/L+TPB6g6f4dcr1NXfl6scZ/BVhLEAng6
 Owsax8MNEeskaiCxD3qruOD/vyRrVmKm0T4/xicgTGGAI+ixld5b/zdwxifZeMeReyjU
 FPw7nDZxFDWLHr3oOy+OfIiuZd67Y49xif/3FL/PlRu9fxZKuL+PI9yqZ+ETkOKZEPfj
 O27YHe0qT2l8hCXlpZdjaDZ7wm1T/9T9mWr9H49a30wl0NUZHdN/qhFDwb4NqKP0qWBX
 C9QoD63FMQ6GckLn1AK2Ok5vhT/fHFp3m4LtrLB0sb8DkuUNtJjBEvsWVNYRGUu/8EBK
 F8kg==
MIME-Version: 1.0
Received: by 10.52.90.241 with SMTP id bz17mr23282318vdb.40.1356222547990;
 Sat, 22 Dec 2012 16:29:07 -0800 (PST)
Received: by 10.58.161.83 with HTTP; Sat, 22 Dec 2012 16:29:07 -0800 (PST)
In-Reply-To: <201212192010.qBJKA0lb075959@svn.freebsd.org>
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
Date: Sat, 22 Dec 2012 19:29:07 -0500
Message-ID: <CAFMmRNxaakTeJ5mE9P=j=zLunZuD2-7dMGaKrN0ztT0BZswSyA@mail.gmail.com>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
From: Ryan Stone <rysto32@gmail.com>
To: Jeff Roberson <jeff@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.14
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 00:29:15 -0000

This appears to have broken the build on arm.  I see the following build
failure building an arm LINT kernel:

cc1: warnings being treated as errors
In file included from
/usr/home/rstone/freebsd/head_2/sys/arn/arm/trap.c:900:
/usr/home/rstone/freebsd/head_2/sys/arm/arm/../../kern/subr_syscall.c: In
function 'syscallenter':
/usr/home/rstone/freebsd/head_2/sys/arm/arm/../../kern/subr_syscall.c:80:
warning: cast from pointer to integer of different size
[-Wpointer-to-int-cast]
/usr/home/rstone/freebsd/head_2/sys/arm/arm/../../kern/subr_syscall.c:154:
warning: cast from pointer to integer of different size
[-Wpointer-to-int-cast]

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 00:54:12 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 88DBBBE5;
 Sun, 23 Dec 2012 00:54:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
 [IPv6:2001:7b8:2ff:146::2])
 by mx1.freebsd.org (Postfix) with ESMTP id 449798FC0C;
 Sun, 23 Dec 2012 00:54:12 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7:0:84e5:2627:88f9:e626] (unknown
 [IPv6:2001:7b8:3a7:0:84e5:2627:88f9:e626])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id D215B5C5A;
 Sun, 23 Dec 2012 01:54:10 +0100 (CET)
Message-ID: <50D65630.8010901@FreeBSD.org>
Date: Sun, 23 Dec 2012 01:54:08 +0100
From: Dimitry Andric <dim@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:18.0) Gecko/20121128 Thunderbird/18.0
MIME-Version: 1.0
To: Brooks Davis <brooks@FreeBSD.org>
Subject: Re: svn commit: r244401 - in head: contrib/libc-vis include
 lib/libc/gen
References: <201212181637.qBIGbP7e084145@svn.freebsd.org>
In-Reply-To: <201212181637.qBIGbP7e084145@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 00:54:12 -0000

On 2012-12-18 17:37, Brooks Davis wrote:
> Author: brooks
> Date: Tue Dec 18 16:37:24 2012
> New Revision: 244401
> URL: http://svnweb.freebsd.org/changeset/base/244401
>
> Log:
>    Replace our implementation of the vis(3) and unvis(3) APIs with
>    NetBSD's.  This output size limited versions of vis and unvis functions
>    as well as a set of vis variants that allow arbitrary characters to be
>    specified for encoding.

This seems to break bootstrapping in some scenarios, in "stage 4.2:
building libraries"; for example, with a test run with gcc on
ref10-amd64.f.o I got this:

gcc  -O2 -pipe  -I/scratch2/tmp/dim/head/lib/libc/include -I/scratch2/tmp/dim/head/lib/libc/../../include -I/scratch2/tmp/dim/head/lib/libc/amd64 -DNLS  -D__DBINTERFACE_PRIVATE -I/scratch2/tmp/dim/head/lib/libc/../../contrib/gdtoa -DINET6 -I/scratch2/tmp/dim/obj/scratch2/tmp/dim/head/lib/libc -I/scratch2/tmp/dim/head/lib/libc/resolv -D_ACL_PRIVATE -DPOSIX_MISTAKE -I/scratch2/tmp/dim/head/lib/libc/../../contrib/jemalloc/include -I/scratch2/tmp/dim/head/lib/libc/../../contrib/tzcode/stdtime -I/scratch2/tmp/dim/head/lib/libc/stdtime -I/scratch2/tmp/dim/head/lib/libc/locale -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -I/scratch2/tmp/dim/head/lib/libc/rpc -DYP -DNS_CACHING -D_FREEFALL_CONFIG -DSYMBOL_VERSIONING -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/vis.c -o vis.o
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c: In function 'unvis':
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:237: error: 'VIS_NOESCAPE' undeclared (first use in this function)
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:237: error: (Each undeclared identifier is reported only once
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:237: error: for each function it appears in.)
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:241: error: 'VIS_HTTP1808' undeclared (first use in this function)
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:245: error: 'VIS_HTTP1866' undeclared (first use in this function)
/scratch2/tmp/dim/head/lib/libc/../../contrib/libc-vis/unvis.c:249: error: 'VIS_MIMESTYLE' undeclared (first use in this function)

There should most likely be an explicit -I option to point the compiler
at the correct vis.h header during the early stages, otherwise it will
pick up /usr/include/vis.h, which does not have several of these new
VIS_XXX defines.

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 03:24:09 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CDB43CE3;
 Sun, 23 Dec 2012 03:24:09 +0000 (UTC)
 (envelope-from bjkfbsd@gmail.com)
Received: from mail-ia0-f169.google.com (mail-ia0-f169.google.com
 [209.85.210.169])
 by mx1.freebsd.org (Postfix) with ESMTP id 624018FC13;
 Sun, 23 Dec 2012 03:24:09 +0000 (UTC)
Received: by mail-ia0-f169.google.com with SMTP id r4so5119142iaj.14
 for <multiple recipients>; Sat, 22 Dec 2012 19:24:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=UFZV67bLqhTLJi6jOvONpZ+EHCI5diVUzKL6YH20T2k=;
 b=IJv0bSGHNhblTS6dzCpTV/Pu3kcBY2lSYrbpup43QTtVkvxHJNy1PsTPX015xc5V2t
 cvVqP0cfE2ykfBMT2KVjHzbHfxL/Kdx+w+oocjZJmYoEbzor0FwwhUaGODDmJza1wy5U
 uzFPG7IjkJT8nn+rg3Mb4EDqe+sFH5xpjsUKMpnja/8nzsMiW06PmlnTblVrDfY/Q+IG
 HdZKPfov1QTeJpwA8/TTNzFa9u79Y+W3LW4rHVQXk497VPgPD1vOiT8PP3s0nP9kBMi0
 WK5aZ687/bQaxLXoQXvcN+xHMWNEudEIE4OWCAfX7NeOMIyB83g3DSqBDCZfmqUfchM+
 9n9A==
MIME-Version: 1.0
Received: by 10.50.187.225 with SMTP id fv1mr12416883igc.96.1356233042870;
 Sat, 22 Dec 2012 19:24:02 -0800 (PST)
Received: by 10.42.56.83 with HTTP; Sat, 22 Dec 2012 19:24:02 -0800 (PST)
In-Reply-To: <201212222334.qBMNYT1Y077396@svn.freebsd.org>
References: <201212222334.qBMNYT1Y077396@svn.freebsd.org>
Date: Sat, 22 Dec 2012 22:24:02 -0500
Message-ID: <CAJ5_RoBGO5e67HYUvOxiB64i1By0sJV=9kTaOb=118jNxfCT=Q@mail.gmail.com>
Subject: Re: svn commit: r244605 - head/usr.sbin/gssd
From: Benjamin Kaduk <bjkfbsd@gmail.com>
To: Rick Macklem <rmacklem@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.14
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 03:24:09 -0000

Hi Rick,

Thanks for all this -- it's good stuff to have.

On Sat, Dec 22, 2012 at 6:34 PM, Rick Macklem <rmacklem@freebsd.org> wrote:

> Author: rmacklem
> Date: Sat Dec 22 23:34:28 2012
> New Revision: 244605
> URL: http://svnweb.freebsd.org/changeset/base/244605
>
> Log:
>   Document the new gssd daemon options added by r244604.
>   This is a content change.
>
>   MFC after:    2 weeks
>
> Modified:
>   head/usr.sbin/gssd/gssd.8
>
> Modified: head/usr.sbin/gssd/gssd.8
>
> ==============================================================================
> --- head/usr.sbin/gssd/gssd.8   Sat Dec 22 23:21:17 2012        (r244604)
> +++ head/usr.sbin/gssd/gssd.8   Sat Dec 22 23:34:28 2012        (r244605)
> @@ -46,6 +49,29 @@ Run in debug mode.
>  In this mode,
>  .Nm
>  will not fork when it starts.
> +.It Fl s Ar dir-list
> +Look for an appropriate credential cache file in this list of directories.
> +The list should be full pathnames from root, separated by ':' characters.
> +Usually this list will simply be "/tmp".
> +Without this option, the
> +.Nm
> +daemon assumes that the credential cache file is called /tmp/krb5cc_<uid>,
> +where <uid> is the effective uid for the RPC caller.
> +.It Fl c Ar file-substring
> +Set a file-substring for the credential cache file names.
> +Only files with this substring embedded in their names will be
> +selected as candidates when the
> +.Fl s
> +has been specified.
>

This grammar seems a bit fishy ("when the -s has been specified"); "when -s
has been specified" or
"when a search directory has been specified with -s" would probably be
better.


> +If not specified, it defaults to "krb5cc_".
> +.It Fl r Ar preferred-realm
> +Set a preferred Kerberos realm for the search of the directory list for
>

"Directory list" sounds like there are multiple directories involved,
perhaps
"directory listing" is better?


> +a credentials cache file.
> +When set, files with TGT credentials for this realm will be selected over
> +other credential files.
> +This option is only meaningful when the
> +.Fl s
> +option has been specified.
>

There is something of a movement among the doc types to remove "redundant"
words,
making this "when -s has been specified", but others (some quite senior) do
not approve
of this "useless churn".  Might not be worth changing now, but for new
content, something
to consider.

Let me know if I should make the patch.

-Ben Kaduk

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 10:21:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4B7203E3;
 Sun, 23 Dec 2012 10:21:02 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1657D8FC12;
 Sun, 23 Dec 2012 10:21:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNAL1jn071532;
 Sun, 23 Dec 2012 10:21:01 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNAL1Fr071531;
 Sun, 23 Dec 2012 10:21:01 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201212231021.qBNAL1Fr071531@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sun, 23 Dec 2012 10:21:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244607 - head/sys/dev/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 10:21:02 -0000

Author: hselasky
Date: Sun Dec 23 10:21:01 2012
New Revision: 244607
URL: http://svnweb.freebsd.org/changeset/base/244607

Log:
  Fix regression issue after r244503.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/usb_msctest.c

Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c	Sun Dec 23 00:03:28 2012	(r244606)
+++ head/sys/dev/usb/usb_msctest.c	Sun Dec 23 10:21:01 2012	(r244607)
@@ -83,7 +83,7 @@ enum {
 	DIR_NONE,
 };
 
-#define	SCSI_MAX_LEN	0x100
+#define	SCSI_MAX_LEN	MAX(0x100, BULK_SIZE)
 #define	SCSI_INQ_LEN	0x24
 #define	SCSI_SENSE_LEN	0xFF
 
@@ -150,6 +150,7 @@ struct bbb_transfer {
 	usb_size_t data_rem;		/* bytes */
 	usb_timeout_t data_timeout;	/* ms */
 	usb_frlength_t actlen;		/* bytes */
+	usb_frlength_t buffer_size;    	/* bytes */
 
 	uint8_t	cmd_len;		/* bytes */
 	uint8_t	dir;
@@ -192,7 +193,7 @@ static const struct usb_config bbb_confi
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.bufsize = MAX(SCSI_MAX_LEN, BULK_SIZE),
+		.bufsize = SCSI_MAX_LEN,
 		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
 		.callback = &bbb_data_read_callback,
 		.timeout = 4 * USB_MS_HZ,	/* 4 seconds */
@@ -211,7 +212,7 @@ static const struct usb_config bbb_confi
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
-		.bufsize = BULK_SIZE,
+		.bufsize = SCSI_MAX_LEN,
 		.flags = {.ext_buffer = 1,.proxy_buffer = 1,},
 		.callback = &bbb_data_write_callback,
 		.timeout = 4 * USB_MS_HZ,	/* 4 seconds */
@@ -553,6 +554,8 @@ bbb_attach(struct usb_device *udev, uint
 	/* store pointer to DMA buffers */
 	sc->buffer = usbd_xfer_get_frame_buffer(
 	    sc->xfer[ST_DATA_RD], 0);
+	sc->buffer_size =
+	    usbd_xfer_max_len(sc->xfer[ST_DATA_RD]);
 	sc->cbw = usbd_xfer_get_frame_buffer(
 	    sc->xfer[ST_COMMAND], 0);
 	sc->csw = usbd_xfer_get_frame_buffer(
@@ -833,8 +836,8 @@ usb_msc_eject(struct usb_device *udev, u
 		 * TCTMobile needs DIR_IN flag. To get it, we
 		 * supply a dummy data with the command.
 		 */
-		err = bbb_command_start(sc, DIR_IN, 0, &sc->buffer,
-		    sizeof(sc->buffer), &scsi_tct_eject,
+		err = bbb_command_start(sc, DIR_IN, 0, sc->buffer,
+		    sc->buffer_size, &scsi_tct_eject,
 		    sizeof(scsi_tct_eject), USB_MS_HZ);
 		break;
 	default:

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 11:22:19 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F26EDD0A;
 Sun, 23 Dec 2012 11:22:18 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D58FD8FC12;
 Sun, 23 Dec 2012 11:22:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNBMI4i081428;
 Sun, 23 Dec 2012 11:22:18 GMT (envelope-from matthew@svn.freebsd.org)
Received: (from matthew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNBMIXb081427;
 Sun, 23 Dec 2012 11:22:18 GMT (envelope-from matthew@svn.freebsd.org)
Message-Id: <201212231122.qBNBMIXb081427@svn.freebsd.org>
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Sun, 23 Dec 2012 11:22:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244608 - head/usr.sbin/pkg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 11:22:19 -0000

Author: matthew (ports committer)
Date: Sun Dec 23 11:22:18 2012
New Revision: 244608
URL: http://svnweb.freebsd.org/changeset/base/244608

Log:
  Third time's the charm.  pkg -N output needs to go to stderr.
  
  Approved by:	bapt
  MFC after:	2 weeks

Modified:
  head/usr.sbin/pkg/pkg.c

Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c	Sun Dec 23 10:21:01 2012	(r244607)
+++ head/usr.sbin/pkg/pkg.c	Sun Dec 23 11:22:18 2012	(r244608)
@@ -457,10 +457,8 @@ main(__unused int argc, char *argv[])
 		 * a system is configured to use pkg, don't bootstrap pkg
 		 * when that argument is given as argv[1].
 		 */
-		if ( argv[1] != NULL && strcmp(argv[1], "-N") == 0) {
-			printf("%s", "pkg is not installed\n");
-			exit(EXIT_FAILURE);
-		}
+		if ( argv[1] != NULL && strcmp(argv[1], "-N") == 0)
+			errx(EXIT_FAILURE, "pkg is not installed\n");
 
 		/*
 		 * Do not ask for confirmation if either of stdin or stdout is

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 12:56:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 16AA3CE6;
 Sun, 23 Dec 2012 12:56:05 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EE9B48FC12;
 Sun, 23 Dec 2012 12:56:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNCu4iI096002;
 Sun, 23 Dec 2012 12:56:04 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNCu4xD096001;
 Sun, 23 Dec 2012 12:56:04 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201212231256.qBNCu4xD096001@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 23 Dec 2012 12:56:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244627 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 12:56:05 -0000

Author: avg
Date: Sun Dec 23 12:56:04 2012
New Revision: 244627
URL: http://svnweb.freebsd.org/changeset/base/244627

Log:
  lock.9: fix incorrect descriptions of LK_SHARED and LK_DOWNGRADE behavior
  
  Reviewed by:	attilio
  MFC after:	5 days
  X-MFC after:	r243900

Modified:
  head/share/man/man9/lock.9

Modified: head/share/man/man9/lock.9
==============================================================================
--- head/share/man/man9/lock.9	Sun Dec 23 12:46:28 2012	(r244626)
+++ head/share/man/man9/lock.9	Sun Dec 23 12:56:04 2012	(r244627)
@@ -148,7 +148,9 @@ Flags indicating what action is to be ta
 .Bl -tag -width ".Dv LK_CANRECURSE"
 .It Dv LK_SHARED
 Acquire a shared lock.
-If an exclusive lock is currently held, it will be downgraded.
+If an exclusive lock is currently held,
+.Dv EDEADLK
+will be returned.
 .It Dv LK_EXCLUSIVE
 Acquire an exclusive lock.
 If an exclusive lock is already held, and
@@ -158,7 +160,8 @@ is not set, the system will
 .It Dv LK_DOWNGRADE
 Downgrade exclusive lock to a shared lock.
 Downgrading a shared lock is not permitted.
-If an exclusive lock has been recursed, all references will be downgraded.
+If an exclusive lock has been recursed, the system will
+.Xr panic 9 .
 .It Dv LK_UPGRADE
 Upgrade a shared lock to an exclusive lock.
 If this call fails, the shared lock is lost.

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 13:04:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 773EFFB8;
 Sun, 23 Dec 2012 13:04:05 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5CE0D8FC0C;
 Sun, 23 Dec 2012 13:04:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBND45ax097321;
 Sun, 23 Dec 2012 13:04:05 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBND45mt097320;
 Sun, 23 Dec 2012 13:04:05 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201212231304.qBND45mt097320@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 23 Dec 2012 13:04:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244629 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 13:04:05 -0000

Author: avg
Date: Sun Dec 23 13:04:04 2012
New Revision: 244629
URL: http://svnweb.freebsd.org/changeset/base/244629

Log:
  UPDATING: add a note about the clang+zfs+i386 stack overflow issue

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Dec 23 13:04:00 2012	(r244628)
+++ head/UPDATING	Sun Dec 23 13:04:04 2012	(r244629)
@@ -26,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20121223:
+	After switching to Clang as the default compiler some users of ZFS
+	on i386 systems started to experience stack overflow kernel panics.
+	Please consider using 'options KSTACK_PAGES=4' in such configurations.
+
 20121222:
 	GEOM_LABEL now mangles label names read from file system metadata.
 	Mangling affect labels containing spaces, non-printable characters,

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 13:04:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1A6F7FB9;
 Sun, 23 Dec 2012 13:04:06 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F129D8FC13;
 Sun, 23 Dec 2012 13:04:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBND45CB097328;
 Sun, 23 Dec 2012 13:04:05 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBND401R097249;
 Sun, 23 Dec 2012 13:04:00 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201212231304.qBND401R097249@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 23 Dec 2012 13:04:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244628 - in head: contrib/llvm/include/llvm/MC
 contrib/llvm/lib/ExecutionEngine/RuntimeDyld contrib/llvm/lib/MC
 contrib/llvm/lib/Target/Mips contrib/llvm/lib/Target/Mips/InstPrinter co...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 13:04:06 -0000

Author: dim
Date: Sun Dec 23 13:04:00 2012
New Revision: 244628
URL: http://svnweb.freebsd.org/changeset/base/244628

Log:
  Upgrade our copy of llvm/clang to 3.2 release.
  
  Release notes for llvm:
  http://llvm.org/releases/3.2/docs/ReleaseNotes.html
  
  Release notes for clang:
  http://llvm.org/releases/3.2/tools/clang/docs/ReleaseNotes.html
  
  MFC after:	2 weeks

Modified:
  head/contrib/llvm/include/llvm/MC/MCExpr.h
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
  head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
  head/contrib/llvm/lib/MC/MCExpr.cpp
  head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h
  head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
  head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
  head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
  head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h
  head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp
  head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
  head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h
  head/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
  head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
  head/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp
  head/lib/clang/include/clang/Basic/Version.inc
  head/usr.bin/clang/clang/clang.1
Directory Properties:
  head/contrib/llvm/   (props changed)
  head/contrib/llvm/tools/clang/   (props changed)

Modified: head/contrib/llvm/include/llvm/MC/MCExpr.h
==============================================================================
--- head/contrib/llvm/include/llvm/MC/MCExpr.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/include/llvm/MC/MCExpr.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -197,7 +197,11 @@ public:
     VK_Mips_GOT_PAGE,
     VK_Mips_GOT_OFST,
     VK_Mips_HIGHER,
-    VK_Mips_HIGHEST
+    VK_Mips_HIGHEST,
+    VK_Mips_GOT_HI16,
+    VK_Mips_GOT_LO16,
+    VK_Mips_CALL_HI16,
+    VK_Mips_CALL_LO16
   };
 
 private:

Modified: head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
==============================================================================
--- head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -346,7 +346,7 @@ uint8_t *RuntimeDyldImpl::createStubFunc
     uint32_t *StubAddr = (uint32_t*)Addr;
     *StubAddr = 0xe51ff004; // ldr pc,<label>
     return (uint8_t*)++StubAddr;
-  } else if (Arch == Triple::mipsel) {
+  } else if (Arch == Triple::mipsel || Arch == Triple::mips) {
     uint32_t *StubAddr = (uint32_t*)Addr;
     // 0:   3c190000        lui     t9,%hi(addr).
     // 4:   27390000        addiu   t9,t9,%lo(addr).

Modified: head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
==============================================================================
--- head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -676,7 +676,8 @@ void RuntimeDyldELF::processRelocationRe
                         RelType, 0);
       Section.StubOffset += getMaxStubSize();
     }
-  } else if (Arch == Triple::mipsel && RelType == ELF::R_MIPS_26) {
+  } else if ((Arch == Triple::mipsel || Arch == Triple::mips) &&
+             RelType == ELF::R_MIPS_26) {
     // This is an Mips branch relocation, need to use a stub function.
     DEBUG(dbgs() << "\t\tThis is a Mips branch relocation.");
     SectionEntry &Section = Sections[Rel.SectionID];

Modified: head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
==============================================================================
--- head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -168,7 +168,7 @@ protected:
   inline unsigned getMaxStubSize() {
     if (Arch == Triple::arm || Arch == Triple::thumb)
       return 8; // 32-bit instruction and 32-bit address
-    else if (Arch == Triple::mipsel)
+    else if (Arch == Triple::mipsel || Arch == Triple::mips)
       return 16;
     else if (Arch == Triple::ppc64)
       return 44;

Modified: head/contrib/llvm/lib/MC/MCExpr.cpp
==============================================================================
--- head/contrib/llvm/lib/MC/MCExpr.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/MC/MCExpr.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -229,6 +229,10 @@ StringRef MCSymbolRefExpr::getVariantKin
   case VK_Mips_GOT_OFST: return "GOT_OFST";
   case VK_Mips_HIGHER:   return "HIGHER";
   case VK_Mips_HIGHEST:  return "HIGHEST";
+  case VK_Mips_GOT_HI16: return "GOT_HI16";
+  case VK_Mips_GOT_LO16: return "GOT_LO16";
+  case VK_Mips_CALL_HI16: return "CALL_HI16";
+  case VK_Mips_CALL_LO16: return "CALL_LO16";
   }
   llvm_unreachable("Invalid variant kind");
 }

Modified: head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -128,6 +128,10 @@ static void printExpr(const MCExpr *Expr
   case MCSymbolRefExpr::VK_Mips_GOT_OFST:  OS << "%got_ofst("; break;
   case MCSymbolRefExpr::VK_Mips_HIGHER:    OS << "%higher("; break;
   case MCSymbolRefExpr::VK_Mips_HIGHEST:   OS << "%highest("; break;
+  case MCSymbolRefExpr::VK_Mips_GOT_HI16:  OS << "%got_hi("; break;
+  case MCSymbolRefExpr::VK_Mips_GOT_LO16:  OS << "%got_lo("; break;
+  case MCSymbolRefExpr::VK_Mips_CALL_HI16: OS << "%call_hi("; break;
+  case MCSymbolRefExpr::VK_Mips_CALL_LO16: OS << "%call_lo("; break;
   }
 
   OS << SRE->getSymbol();

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -42,6 +42,8 @@ static unsigned adjustFixupValue(unsigne
   case Mips::fixup_Mips_GOT_PAGE:
   case Mips::fixup_Mips_GOT_OFST:
   case Mips::fixup_Mips_GOT_DISP:
+  case Mips::fixup_Mips_GOT_LO16:
+  case Mips::fixup_Mips_CALL_LO16:
     break;
   case Mips::fixup_Mips_PC16:
     // So far we are only using this type for branches.
@@ -60,6 +62,8 @@ static unsigned adjustFixupValue(unsigne
     break;
   case Mips::fixup_Mips_HI16:
   case Mips::fixup_Mips_GOT_Local:
+  case Mips::fixup_Mips_GOT_HI16:
+  case Mips::fixup_Mips_CALL_HI16:
     // Get the 2nd 16-bits. Also add 1 if bit 15 is 1.
     Value = ((Value + 0x8000) >> 16) & 0xffff;
     break;
@@ -179,7 +183,11 @@ public:
       { "fixup_Mips_GOT_OFST",     0,     16,   0 },
       { "fixup_Mips_GOT_DISP",     0,     16,   0 },
       { "fixup_Mips_HIGHER",       0,     16,   0 },
-      { "fixup_Mips_HIGHEST",      0,     16,   0 }
+      { "fixup_Mips_HIGHEST",      0,     16,   0 },
+      { "fixup_Mips_GOT_HI16",     0,     16,   0 },
+      { "fixup_Mips_GOT_LO16",     0,     16,   0 },
+      { "fixup_Mips_CALL_HI16",    0,     16,   0 },
+      { "fixup_Mips_CALL_LO16",    0,     16,   0 }
     };
 
     if (Kind < FirstTargetFixupKind)

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -84,7 +84,13 @@ namespace MipsII {
     /// MO_HIGHER/HIGHEST - Represents the highest or higher half word of a
     /// 64-bit symbol address.
     MO_HIGHER,
-    MO_HIGHEST
+    MO_HIGHEST,
+
+    /// MO_GOT_HI16/LO16, MO_CALL_HI16/LO16 - Relocations used for large GOTs.
+    MO_GOT_HI16,
+    MO_GOT_LO16,
+    MO_CALL_HI16,
+    MO_CALL_LO16
   };
 
   enum {

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -179,6 +179,18 @@ unsigned MipsELFObjectWriter::GetRelocTy
   case Mips::fixup_Mips_HIGHEST:
     Type = ELF::R_MIPS_HIGHEST;
     break;
+  case Mips::fixup_Mips_GOT_HI16:
+    Type = ELF::R_MIPS_GOT_HI16;
+    break;
+  case Mips::fixup_Mips_GOT_LO16:
+    Type = ELF::R_MIPS_GOT_LO16;
+    break;
+  case Mips::fixup_Mips_CALL_HI16:
+    Type = ELF::R_MIPS_CALL_HI16;
+    break;
+  case Mips::fixup_Mips_CALL_LO16:
+    Type = ELF::R_MIPS_CALL_LO16;
+    break;
   }
   return Type;
 }

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -116,6 +116,18 @@ namespace Mips {
     // resulting in - R_MIPS_HIGHEST
     fixup_Mips_HIGHEST,
 
+    // resulting in - R_MIPS_GOT_HI16
+    fixup_Mips_GOT_HI16,
+
+    // resulting in - R_MIPS_GOT_LO16
+    fixup_Mips_GOT_LO16,
+
+    // resulting in - R_MIPS_CALL_HI16
+    fixup_Mips_CALL_HI16,
+
+    // resulting in - R_MIPS_CALL_LO16
+    fixup_Mips_CALL_LO16,
+
     // Marker
     LastTargetFixupKind,
     NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -287,6 +287,18 @@ getMachineOpValue(const MCInst &MI, cons
   case MCSymbolRefExpr::VK_Mips_HIGHEST:
     FixupKind = Mips::fixup_Mips_HIGHEST;
     break;
+  case MCSymbolRefExpr::VK_Mips_GOT_HI16:
+    FixupKind = Mips::fixup_Mips_GOT_HI16;
+    break;
+  case MCSymbolRefExpr::VK_Mips_GOT_LO16:
+    FixupKind = Mips::fixup_Mips_GOT_LO16;
+    break;
+  case MCSymbolRefExpr::VK_Mips_CALL_HI16:
+    FixupKind = Mips::fixup_Mips_CALL_HI16;
+    break;
+  case MCSymbolRefExpr::VK_Mips_CALL_LO16:
+    FixupKind = Mips::fixup_Mips_CALL_LO16;
+    break;
   } // switch
 
   Fixups.push_back(MCFixup::Create(0, MO.getExpr(), MCFixupKind(FixupKind)));

Modified: head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td	Sun Dec 23 13:04:00 2012	(r244628)
@@ -255,6 +255,7 @@ def : MipsPat<(MipsHi tblockaddress:$in)
 def : MipsPat<(MipsHi tjumptable:$in), (LUi64 tjumptable:$in)>;
 def : MipsPat<(MipsHi tconstpool:$in), (LUi64 tconstpool:$in)>;
 def : MipsPat<(MipsHi tglobaltlsaddr:$in), (LUi64 tglobaltlsaddr:$in)>;
+def : MipsPat<(MipsHi texternalsym:$in), (LUi64 texternalsym:$in)>;
 
 def : MipsPat<(MipsLo tglobaladdr:$in), (DADDiu ZERO_64, tglobaladdr:$in)>;
 def : MipsPat<(MipsLo tblockaddress:$in), (DADDiu ZERO_64, tblockaddress:$in)>;
@@ -262,6 +263,7 @@ def : MipsPat<(MipsLo tjumptable:$in), (
 def : MipsPat<(MipsLo tconstpool:$in), (DADDiu ZERO_64, tconstpool:$in)>;
 def : MipsPat<(MipsLo tglobaltlsaddr:$in),
               (DADDiu ZERO_64, tglobaltlsaddr:$in)>;
+def : MipsPat<(MipsLo texternalsym:$in), (DADDiu ZERO_64, texternalsym:$in)>;
 
 def : MipsPat<(add CPU64Regs:$hi, (MipsLo tglobaladdr:$lo)),
               (DADDiu CPU64Regs:$hi, tglobaladdr:$lo)>;

Modified: head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -85,7 +85,7 @@ class MipsCodeEmitter : public MachineFu
 
   private:
 
-    void emitWordLE(unsigned Word);
+    void emitWord(unsigned Word);
 
     /// Routines that handle operands which add machine relocations which are
     /// fixed up by the relocation stage.
@@ -112,12 +112,6 @@ class MipsCodeEmitter : public MachineFu
     unsigned getSizeExtEncoding(const MachineInstr &MI, unsigned OpNo) const;
     unsigned getSizeInsEncoding(const MachineInstr &MI, unsigned OpNo) const;
 
-    int emitULW(const MachineInstr &MI);
-    int emitUSW(const MachineInstr &MI);
-    int emitULH(const MachineInstr &MI);
-    int emitULHu(const MachineInstr &MI);
-    int emitUSH(const MachineInstr &MI);
-
     void emitGlobalAddressUnaligned(const GlobalValue *GV, unsigned Reloc,
                                     int Offset) const;
   };
@@ -133,7 +127,7 @@ bool MipsCodeEmitter::runOnMachineFuncti
   MCPEs = &MF.getConstantPool()->getConstants();
   MJTEs = 0;
   if (MF.getJumpTableInfo()) MJTEs = &MF.getJumpTableInfo()->getJumpTables();
-  JTI->Initialize(MF, IsPIC);
+  JTI->Initialize(MF, IsPIC, Subtarget->isLittle());
   MCE.setModuleInfo(&getAnalysis<MachineModuleInfo> ());
 
   do {
@@ -271,103 +265,6 @@ void MipsCodeEmitter::emitMachineBasicBl
                                              Reloc, BB));
 }
 
-int MipsCodeEmitter::emitUSW(const MachineInstr &MI) {
-  unsigned src = getMachineOpValue(MI, MI.getOperand(0));
-  unsigned base = getMachineOpValue(MI, MI.getOperand(1));
-  unsigned offset = getMachineOpValue(MI, MI.getOperand(2));
-  // swr src, offset(base)
-  // swl src, offset+3(base)
-  MCE.emitWordLE(
-    (0x2e << 26) | (base << 21) | (src << 16) | (offset & 0xffff));
-  MCE.emitWordLE(
-    (0x2a << 26) | (base << 21) | (src << 16) | ((offset+3) & 0xffff));
-  return 2;
-}
-
-int MipsCodeEmitter::emitULW(const MachineInstr &MI) {
-  unsigned dst = getMachineOpValue(MI, MI.getOperand(0));
-  unsigned base = getMachineOpValue(MI, MI.getOperand(1));
-  unsigned offset = getMachineOpValue(MI, MI.getOperand(2));
-  unsigned at = 1;
-  if (dst != base) {
-    // lwr dst, offset(base)
-    // lwl dst, offset+3(base)
-    MCE.emitWordLE(
-      (0x26 << 26) | (base << 21) | (dst << 16) | (offset & 0xffff));
-    MCE.emitWordLE(
-      (0x22 << 26) | (base << 21) | (dst << 16) | ((offset+3) & 0xffff));
-    return 2;
-  } else {
-    // lwr at, offset(base)
-    // lwl at, offset+3(base)
-    // addu dst, at, $zero
-    MCE.emitWordLE(
-      (0x26 << 26) | (base << 21) | (at << 16) | (offset & 0xffff));
-    MCE.emitWordLE(
-      (0x22 << 26) | (base << 21) | (at << 16) | ((offset+3) & 0xffff));
-    MCE.emitWordLE(
-      (0x0 << 26) | (at << 21) | (0x0 << 16) | (dst << 11) | (0x0 << 6) | 0x21);
-    return 3;
-  }
-}
-
-int MipsCodeEmitter::emitUSH(const MachineInstr &MI) {
-  unsigned src = getMachineOpValue(MI, MI.getOperand(0));
-  unsigned base = getMachineOpValue(MI, MI.getOperand(1));
-  unsigned offset = getMachineOpValue(MI, MI.getOperand(2));
-  unsigned at = 1;
-  // sb src, offset(base)
-  // srl at,src,8
-  // sb at, offset+1(base)
-  MCE.emitWordLE(
-    (0x28 << 26) | (base << 21) | (src << 16) | (offset & 0xffff));
-  MCE.emitWordLE(
-    (0x0 << 26) | (0x0 << 21) | (src << 16) | (at << 11) | (0x8 << 6) | 0x2);
-  MCE.emitWordLE(
-    (0x28 << 26) | (base << 21) | (at << 16) | ((offset+1) & 0xffff));
-  return 3;
-}
-
-int MipsCodeEmitter::emitULH(const MachineInstr &MI) {
-  unsigned dst = getMachineOpValue(MI, MI.getOperand(0));
-  unsigned base = getMachineOpValue(MI, MI.getOperand(1));
-  unsigned offset = getMachineOpValue(MI, MI.getOperand(2));
-  unsigned at = 1;
-  // lbu at, offset(base)
-  // lb dst, offset+1(base)
-  // sll dst,dst,8
-  // or dst,dst,at
-  MCE.emitWordLE(
-    (0x24 << 26) | (base << 21) | (at << 16) | (offset & 0xffff));
-  MCE.emitWordLE(
-    (0x20 << 26) | (base << 21) | (dst << 16) | ((offset+1) & 0xffff));
-  MCE.emitWordLE(
-    (0x0 << 26) | (0x0 << 21) | (dst << 16) | (dst << 11) | (0x8 << 6) | 0x0);
-  MCE.emitWordLE(
-    (0x0 << 26) | (dst << 21) | (at << 16) | (dst << 11) | (0x0 << 6) | 0x25);
-  return 4;
-}
-
-int MipsCodeEmitter::emitULHu(const MachineInstr &MI) {
-  unsigned dst = getMachineOpValue(MI, MI.getOperand(0));
-  unsigned base = getMachineOpValue(MI, MI.getOperand(1));
-  unsigned offset = getMachineOpValue(MI, MI.getOperand(2));
-  unsigned at = 1;
-  // lbu at, offset(base)
-  // lbu dst, offset+1(base)
-  // sll dst,dst,8
-  // or dst,dst,at
-  MCE.emitWordLE(
-    (0x24 << 26) | (base << 21) | (at << 16) | (offset & 0xffff));
-  MCE.emitWordLE(
-    (0x24 << 26) | (base << 21) | (dst << 16) | ((offset+1) & 0xffff));
-  MCE.emitWordLE(
-    (0x0 << 26) | (0x0 << 21) | (dst << 16) | (dst << 11) | (0x8 << 6) | 0x0);
-  MCE.emitWordLE(
-    (0x0 << 26) | (dst << 21) | (at << 16) | (dst << 11) | (0x0 << 6) | 0x25);
-  return 4;
-}
-
 void MipsCodeEmitter::emitInstruction(const MachineInstr &MI) {
   DEBUG(errs() << "JIT: " << (void*)MCE.getCurrentPCValue() << ":\t" << MI);
 
@@ -377,16 +274,19 @@ void MipsCodeEmitter::emitInstruction(co
   if ((MI.getDesc().TSFlags & MipsII::FormMask) == MipsII::Pseudo)
     return;
 
-  emitWordLE(getBinaryCodeForInstr(MI));
+  emitWord(getBinaryCodeForInstr(MI));
   ++NumEmitted;  // Keep track of the # of mi's emitted
 
   MCE.processDebugLoc(MI.getDebugLoc(), false);
 }
 
-void MipsCodeEmitter::emitWordLE(unsigned Word) {
+void MipsCodeEmitter::emitWord(unsigned Word) {
   DEBUG(errs() << "  0x";
         errs().write_hex(Word) << "\n");
-  MCE.emitWordLE(Word);
+  if (Subtarget->isLittle())
+    MCE.emitWordLE(Word);
+  else
+    MCE.emitWordBE(Word);
 }
 
 /// createMipsJITCodeEmitterPass - Return a pass that emits the collected Mips

Modified: head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -46,6 +46,10 @@ static cl::opt<bool>
 EnableMipsTailCalls("enable-mips-tail-calls", cl::Hidden,
                     cl::desc("MIPS: Enable tail calls."), cl::init(false));
 
+static cl::opt<bool>
+LargeGOT("mxgot", cl::Hidden,
+         cl::desc("MIPS: Enable GOT larger than 64k."), cl::init(false));
+
 static const uint16_t O32IntRegs[4] = {
   Mips::A0, Mips::A1, Mips::A2, Mips::A3
 };
@@ -77,6 +81,71 @@ static SDValue GetGlobalReg(SelectionDAG
   return DAG.getRegister(FI->getGlobalBaseReg(), Ty);
 }
 
+static SDValue getTargetNode(SDValue Op, SelectionDAG &DAG, unsigned Flag) {
+  EVT Ty = Op.getValueType();
+
+  if (GlobalAddressSDNode *N = dyn_cast<GlobalAddressSDNode>(Op))
+    return DAG.getTargetGlobalAddress(N->getGlobal(), Op.getDebugLoc(), Ty, 0,
+                                      Flag);
+  if (ExternalSymbolSDNode *N = dyn_cast<ExternalSymbolSDNode>(Op))
+    return DAG.getTargetExternalSymbol(N->getSymbol(), Ty, Flag);
+  if (BlockAddressSDNode *N = dyn_cast<BlockAddressSDNode>(Op))
+    return DAG.getTargetBlockAddress(N->getBlockAddress(), Ty, 0, Flag);
+  if (JumpTableSDNode *N = dyn_cast<JumpTableSDNode>(Op))
+    return DAG.getTargetJumpTable(N->getIndex(), Ty, Flag);
+  if (ConstantPoolSDNode *N = dyn_cast<ConstantPoolSDNode>(Op))
+    return DAG.getTargetConstantPool(N->getConstVal(), Ty, N->getAlignment(),
+                                     N->getOffset(), Flag);
+
+  llvm_unreachable("Unexpected node type.");
+  return SDValue();
+}
+
+static SDValue getAddrNonPIC(SDValue Op, SelectionDAG &DAG) {
+  DebugLoc DL = Op.getDebugLoc();
+  EVT Ty = Op.getValueType();
+  SDValue Hi = getTargetNode(Op, DAG, MipsII::MO_ABS_HI);
+  SDValue Lo = getTargetNode(Op, DAG, MipsII::MO_ABS_LO);
+  return DAG.getNode(ISD::ADD, DL, Ty,
+                     DAG.getNode(MipsISD::Hi, DL, Ty, Hi),
+                     DAG.getNode(MipsISD::Lo, DL, Ty, Lo));
+}
+
+static SDValue getAddrLocal(SDValue Op, SelectionDAG &DAG, bool HasMips64) {
+  DebugLoc DL = Op.getDebugLoc();
+  EVT Ty = Op.getValueType();
+  unsigned GOTFlag = HasMips64 ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT;
+  SDValue GOT = DAG.getNode(MipsISD::Wrapper, DL, Ty, GetGlobalReg(DAG, Ty),
+                            getTargetNode(Op, DAG, GOTFlag));
+  SDValue Load = DAG.getLoad(Ty, DL, DAG.getEntryNode(), GOT,
+                             MachinePointerInfo::getGOT(), false, false, false,
+                             0);
+  unsigned LoFlag = HasMips64 ? MipsII::MO_GOT_OFST : MipsII::MO_ABS_LO;
+  SDValue Lo = DAG.getNode(MipsISD::Lo, DL, Ty, getTargetNode(Op, DAG, LoFlag));
+  return DAG.getNode(ISD::ADD, DL, Ty, Load, Lo);
+}
+
+static SDValue getAddrGlobal(SDValue Op, SelectionDAG &DAG, unsigned Flag) {
+  DebugLoc DL = Op.getDebugLoc();
+  EVT Ty = Op.getValueType();
+  SDValue Tgt = DAG.getNode(MipsISD::Wrapper, DL, Ty, GetGlobalReg(DAG, Ty),
+                            getTargetNode(Op, DAG, Flag));
+  return DAG.getLoad(Ty, DL, DAG.getEntryNode(), Tgt,
+                     MachinePointerInfo::getGOT(), false, false, false, 0);
+}
+
+static SDValue getAddrGlobalLargeGOT(SDValue Op, SelectionDAG &DAG,
+                                     unsigned HiFlag, unsigned LoFlag) {
+  DebugLoc DL = Op.getDebugLoc();
+  EVT Ty = Op.getValueType();
+  SDValue Hi = DAG.getNode(MipsISD::Hi, DL, Ty, getTargetNode(Op, DAG, HiFlag));
+  Hi = DAG.getNode(ISD::ADD, DL, Ty, Hi, GetGlobalReg(DAG, Ty));
+  SDValue Wrapper = DAG.getNode(MipsISD::Wrapper, DL, Ty, Hi,
+                                getTargetNode(Op, DAG, LoFlag));
+  return DAG.getLoad(Ty, DL, DAG.getEntryNode(), Wrapper,
+                     MachinePointerInfo::getGOT(), false, false, false, 0);
+}
+
 const char *MipsTargetLowering::getTargetNodeName(unsigned Opcode) const {
   switch (Opcode) {
   case MipsISD::JmpLink:           return "MipsISD::JmpLink";
@@ -1743,8 +1812,6 @@ SDValue MipsTargetLowering::LowerGlobalA
   const GlobalValue *GV = cast<GlobalAddressSDNode>(Op)->getGlobal();
 
   if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64) {
-    SDVTList VTs = DAG.getVTList(MVT::i32);
-
     const MipsTargetObjectFile &TLOF =
       (const MipsTargetObjectFile&)getObjFileLowering();
 
@@ -1752,69 +1819,33 @@ SDValue MipsTargetLowering::LowerGlobalA
     if (TLOF.IsGlobalInSmallSection(GV, getTargetMachine())) {
       SDValue GA = DAG.getTargetGlobalAddress(GV, dl, MVT::i32, 0,
                                               MipsII::MO_GPREL);
-      SDValue GPRelNode = DAG.getNode(MipsISD::GPRel, dl, VTs, &GA, 1);
+      SDValue GPRelNode = DAG.getNode(MipsISD::GPRel, dl,
+                                      DAG.getVTList(MVT::i32), &GA, 1);
       SDValue GPReg = DAG.getRegister(Mips::GP, MVT::i32);
       return DAG.getNode(ISD::ADD, dl, MVT::i32, GPReg, GPRelNode);
     }
+
     // %hi/%lo relocation
-    SDValue GAHi = DAG.getTargetGlobalAddress(GV, dl, MVT::i32, 0,
-                                              MipsII::MO_ABS_HI);
-    SDValue GALo = DAG.getTargetGlobalAddress(GV, dl, MVT::i32, 0,
-                                              MipsII::MO_ABS_LO);
-    SDValue HiPart = DAG.getNode(MipsISD::Hi, dl, VTs, &GAHi, 1);
-    SDValue Lo = DAG.getNode(MipsISD::Lo, dl, MVT::i32, GALo);
-    return DAG.getNode(ISD::ADD, dl, MVT::i32, HiPart, Lo);
-  }
-
-  EVT ValTy = Op.getValueType();
-  bool HasGotOfst = (GV->hasInternalLinkage() ||
-                     (GV->hasLocalLinkage() && !isa<Function>(GV)));
-  unsigned GotFlag = HasMips64 ?
-                     (HasGotOfst ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT_DISP) :
-                     (HasGotOfst ? MipsII::MO_GOT : MipsII::MO_GOT16);
-  SDValue GA = DAG.getTargetGlobalAddress(GV, dl, ValTy, 0, GotFlag);
-  GA = DAG.getNode(MipsISD::Wrapper, dl, ValTy, GetGlobalReg(DAG, ValTy), GA);
-  SDValue ResNode = DAG.getLoad(ValTy, dl, DAG.getEntryNode(), GA,
-                                MachinePointerInfo(), false, false, false, 0);
-  // On functions and global targets not internal linked only
-  // a load from got/GP is necessary for PIC to work.
-  if (!HasGotOfst)
-    return ResNode;
-  SDValue GALo = DAG.getTargetGlobalAddress(GV, dl, ValTy, 0,
-                                            HasMips64 ? MipsII::MO_GOT_OFST :
-                                                        MipsII::MO_ABS_LO);
-  SDValue Lo = DAG.getNode(MipsISD::Lo, dl, ValTy, GALo);
-  return DAG.getNode(ISD::ADD, dl, ValTy, ResNode, Lo);
+    return getAddrNonPIC(Op, DAG);
+  }
+
+  if (GV->hasInternalLinkage() || (GV->hasLocalLinkage() && !isa<Function>(GV)))
+    return getAddrLocal(Op, DAG, HasMips64);
+
+  if (LargeGOT)
+    return getAddrGlobalLargeGOT(Op, DAG, MipsII::MO_GOT_HI16,
+                                 MipsII::MO_GOT_LO16);
+
+  return getAddrGlobal(Op, DAG,
+                       HasMips64 ? MipsII::MO_GOT_DISP : MipsII::MO_GOT16);
 }
 
 SDValue MipsTargetLowering::LowerBlockAddress(SDValue Op,
                                               SelectionDAG &DAG) const {
-  const BlockAddress *BA = cast<BlockAddressSDNode>(Op)->getBlockAddress();
-  // FIXME there isn't actually debug info here
-  DebugLoc dl = Op.getDebugLoc();
+  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64)
+    return getAddrNonPIC(Op, DAG);
 
-  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64) {
-    // %hi/%lo relocation
-    SDValue BAHi =
-      DAG.getTargetBlockAddress(BA, MVT::i32, 0, MipsII::MO_ABS_HI);
-    SDValue BALo =
-      DAG.getTargetBlockAddress(BA, MVT::i32, 0, MipsII::MO_ABS_LO);
-    SDValue Hi = DAG.getNode(MipsISD::Hi, dl, MVT::i32, BAHi);
-    SDValue Lo = DAG.getNode(MipsISD::Lo, dl, MVT::i32, BALo);
-    return DAG.getNode(ISD::ADD, dl, MVT::i32, Hi, Lo);
-  }
-
-  EVT ValTy = Op.getValueType();
-  unsigned GOTFlag = HasMips64 ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT;
-  unsigned OFSTFlag = HasMips64 ? MipsII::MO_GOT_OFST : MipsII::MO_ABS_LO;
-  SDValue BAGOTOffset = DAG.getTargetBlockAddress(BA, ValTy, 0, GOTFlag);
-  BAGOTOffset = DAG.getNode(MipsISD::Wrapper, dl, ValTy,
-                            GetGlobalReg(DAG, ValTy), BAGOTOffset);
-  SDValue BALOOffset = DAG.getTargetBlockAddress(BA, ValTy, 0, OFSTFlag);
-  SDValue Load = DAG.getLoad(ValTy, dl, DAG.getEntryNode(), BAGOTOffset,
-                             MachinePointerInfo(), false, false, false, 0);
-  SDValue Lo = DAG.getNode(MipsISD::Lo, dl, ValTy, BALOOffset);
-  return DAG.getNode(ISD::ADD, dl, ValTy, Load, Lo);
+  return getAddrLocal(Op, DAG, HasMips64);
 }
 
 SDValue MipsTargetLowering::
@@ -1901,41 +1932,15 @@ LowerGlobalTLSAddress(SDValue Op, Select
 SDValue MipsTargetLowering::
 LowerJumpTable(SDValue Op, SelectionDAG &DAG) const
 {
-  SDValue HiPart, JTI, JTILo;
-  // FIXME there isn't actually debug info here
-  DebugLoc dl = Op.getDebugLoc();
-  bool IsPIC = getTargetMachine().getRelocationModel() == Reloc::PIC_;
-  EVT PtrVT = Op.getValueType();
-  JumpTableSDNode *JT = cast<JumpTableSDNode>(Op);
-
-  if (!IsPIC && !IsN64) {
-    JTI = DAG.getTargetJumpTable(JT->getIndex(), PtrVT, MipsII::MO_ABS_HI);
-    HiPart = DAG.getNode(MipsISD::Hi, dl, PtrVT, JTI);
-    JTILo = DAG.getTargetJumpTable(JT->getIndex(), PtrVT, MipsII::MO_ABS_LO);
-  } else {// Emit Load from Global Pointer
-    unsigned GOTFlag = HasMips64 ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT;
-    unsigned OfstFlag = HasMips64 ? MipsII::MO_GOT_OFST : MipsII::MO_ABS_LO;
-    JTI = DAG.getTargetJumpTable(JT->getIndex(), PtrVT, GOTFlag);
-    JTI = DAG.getNode(MipsISD::Wrapper, dl, PtrVT, GetGlobalReg(DAG, PtrVT),
-                      JTI);
-    HiPart = DAG.getLoad(PtrVT, dl, DAG.getEntryNode(), JTI,
-                         MachinePointerInfo(), false, false, false, 0);
-    JTILo = DAG.getTargetJumpTable(JT->getIndex(), PtrVT, OfstFlag);
-  }
+  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64)
+    return getAddrNonPIC(Op, DAG);
 
-  SDValue Lo = DAG.getNode(MipsISD::Lo, dl, PtrVT, JTILo);
-  return DAG.getNode(ISD::ADD, dl, PtrVT, HiPart, Lo);
+  return getAddrLocal(Op, DAG, HasMips64);
 }
 
 SDValue MipsTargetLowering::
 LowerConstantPool(SDValue Op, SelectionDAG &DAG) const
 {
-  SDValue ResNode;
-  ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
-  const Constant *C = N->getConstVal();
-  // FIXME there isn't actually debug info here
-  DebugLoc dl = Op.getDebugLoc();
-
   // gp_rel relocation
   // FIXME: we should reference the constant pool using small data sections,
   // but the asm printer currently doesn't support this feature without
@@ -1946,31 +1951,10 @@ LowerConstantPool(SDValue Op, SelectionD
   //  SDValue GOT = DAG.getGLOBAL_OFFSET_TABLE(MVT::i32);
   //  ResNode = DAG.getNode(ISD::ADD, MVT::i32, GOT, GPRelNode);
 
-  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64) {
-    SDValue CPHi = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
-                                             N->getOffset(), MipsII::MO_ABS_HI);
-    SDValue CPLo = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
-                                             N->getOffset(), MipsII::MO_ABS_LO);
-    SDValue HiPart = DAG.getNode(MipsISD::Hi, dl, MVT::i32, CPHi);
-    SDValue Lo = DAG.getNode(MipsISD::Lo, dl, MVT::i32, CPLo);
-    ResNode = DAG.getNode(ISD::ADD, dl, MVT::i32, HiPart, Lo);
-  } else {
-    EVT ValTy = Op.getValueType();
-    unsigned GOTFlag = HasMips64 ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT;
-    unsigned OFSTFlag = HasMips64 ? MipsII::MO_GOT_OFST : MipsII::MO_ABS_LO;
-    SDValue CP = DAG.getTargetConstantPool(C, ValTy, N->getAlignment(),
-                                           N->getOffset(), GOTFlag);
-    CP = DAG.getNode(MipsISD::Wrapper, dl, ValTy, GetGlobalReg(DAG, ValTy), CP);
-    SDValue Load = DAG.getLoad(ValTy, dl, DAG.getEntryNode(), CP,
-                               MachinePointerInfo::getConstantPool(), false,
-                               false, false, 0);
-    SDValue CPLo = DAG.getTargetConstantPool(C, ValTy, N->getAlignment(),
-                                             N->getOffset(), OFSTFlag);
-    SDValue Lo = DAG.getNode(MipsISD::Lo, dl, ValTy, CPLo);
-    ResNode = DAG.getNode(ISD::ADD, dl, ValTy, Load, Lo);
-  }
+  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64)
+    return getAddrNonPIC(Op, DAG);
 
-  return ResNode;
+  return getAddrLocal(Op, DAG, HasMips64);
 }
 
 SDValue MipsTargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG) const {
@@ -2862,60 +2846,41 @@ MipsTargetLowering::LowerCall(TargetLowe
   // If the callee is a GlobalAddress/ExternalSymbol node (quite common, every
   // direct call is) turn it into a TargetGlobalAddress/TargetExternalSymbol
   // node so that legalize doesn't hack it.
-  unsigned char OpFlag;
   bool IsPICCall = (IsN64 || IsPIC); // true if calls are translated to jalr $25
   bool GlobalOrExternal = false;
   SDValue CalleeLo;
 
   if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee)) {
-    if (IsPICCall && G->getGlobal()->hasInternalLinkage()) {
-      OpFlag = IsO32 ? MipsII::MO_GOT : MipsII::MO_GOT_PAGE;
-      unsigned char LoFlag = IsO32 ? MipsII::MO_ABS_LO : MipsII::MO_GOT_OFST;
+    if (IsPICCall) {
+      if (G->getGlobal()->hasInternalLinkage())
+        Callee = getAddrLocal(Callee, DAG, HasMips64);
+      else if (LargeGOT)
+        Callee = getAddrGlobalLargeGOT(Callee, DAG, MipsII::MO_CALL_HI16,
+                                       MipsII::MO_CALL_LO16);
+      else
+        Callee = getAddrGlobal(Callee, DAG, MipsII::MO_GOT_CALL);
+    } else
       Callee = DAG.getTargetGlobalAddress(G->getGlobal(), dl, getPointerTy(), 0,
-                                          OpFlag);
-      CalleeLo = DAG.getTargetGlobalAddress(G->getGlobal(), dl, getPointerTy(),
-                                            0, LoFlag);
-    } else {
-      OpFlag = IsPICCall ? MipsII::MO_GOT_CALL : MipsII::MO_NO_FLAG;
-      Callee = DAG.getTargetGlobalAddress(G->getGlobal(), dl,
-                                          getPointerTy(), 0, OpFlag);
-    }
-
+                                          MipsII::MO_NO_FLAG);
     GlobalOrExternal = true;
   }
   else if (ExternalSymbolSDNode *S = dyn_cast<ExternalSymbolSDNode>(Callee)) {
-    if (IsN64 || (!IsO32 && IsPIC))
-      OpFlag = MipsII::MO_GOT_DISP;
-    else if (!IsPIC) // !N64 && static
-      OpFlag = MipsII::MO_NO_FLAG;
+    if (!IsN64 && !IsPIC) // !N64 && static
+      Callee = DAG.getTargetExternalSymbol(S->getSymbol(), getPointerTy(),
+                                            MipsII::MO_NO_FLAG);
+    else if (LargeGOT)
+      Callee = getAddrGlobalLargeGOT(Callee, DAG, MipsII::MO_CALL_HI16,
+                                     MipsII::MO_CALL_LO16);
+    else if (HasMips64)
+      Callee = getAddrGlobal(Callee, DAG, MipsII::MO_GOT_DISP);
     else // O32 & PIC
-      OpFlag = MipsII::MO_GOT_CALL;
-    Callee = DAG.getTargetExternalSymbol(S->getSymbol(), getPointerTy(),
-                                         OpFlag);
+      Callee = getAddrGlobal(Callee, DAG, MipsII::MO_GOT_CALL);
+
     GlobalOrExternal = true;
   }
 
   SDValue InFlag;
 
-  // Create nodes that load address of callee and copy it to T9
-  if (IsPICCall) {
-    if (GlobalOrExternal) {
-      // Load callee address
-      Callee = DAG.getNode(MipsISD::Wrapper, dl, getPointerTy(),
-                           GetGlobalReg(DAG, getPointerTy()), Callee);
-      SDValue LoadValue = DAG.getLoad(getPointerTy(), dl, DAG.getEntryNode(),
-                                      Callee, MachinePointerInfo::getGOT(),
-                                      false, false, false, 0);
-
-      // Use GOT+LO if callee has internal linkage.
-      if (CalleeLo.getNode()) {
-        SDValue Lo = DAG.getNode(MipsISD::Lo, dl, getPointerTy(), CalleeLo);
-        Callee = DAG.getNode(ISD::ADD, dl, getPointerTy(), LoadValue, Lo);
-      } else
-        Callee = LoadValue;
-    }
-  }
-
   // T9 register operand.
   SDValue T9;
 

Modified: head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td	Sun Dec 23 13:04:00 2012	(r244628)
@@ -1154,12 +1154,14 @@ def : MipsPat<(MipsHi tblockaddress:$in)
 def : MipsPat<(MipsHi tjumptable:$in), (LUi tjumptable:$in)>;
 def : MipsPat<(MipsHi tconstpool:$in), (LUi tconstpool:$in)>;
 def : MipsPat<(MipsHi tglobaltlsaddr:$in), (LUi tglobaltlsaddr:$in)>;
+def : MipsPat<(MipsHi texternalsym:$in), (LUi texternalsym:$in)>;
 
 def : MipsPat<(MipsLo tglobaladdr:$in), (ADDiu ZERO, tglobaladdr:$in)>;
 def : MipsPat<(MipsLo tblockaddress:$in), (ADDiu ZERO, tblockaddress:$in)>;
 def : MipsPat<(MipsLo tjumptable:$in), (ADDiu ZERO, tjumptable:$in)>;
 def : MipsPat<(MipsLo tconstpool:$in), (ADDiu ZERO, tconstpool:$in)>;
 def : MipsPat<(MipsLo tglobaltlsaddr:$in), (ADDiu ZERO, tglobaltlsaddr:$in)>;
+def : MipsPat<(MipsLo texternalsym:$in), (ADDiu ZERO, texternalsym:$in)>;
 
 def : MipsPat<(add CPURegs:$hi, (MipsLo tglobaladdr:$lo)),
               (ADDiu CPURegs:$hi, tglobaladdr:$lo)>;

Modified: head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -222,10 +222,17 @@ void *MipsJITInfo::emitFunctionStub(cons
   // addiu t9, t9, %lo(EmittedAddr)
   // jalr t8, t9
   // nop
-  JCE.emitWordLE(0xf << 26 | 25 << 16 | Hi);
-  JCE.emitWordLE(9 << 26 | 25 << 21 | 25 << 16 | Lo);
-  JCE.emitWordLE(25 << 21 | 24 << 11 | 9);
-  JCE.emitWordLE(0);
+  if (IsLittleEndian) {
+    JCE.emitWordLE(0xf << 26 | 25 << 16 | Hi);
+    JCE.emitWordLE(9 << 26 | 25 << 21 | 25 << 16 | Lo);
+    JCE.emitWordLE(25 << 21 | 24 << 11 | 9);
+    JCE.emitWordLE(0);
+  } else {
+    JCE.emitWordBE(0xf << 26 | 25 << 16 | Hi);
+    JCE.emitWordBE(9 << 26 | 25 << 21 | 25 << 16 | Lo);
+    JCE.emitWordBE(25 << 21 | 24 << 11 | 9);
+    JCE.emitWordBE(0);
+  }
 
   sys::Memory::InvalidateInstructionCache(Addr, 16);
   if (!sys::Memory::setRangeExecutable(Addr, 16))

Modified: head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsJITInfo.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -26,10 +26,11 @@ class MipsTargetMachine;
 class MipsJITInfo : public TargetJITInfo {
 
   bool IsPIC;
+  bool IsLittleEndian;
 
   public:
     explicit MipsJITInfo() :
-      IsPIC(false) {}
+      IsPIC(false), IsLittleEndian(true) {}
 
     /// replaceMachineCodeForFunction - Make it so that calling the function
     /// whose machine code is at OLD turns into a call to NEW, perhaps by
@@ -58,8 +59,10 @@ class MipsJITInfo : public TargetJITInfo
                           unsigned NumRelocs, unsigned char *GOTBase);
 
     /// Initialize - Initialize internal stage for the function being JITted.
-    void Initialize(const MachineFunction &MF, bool isPIC) {
+    void Initialize(const MachineFunction &MF, bool isPIC,
+                    bool isLittleEndian) {
       IsPIC = isPIC;
+      IsLittleEndian = isLittleEndian;
     }
 
 };

Modified: head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -62,6 +62,10 @@ MCOperand MipsMCInstLower::LowerSymbolOp
   case MipsII::MO_GOT_OFST:  Kind = MCSymbolRefExpr::VK_Mips_GOT_OFST; break;
   case MipsII::MO_HIGHER:    Kind = MCSymbolRefExpr::VK_Mips_HIGHER; break;
   case MipsII::MO_HIGHEST:   Kind = MCSymbolRefExpr::VK_Mips_HIGHEST; break;
+  case MipsII::MO_GOT_HI16:  Kind = MCSymbolRefExpr::VK_Mips_GOT_HI16; break;
+  case MipsII::MO_GOT_LO16:  Kind = MCSymbolRefExpr::VK_Mips_GOT_LO16; break;
+  case MipsII::MO_CALL_HI16: Kind = MCSymbolRefExpr::VK_Mips_CALL_HI16; break;
+  case MipsII::MO_CALL_LO16: Kind = MCSymbolRefExpr::VK_Mips_CALL_LO16; break;
   }
 
   switch (MOTy) {

Modified: head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
==============================================================================
--- head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -2160,6 +2160,9 @@ static bool isIntegerWideningViable(cons
                                     AllocaPartitioning::const_use_iterator I,
                                     AllocaPartitioning::const_use_iterator E) {
   uint64_t SizeInBits = TD.getTypeSizeInBits(AllocaTy);
+  // Don't create integer types larger than the maximum bitwidth.
+  if (SizeInBits > IntegerType::MAX_INT_BITS)
+    return false;
 
   // Don't try to handle allocas with bit-padding.
   if (SizeInBits != TD.getTypeStoreSizeInBits(AllocaTy))
@@ -2198,7 +2201,7 @@ static bool isIntegerWideningViable(cons
       if (RelBegin == 0 && RelEnd == Size)
         WholeAllocaOp = true;
       if (IntegerType *ITy = dyn_cast<IntegerType>(LI->getType())) {
-        if (ITy->getBitWidth() < TD.getTypeStoreSize(ITy))
+        if (ITy->getBitWidth() < TD.getTypeStoreSizeInBits(ITy))
           return false;
         continue;
       }
@@ -2214,7 +2217,7 @@ static bool isIntegerWideningViable(cons
       if (RelBegin == 0 && RelEnd == Size)
         WholeAllocaOp = true;
       if (IntegerType *ITy = dyn_cast<IntegerType>(ValueTy)) {
-        if (ITy->getBitWidth() < TD.getTypeStoreSize(ITy))
+        if (ITy->getBitWidth() < TD.getTypeStoreSizeInBits(ITy))
           return false;
         continue;
       }

Modified: head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h
==============================================================================
--- head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/include/clang/Sema/Scope.h	Sun Dec 23 13:04:00 2012	(r244628)
@@ -84,11 +84,18 @@ public:
     /// TryScope - This is the scope of a C++ try statement.
     TryScope = 0x1000,
 
+    /// CatchScope - This is the scope of a C++ catch statement.
+    CatchScope = 0x2000,
+
+    /// FnTryCatchScope - This is the scope for a function-level C++ try or
+    /// catch scope.
+    FnTryCatchScope = 0x4000,
+
     /// FnTryScope - This is the scope of a function-level C++ try scope.
-    FnTryScope = 0x3000,
+    FnTryScope = TryScope | FnTryCatchScope,
 
     /// FnCatchScope - This is the scope of a function-level C++ catch scope.
-    FnCatchScope = 0x4000
+    FnCatchScope = CatchScope | FnTryCatchScope
   };
 private:
   /// The parent scope for this scope.  This is null for the translation-unit

Modified: head/contrib/llvm/tools/clang/lib/Basic/Version.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -32,7 +32,7 @@ std::string getClangRepositoryPath() {
 
   // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us
   // pick up a tag in an SVN export, for example.
-  static StringRef SVNRepository("$URL: http://llvm.org/svn/llvm-project/cfe/branches/release_32/lib/Basic/Version.cpp $");
+  static StringRef SVNRepository("$URL: http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_32/final/lib/Basic/Version.cpp $");
   if (URL.empty()) {
     URL = SVNRepository.slice(SVNRepository.find(':'),
                               SVNRepository.find("/lib/Basic"));

Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -1855,6 +1855,8 @@ enum LinuxDistro {
   UbuntuNatty,
   UbuntuOneiric,
   UbuntuPrecise,
+  UbuntuQuantal,
+  UbuntuRaring,
   UnknownDistro
 };
 
@@ -1872,7 +1874,7 @@ static bool IsDebian(enum LinuxDistro Di
 }
 
 static bool IsUbuntu(enum LinuxDistro Distro) {
-  return Distro >= UbuntuHardy && Distro <= UbuntuPrecise;
+  return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
 }
 
 static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
@@ -1894,6 +1896,8 @@ static LinuxDistro DetectLinuxDistro(llv
           .Case("natty", UbuntuNatty)
           .Case("oneiric", UbuntuOneiric)
           .Case("precise", UbuntuPrecise)
+          .Case("quantal", UbuntuQuantal)
+          .Case("raring", UbuntuRaring)
           .Default(UnknownDistro);
     return Version;
   }

Modified: head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -706,8 +706,7 @@ SourceLocation Parser::ParseDecltypeSpec
       if (SkipUntil(tok::r_paren, /*StopAtSemi=*/true, /*DontConsume=*/true)) {
         EndLoc = ConsumeParen();
       } else {
-        assert(Tok.is(tok::semi));
-        if (PP.isBacktrackEnabled()) {
+        if (PP.isBacktrackEnabled() && Tok.is(tok::semi)) {
           // Backtrack to get the location of the last token before the semi.
           PP.RevertCachedTokens(2);
           ConsumeToken(); // the semi.

Modified: head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -2197,7 +2197,7 @@ StmtResult Parser::ParseCXXCatchBlock(bo
   // The name in a catch exception-declaration is local to the handler and
   // shall not be redeclared in the outermost block of the handler.
   ParseScope CatchScope(this, Scope::DeclScope | Scope::ControlScope |
-                          (FnCatch ? Scope::FnCatchScope : 0));
+                          (FnCatch ? Scope::FnCatchScope : Scope::CatchScope));
 
   // exception-declaration is equivalent to '...' or a parameter-declaration
   // without default arguments.

Modified: head/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp	Sun Dec 23 13:04:00 2012	(r244628)
@@ -135,16 +135,13 @@ bool IdentifierResolver::isDeclInScope(D
       // of the controlled statement.
       //
       assert(S->getParent() && "No TUScope?");
-      if (S->getFlags() & Scope::FnTryScope)
-        return S->getParent()->isDeclScope(D);
       if (S->getParent()->getFlags() & Scope::ControlScope) {
-        if (S->getParent()->getFlags() & Scope::FnCatchScope) {
-          S = S->getParent();
-          if (S->isDeclScope(D))
-            return true;
-        }
-        return S->getParent()->isDeclScope(D);
+        S = S->getParent();
+        if (S->isDeclScope(D))
+          return true;
       }
+      if (S->getFlags() & Scope::FnTryCatchScope)
+        return S->getParent()->isDeclScope(D);
     }
     return false;
   }

Modified: head/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- head/lib/clang/include/clang/Basic/Version.inc	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/lib/clang/include/clang/Basic/Version.inc	Sun Dec 23 13:04:00 2012	(r244628)
@@ -5,6 +5,6 @@
 #define	CLANG_VERSION_MINOR	2
 
 #define	CLANG_VENDOR		"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX	" 20121130"
+#define	CLANG_VENDOR_SUFFIX	" 20121221"
 
-#define	SVN_REVISION		"168974"
+#define	SVN_REVISION		"170710"

Modified: head/usr.bin/clang/clang/clang.1
==============================================================================
--- head/usr.bin/clang/clang/clang.1	Sun Dec 23 12:56:04 2012	(r244627)
+++ head/usr.bin/clang/clang/clang.1	Sun Dec 23 13:04:00 2012	(r244628)
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -125,7 +125,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CLANG 1"
-.TH CLANG 1 "2012-08-09" "clang 3.2" "Clang Tools Documentation"
+.TH CLANG 1 "2012-12-21" "clang 3.2" "Clang Tools Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -231,8 +231,8 @@ Treat subsequent input files as having t
 .IP "\fB\-std\fR=\fIlanguage\fR" 4
 .IX Item "-std=language"
 Specify the language standard to compile for.
-.IP "\fB\-stdlib\fR=\fIlanguage\fR" 4
-.IX Item "-stdlib=language"
+.IP "\fB\-stdlib\fR=\fIlibrary\fR" 4
+.IX Item "-stdlib=library"
 Specify the \*(C+ standard library to use; supported options are libstdc++ and
 libc++.
 .IP "\fB\-ansi\fR" 4

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 13:52:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 512B11E2;
 Sun, 23 Dec 2012 13:52:34 +0000 (UTC)
 (envelope-from rmacklem@uoguelph.ca)
Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca
 [131.104.91.44])
 by mx1.freebsd.org (Postfix) with ESMTP id AC3A28FC12;
 Sun, 23 Dec 2012 13:52:33 +0000 (UTC)
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: Ap8EAAAL11CDaFvO/2dsb2JhbABEhjq3ZXOCHgEBBSNWGw4GBAICDRkCWQYTiBMMokyRaIEiizULgyWBEwOIYo0qgRyPLIMSgU81
X-IronPort-AV: E=Sophos;i="4.84,341,1355115600"; 
   d="scan'208";a="6214811"
Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca)
 ([131.104.91.206])
 by esa-jnhn.mail.uoguelph.ca with ESMTP; 23 Dec 2012 08:52:30 -0500
Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1])
 by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 9C242B3F0B;
 Sun, 23 Dec 2012 08:52:30 -0500 (EST)
Date: Sun, 23 Dec 2012 08:52:30 -0500 (EST)
From: Rick Macklem <rmacklem@uoguelph.ca>
To: Benjamin Kaduk <bjkfbsd@gmail.com>
Message-ID: <1683112038.1560744.1356270750582.JavaMail.root@erie.cs.uoguelph.ca>
In-Reply-To: <CAJ5_RoBGO5e67HYUvOxiB64i1By0sJV=9kTaOb=118jNxfCT=Q@mail.gmail.com>
Subject: Re: svn commit: r244605 - head/usr.sbin/gssd
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Originating-IP: [172.17.91.203]
X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692)
Cc: svn-src-head@freebsd.org, Rick Macklem <rmacklem@freebsd.org>,
 svn-src-all@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 13:52:34 -0000

Benjamin Kaduk wrote:
> Hi Rick,
> 
> 
> Thanks for all this -- it's good stuff to have.
> 
> 
> On Sat, Dec 22, 2012 at 6:34 PM, Rick Macklem < rmacklem@freebsd.org >
> wrote:
> 
> 
> Author: rmacklem
> Date: Sat Dec 22 23:34:28 2012
> New Revision: 244605
> URL: http://svnweb.freebsd.org/changeset/base/244605
> 
> Log:
> Document the new gssd daemon options added by r244604.
> This is a content change.
> 
> MFC after: 2 weeks
> 
> Modified:
> head/usr.sbin/gssd/gssd.8
> 
> Modified: head/usr.sbin/gssd/gssd.8
> ==============================================================================
> --- head/usr.sbin/gssd/gssd.8 Sat Dec 22 23:21:17 2012 (r244604)
> +++ head/usr.sbin/gssd/gssd.8 Sat Dec 22 23:34:28 2012 (r244605)
> @@ -46,6 +49,29 @@ Run in debug mode.
> In this mode,
> .Nm
> will not fork when it starts.
> +.It Fl s Ar dir-list
> +Look for an appropriate credential cache file in this list of
> directories.
> +The list should be full pathnames from root, separated by ':'
> characters.
> +Usually this list will simply be "/tmp".
> +Without this option, the
> +.Nm
> +daemon assumes that the credential cache file is called
> /tmp/krb5cc_<uid>,
> +where <uid> is the effective uid for the RPC caller.
> +.It Fl c Ar file-substring
> +Set a file-substring for the credential cache file names.
> +Only files with this substring embedded in their names will be
> +selected as candidates when the
> +.Fl s
> +has been specified.
> 
> 
> 
> This grammar seems a bit fishy ("when the -s has been specified");
> "when -s has been specified" or
> "when a search directory has been specified with -s" would probably be
> better.
> 
Sure.

> 
> +If not specified, it defaults to "krb5cc_".
> +.It Fl r Ar preferred-realm
> +Set a preferred Kerberos realm for the search of the directory list
> for
> 
> 
> 
> "Directory list" sounds like there are multiple directories involved,
> perhaps
> "directory listing" is better?
> 
It can be a list, for example: "/tmp:/var/tmp". Personally, I thought
having a list was overkill, but during the email discussion with the people
that reported the problem, it was felt that a list might be needed (and
the Linux gssd does take a list of directories).

However, it probably isn't clear that the preferred realm applies to
the principal names in the credential cache file entries being examined.

> 
> +a credentials cache file.
> +When set, files with TGT credentials for this realm will be selected
> over
> +other credential files.
> +This option is only meaningful when the
> +.Fl s
> +option has been specified.
> 
> 
> 
> There is something of a movement among the doc types to remove
> "redundant" words,
> making this "when -s has been specified", but others (some quite
> senior) do not approve
> of this "useless churn". Might not be worth changing now, but for new
> content, something
> to consider.
> 
> 
> Let me know if I should make the patch.
> 
Sure, if you'd like to. Otherwise, I'll try and come up with a fixup.

Thanks for pointing this out, rick

> 
> -Ben Kaduk

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 14:00:36 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AEA7A382;
 Sun, 23 Dec 2012 14:00:36 +0000 (UTC)
 (envelope-from stefan@fafoe.narf.at)
Received: from fep16.mx.upcmail.net (fep16.mx.upcmail.net [62.179.121.36])
 by mx1.freebsd.org (Postfix) with ESMTP id 6E2828FC0A;
 Sun, 23 Dec 2012 14:00:34 +0000 (UTC)
Received: from edge01.upcmail.net ([192.168.13.236]) by viefep16-int.chello.at
 (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP
 id <20121223140028.ZEIF29828.viefep16-int.chello.at@edge01.upcmail.net>;
 Sun, 23 Dec 2012 15:00:28 +0100
Received: from mole.fafoe.narf.at ([80.109.55.137])
 by edge01.upcmail.net with edge
 id f20T1k0192xdvHc0120TWW; Sun, 23 Dec 2012 15:00:28 +0100
X-SourceIP: 80.109.55.137
Received: by mole.fafoe.narf.at (Postfix, from userid 1001)
 id 805386D449; Sun, 23 Dec 2012 15:00:27 +0100 (CET)
Date: Sun, 23 Dec 2012 15:00:27 +0100
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: Rick Macklem <rmacklem@FreeBSD.org>
Subject: Re: svn commit: r244604 - head/usr.sbin/gssd
Message-ID: <20121223140027.GA42937@mole.fafoe.narf.at>
References: <201212222321.qBMNLHGo075542@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201212222321.qBMNLHGo075542@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 14:00:36 -0000

On Sat, Dec 22, 2012 at 11:21:17PM +0000, Rick Macklem wrote:
> Author: rmacklem
> Date: Sat Dec 22 23:21:17 2012
> New Revision: 244604
> URL: http://svnweb.freebsd.org/changeset/base/244604
> 
> Log:
>   It was reported via email that some sshds create kerberos
>   credential cache files with names other than /tmp/krb5cc_<uid>.
>   The gssd daemon does not know how to find these credential caches.
>   This patch implements a new option "-s" that does a search for
>   credential cache files, using roughly the same algorithm as the
>   gssd daemon for Linux uses. The gssd behaviour is only changed
>   if the new "-s" option is specified. It also implements two other
>   new options related to the "-s" option.
>   
>   Reported by:	Piete.Brooks at cl.cam.ac.uk, Herbert Poeckl
>   Tested by:	Herbert Poeckl (admin at ist.tugraz.at), Illias A. Marinos
>   MFC after:	2 weeks
> 
> Modified:
>   head/usr.sbin/gssd/gssd.c

I think you forgot to add -lkrb5 to the Makefile.

Stefan

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 15:50:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A409B404;
 Sun, 23 Dec 2012 15:50:38 +0000 (UTC)
 (envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8898C8FC17;
 Sun, 23 Dec 2012 15:50:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNFocKQ021156;
 Sun, 23 Dec 2012 15:50:38 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNFocEX021155;
 Sun, 23 Dec 2012 15:50:38 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201212231550.qBNFocEX021155@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Sun, 23 Dec 2012 15:50:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244631 - head/sys/cddl/dev/dtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 15:50:38 -0000

Author: rstone
Date: Sun Dec 23 15:50:37 2012
New Revision: 244631
URL: http://svnweb.freebsd.org/changeset/base/244631

Log:
  Correct a series of errors in the hand-rolled locking for drace_debug.c:
  
  - Use spinlock_enter()/spinlock_exit() to prevent a thread holding a
    debug lock from being preempted to prevent other threads waiting
    on that lock from starvation.
  
  - Handle the possibility of CPU migration in between the fetch of curcpu
    and the call to spinlock_enter() by saving curcpu in a local variable.
  
  - Use memory barriers to prevent reordering of loads and stores of the
    data protected by the lock outside of the critical section
  
  - Eliminate false sharing of the locks by moving them into the structures
    that they protect and aligning them to a cacheline boundary.
  
  - Record the owning thread in the lock to make debugging future problems
    easier.
  
  Reviewed by:	rpaulo (initial version)
  MFC after:	2 weeks

Modified:
  head/sys/cddl/dev/dtrace/dtrace_debug.c

Modified: head/sys/cddl/dev/dtrace/dtrace_debug.c
==============================================================================
--- head/sys/cddl/dev/dtrace/dtrace_debug.c	Sun Dec 23 14:19:04 2012	(r244630)
+++ head/sys/cddl/dev/dtrace/dtrace_debug.c	Sun Dec 23 15:50:37 2012	(r244631)
@@ -33,11 +33,10 @@
 
 #include <machine/atomic.h>
 
-#define	dtrace_cmpset_long	atomic_cmpset_long
-
 #define DTRACE_DEBUG_BUFR_SIZE	(32 * 1024)
 
 struct dtrace_debug_data {
+	uintptr_t lock __aligned(CACHE_LINE_SIZE);
 	char bufr[DTRACE_DEBUG_BUFR_SIZE];
 	char *first;
 	char *last;
@@ -46,20 +45,22 @@ struct dtrace_debug_data {
 
 static char dtrace_debug_bufr[DTRACE_DEBUG_BUFR_SIZE];
 
-static volatile u_long	dtrace_debug_flag[MAXCPU];
-
 static void
 dtrace_debug_lock(int cpu)
 {
-	while (dtrace_cmpset_long(&dtrace_debug_flag[cpu], 0, 1) == 0)
-		/* Loop until the lock is obtained. */
+	 uintptr_t tid;
+
+	tid = (uintptr_t)curthread;
+	spinlock_enter();
+	while (atomic_cmpset_acq_ptr(&dtrace_debug_data[cpu].lock, 0, tid) == 0)		/* Loop until the lock is obtained. */
 		;
 }
 
 static void
 dtrace_debug_unlock(int cpu)
 {
-	dtrace_debug_flag[cpu] = 0;
+	atomic_store_rel_ptr(&dtrace_debug_data[cpu].lock, 0);
+	spinlock_exit();
 }
 
 static void
@@ -151,10 +152,11 @@ dtrace_debug_output(void)
  */
 
 static __inline void
-dtrace_debug__putc(char c)
+dtrace_debug__putc(int cpu, char c)
 {
-	struct dtrace_debug_data *d = &dtrace_debug_data[curcpu];
+	struct dtrace_debug_data *d;
 
+	d = &dtrace_debug_data[cpu];
 	*d->next++ = c;
 
 	if (d->next == d->last)
@@ -172,24 +174,30 @@ dtrace_debug__putc(char c)
 static void __used
 dtrace_debug_putc(char c)
 {
-	dtrace_debug_lock(curcpu);
+	int cpu;
+
+	cpu = curcpu;
+	dtrace_debug_lock(cpu);
 
-	dtrace_debug__putc(c);
+	dtrace_debug__putc(cpu, c);
 
-	dtrace_debug_unlock(curcpu);
+	dtrace_debug_unlock(cpu);
 }
 
 static void __used
 dtrace_debug_puts(const char *s)
 {
-	dtrace_debug_lock(curcpu);
+	int cpu;
+	
+	cpu = curcpu;
+	dtrace_debug_lock(cpu);
 
 	while (*s != '\0')
-		dtrace_debug__putc(*s++);
+		dtrace_debug__putc(cpu, *s++);
 
-	dtrace_debug__putc('\0');
+	dtrace_debug__putc(cpu, '\0');
 
-	dtrace_debug_unlock(curcpu);
+	dtrace_debug_unlock(cpu);
 }
 
 /*
@@ -219,7 +227,7 @@ dtrace_debug_ksprintn(char *nbuf, uintma
 #define MAXNBUF (sizeof(intmax_t) * NBBY + 1)
 
 static void
-dtrace_debug_vprintf(const char *fmt, va_list ap)
+dtrace_debug_vprintf(int cpu, const char *fmt, va_list ap)
 {
 	char nbuf[MAXNBUF];
 	const char *p, *percent, *q;
@@ -243,10 +251,10 @@ dtrace_debug_vprintf(const char *fmt, va
 		width = 0;
 		while ((ch = (u_char)*fmt++) != '%' || stop) {
 			if (ch == '\0') {
-				dtrace_debug__putc('\0');
+				dtrace_debug__putc(cpu, '\0');
 				return;
 			}
-			dtrace_debug__putc(ch);
+			dtrace_debug__putc(cpu, ch);
 		}
 		percent = fmt - 1;
 		qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
@@ -266,7 +274,7 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 			ladjust = 1;
 			goto reswitch;
 		case '%':
-			dtrace_debug__putc(ch);
+			dtrace_debug__putc(cpu, ch);
 			break;
 		case '*':
 			if (!dot) {
@@ -301,7 +309,7 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 			num = (u_int)va_arg(ap, int);
 			p = va_arg(ap, char *);
 			for (q = dtrace_debug_ksprintn(nbuf, num, *p++, NULL, 0); *q;)
-				dtrace_debug__putc(*q--);
+				dtrace_debug__putc(cpu, *q--);
 
 			if (num == 0)
 				break;
@@ -309,19 +317,19 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 			for (tmp = 0; *p;) {
 				n = *p++;
 				if (num & (1 << (n - 1))) {
-					dtrace_debug__putc(tmp ? ',' : '<');
+					dtrace_debug__putc(cpu, tmp ? ',' : '<');
 					for (; (n = *p) > ' '; ++p)
-						dtrace_debug__putc(n);
+						dtrace_debug__putc(cpu, n);
 					tmp = 1;
 				} else
 					for (; *p > ' '; ++p)
 						continue;
 			}
 			if (tmp)
-				dtrace_debug__putc('>');
+				dtrace_debug__putc(cpu, '>');
 			break;
 		case 'c':
-			dtrace_debug__putc(va_arg(ap, int));
+			dtrace_debug__putc(cpu, va_arg(ap, int));
 			break;
 		case 'D':
 			up = va_arg(ap, u_char *);
@@ -329,12 +337,12 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 			if (!width)
 				width = 16;
 			while(width--) {
-				dtrace_debug__putc(hex2ascii(*up >> 4));
-				dtrace_debug__putc(hex2ascii(*up & 0x0f));
+				dtrace_debug__putc(cpu, hex2ascii(*up >> 4));
+				dtrace_debug__putc(cpu, hex2ascii(*up & 0x0f));
 				up++;
 				if (width)
 					for (q=p;*q;q++)
-						dtrace_debug__putc(*q);
+						dtrace_debug__putc(cpu, *q);
 			}
 			break;
 		case 'd':
@@ -406,12 +414,12 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 
 			if (!ladjust && width > 0)
 				while (width--)
-					dtrace_debug__putc(padc);
+					dtrace_debug__putc(cpu, padc);
 			while (n--)
-				dtrace_debug__putc(*p++);
+				dtrace_debug__putc(cpu, *p++);
 			if (ladjust && width > 0)
 				while (width--)
-					dtrace_debug__putc(padc);
+					dtrace_debug__putc(cpu, padc);
 			break;
 		case 't':
 			tflag = 1;
@@ -485,32 +493,32 @@ number:
 			if (!ladjust && padc != '0' && width
 			    && (width -= tmp) > 0)
 				while (width--)
-					dtrace_debug__putc(padc);
+					dtrace_debug__putc(cpu, padc);
 			if (neg)
-				dtrace_debug__putc('-');
+				dtrace_debug__putc(cpu, '-');
 			if (sharpflag && num != 0) {
 				if (base == 8) {
-					dtrace_debug__putc('0');
+					dtrace_debug__putc(cpu, '0');
 				} else if (base == 16) {
-					dtrace_debug__putc('0');
-					dtrace_debug__putc('x');
+					dtrace_debug__putc(cpu, '0');
+					dtrace_debug__putc(cpu, 'x');
 				}
 			}
 			if (!ladjust && width && (width -= tmp) > 0)
 				while (width--)
-					dtrace_debug__putc(padc);
+					dtrace_debug__putc(cpu, padc);
 
 			while (*p)
-				dtrace_debug__putc(*p--);
+				dtrace_debug__putc(cpu, *p--);
 
 			if (ladjust && width && (width -= tmp) > 0)
 				while (width--)
-					dtrace_debug__putc(padc);
+					dtrace_debug__putc(cpu, padc);
 
 			break;
 		default:
 			while (percent < fmt)
-				dtrace_debug__putc(*percent++);
+				dtrace_debug__putc(cpu, *percent++);
 			/*
 			 * Since we ignore an formatting argument it is no 
 			 * longer safe to obey the remaining formatting
@@ -522,23 +530,25 @@ number:
 		}
 	}
 
-	dtrace_debug__putc('\0');
+	dtrace_debug__putc(cpu, '\0');
 }
 
 void
 dtrace_debug_printf(const char *fmt, ...)
 {
 	va_list ap;
+	int cpu;
 
-	dtrace_debug_lock(curcpu);
+	cpu = curcpu;
+	dtrace_debug_lock(cpu);
 
 	va_start(ap, fmt);
 
-	dtrace_debug_vprintf(fmt, ap);
+	dtrace_debug_vprintf(cpu, fmt, ap);
 
 	va_end(ap);
 
-	dtrace_debug_unlock(curcpu);
+	dtrace_debug_unlock(cpu);
 }
 
 #else

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 16:28:20 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 39416FFA;
 Sun, 23 Dec 2012 16:28:20 +0000 (UTC)
 (envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1D1E78FC0C;
 Sun, 23 Dec 2012 16:28:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNGSJJc026846;
 Sun, 23 Dec 2012 16:28:19 GMT
 (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNGSJkd026840;
 Sun, 23 Dec 2012 16:28:19 GMT
 (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201212231628.qBNGSJkd026840@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 23 Dec 2012 16:28:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244633 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 16:28:20 -0000

Author: melifaro
Date: Sun Dec 23 16:28:18 2012
New Revision: 244633
URL: http://svnweb.freebsd.org/changeset/base/244633

Log:
  Use unified IP_FW_ARG_TABLEARG() macro for most tablearg checks.
  Log real value instead of IP_FW_TABLEARG (65535) in ipfw_log().
  
  Noticed by:	Vitaliy Tokarenko <rphone@ukr.net>
  MFC after:	2 weeks

Modified:
  head/sys/netpfil/ipfw/ip_fw2.c
  head/sys/netpfil/ipfw/ip_fw_dynamic.c
  head/sys/netpfil/ipfw/ip_fw_log.c
  head/sys/netpfil/ipfw/ip_fw_private.h

Modified: head/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw2.c	Sun Dec 23 16:11:43 2012	(r244632)
+++ head/sys/netpfil/ipfw/ip_fw2.c	Sun Dec 23 16:28:18 2012	(r244633)
@@ -1850,8 +1850,7 @@ do {								\
 
 			case O_TAG: {
 				struct m_tag *mtag;
-				uint32_t tag = (cmd->arg1 == IP_FW_TABLEARG) ?
-				    tablearg : cmd->arg1;
+				uint32_t tag = IP_FW_ARG_TABLEARG(cmd->arg1);
 
 				/* Packet is already tagged with this tag? */
 				mtag = m_tag_locate(m, MTAG_IPFW, tag, NULL);
@@ -1930,8 +1929,7 @@ do {								\
 
 			case O_TAGGED: {
 				struct m_tag *mtag;
-				uint32_t tag = (cmd->arg1 == IP_FW_TABLEARG) ?
-				    tablearg : cmd->arg1;
+				uint32_t tag = IP_FW_ARG_TABLEARG(cmd->arg1);
 
 				if (cmdlen == 1) {
 					match = m_tag_locate(m, MTAG_IPFW,
@@ -2069,8 +2067,7 @@ do {								\
 			case O_PIPE:
 			case O_QUEUE:
 				set_match(args, f_pos, chain);
-				args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ?
-					tablearg : cmd->arg1;
+				args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1);
 				if (cmd->opcode == O_PIPE)
 					args->rule.info |= IPFW_IS_PIPE;
 				if (V_fw_one_pass)
@@ -2090,8 +2087,7 @@ do {								\
 				retval = (cmd->opcode == O_DIVERT) ?
 					IP_FW_DIVERT : IP_FW_TEE;
 				set_match(args, f_pos, chain);
-				args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ?
-				    tablearg : cmd->arg1;
+				args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1);
 				break;
 
 			case O_COUNT:
@@ -2109,8 +2105,7 @@ do {								\
 				    (uintptr_t)f->x_next == chain->id) {
 				f_pos = (uintptr_t)f->next_rule;
 			    } else {
-				int i = (cmd->arg1 == IP_FW_TABLEARG) ?
-					tablearg : cmd->arg1;
+				int i = IP_FW_ARG_TABLEARG(cmd->arg1);
 				/* make sure we do not jump backward */
 				if (i <= f->rulenum)
 				    i = f->rulenum + 1;
@@ -2215,9 +2210,8 @@ do {								\
 					    (uintptr_t)f->x_next == chain->id) {
 						f_pos = (uintptr_t)f->next_rule;
 					} else {
-						jmpto = (cmd->arg1 ==
-						    IP_FW_TABLEARG) ? tablearg:
-						    cmd->arg1;
+						jmpto = IP_FW_ARG_TABLEARG(
+						    cmd->arg1);
 						f_pos = ipfw_find_rule(chain,
 						    jmpto, 0);
 						/* update the cache */
@@ -2337,8 +2331,7 @@ do {								\
 			case O_NETGRAPH:
 			case O_NGTEE:
 				set_match(args, f_pos, chain);
-				args->rule.info = (cmd->arg1 == IP_FW_TABLEARG) ?
-					tablearg : cmd->arg1;
+				args->rule.info = IP_FW_ARG_TABLEARG(cmd->arg1);
 				if (V_fw_one_pass)
 					args->rule.info |= IPFW_ONEPASS;
 				retval = (cmd->opcode == O_NETGRAPH) ?
@@ -2351,8 +2344,7 @@ do {								\
 				uint32_t fib;
 
 				IPFW_INC_RULE_COUNTER(f, pktlen);
-				fib = (cmd->arg1 == IP_FW_TABLEARG) ? tablearg:
-				    cmd->arg1;
+				fib = IP_FW_ARG_TABLEARG(cmd->arg1);
 				if (fib >= rt_numfibs)
 					fib = 0;
 				M_SETFIB(m, fib);
@@ -2378,8 +2370,7 @@ do {								\
 				    }
 				    t = ((ipfw_insn_nat *)cmd)->nat;
 				    if (t == NULL) {
-					nat_id = (cmd->arg1 == IP_FW_TABLEARG) ?
-						tablearg : cmd->arg1;
+					nat_id = IP_FW_ARG_TABLEARG(cmd->arg1);
 					t = (*lookup_nat_ptr)(&chain->nat, nat_id);
 
 					if (t == NULL) {

Modified: head/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c	Sun Dec 23 16:11:43 2012	(r244632)
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c	Sun Dec 23 16:28:18 2012	(r244633)
@@ -696,8 +696,7 @@ ipfw_install_state(struct ip_fw *rule, i
 		uint16_t limit_mask = cmd->limit_mask;
 		int pindex;
 
-		conn_limit = (cmd->conn_limit == IP_FW_TABLEARG) ?
-		    tablearg : cmd->conn_limit;
+		conn_limit = IP_FW_ARG_TABLEARG(cmd->conn_limit);
 		  
 		DEB(
 		if (cmd->conn_limit == IP_FW_TABLEARG)

Modified: head/sys/netpfil/ipfw/ip_fw_log.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_log.c	Sun Dec 23 16:11:43 2012	(r244632)
+++ head/sys/netpfil/ipfw/ip_fw_log.c	Sun Dec 23 16:28:18 2012	(r244633)
@@ -338,19 +338,19 @@ ipfw_log(struct ip_fw *f, u_int hlen, st
 			break;
 		case O_SETFIB:
 			snprintf(SNPARGS(action2, 0), "SetFib %d",
-				cmd->arg1);
+				IP_FW_ARG_TABLEARG(cmd->arg1));
 			break;
 		case O_SKIPTO:
 			snprintf(SNPARGS(action2, 0), "SkipTo %d",
-				cmd->arg1);
+				IP_FW_ARG_TABLEARG(cmd->arg1));
 			break;
 		case O_PIPE:
 			snprintf(SNPARGS(action2, 0), "Pipe %d",
-				cmd->arg1);
+				IP_FW_ARG_TABLEARG(cmd->arg1));
 			break;
 		case O_QUEUE:
 			snprintf(SNPARGS(action2, 0), "Queue %d",
-				cmd->arg1);
+				IP_FW_ARG_TABLEARG(cmd->arg1));
 			break;
 		case O_FORWARD_IP: {
 			ipfw_insn_sa *sa = (ipfw_insn_sa *)cmd;

Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_private.h	Sun Dec 23 16:11:43 2012	(r244632)
+++ head/sys/netpfil/ipfw/ip_fw_private.h	Sun Dec 23 16:28:18 2012	(r244633)
@@ -258,6 +258,8 @@ struct sockopt;	/* used by tcp_var.h */
 	(_cntr)->pcnt = 0;				\
 	(_cntr)->bcnt = 0;				\
 	} while (0)
+
+#define	IP_FW_ARG_TABLEARG(a)	((a) == IP_FW_TABLEARG) ? tablearg : (a)
 /*
  * The lock is heavily used by ip_fw2.c (the main file) and ip_fw_nat.c
  * so the variable and the macros must be here.

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 18:35:43 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78105670;
 Sun, 23 Dec 2012 18:35:43 +0000 (UTC)
 (envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5B4288FC13;
 Sun, 23 Dec 2012 18:35:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNIZhID046139;
 Sun, 23 Dec 2012 18:35:43 GMT
 (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNIZht9046138;
 Sun, 23 Dec 2012 18:35:43 GMT
 (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201212231835.qBNIZht9046138@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 23 Dec 2012 18:35:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244634 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 18:35:43 -0000

Author: melifaro
Date: Sun Dec 23 18:35:42 2012
New Revision: 244634
URL: http://svnweb.freebsd.org/changeset/base/244634

Log:
  Add parentheses to IP_FW_ARG_TABLEARG() definition.
  
  Suggested by:	glebius
  MFC with:	r244633

Modified:
  head/sys/netpfil/ipfw/ip_fw_private.h

Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_private.h	Sun Dec 23 16:28:18 2012	(r244633)
+++ head/sys/netpfil/ipfw/ip_fw_private.h	Sun Dec 23 18:35:42 2012	(r244634)
@@ -259,7 +259,7 @@ struct sockopt;	/* used by tcp_var.h */
 	(_cntr)->bcnt = 0;				\
 	} while (0)
 
-#define	IP_FW_ARG_TABLEARG(a)	((a) == IP_FW_TABLEARG) ? tablearg : (a)
+#define	IP_FW_ARG_TABLEARG(a)	(((a) == IP_FW_TABLEARG) ? tablearg : (a))
 /*
  * The lock is heavily used by ip_fw2.c (the main file) and ip_fw_nat.c
  * so the variable and the macros must be here.

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 19:58:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 495B397F;
 Sun, 23 Dec 2012 19:58:42 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1216B8FC14;
 Sun, 23 Dec 2012 19:58:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNJwfFu057543;
 Sun, 23 Dec 2012 19:58:41 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNJwfkJ057541;
 Sun, 23 Dec 2012 19:58:41 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201212231958.qBNJwfkJ057541@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 23 Dec 2012 19:58:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244635 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 19:58:42 -0000

Author: avg
Date: Sun Dec 23 19:58:41 2012
New Revision: 244635
URL: http://svnweb.freebsd.org/changeset/base/244635

Log:
  zfs: solaris doesn't have KM_ZERO, kmem_zalloc should be used instead
  
  To do:		remove KM_ZERO declaration
  Pointyhat to:	avg (for mindlessly using the pseudo-flag)
  MFC after:	instantly (to fix stable/8 build)

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Dec 23 18:35:42 2012	(r244634)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Dec 23 19:58:41 2012	(r244635)
@@ -3799,7 +3799,7 @@ spa_generate_rootconf(const char *name)
 	nvlist_lookup_uint64_array(best_cfg, ZPOOL_CONFIG_HOLE_ARRAY,
 	    &holes, &nholes);
 
-	tops = kmem_alloc(nchildren * sizeof(void *), KM_SLEEP | KM_ZERO);
+	tops = kmem_zalloc(nchildren * sizeof(void *), KM_SLEEP);
 	for (i = 0; i < nchildren; i++) {
 		if (i >= count)
 			break;

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Sun Dec 23 18:35:42 2012	(r244634)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Sun Dec 23 19:58:41 2012	(r244635)
@@ -300,8 +300,8 @@ resize_configs(nvlist_t ***configs, uint
 
 	if (id < *count)
 		return;
-	new_configs = kmem_alloc((id + 1) * sizeof(nvlist_t *),
-	    KM_SLEEP | KM_ZERO);
+	new_configs = kmem_zalloc((id + 1) * sizeof(nvlist_t *),
+	    KM_SLEEP);
 	for (i = 0; i < *count; i++)
 		new_configs[i] = (*configs)[i];
 	if (*configs != NULL)

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 20:12:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 914A6F42;
 Sun, 23 Dec 2012 20:12:58 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 74C838FC14;
 Sun, 23 Dec 2012 20:12:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNKCwEH060108;
 Sun, 23 Dec 2012 20:12:58 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNKCwHW060107;
 Sun, 23 Dec 2012 20:12:58 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201212232012.qBNKCwHW060107@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 23 Dec 2012 20:12:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244638 - head/usr.sbin/gssd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 20:12:58 -0000

Author: rmacklem
Date: Sun Dec 23 20:12:57 2012
New Revision: 244638
URL: http://svnweb.freebsd.org/changeset/base/244638

Log:
  Fix the Makefile so it can build gssd.c after r244604.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/gssd/Makefile

Modified: head/usr.sbin/gssd/Makefile
==============================================================================
--- head/usr.sbin/gssd/Makefile	Sun Dec 23 20:03:53 2012	(r244637)
+++ head/usr.sbin/gssd/Makefile	Sun Dec 23 20:12:57 2012	(r244638)
@@ -7,8 +7,8 @@ SRCS=	gssd.c gssd.h gssd_svc.c gssd_xdr.
 CFLAGS+= -I.
 WARNS?= 1
 
-DPADD=	${LIBGSSAPI}
-LDADD=	-lgssapi
+DPADD=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
+LDADD=	-lgssapi -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
 
 CLEANFILES= gssd_svc.c gssd.h
 

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 20:17:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78D18170;
 Sun, 23 Dec 2012 20:17:10 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 35F6E8FC13;
 Sun, 23 Dec 2012 20:17:09 +0000 (UTC)
Received: from localhost (static254.debica228.tnp.pl [87.116.228.254])
 by mail.dawidek.net (Postfix) with ESMTPSA id 73E59205;
 Sun, 23 Dec 2012 21:14:51 +0100 (CET)
Date: Sun, 23 Dec 2012 21:17:05 +0100
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Matthew Seaman <matthew@FreeBSD.org>
Subject: Re: svn commit: r244608 - head/usr.sbin/pkg
Message-ID: <20121223201704.GA1436@garage.freebsd.pl>
References: <201212231122.qBNBMIXb081427@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw"
Content-Disposition: inline
In-Reply-To: <201212231122.qBNBMIXb081427@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 20:17:10 -0000


--GvXjxJ+pjyke8COw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Dec 23, 2012 at 11:22:18AM +0000, Matthew Seaman wrote:
> Author: matthew (ports committer)
> Date: Sun Dec 23 11:22:18 2012
> New Revision: 244608
> URL: http://svnweb.freebsd.org/changeset/base/244608
>=20
> Log:
>   Third time's the charm.  pkg -N output needs to go to stderr.
>  =20
>   Approved by:	bapt
>   MFC after:	2 weeks
>=20
> Modified:
>   head/usr.sbin/pkg/pkg.c
>=20
> Modified: head/usr.sbin/pkg/pkg.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/usr.sbin/pkg/pkg.c	Sun Dec 23 10:21:01 2012	(r244607)
> +++ head/usr.sbin/pkg/pkg.c	Sun Dec 23 11:22:18 2012	(r244608)
> @@ -457,10 +457,8 @@ main(__unused int argc, char *argv[])
>  		 * a system is configured to use pkg, don't bootstrap pkg
>  		 * when that argument is given as argv[1].
>  		 */
> -		if ( argv[1] !=3D NULL && strcmp(argv[1], "-N") =3D=3D 0) {
> -			printf("%s", "pkg is not installed\n");
> -			exit(EXIT_FAILURE);
> -		}
> +		if ( argv[1] !=3D NULL && strcmp(argv[1], "-N") =3D=3D 0)
> +			errx(EXIT_FAILURE, "pkg is not installed\n");

How about removing space after 'if (' and redundant '\n'?

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--GvXjxJ+pjyke8COw
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDXZsAACgkQForvXbEpPzRe5wCg42/xjBdDW5A8RfMtZJ8lC/Kc
dEMAn35bdDpB75F37yPapW6VthHLHyui
=mGC+
-----END PGP SIGNATURE-----

--GvXjxJ+pjyke8COw--

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 20:29:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C702D452;
 Sun, 23 Dec 2012 20:29:00 +0000 (UTC)
 (envelope-from rmacklem@uoguelph.ca)
Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca
 [131.104.91.44])
 by mx1.freebsd.org (Postfix) with ESMTP id 2FDF28FC0C;
 Sun, 23 Dec 2012 20:28:59 +0000 (UTC)
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: Ap8EAOlo11CDaFvO/2dsb2JhbABEhjq3UXOCHgEBBAEjVgUWFAQCAg0ZAlkGiCAGDKJfkXKBIos1C4MlgRMDiGKNKoEcjyyDEoFPNQ
X-IronPort-AV: E=Sophos;i="4.84,343,1355115600"; 
   d="scan'208";a="6286181"
Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca)
 ([131.104.91.206])
 by esa-jnhn.mail.uoguelph.ca with ESMTP; 23 Dec 2012 15:28:58 -0500
Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1])
 by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id F22DAB3F23;
 Sun, 23 Dec 2012 15:28:58 -0500 (EST)
Date: Sun, 23 Dec 2012 15:28:58 -0500 (EST)
From: Rick Macklem <rmacklem@uoguelph.ca>
To: Stefan Farfeleder <stefanf@FreeBSD.org>
Message-ID: <679335077.1562704.1356294538939.JavaMail.root@erie.cs.uoguelph.ca>
In-Reply-To: <20121223140027.GA42937@mole.fafoe.narf.at>
Subject: Re: svn commit: r244604 - head/usr.sbin/gssd
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Originating-IP: [172.17.91.201]
X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692)
Cc: svn-src-head@freebsd.org, Rick Macklem <rmacklem@FreeBSD.org>,
 svn-src-all@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 20:29:00 -0000

Stefan Farfeleder wrote:
> On Sat, Dec 22, 2012 at 11:21:17PM +0000, Rick Macklem wrote:
> > Author: rmacklem
> > Date: Sat Dec 22 23:21:17 2012
> > New Revision: 244604
> > URL: http://svnweb.freebsd.org/changeset/base/244604
> >
> > Log:
> >   It was reported via email that some sshds create kerberos
> >   credential cache files with names other than /tmp/krb5cc_<uid>.
> >   The gssd daemon does not know how to find these credential caches.
> >   This patch implements a new option "-s" that does a search for
> >   credential cache files, using roughly the same algorithm as the
> >   gssd daemon for Linux uses. The gssd behaviour is only changed
> >   if the new "-s" option is specified. It also implements two other
> >   new options related to the "-s" option.
> >
> >   Reported by: Piete.Brooks at cl.cam.ac.uk, Herbert Poeckl
> >   Tested by: Herbert Poeckl (admin at ist.tugraz.at), Illias A.
> >   Marinos
> >   MFC after: 2 weeks
> >
> > Modified:
> >   head/usr.sbin/gssd/gssd.c
> 
> I think you forgot to add -lkrb5 to the Makefile.
> 
Oops, I forgot to commit the Makefile fix. It has been committed now.
(which for wonderful Kerberos, includes a half dozen extra libraries;-)

Thanks for pointing it out, rick

> Stefan

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 20:39:04 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EFDB0812;
 Sun, 23 Dec 2012 20:39:03 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3AC98FC0A;
 Sun, 23 Dec 2012 20:39:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNKd3IJ063891;
 Sun, 23 Dec 2012 20:39:03 GMT (envelope-from matthew@svn.freebsd.org)
Received: (from matthew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNKd3tv063890;
 Sun, 23 Dec 2012 20:39:03 GMT (envelope-from matthew@svn.freebsd.org)
Message-Id: <201212232039.qBNKd3tv063890@svn.freebsd.org>
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Sun, 23 Dec 2012 20:39:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244639 - head/usr.sbin/pkg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 20:39:04 -0000

Author: matthew (ports committer)
Date: Sun Dec 23 20:39:03 2012
New Revision: 244639
URL: http://svnweb.freebsd.org/changeset/base/244639

Log:
  Remove extraneous space and new-line.
  
  Submitted by:	pjd, gcooper
  Approved by:	bapt
  MFC after:	2 weeks

Modified:
  head/usr.sbin/pkg/pkg.c

Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c	Sun Dec 23 20:12:57 2012	(r244638)
+++ head/usr.sbin/pkg/pkg.c	Sun Dec 23 20:39:03 2012	(r244639)
@@ -457,8 +457,8 @@ main(__unused int argc, char *argv[])
 		 * a system is configured to use pkg, don't bootstrap pkg
 		 * when that argument is given as argv[1].
 		 */
-		if ( argv[1] != NULL && strcmp(argv[1], "-N") == 0)
-			errx(EXIT_FAILURE, "pkg is not installed\n");
+		if (argv[1] != NULL && strcmp(argv[1], "-N") == 0)
+			errx(EXIT_FAILURE, "pkg is not installed");
 
 		/*
 		 * Do not ask for confirmation if either of stdin or stdout is

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 21:41:41 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 32AE024A;
 Sun, 23 Dec 2012 21:41:41 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0D8438FC13;
 Sun, 23 Dec 2012 21:41:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNLfeNx072766;
 Sun, 23 Dec 2012 21:41:40 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNLfeNM072760;
 Sun, 23 Dec 2012 21:41:40 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201212232141.qBNLfeNM072760@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 23 Dec 2012 21:41:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244640 - in head/contrib/llvm/tools/clang/lib: Basic
 Driver
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 21:41:41 -0000

Author: andrew
Date: Sun Dec 23 21:41:39 2012
New Revision: 244640
URL: http://svnweb.freebsd.org/changeset/base/244640

Log:
  Pull in r170096 from upstream clang trunk:
  
    Initial support for FreeBSD on ARM.

Modified:
  head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sun Dec 23 20:39:03 2012	(r244639)
+++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sun Dec 23 21:41:39 2012	(r244640)
@@ -3078,7 +3078,9 @@ public:
     // name.
     if (Name == "apcs-gnu") {
       DoubleAlign = LongLongAlign = LongDoubleAlign = SuitableAlign = 32;
-      SizeType = UnsignedLong;
+      // size_t is unsigned int on FreeBSD.
+      if (getTriple().getOS() != llvm::Triple::FreeBSD)
+        SizeType = UnsignedLong;
 
       // Revert to using SignedInt on apcs-gnu to comply with existing behaviour.
       WCharType = SignedInt;

Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Dec 23 20:39:03 2012	(r244639)
+++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp	Sun Dec 23 21:41:39 2012	(r244640)
@@ -1667,6 +1667,19 @@ Tool &FreeBSD::SelectTool(const Compilat
   return *T;
 }
 
+bool FreeBSD::UseSjLjExceptions() const {
+  // FreeBSD uses SjLj exceptions on ARM oabi.
+  switch (getTriple().getEnvironment()) {
+  case llvm::Triple::GNUEABI:
+  case llvm::Triple::EABI:
+    return false;
+
+  default:
+    return (getTriple().getArch() == llvm::Triple::arm ||
+            getTriple().getArch() == llvm::Triple::thumb);
+  }
+}
+
 /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
 
 NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)

Modified: head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Sun Dec 23 20:39:03 2012	(r244639)
+++ head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Sun Dec 23 21:41:39 2012	(r244640)
@@ -468,6 +468,7 @@ public:
 
   virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
                            const ActionList &Inputs) const;
+  virtual bool UseSjLjExceptions() const;
 };
 
 class LLVM_LIBRARY_VISIBILITY NetBSD : public Generic_ELF {

Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Dec 23 20:39:03 2012	(r244639)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Dec 23 21:41:39 2012	(r244640)
@@ -665,6 +665,11 @@ static StringRef getARMFloatABI(const Dr
       break;
     }
 
+    case llvm::Triple::FreeBSD:
+      // FreeBSD defaults to soft float
+      FloatABI = "soft";
+      break;
+
     default:
       switch(Triple.getEnvironment()) {
       case llvm::Triple::GNUEABIHF:
@@ -5422,6 +5427,17 @@ void freebsd::Assemble::ConstructJob(Com
          LastPICArg->getOption().matches(options::OPT_fpie))) {
       CmdArgs.push_back("-KPIC");
     }
+  } else if (getToolChain().getArch() == llvm::Triple::arm ||
+             getToolChain().getArch() == llvm::Triple::thumb) {
+    CmdArgs.push_back("-mfpu=softvfp");
+    switch(getToolChain().getTriple().getEnvironment()) {
+    case llvm::Triple::GNUEABI:
+    case llvm::Triple::EABI:
+      break;
+
+    default:
+      CmdArgs.push_back("-matpcs");
+    }
   }
 
   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 22:41:55 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2DD31F75;
 Sun, 23 Dec 2012 22:41:55 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 11E778FC0A;
 Sun, 23 Dec 2012 22:41:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNMfsAq081431;
 Sun, 23 Dec 2012 22:41:54 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNMfsg6081430;
 Sun, 23 Dec 2012 22:41:54 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201212232241.qBNMfsg6081430@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sun, 23 Dec 2012 22:41:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244642 - head/release/picobsd/build
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 22:41:55 -0000

Author: luigi
Date: Sun Dec 23 22:41:54 2012
New Revision: 244642
URL: http://svnweb.freebsd.org/changeset/base/244642

Log:
  enable building picobsd with CC instead of CLANG

Modified:
  head/release/picobsd/build/picobsd

Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd	Sun Dec 23 22:13:53 2012	(r244641)
+++ head/release/picobsd/build/picobsd	Sun Dec 23 22:41:54 2012	(r244642)
@@ -445,6 +445,8 @@ do_kernel() {		# OK
 	${BINMAKE} ${o_par} KERNCONF=${l_kernconf}	\
 		-v -f ${PICO_TREE}/build/Makefile.conf ) || \
 	    fail $? missing_kernel
+#		-DWITHOUT_CLANG_IS_CC			\
+
 }
 
 # Populate the variable part of the floppy filesystem. Must be done before
@@ -973,6 +975,7 @@ set_build_parameters() {
     if [ ${OSVERSION} -ge 500035 ] ; then
 	export MAKEOBJDIRPREFIX=${l_objtree}
 	export TARGET_ARCH=${o_arch} TARGET=${o_arch}
+	export WITHOUT_CLANG_IS_CC=1
 	# XXX why change machine_arch ?
 	#-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m`
 	# export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers"

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 22:43:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8709117E;
 Sun, 23 Dec 2012 22:43:28 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 51C718FC19;
 Sun, 23 Dec 2012 22:43:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNMhSvT081677;
 Sun, 23 Dec 2012 22:43:28 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNMhRFt081673;
 Sun, 23 Dec 2012 22:43:27 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201212232243.qBNMhRFt081673@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 23 Dec 2012 22:43:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244643 - in head/sys: fs/devfs kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 22:43:28 -0000

Author: kib
Date: Sun Dec 23 22:43:27 2012
New Revision: 244643
URL: http://svnweb.freebsd.org/changeset/base/244643

Log:
  Do not force a writer to the devfs file to drain the buffer writes.
  
  Requested and tested by:	Ian Lepore <freebsd@damnhippie.dyndns.org>
  MFC after:	2 weeks

Modified:
  head/sys/fs/devfs/devfs_vnops.c
  head/sys/kern/sys_generic.c
  head/sys/sys/file.h

Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c	Sun Dec 23 22:41:54 2012	(r244642)
+++ head/sys/fs/devfs/devfs_vnops.c	Sun Dec 23 22:43:27 2012	(r244643)
@@ -1049,6 +1049,7 @@ devfs_open(struct vop_open_args *ap)
 	int error, ref, vlocked;
 	struct cdevsw *dsw;
 	struct file *fpop;
+	struct mtx *mtxp;
 
 	if (vp->v_type == VBLK)
 		return (ENXIO);
@@ -1099,6 +1100,16 @@ devfs_open(struct vop_open_args *ap)
 #endif
 	if (fp->f_ops == &badfileops)
 		finit(fp, fp->f_flag, DTYPE_VNODE, dev, &devfs_ops_f);
+	mtxp = mtx_pool_find(mtxpool_sleep, fp);
+
+	/*
+	 * Hint to the dofilewrite() to not force the buffer draining
+	 * on the writer to the file.  Most likely, the write would
+	 * not need normal buffers.
+	 */
+	mtx_lock(mtxp);
+	fp->f_vnread_flags |= FDEVFS_VNODE;
+	mtx_unlock(mtxp);
 	return (error);
 }
 

Modified: head/sys/kern/sys_generic.c
==============================================================================
--- head/sys/kern/sys_generic.c	Sun Dec 23 22:41:54 2012	(r244642)
+++ head/sys/kern/sys_generic.c	Sun Dec 23 22:43:27 2012	(r244643)
@@ -536,7 +536,8 @@ dofilewrite(td, fd, fp, auio, offset, fl
 		ktruio = cloneuio(auio);
 #endif
 	cnt = auio->uio_resid;
-	if (fp->f_type == DTYPE_VNODE)
+	if (fp->f_type == DTYPE_VNODE &&
+	    (fp->f_vnread_flags & FDEVFS_VNODE) == 0)
 		bwillwrite();
 	if ((error = fo_write(fp, auio, td->td_ucred, flags, td))) {
 		if (auio->uio_resid != cnt && (error == ERESTART ||

Modified: head/sys/sys/file.h
==============================================================================
--- head/sys/sys/file.h	Sun Dec 23 22:41:54 2012	(r244642)
+++ head/sys/sys/file.h	Sun Dec 23 22:43:27 2012	(r244643)
@@ -178,7 +178,8 @@ struct file {
 #define	f_advice	f_vnun.fvn_advice
 
 #define	FOFFSET_LOCKED       0x1
-#define	FOFFSET_LOCK_WAITING 0x2		 
+#define	FOFFSET_LOCK_WAITING 0x2
+#define	FDEVFS_VNODE	     0x4
 
 #endif /* _KERNEL || _WANT_FILE */
 

From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 23:03:45 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B29C2715;
 Sun, 23 Dec 2012 23:03:45 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 952428FC0A;
 Sun, 23 Dec 2012 23:03:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBNN3j7i084786;
 Sun, 23 Dec 2012 23:03:45 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNN3jBD084785;
 Sun, 23 Dec 2012 23:03:45 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201212232303.qBNN3jBD084785@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sun, 23 Dec 2012 23:03:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244644 - head/tools/tools/netrate/netreceive
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 23:03:45 -0000

Author: luigi
Date: Sun Dec 23 23:03:45 2012
New Revision: 244644
URL: http://svnweb.freebsd.org/changeset/base/244644

Log:
  small cleanup of the code, and add support for running multiple
  threads on each socket.

Modified:
  head/tools/tools/netrate/netreceive/netreceive.c

Modified: head/tools/tools/netrate/netreceive/netreceive.c
==============================================================================
--- head/tools/tools/netrate/netreceive/netreceive.c	Sun Dec 23 22:43:27 2012	(r244643)
+++ head/tools/tools/netrate/netreceive/netreceive.c	Sun Dec 23 23:03:45 2012	(r244644)
@@ -43,27 +43,158 @@
 
 #define MAXSOCK 20
 
+#include <pthread.h>
+#include <fcntl.h>
+#include <time.h>	/* clock_getres() */
+
+static int round_to(int n, int l)
+{
+	return ((n + l - 1)/l)*l;
+}
+
+/*
+ * Each socket uses multiple threads so the receiver is
+ * more efficient. A collector thread runs the stats.
+ */
+struct td_desc {
+	pthread_t td_id;
+	uint64_t count;	/* rx counter */
+	int fd;
+	char *buf;
+	int buflen;
+};
+
 static void
 usage(void)
 {
 
-	fprintf(stderr, "netreceive [port]\n");
+	fprintf(stderr, "netreceive port [nthreads]\n");
 	exit(-1);
 }
 
+static __inline void
+timespec_add(struct timespec *tsa, struct timespec *tsb)
+{
+
+        tsa->tv_sec += tsb->tv_sec;
+        tsa->tv_nsec += tsb->tv_nsec;
+        if (tsa->tv_nsec >= 1000000000) {
+                tsa->tv_sec++;
+                tsa->tv_nsec -= 1000000000;
+        }
+}
+
+static __inline void
+timespec_sub(struct timespec *tsa, struct timespec *tsb)
+{
+
+        tsa->tv_sec -= tsb->tv_sec;
+        tsa->tv_nsec -= tsb->tv_nsec;
+        if (tsa->tv_nsec < 0) {
+                tsa->tv_sec--;
+                tsa->tv_nsec += 1000000000;
+        }
+}
+
+static void *
+rx_body(void *data)
+{
+	struct td_desc *t = data;
+	struct pollfd fds;
+	int y;
+
+	fds.fd = t->fd;
+	fds.events = POLLIN;
+
+	for (;;) {
+		if (poll(&fds, 1, -1) < 0) 
+			perror("poll on thread");
+		if (!(fds.revents & POLLIN))
+			continue;
+		for (;;) {
+			y = recv(t->fd, t->buf, t->buflen, MSG_DONTWAIT);
+			if (y < 0)
+				break;
+			t->count++;
+		}
+	}
+	return NULL;
+}
+
+int
+make_threads(struct td_desc **tp, int *s, int nsock, int nthreads)
+{
+	int i, si, nt = nsock * nthreads;
+	int lb = round_to(nt * sizeof (struct td_desc *), 64);
+	int td_len = round_to(sizeof(struct td_desc), 64); // cache align
+	char *m = calloc(1, lb + td_len * nt);
+
+	printf("td len %d -> %d\n", (int)sizeof(struct td_desc) , td_len);
+	/* pointers plus the structs */
+	if (m == NULL) {
+		perror("no room for pointers!");
+		exit(1);
+	}
+	tp = (struct td_desc **)m;
+	m += lb;	/* skip the pointers */
+	for (si = i = 0; i < nt; i++, m += td_len) {
+		tp[i] = (struct td_desc *)m;
+		tp[i]->fd = s[si];
+		if (++si == nsock)
+			si = 0;
+		if (pthread_create(&tp[i]->td_id, NULL, rx_body, tp[i])) {
+			perror("unable to create thread");
+			exit(1);
+		}
+	}
+}
+
+int
+main_thread(struct td_desc **tp, int nsock, int nthreads)
+{
+	uint64_t c0, c1;
+	struct timespec now, then, delta;
+	/* now the parent collects and prints results */
+	c0 = c1 = 0;
+	clock_gettime(CLOCK_REALTIME, &then);
+	fprintf(stderr, "start at %ld.%09ld\n", then.tv_sec, then.tv_nsec);
+	while (1) {
+		int i, nt = nsock * nthreads;
+		int64_t dn;
+		uint64_t pps;
+
+		if (poll(NULL, 0, 500) < 0) 
+			perror("poll");
+		c0 = 0;
+		for (i = 0; i < nt; i++) {
+			c0 += tp[i]->count;
+		}
+		dn = c0 - c1;
+		clock_gettime(CLOCK_REALTIME, &now);
+		delta = now;
+		timespec_sub(&delta, &then);
+		then = now;
+		pps = dn;
+		pps = (pps * 1000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1);
+		fprintf(stderr, "%d pkts in %ld.%09ld ns %ld pps\n",
+			(int)dn, delta.tv_sec, delta.tv_nsec, (long)pps);
+		c1 = c0;
+	}
+}
+
 int
 main(int argc, char *argv[])
 {
 	struct addrinfo hints, *res, *res0;
 	char *dummy, *packet;
 	int port;
-	int error, v, i;
+	int error, v, nthreads = 1;
+	struct td_desc **tp;
 	const char *cause = NULL;
 	int s[MAXSOCK];
-	struct pollfd fds[MAXSOCK];
 	int nsock;
 
-	if (argc != 2)
+	if (argc < 2)
 		usage();
 
 	memset(&hints, 0, sizeof(hints));
@@ -74,6 +205,10 @@ main(int argc, char *argv[])
 	port = strtoul(argv[1], &dummy, 10);
 	if (port < 1 || port > 65535 || *dummy != '\0')
 		usage();
+	if (argc > 2)
+		nthreads = strtoul(argv[2], &dummy, 10);
+	if (nthreads < 1 || nthreads > 64)
+		usage();
 
 	packet = malloc(65536);
 	if (packet == NULL) {
@@ -110,9 +245,6 @@ main(int argc, char *argv[])
 			continue;
 		}
 		(void) listen(s[nsock], 5);
-		fds[nsock].fd = s[nsock];
-		fds[nsock].events = POLLIN;
-
 		nsock++;
 	}
 	if (nsock == 0) {
@@ -121,21 +253,12 @@ main(int argc, char *argv[])
 		/*NOTREACHED*/
 	}
 
-	printf("netreceive listening on UDP port %d\n", (u_short)port);
+	printf("netreceive %d sockets x %d threads listening on UDP port %d\n",
+		nsock, nthreads, (u_short)port);
+
+	make_threads(tp, s, nsock, nthreads);
+	main_thread(tp, nsock, nthreads);
 
-	while (1) {
-		if (poll(fds, nsock, -1) < 0) 
-			perror("poll");
-		for (i = 0; i < nsock; i++) {
-			if (fds[i].revents & POLLIN) {
-				if (recv(s[i], packet, 65536, 0) < 0)
-					perror("recv");
-			}
-			if ((fds[i].revents &~ POLLIN) != 0)
-				perror("poll");
-		}
-	}
-	
 	/*NOTREACHED*/
 	freeaddrinfo(res0);
 }

From owner-svn-src-head@FreeBSD.ORG  Mon Dec 24 10:10:19 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 86A97976;
 Mon, 24 Dec 2012 10:10:19 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6B3978FC0C;
 Mon, 24 Dec 2012 10:10:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBOAAJS3083386;
 Mon, 24 Dec 2012 10:10:19 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBOAAIHe083382;
 Mon, 24 Dec 2012 10:10:18 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201212241010.qBOAAIHe083382@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 24 Dec 2012 10:10:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244650 - in head/sys/dev/usb: . storage wlan
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Dec 2012 10:10:19 -0000

Author: hselasky
Date: Mon Dec 24 10:10:18 2012
New Revision: 244650
URL: http://svnweb.freebsd.org/changeset/base/244650

Log:
  Fix more regression issue after r244503.
  
  usbd_transfer_setup() does not set a default length for USB transfers.
  Only the number of frames is automatically setup.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/storage/ustorage_fs.c
  head/sys/dev/usb/usb_msctest.c
  head/sys/dev/usb/wlan/if_urtw.c

Modified: head/sys/dev/usb/storage/ustorage_fs.c
==============================================================================
--- head/sys/dev/usb/storage/ustorage_fs.c	Mon Dec 24 01:00:36 2012	(r244649)
+++ head/sys/dev/usb/storage/ustorage_fs.c	Mon Dec 24 10:10:18 2012	(r244650)
@@ -603,6 +603,8 @@ tr_setup:
 			usbd_xfer_set_stall(xfer);
 			DPRINTF("stall pipe\n");
 		}
+		usbd_xfer_set_frame_len(xfer, 0,
+		    sizeof(ustorage_fs_bbb_cbw_t));
 		usbd_transfer_submit(xfer);
 		break;
 
@@ -827,6 +829,8 @@ tr_setup:
 			sc->sc_transfer.data_error = 0;
 			usbd_xfer_set_stall(xfer);
 		}
+		usbd_xfer_set_frame_len(xfer, 0,
+		    sizeof(ustorage_fs_bbb_csw_t));
 		usbd_transfer_submit(xfer);
 		break;
 

Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c	Mon Dec 24 01:00:36 2012	(r244649)
+++ head/sys/dev/usb/usb_msctest.c	Mon Dec 24 10:10:18 2012	(r244650)
@@ -300,6 +300,8 @@ bbb_command_callback(struct usb_xfer *xf
 			sc->cbw->bCDBLength = sizeof(sc->cbw->CBWCDB);
 			DPRINTFN(0, "Truncating long command\n");
 		}
+		usbd_xfer_set_frame_len(xfer, 0,
+		    sizeof(struct bbb_cbw));
 		usbd_transfer_submit(xfer);
 		break;
 
@@ -386,7 +388,7 @@ bbb_data_write_callback(struct usb_xfer 
 
 		if (sc->data_rem == 0) {
 			bbb_transfer_start(sc, ST_STATUS);
-			return;
+			break;
 		}
 		if (max_bulk > sc->data_rem) {
 			max_bulk = sc->data_rem;
@@ -394,7 +396,7 @@ bbb_data_write_callback(struct usb_xfer 
 		usbd_xfer_set_timeout(xfer, sc->data_timeout);
 		usbd_xfer_set_frame_data(xfer, 0, sc->data_ptr, max_bulk);
 		usbd_transfer_submit(xfer);
-		return;
+		break;
 
 	default:			/* Error */
 		if (error == USB_ERR_CANCELLED) {
@@ -402,8 +404,7 @@ bbb_data_write_callback(struct usb_xfer 
 		} else {
 			bbb_transfer_start(sc, ST_DATA_WR_CS);
 		}
-		return;
-
+		break;
 	}
 }
 
@@ -438,6 +439,8 @@ bbb_status_callback(struct usb_xfer *xfe
 		break;
 
 	case USB_ST_SETUP:
+		usbd_xfer_set_frame_len(xfer, 0,
+		    sizeof(struct bbb_csw));
 		usbd_transfer_submit(xfer);
 		break;
 

Modified: head/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtw.c	Mon Dec 24 01:00:36 2012	(r244649)
+++ head/sys/dev/usb/wlan/if_urtw.c	Mon Dec 24 10:10:18 2012	(r244650)
@@ -4127,6 +4127,7 @@ urtw_bulk_tx_status_callback(struct usb_
 	case USB_ST_SETUP:
 setup:
 		memcpy(dma_buf, &sc->sc_txstatus, sizeof(uint64_t));
+		usbd_xfer_set_frame_len(xfer, 0, sizeof(uint64_t));
 		usbd_transfer_submit(xfer);
 		break;
 	default:

From owner-svn-src-head@FreeBSD.ORG  Mon Dec 24 21:19:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AD5949CC;
 Mon, 24 Dec 2012 21:19:30 +0000 (UTC)
 (envelope-from peter@rulingia.com)
Received: from vps.rulingia.com (host-122-100-2-194.octopus.com.au
 [122.100.2.194])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B3D88FC0A;
 Mon, 24 Dec 2012 21:19:29 +0000 (UTC)
Received: from server.rulingia.com
 (c220-239-254-207.belrs5.nsw.optusnet.com.au [220.239.254.207])
 by vps.rulingia.com (8.14.5/8.14.5) with ESMTP id qBOLJQ5O094702
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
 Tue, 25 Dec 2012 08:19:27 +1100 (EST)
 (envelope-from peter@rulingia.com)
X-Bogosity: Ham, spamicity=0.000000
Received: from server.rulingia.com (localhost.rulingia.com [127.0.0.1])
 by server.rulingia.com (8.14.5/8.14.5) with ESMTP id qBOLJLMU058127
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Tue, 25 Dec 2012 08:19:21 +1100 (EST)
 (envelope-from peter@server.rulingia.com)
Received: (from peter@localhost)
 by server.rulingia.com (8.14.5/8.14.5/Submit) id qBOLJLLu058126;
 Tue, 25 Dec 2012 08:19:21 +1100 (EST) (envelope-from peter)
Date: Tue, 25 Dec 2012 08:19:21 +1100
From: Peter Jeremy <peter@rulingia.com>
To: Olivier Houchard <cognet@FreeBSD.org>
Subject: Re: svn commit: r244469 - head/sys/arm/arm
Message-ID: <20121224211921.GA54928@server.rulingia.com>
References: <201212200035.qBK0ZRU0022739@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="bg08WKrSYDhXBjb5"
Content-Disposition: inline
In-Reply-To: <201212200035.qBK0ZRU0022739@svn.freebsd.org>
X-PGP-Key: http://www.rulingia.com/keys/peter.pgp
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Dec 2012 21:19:30 -0000


--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 2012-Dec-20 00:35:27 +0000, Olivier Houchard <cognet@FreeBSD.org> wrote:
>Author: cognet
>Date: Thu Dec 20 00:35:26 2012
>New Revision: 244469
>URL: http://svnweb.freebsd.org/changeset/base/244469
>
>Log:
>  Use the new allocator in bus_dmamem_alloc().
>
>Modified:
>  head/sys/arm/arm/busdma_machdep-v6.c

Do you have any plans to make similar changes to the other busdma_machdep.c
files?

--=20
Peter Jeremy

--bg08WKrSYDhXBjb5
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDYxtkACgkQ/opHv/APuIf7AgCgh1BUF8CzN1Eqey2PKU388N05
jEcAnj22bXpzW/2x0E9pLk3+e+mPE08V
=CAGL
-----END PGP SIGNATURE-----

--bg08WKrSYDhXBjb5--

From owner-svn-src-head@FreeBSD.ORG  Mon Dec 24 21:35:49 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 85167DD4;
 Mon, 24 Dec 2012 21:35:49 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 69B9A8FC12;
 Mon, 24 Dec 2012 21:35:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBOLZnlx085021;
 Mon, 24 Dec 2012 21:35:49 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBOLZnF8085020;
 Mon, 24 Dec 2012 21:35:49 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212242135.qBOLZnF8085020@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 24 Dec 2012 21:35:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244665 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Dec 2012 21:35:49 -0000

Author: glebius
Date: Mon Dec 24 21:35:48 2012
New Revision: 244665
URL: http://svnweb.freebsd.org/changeset/base/244665

Log:
  Minor style(9) changes:
  - Remove declaration in initializer.
  - Add empty line between logical blocks.

Modified:
  head/sys/netinet/in.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Mon Dec 24 20:33:37 2012	(r244664)
+++ head/sys/netinet/in.c	Mon Dec 24 21:35:48 2012	(r244665)
@@ -799,7 +799,7 @@ in_ifinit(struct ifnet *ifp, struct in_i
     int masksupplied, int vhid)
 {
 	register u_long i = ntohl(sin->sin_addr.s_addr);
-	int flags = RTF_UP, error = 0;
+	int flags, error = 0;
 
 	IN_IFADDR_WLOCK();
 	if (ia->ia_addr.sin_family == AF_INET)
@@ -843,9 +843,11 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	}
 	ia->ia_subnet = i & ia->ia_subnetmask;
 	in_socktrim(&ia->ia_sockmask);
+
 	/*
 	 * Add route for the network.
 	 */
+	flags = RTF_UP;
 	ia->ia_ifa.ifa_metric = ifp->if_metric;
 	if (ifp->if_flags & IFF_BROADCAST) {
 		if (ia->ia_subnetmask == IN_RFC3021_MASK)

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 07:29:26 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1A34BB53;
 Tue, 25 Dec 2012 07:29:26 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F12B08FC0C;
 Tue, 25 Dec 2012 07:29:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBP7TPM0010319;
 Tue, 25 Dec 2012 07:29:25 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBP7TPGo010317;
 Tue, 25 Dec 2012 07:29:25 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201212250729.qBP7TPGo010317@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Tue, 25 Dec 2012 07:29:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244672 - head/tools/tools/netrate/netreceive
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 07:29:26 -0000

Author: luigi
Date: Tue Dec 25 07:29:25 2012
New Revision: 244672
URL: http://svnweb.freebsd.org/changeset/base/244672

Log:
  various connections to last commit

Modified:
  head/tools/tools/netrate/netreceive/Makefile
  head/tools/tools/netrate/netreceive/netreceive.c

Modified: head/tools/tools/netrate/netreceive/Makefile
==============================================================================
--- head/tools/tools/netrate/netreceive/Makefile	Tue Dec 25 06:07:34 2012	(r244671)
+++ head/tools/tools/netrate/netreceive/Makefile	Tue Dec 25 07:29:25 2012	(r244672)
@@ -4,5 +4,6 @@
 
 PROG=	netreceive
 NO_MAN=
+LDFLAGS += -lpthread
 
 .include <bsd.prog.mk>

Modified: head/tools/tools/netrate/netreceive/netreceive.c
==============================================================================
--- head/tools/tools/netrate/netreceive/netreceive.c	Tue Dec 25 06:07:34 2012	(r244671)
+++ head/tools/tools/netrate/netreceive/netreceive.c	Tue Dec 25 07:29:25 2012	(r244672)
@@ -59,6 +59,7 @@ static int round_to(int n, int l)
 struct td_desc {
 	pthread_t td_id;
 	uint64_t count;	/* rx counter */
+	uint64_t byte_count;	/* rx byte counter */
 	int fd;
 	char *buf;
 	int buflen;
@@ -116,18 +117,20 @@ rx_body(void *data)
 			if (y < 0)
 				break;
 			t->count++;
+			t->byte_count += y;
 		}
 	}
 	return NULL;
 }
 
-int
-make_threads(struct td_desc **tp, int *s, int nsock, int nthreads)
+static struct td_desc **
+make_threads(int *s, int nsock, int nthreads)
 {
 	int i, si, nt = nsock * nthreads;
 	int lb = round_to(nt * sizeof (struct td_desc *), 64);
 	int td_len = round_to(sizeof(struct td_desc), 64); // cache align
 	char *m = calloc(1, lb + td_len * nt);
+	struct td_desc **tp;
 
 	printf("td len %d -> %d\n", (int)sizeof(struct td_desc) , td_len);
 	/* pointers plus the structs */
@@ -140,6 +143,8 @@ make_threads(struct td_desc **tp, int *s
 	for (si = i = 0; i < nt; i++, m += td_len) {
 		tp[i] = (struct td_desc *)m;
 		tp[i]->fd = s[si];
+		tp[i]->buflen = 65536;
+		tp[i]->buf = calloc(1, tp[i]->buflen);
 		if (++si == nsock)
 			si = 0;
 		if (pthread_create(&tp[i]->td_id, NULL, rx_body, tp[i])) {
@@ -147,27 +152,29 @@ make_threads(struct td_desc **tp, int *s
 			exit(1);
 		}
 	}
+	return tp;
 }
 
-int
+static void
 main_thread(struct td_desc **tp, int nsock, int nthreads)
 {
-	uint64_t c0, c1;
+	uint64_t c0, c1, bc0, bc1;
 	struct timespec now, then, delta;
 	/* now the parent collects and prints results */
-	c0 = c1 = 0;
+	c0 = c1 = bc0 = bc1 = 0;
 	clock_gettime(CLOCK_REALTIME, &then);
 	fprintf(stderr, "start at %ld.%09ld\n", then.tv_sec, then.tv_nsec);
 	while (1) {
 		int i, nt = nsock * nthreads;
 		int64_t dn;
-		uint64_t pps;
+		uint64_t pps, bps;
 
 		if (poll(NULL, 0, 500) < 0) 
 			perror("poll");
-		c0 = 0;
+		c0 = bc0 = 0;
 		for (i = 0; i < nt; i++) {
 			c0 += tp[i]->count;
+			bc0 += tp[i]->byte_count;
 		}
 		dn = c0 - c1;
 		clock_gettime(CLOCK_REALTIME, &now);
@@ -176,9 +183,12 @@ main_thread(struct td_desc **tp, int nso
 		then = now;
 		pps = dn;
 		pps = (pps * 1000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1);
-		fprintf(stderr, "%d pkts in %ld.%09ld ns %ld pps\n",
-			(int)dn, delta.tv_sec, delta.tv_nsec, (long)pps);
+		bps = ((bc0 - bc1) * 8000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1);
+		fprintf(stderr, " %9ld pps %8.3f Mbps", (long)pps, .000001*bps);
+		fprintf(stderr, " - %d pkts in %ld.%09ld ns\n",
+			(int)dn, delta.tv_sec, delta.tv_nsec);
 		c1 = c0;
+		bc1 = bc0;
 	}
 }
 
@@ -256,7 +266,7 @@ main(int argc, char *argv[])
 	printf("netreceive %d sockets x %d threads listening on UDP port %d\n",
 		nsock, nthreads, (u_short)port);
 
-	make_threads(tp, s, nsock, nthreads);
+	tp = make_threads(s, nsock, nthreads);
 	main_thread(tp, nsock, nthreads);
 
 	/*NOTREACHED*/

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 07:37:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6F405D09;
 Tue, 25 Dec 2012 07:37:34 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 528F58FC12;
 Tue, 25 Dec 2012 07:37:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBP7bYwE011466;
 Tue, 25 Dec 2012 07:37:34 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBP7bYeh011465;
 Tue, 25 Dec 2012 07:37:34 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201212250737.qBP7bYeh011465@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 25 Dec 2012 07:37:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244673 - head/contrib/libstdc++/include/std
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 07:37:34 -0000

Author: andrew
Date: Tue Dec 25 07:37:33 2012
New Revision: 244673
URL: http://svnweb.freebsd.org/changeset/base/244673

Log:
  Fix the __glibcxx_min and __glibcxx_max macros for a signed wchar_t.
  
  * The __glibcxx_max macro came from GCC svn r138078, the last GPLv2
    revision of this file.
  * I wrote the updated __glibcxx_min macro.

Modified:
  head/contrib/libstdc++/include/std/std_limits.h

Modified: head/contrib/libstdc++/include/std/std_limits.h
==============================================================================
--- head/contrib/libstdc++/include/std/std_limits.h	Tue Dec 25 07:29:25 2012	(r244672)
+++ head/contrib/libstdc++/include/std/std_limits.h	Tue Dec 25 07:37:33 2012	(r244673)
@@ -134,10 +134,11 @@
 #define __glibcxx_signed(T)	((T)(-1) < 0)
 
 #define __glibcxx_min(T) \
-  (__glibcxx_signed (T) ? (T)1 << __glibcxx_digits (T) : (T)0)
+  (__glibcxx_signed (T) ? (((T)1 << (__glibcxx_digits (T) - 1)) << 1) : (T)0)
 
 #define __glibcxx_max(T) \
-  (__glibcxx_signed (T) ? ((T)1 << __glibcxx_digits (T)) - 1 : ~(T)0)
+  (__glibcxx_signed (T) ? \
+   (((((T)1 << (__glibcxx_digits (T) - 1)) - 1) << 1) + 1) : ~(T)0)
 
 #define __glibcxx_digits(T) \
   (sizeof(T) * __CHAR_BIT__ - __glibcxx_signed (T))

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 07:40:12 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 31094EA8;
 Tue, 25 Dec 2012 07:40:12 +0000 (UTC)
 (envelope-from luigi@onelab2.iet.unipi.it)
Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.59.238])
 by mx1.freebsd.org (Postfix) with ESMTP id DAD258FC14;
 Tue, 25 Dec 2012 07:40:10 +0000 (UTC)
Received: by onelab2.iet.unipi.it (Postfix, from userid 275)
 id 91D1D7300A; Tue, 25 Dec 2012 08:38:54 +0100 (CET)
Date: Tue, 25 Dec 2012 08:38:54 +0100
From: Luigi Rizzo <rizzo@iet.unipi.it>
To: Gleb Smirnoff <glebius@FreeBSD.org>
Subject: Re: svn commit: r244665 - head/sys/netinet
Message-ID: <20121225073854.GA16201@onelab2.iet.unipi.it>
References: <201212242135.qBOLZnF8085020@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201212242135.qBOLZnF8085020@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 07:40:12 -0000

On Mon, Dec 24, 2012 at 09:35:49PM +0000, Gleb Smirnoff wrote:
> Author: glebius
> Date: Mon Dec 24 21:35:48 2012
> New Revision: 244665
> URL: http://svnweb.freebsd.org/changeset/base/244665
> 
> Log:
>   Minor style(9) changes:
>   - Remove declaration in initializer.

i am really curious, what is the point of removing one
initialization out of three ?
(and if anything, the 'register' should have gone...)

cheers
luigi

>   - Add empty line between logical blocks.
> 
> Modified:
>   head/sys/netinet/in.c
> 
> Modified: head/sys/netinet/in.c
> ==============================================================================
> --- head/sys/netinet/in.c	Mon Dec 24 20:33:37 2012	(r244664)
> +++ head/sys/netinet/in.c	Mon Dec 24 21:35:48 2012	(r244665)
> @@ -799,7 +799,7 @@ in_ifinit(struct ifnet *ifp, struct in_i
>      int masksupplied, int vhid)
>  {
>  	register u_long i = ntohl(sin->sin_addr.s_addr);
> -	int flags = RTF_UP, error = 0;
> +	int flags, error = 0;
>  
>  	IN_IFADDR_WLOCK();
>  	if (ia->ia_addr.sin_family == AF_INET)
> @@ -843,9 +843,11 @@ in_ifinit(struct ifnet *ifp, struct in_i
>  	}
>  	ia->ia_subnet = i & ia->ia_subnetmask;
>  	in_socktrim(&ia->ia_sockmask);
> +
>  	/*
>  	 * Add route for the network.
>  	 */
> +	flags = RTF_UP;
>  	ia->ia_ifa.ifa_metric = ifp->if_metric;
>  	if (ifp->if_flags & IFF_BROADCAST) {
>  		if (ia->ia_subnetmask == IN_RFC3021_MASK)

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 08:16:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B7802454;
 Tue, 25 Dec 2012 08:16:01 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from smtp5.clear.net.nz (smtp5.clear.net.nz [203.97.33.68])
 by mx1.freebsd.org (Postfix) with ESMTP id 798B38FC12;
 Tue, 25 Dec 2012 08:16:00 +0000 (UTC)
Received: from mxin3-orange.clear.net.nz
 (lb2-srcnat.clear.net.nz [203.97.32.237])
 by smtp5.clear.net.nz (CLEAR Net Mail)
 with ESMTP id <0MFK002YBUYHOS20@smtp5.clear.net.nz>; Tue,
 25 Dec 2012 21:16:00 +1300 (NZDT)
Received: from 202-0-48-19.paradise.net.nz (HELO localhost) ([202.0.48.19])
 by smtpin32.paradise.net.nz with ESMTP; Tue, 25 Dec 2012 21:15:59 +1300
Date: Tue, 25 Dec 2012 21:15:47 +1300
From: Andrew Turner <andrew@fubar.geek.nz>
Subject: Re: svn commit: r244673 - head/contrib/libstdc++/include/std
In-reply-to: <201212250737.qBP7bYeh011465@svn.freebsd.org>
To: src-committers@freebsd.org
Message-id: <20121225211547.63d42295@fubar.geek.nz>
MIME-version: 1.0
X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.6; i386-portbld-freebsd8.1)
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
X-Pirate: Arrrr
References: <201212250737.qBP7bYeh011465@svn.freebsd.org>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 08:16:01 -0000

On Tue, 25 Dec 2012 07:37:34 +0000 (UTC)
Andrew Turner <andrew@FreeBSD.org> wrote:

> Author: andrew
> Date: Tue Dec 25 07:37:33 2012
> New Revision: 244673
> URL: http://svnweb.freebsd.org/changeset/base/244673
> 
> Log:
>   Fix the __glibcxx_min and __glibcxx_max macros for a signed wchar_t.
This should say:

Fix the __glibcxx_min and __glibcxx_max macros for an unsigned wchar_t.
The left shift's in the original version cause GCC to issue a warning:
warning: left shift count >= width of type

>   
>   * The __glibcxx_max macro came from GCC svn r138078, the last GPLv2
>     revision of this file.
>   * I wrote the updated __glibcxx_min macro.
> 
> Modified:
>   head/contrib/libstdc++/include/std/std_limits.h
> 
> Modified: head/contrib/libstdc++/include/std/std_limits.h
> ==============================================================================
> --- head/contrib/libstdc++/include/std/std_limits.h	Tue Dec 25
> 07:29:25 2012	(r244672) +++
> head/contrib/libstdc++/include/std/std_limits.h	Tue Dec 25
> 07:37:33 2012	(r244673) @@ -134,10 +134,11 @@ #define
> __glibcxx_signed(T)	((T)(-1) < 0) 
>  #define __glibcxx_min(T) \
> -  (__glibcxx_signed (T) ? (T)1 << __glibcxx_digits (T) : (T)0)
> +  (__glibcxx_signed (T) ? (((T)1 << (__glibcxx_digits (T) - 1)) <<
> 1) : (T)0) 
>  #define __glibcxx_max(T) \
> -  (__glibcxx_signed (T) ? ((T)1 << __glibcxx_digits (T)) - 1 : ~(T)0)
> +  (__glibcxx_signed (T) ? \
> +   (((((T)1 << (__glibcxx_digits (T) - 1)) - 1) << 1) + 1) : ~(T)0)
>  
>  #define __glibcxx_digits(T) \
>    (sizeof(T) * __CHAR_BIT__ - __glibcxx_signed (T))
> 
> 



From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 09:30:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4C429100;
 Tue, 25 Dec 2012 09:30:34 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2F9648FC16;
 Tue, 25 Dec 2012 09:30:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBP9UYuB027834;
 Tue, 25 Dec 2012 09:30:34 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBP9UPR7027776;
 Tue, 25 Dec 2012 09:30:25 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212250930.qBP9UPR7027776@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 25 Dec 2012 09:30:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244674 - in head/usr.sbin/bsdconfig: . console diskmgmt
 docsinstall mouse networking password security startup timezone ttys usermgmt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 09:30:34 -0000

Author: dteske
Date: Tue Dec 25 09:30:25 2012
New Revision: 244674
URL: http://svnweb.freebsd.org/changeset/base/244674

Log:
  Remove unnecessary duplicate initialization of the dialog(1) API (automatically
  bootstrapped on-include unless DIALOG_SELF_INITIALIZE is set to NO before-hand)

Modified:
  head/usr.sbin/bsdconfig/bsdconfig
  head/usr.sbin/bsdconfig/console/console
  head/usr.sbin/bsdconfig/console/font
  head/usr.sbin/bsdconfig/console/keymap
  head/usr.sbin/bsdconfig/console/repeat
  head/usr.sbin/bsdconfig/console/saver
  head/usr.sbin/bsdconfig/console/screenmap
  head/usr.sbin/bsdconfig/console/ttys
  head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  head/usr.sbin/bsdconfig/docsinstall/docsinstall
  head/usr.sbin/bsdconfig/mouse/disable
  head/usr.sbin/bsdconfig/mouse/enable
  head/usr.sbin/bsdconfig/mouse/flags
  head/usr.sbin/bsdconfig/mouse/mouse
  head/usr.sbin/bsdconfig/mouse/port
  head/usr.sbin/bsdconfig/mouse/type
  head/usr.sbin/bsdconfig/networking/defaultrouter
  head/usr.sbin/bsdconfig/networking/devices
  head/usr.sbin/bsdconfig/networking/hostname
  head/usr.sbin/bsdconfig/networking/nameservers
  head/usr.sbin/bsdconfig/networking/networking
  head/usr.sbin/bsdconfig/password/password
  head/usr.sbin/bsdconfig/security/kern_securelevel
  head/usr.sbin/bsdconfig/security/security
  head/usr.sbin/bsdconfig/startup/misc
  head/usr.sbin/bsdconfig/startup/rcadd
  head/usr.sbin/bsdconfig/startup/rcconf
  head/usr.sbin/bsdconfig/startup/rcdelete
  head/usr.sbin/bsdconfig/startup/rcedit
  head/usr.sbin/bsdconfig/startup/rcvar
  head/usr.sbin/bsdconfig/startup/startup
  head/usr.sbin/bsdconfig/timezone/timezone
  head/usr.sbin/bsdconfig/ttys/ttys
  head/usr.sbin/bsdconfig/usermgmt/groupadd
  head/usr.sbin/bsdconfig/usermgmt/groupdel
  head/usr.sbin/bsdconfig/usermgmt/groupedit
  head/usr.sbin/bsdconfig/usermgmt/groupinput
  head/usr.sbin/bsdconfig/usermgmt/useradd
  head/usr.sbin/bsdconfig/usermgmt/userdel
  head/usr.sbin/bsdconfig/usermgmt/useredit
  head/usr.sbin/bsdconfig/usermgmt/userinput
  head/usr.sbin/bsdconfig/usermgmt/usermgmt

Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 09:30:25 2012	(r244674)
@@ -225,7 +225,6 @@ shift $(( $OPTIND -1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_main_menu"
 
 [ "$SECURE" ] && f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/console
==============================================================================
--- head/usr.sbin/bsdconfig/console/console	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/console	Tue Dec 25 09:30:25 2012	(r244674)
@@ -102,7 +102,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_configuration"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/font
==============================================================================
--- head/usr.sbin/bsdconfig/console/font	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/font	Tue Dec 25 09:30:25 2012	(r244674)
@@ -110,7 +110,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_font"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/keymap
==============================================================================
--- head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 09:30:25 2012	(r244674)
@@ -150,7 +150,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_keymap"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/repeat
==============================================================================
--- head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 09:30:25 2012	(r244674)
@@ -100,7 +100,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_keyboard_repeat_rate"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/saver
==============================================================================
--- head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 09:30:25 2012	(r244674)
@@ -110,7 +110,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_screen_saver"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/screenmap
==============================================================================
--- head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 09:30:25 2012	(r244674)
@@ -102,7 +102,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_screenmap"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/console/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 09:30:25 2012	(r244674)
@@ -172,7 +172,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_console_terminal_type"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
==============================================================================
--- head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 09:30:25 2012	(r244674)
@@ -65,7 +65,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_mustberoot_init
 
 #

Modified: head/usr.sbin/bsdconfig/docsinstall/docsinstall
==============================================================================
--- head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 09:30:25 2012	(r244674)
@@ -65,7 +65,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_mustberoot_init
 
 #

Modified: head/usr.sbin/bsdconfig/mouse/disable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 09:30:25 2012	(r244674)
@@ -65,7 +65,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_mouse_disable"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/mouse/enable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 09:30:25 2012	(r244674)
@@ -65,7 +65,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_mouse_enable"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/mouse/flags
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 09:30:25 2012	(r244674)
@@ -65,7 +65,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_mouse_flags"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/mouse/mouse
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 09:30:25 2012	(r244674)
@@ -101,7 +101,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_please_configure_your_mouse"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/mouse/port
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 09:30:25 2012	(r244674)
@@ -102,7 +102,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_select_your_mouse_port_from_the_following_menu"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/mouse/type
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 09:30:25 2012	(r244674)
@@ -106,7 +106,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_select_a_protocol_type_for_your_mouse"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/networking/defaultrouter
==============================================================================
--- head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 09:30:25 2012	(r244674)
@@ -58,7 +58,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_default_router"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/networking/devices
==============================================================================
--- head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 09:30:25 2012	(r244674)
@@ -62,7 +62,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_networking_devices"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/networking/hostname
==============================================================================
--- head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 09:30:25 2012	(r244674)
@@ -58,7 +58,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_hostname_domain"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/networking/nameservers
==============================================================================
--- head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 09:30:25 2012	(r244674)
@@ -58,7 +58,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_dns_nameservers"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/networking/networking
==============================================================================
--- head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 09:30:25 2012	(r244674)
@@ -98,7 +98,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_network_management"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/password/password
==============================================================================
--- head/usr.sbin/bsdconfig/password/password	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/password/password	Tue Dec 25 09:30:25 2012	(r244674)
@@ -64,7 +64,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_root_password"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 09:30:25 2012	(r244674)
@@ -105,7 +105,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_securelevels_menu_title"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/security/security
==============================================================================
--- head/usr.sbin/bsdconfig/security/security	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/security/security	Tue Dec 25 09:30:25 2012	(r244674)
@@ -120,7 +120,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_system_security_options_menu"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 09:30:25 2012	(r244674)
@@ -285,7 +285,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_miscellaneous_startup_services"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/rcadd
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 09:30:25 2012	(r244674)
@@ -106,7 +106,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_add_startup_directive"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 09:30:25 2012	(r244674)
@@ -205,7 +205,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_view_edit_startup_configuration"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 09:30:25 2012	(r244674)
@@ -280,7 +280,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_delete_startup_directives"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/rcedit
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 09:30:25 2012	(r244674)
@@ -58,7 +58,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init
 

Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 09:30:25 2012	(r244674)
@@ -167,7 +167,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_toggle_startup_services"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/startup/startup
==============================================================================
--- head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 09:30:25 2012	(r244674)
@@ -99,7 +99,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_startup"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/timezone/timezone
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 09:30:25 2012	(r244674)
@@ -131,7 +131,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_time_zone"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/ttys/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 09:30:25 2012	(r244674)
@@ -76,7 +76,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_configure_ttys"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/groupadd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 09:30:25 2012	(r244674)
@@ -56,7 +56,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Chain-load to groupinput to centralize code and minimize duplication
 #
-f_dialog_init
 $BSDCFG_LIBE/$APP_DIR/groupinput ${USE_XDIALOG:+-X} mode="Add"
 
 ################################################################################

Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 09:30:25 2012	(r244674)
@@ -59,7 +59,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_delete $msg_group"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/groupedit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 09:30:25 2012	(r244674)
@@ -59,7 +59,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_edit_view $msg_group"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/groupinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 09:30:25 2012	(r244674)
@@ -148,7 +148,6 @@ f_dprintf "mode=[%s] group=[%s]" "$mode"
 #
 # Initialize
 #
-f_dialog_init
 dialog_title_update "$mode"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/useradd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 09:30:25 2012	(r244674)
@@ -56,7 +56,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Chain-load to userinput to centralize code and minimize duplication
 #
-f_dialog_init
 $BSDCFG_LIBE/$APP_DIR/userinput ${USE_XDIALOG:+-X} mode="Add"
 
 ################################################################################

Modified: head/usr.sbin/bsdconfig/usermgmt/userdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 09:30:25 2012	(r244674)
@@ -59,7 +59,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_delete $msg_login"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/useredit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 09:30:25 2012	(r244674)
@@ -59,7 +59,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_edit_view $msg_login"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 09:30:25 2012	(r244674)
@@ -229,7 +229,6 @@ f_dprintf "mode=[%s] user=[%s]" "$mode" 
 #
 # Initialize
 #
-f_dialog_init
 dialog_title_update "$mode"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

Modified: head/usr.sbin/bsdconfig/usermgmt/usermgmt
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 07:37:33 2012	(r244673)
+++ head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 09:30:25 2012	(r244674)
@@ -114,7 +114,6 @@ shift $(( $OPTIND - 1 ))
 #
 # Initialize
 #
-f_dialog_init
 f_dialog_title "$msg_login_management"
 f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 10:30:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CF0D060A;
 Tue, 25 Dec 2012 10:30:37 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id 4B90F8FC13;
 Tue, 25 Dec 2012 10:30:36 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBPAUSJO099433;
 Tue, 25 Dec 2012 14:30:28 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBPAUScD099432;
 Tue, 25 Dec 2012 14:30:28 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Tue, 25 Dec 2012 14:30:28 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Luigi Rizzo <rizzo@iet.unipi.it>
Subject: Re: svn commit: r244665 - head/sys/netinet
Message-ID: <20121225103028.GH80310@FreeBSD.org>
References: <201212242135.qBOLZnF8085020@svn.freebsd.org>
 <20121225073854.GA16201@onelab2.iet.unipi.it>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <20121225073854.GA16201@onelab2.iet.unipi.it>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 10:30:37 -0000

On Tue, Dec 25, 2012 at 08:38:54AM +0100, Luigi Rizzo wrote:
L> On Mon, Dec 24, 2012 at 09:35:49PM +0000, Gleb Smirnoff wrote:
L> > Author: glebius
L> > Date: Mon Dec 24 21:35:48 2012
L> > New Revision: 244665
L> > URL: http://svnweb.freebsd.org/changeset/base/244665
L> > 
L> > Log:
L> >   Minor style(9) changes:
L> >   - Remove declaration in initializer.
L> 
L> i am really curious, what is the point of removing one
L> initialization out of three ?
L> (and if anything, the 'register' should have gone...)

Just to make next commit more laconic.

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 10:47:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 964A4B3D;
 Tue, 25 Dec 2012 10:47:59 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 75FE28FC0C;
 Tue, 25 Dec 2012 10:47:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPAlxYw039038;
 Tue, 25 Dec 2012 10:47:59 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPAljFN038947;
 Tue, 25 Dec 2012 10:47:45 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212251047.qBPAljFN038947@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 25 Dec 2012 10:47:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244675 - in head/usr.sbin/bsdconfig: . console diskmgmt
 docsinstall dot mouse networking networking/share password password/share
 security share startup startup/share timezone timezone...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 10:47:59 -0000

Author: dteske
Date: Tue Dec 25 10:47:45 2012
New Revision: 244675
URL: http://svnweb.freebsd.org/changeset/base/244675

Log:
  Add more debugging to help with diagnosis of program-flow when needed.

Modified:
  head/usr.sbin/bsdconfig/bsdconfig
  head/usr.sbin/bsdconfig/console/console
  head/usr.sbin/bsdconfig/console/font
  head/usr.sbin/bsdconfig/console/keymap
  head/usr.sbin/bsdconfig/console/repeat
  head/usr.sbin/bsdconfig/console/saver
  head/usr.sbin/bsdconfig/console/screenmap
  head/usr.sbin/bsdconfig/console/ttys
  head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  head/usr.sbin/bsdconfig/docsinstall/docsinstall
  head/usr.sbin/bsdconfig/dot/dot
  head/usr.sbin/bsdconfig/mouse/disable
  head/usr.sbin/bsdconfig/mouse/enable
  head/usr.sbin/bsdconfig/mouse/flags
  head/usr.sbin/bsdconfig/mouse/mouse
  head/usr.sbin/bsdconfig/mouse/port
  head/usr.sbin/bsdconfig/mouse/type
  head/usr.sbin/bsdconfig/networking/defaultrouter
  head/usr.sbin/bsdconfig/networking/devices
  head/usr.sbin/bsdconfig/networking/hostname
  head/usr.sbin/bsdconfig/networking/nameservers
  head/usr.sbin/bsdconfig/networking/networking
  head/usr.sbin/bsdconfig/networking/share/common.subr
  head/usr.sbin/bsdconfig/networking/share/device.subr
  head/usr.sbin/bsdconfig/networking/share/hostname.subr
  head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
  head/usr.sbin/bsdconfig/networking/share/media.subr
  head/usr.sbin/bsdconfig/networking/share/netmask.subr
  head/usr.sbin/bsdconfig/networking/share/resolv.subr
  head/usr.sbin/bsdconfig/networking/share/routing.subr
  head/usr.sbin/bsdconfig/password/password
  head/usr.sbin/bsdconfig/password/share/password.subr
  head/usr.sbin/bsdconfig/security/kern_securelevel
  head/usr.sbin/bsdconfig/security/security
  head/usr.sbin/bsdconfig/share/common.subr
  head/usr.sbin/bsdconfig/share/dialog.subr
  head/usr.sbin/bsdconfig/share/mustberoot.subr
  head/usr.sbin/bsdconfig/share/strings.subr
  head/usr.sbin/bsdconfig/share/sysrc.subr
  head/usr.sbin/bsdconfig/startup/misc
  head/usr.sbin/bsdconfig/startup/rcadd
  head/usr.sbin/bsdconfig/startup/rcconf
  head/usr.sbin/bsdconfig/startup/rcdelete
  head/usr.sbin/bsdconfig/startup/rcedit
  head/usr.sbin/bsdconfig/startup/rcvar
  head/usr.sbin/bsdconfig/startup/share/rcconf.subr
  head/usr.sbin/bsdconfig/startup/share/rcedit.subr
  head/usr.sbin/bsdconfig/startup/share/rcvar.subr
  head/usr.sbin/bsdconfig/startup/startup
  head/usr.sbin/bsdconfig/timezone/share/continents.subr
  head/usr.sbin/bsdconfig/timezone/share/countries.subr
  head/usr.sbin/bsdconfig/timezone/share/iso3166.subr
  head/usr.sbin/bsdconfig/timezone/share/menus.subr
  head/usr.sbin/bsdconfig/timezone/share/zones.subr
  head/usr.sbin/bsdconfig/timezone/timezone
  head/usr.sbin/bsdconfig/ttys/ttys
  head/usr.sbin/bsdconfig/usermgmt/groupadd
  head/usr.sbin/bsdconfig/usermgmt/groupdel
  head/usr.sbin/bsdconfig/usermgmt/groupedit
  head/usr.sbin/bsdconfig/usermgmt/groupinput
  head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  head/usr.sbin/bsdconfig/usermgmt/useradd
  head/usr.sbin/bsdconfig/usermgmt/userdel
  head/usr.sbin/bsdconfig/usermgmt/useredit
  head/usr.sbin/bsdconfig/usermgmt/userinput
  head/usr.sbin/bsdconfig/usermgmt/usermgmt

Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/bsdconfig	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/strings.subr
@@ -232,15 +233,6 @@ f_dialog_title "$msg_main_menu"
 # Incorporate rc-file if it exists
 [ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
 
-#
-# Log our operating environment for debugging purposes
-#
-export UNAME_S="$(uname -s)" # Operating System (i.e. FreeBSD)
-export UNAME_P="$(uname -p)" # Processor Architecture (i.e. i386)
-export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE)
-f_dprintf "UNAME_S=[%s] UNAME_P=[%s] UNAME_R=[%s]" \
-          "$UNAME_S" "$UNAME_P" "$UNAME_R"
-
 cd $BSDCFG_LIBE || f_die 1 "$msg_directory_not_found" "$BSDCFG_LIBE"
 
 #

Modified: head/usr.sbin/bsdconfig/console/console
==============================================================================
--- head/usr.sbin/bsdconfig/console/console	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/console	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/console/font
==============================================================================
--- head/usr.sbin/bsdconfig/console/font	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/font	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/keymap
==============================================================================
--- head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/keymap	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/repeat
==============================================================================
--- head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/repeat	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/saver
==============================================================================
--- head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/saver	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/screenmap
==============================================================================
--- head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/screenmap	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/console/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/console/ttys	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
==============================================================================
--- head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/diskmgmt/diskmgmt	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/docsinstall/docsinstall
==============================================================================
--- head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/docsinstall/docsinstall	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/dot/dot
==============================================================================
--- head/usr.sbin/bsdconfig/dot/dot	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/dot/dot	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="dot"
 f_include_lang $BSDCFG_LIBE/include/messages.subr

Modified: head/usr.sbin/bsdconfig/mouse/disable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/disable	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/enable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/enable	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/flags
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/flags	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/mouse
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/mouse	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/mouse/port
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/port	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/mouse/type
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/mouse/type	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/networking/defaultrouter
==============================================================================
--- head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/defaultrouter	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/routing.subr

Modified: head/usr.sbin/bsdconfig/networking/devices
==============================================================================
--- head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/devices	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/networking/hostname
==============================================================================
--- head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/hostname	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/hostname.subr

Modified: head/usr.sbin/bsdconfig/networking/nameservers
==============================================================================
--- head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/nameservers	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/networking/resolv.subr

Modified: head/usr.sbin/bsdconfig/networking/networking
==============================================================================
--- head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/networking	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/networking/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/common.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/common.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -62,4 +62,8 @@ f_nfs_mounted()
 	[ "$( df -t nfs )" ]
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/common.subr
+
 fi # ! $_NETWORKING_COMMON_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/device.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/device.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_DEVICE_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/device.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -495,4 +496,8 @@ f_dialog_menu_netdev_edit()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/device.subr
+
 fi # ! $_NETWORKING_DEVICE_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/hostname.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/hostname.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_HOSTNAME_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/hostname.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -211,4 +212,8 @@ f_dialog_input_hostname()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/hostname.subr
+
 fi # ! $_NETWORKING_HOSTNAME_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_IPADDR_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/ipaddr.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -410,4 +411,8 @@ f_dialog_input_ipaddr()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/ipaddr.subr
+
 fi # ! $_NETWORKING_IPADDR_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/media.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/media.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/media.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_MEDIA_SUBR" ]; then
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/media.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/sysrc.subr
@@ -234,4 +235,8 @@ f_dialog_menu_media_options()
 	return $retval
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/media.subr
+
 fi # ! $_NETWORKING_MEDIA_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/netmask.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/netmask.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/netmask.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_NETMASK_SUBR" ]; th
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/netmask.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -209,4 +210,8 @@ f_dialog_input_netmask()
 	netmask="$_netmask"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/netmask.subr
+
 fi # ! $_NETWORKING_NETMASK_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/resolv.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/resolv.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_RESOLV_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/resolv.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -488,4 +489,8 @@ f_dialog_menu_nameservers()
 	done
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/resolv.subr
+
 fi # ! $_NETWORKING_RESOLV_SUBR

Modified: head/usr.sbin/bsdconfig/networking/share/routing.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/routing.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/networking/share/routing.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_NETWORKING_ROUTING_SUBR" ]; th
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." networking/routing.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/networking/common.subr
@@ -147,4 +148,8 @@ f_dialog_input_defaultrouter()
 	fi
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." networking/routing.subr
+
 fi # ! $_NETWORKING_ROUTING_SUBR

Modified: head/usr.sbin/bsdconfig/password/password
==============================================================================
--- head/usr.sbin/bsdconfig/password/password	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/password/password	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/password/password.subr

Modified: head/usr.sbin/bsdconfig/password/share/password.subr
==============================================================================
--- head/usr.sbin/bsdconfig/password/share/password.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/password/share/password.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; the
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." password/password.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password"
@@ -124,4 +125,8 @@ f_dialog_input_password()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." password/password.subr
+
 fi # ! $_PASSWORD_PASSWORD_SUBR

Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/security/security
==============================================================================
--- head/usr.sbin/bsdconfig/security/security	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/security/security	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/common.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -55,24 +55,25 @@ ARGV="$@"
 SUCCESS=0
 FAILURE=1
 
+#
+# Operating environment details
+#
+export UNAME_S="$(uname -s)" # Operating System (i.e. FreeBSD)
+export UNAME_P="$(uname -p)" # Processor Architecture (i.e. i386)
+export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE)
+
 ############################################################ FUNCTIONS
 
 #
-# This is an empty function by default, to use it, copy
-# /usr/share/examples/bsdconfig/bsdconfigrc to $HOME/.bsdconfigrc
+# Sensible debug function. Override in ~/.bsdconfigrc if desired.
+# See /usr/share/examples/bsdconfig/bsdconfigrc for example.
 #
 f_dprintf()
 {
-	: this page intentionally left blank
+	[ "$debug" ] || return $SUCCESS
+	local fmt="$1"; shift
+	printf "DEBUG: $fmt${fmt:+\n}" "$@" >&${TERMINAL_STDOUT_PASSTHRU:-1}
 }
-[ "$DEBUGGING" ] && f_dprintf()
-{
-	local fmt="$1"
-	shift
-	printf "$fmt${fmt:+\n}" "$@" \
-		>&${TERMINAL_STDOUT_PASSTHRU:-1}
-} &&
-	export DEBUGGING
 
 # f_err $fmt [ $opts ... ]
 #
@@ -510,4 +511,17 @@ trap '' SIGALRM SIGPROF SIGUSR1 SIGUSR2 
 eval exec $TERMINAL_STDOUT_PASSTHRU\>\&1
 eval exec $TERMINAL_STDERR_PASSTHRU\>\&2
 
+#
+# Make debugging persistant if set
+#
+[ "$debug" ] && export debug
+
+#
+# Log our operating environment for debugging purposes
+#
+f_dprintf "UNAME_S=[%s] UNAME_P=[%s] UNAME_R=[%s]" \
+          "$UNAME_S" "$UNAME_P" "$UNAME_R"
+
+f_dprintf "%s: Successfully loaded." common.subr
+
 fi # ! $_COMMON_SUBR

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_DIALOG_SUBR" ]; then _DIALOG_S
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -1473,13 +1474,19 @@ f_dialog_init()
 		DIALOG_BACKTITLE="$_DIALOG_TITLE"
 		unset _DIALOG_TITLE
 	fi
+
+	f_dprintf "f_dialog_init: dialog(1) API initialized."
 }
 
 ############################################################ MAIN
 
+f_dprintf "%s: DIALOG_SELF_INITIALIZE=[%s]" \
+          dialog.subr "$DIALOG_SELF_INITIALIZE"
 case "$DIALOG_SELF_INITIALIZE" in
 ""|0|[Nn][Oo]|[Oo][Ff][Ff]|[Ff][Aa][Ll][Ss][Ee]) : do nothing ;;
 *) f_dialog_init
 esac
 
+f_dprintf "%s: Successfully loaded." dialog.subr
+
 fi # ! $_DIALOG_SUBR

Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/mustberoot.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/mustberoot.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUST
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." mustberoot.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -419,4 +420,8 @@ f_mustberoot_init()
 	fi
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." mustberoot.subr
+
 fi # ! $_MUSTBEROOT_SUBR

Modified: head/usr.sbin/bsdconfig/share/strings.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/strings.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/strings.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -101,4 +101,6 @@ f_isinteger()
 	( : $((0/$arg)) ) > /dev/null 2>&1
 }
 
+f_dprintf "%s: Successfully loaded." strings.subr
+
 fi # ! $_STRINGS_SUBR

Modified: head/usr.sbin/bsdconfig/share/sysrc.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/sysrc.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/share/sysrc.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -32,7 +32,10 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 [ "$_COMMON_SUBR" ] || . $BSDCFG_SHARE/common.subr || exit 1
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-[ ! "$_SYSRC_JAILED" ] && f_include_lang $BSDCFG_LIBE/include/messages.subr
+if [ ! "$_SYSRC_JAILED" ]; then
+	f_dprintf "%s: loading includes..." sysrc.subr
+	f_include_lang $BSDCFG_LIBE/include/messages.subr
+fi
 
 ############################################################ CONFIGURATION
 
@@ -623,4 +626,8 @@ f_sysrc_delete()
 	done
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." sysrc.subr
+
 fi # ! $_SYSRC_SUBR

Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/misc	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcadd
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcadd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/startup/rcconf.subr

Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcconf	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcdelete	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/rcedit
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcedit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/startup/rcedit.subr

Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/rcvar	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/sysrc.subr

Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCCONF_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcconf.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
@@ -451,4 +452,8 @@ f_dialog_input_rcvar()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcconf.subr
+
 fi # ! $_STARTUP_RCCONF_SUBR

Modified: head/usr.sbin/bsdconfig/startup/share/rcedit.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcedit.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcedit.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcedit.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
@@ -81,4 +82,8 @@ f_dialog_rcedit()
 		f_show_msg "$err"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcedit.subr
+
 fi # ! $_STARTUP_RCEDIT_SUBR

Modified: head/usr.sbin/bsdconfig/startup/share/rcvar.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_STARTUP_RCVAR_SUBR" ]; then _S
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." startup/rcvar.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 ############################################################ CONFIGURATION
@@ -203,4 +204,8 @@ f_startup_rcvar_map()
 	mv "$tmpfile" "$STARTUP_RCVAR_MAP_CACHEFILE"
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." startup/rcvar.subr
+
 fi # ! $_STARTUP_RCVAR_SUBR

Modified: head/usr.sbin/bsdconfig/startup/startup
==============================================================================
--- head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/startup/startup	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/timezone/share/continents.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/continents.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/continents.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_CONTINENTS_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/continents.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
@@ -135,4 +136,8 @@ f_OCEANP()
 	esac
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/continents.subr
+
 fi # ! $_TIMEZONE_CONTINENTS_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/countries.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/countries.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/countries.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -75,4 +75,6 @@ f_sort_countries()
 	export COUNTRIES
 }
 
+f_dprintf "%s: Successfully loaded." timezone/countries.subr
+
 fi # ! $_TIMEZONE_COUNTRIES_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/iso3166.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/iso3166.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/iso3166.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_ISO3166_SUBR" ]; then
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/iso3166.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
@@ -194,4 +195,8 @@ f_read_iso3166_table()
 	            "$_PATH_ISO3166"            )
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/iso3166.subr
+
 fi # ! $_TIMEZONE_ISO3166_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/menus.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/menus.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/menus.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_MENUS_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/menus.subr
 f_include $BSDCFG_SHARE/dialog.subr
 
 ############################################################ GLOBALS
@@ -217,4 +218,8 @@ f_make_menus()
 	eval $( :| awk "$f_make_menus_awk" )
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/menus.subr
+
 fi # ! $_TIMEZONE_MENUS_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/share/zones.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/zones.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/share/zones.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@ if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." timezone/zones.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/timezone/continents.subr
 
@@ -667,4 +668,8 @@ f_set_zone_utc()
 	f_install_zoneinfo_file ""
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." timezone/zones.subr
+
 fi # ! $_TIMEZONE_ZONES_SUBR

Modified: head/usr.sbin/bsdconfig/timezone/timezone
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/timezone/timezone	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/strings.subr

Modified: head/usr.sbin/bsdconfig/ttys/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/ttys/ttys	Tue Dec 25 10:47:45 2012	(r244675)
@@ -30,6 +30,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

Modified: head/usr.sbin/bsdconfig/usermgmt/groupadd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupadd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"

Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/groupedit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupedit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/groupinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/groupinput	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@ if [ ! "$_USERMGMT_GROUP_INPUT_SUBR" ]; 
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." usermgmt/group_input.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
@@ -392,4 +393,8 @@ f_dialog_input_group_members()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." usermgmt/group_input.subr
+
 fi # ! $_USERMGMT_GROUP_INPUT_SUBR

Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@ if [ ! "$_USERMGMT_USER_INPUT_SUBR" ]; t
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." usermgmt/user_input.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/strings.subr
 
@@ -1025,4 +1026,8 @@ f_dialog_input_shell()
 	return $SUCCESS
 }
 
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." usermgmt/user_input.subr
+
 fi # ! $_USERMGMT_USER_INPUT_SUBR

Modified: head/usr.sbin/bsdconfig/usermgmt/useradd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/useradd	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"

Modified: head/usr.sbin/bsdconfig/usermgmt/userdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/userdel	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/useredit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/useredit	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/usermgmt
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 09:30:25 2012	(r244674)
+++ head/usr.sbin/bsdconfig/usermgmt/usermgmt	Tue Dec 25 10:47:45 2012	(r244675)
@@ -31,6 +31,7 @@
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 13:01:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5259783C;
 Tue, 25 Dec 2012 13:01:59 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1D0218FC0C;
 Tue, 25 Dec 2012 13:01:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPD1weH059214;
 Tue, 25 Dec 2012 13:01:58 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPD1wfA059212;
 Tue, 25 Dec 2012 13:01:58 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212251301.qBPD1wfA059212@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 25 Dec 2012 13:01:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244678 - in head/sys: netinet netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 13:01:59 -0000

Author: glebius
Date: Tue Dec 25 13:01:58 2012
New Revision: 244678
URL: http://svnweb.freebsd.org/changeset/base/244678

Log:
    The SIOCSIFFLAGS ioctl handler runs if_up()/if_down() that notify
  all interested parties in case if interface flag IFF_UP has changed.
  
    However, not only SIOCSIFFLAGS can raise the flag, but SIOCAIFADDR
  and SIOCAIFADDR_IN6 can, too. The actual |= is done not in the protocol
  code, but in code of interface drivers. To fix this historical layering
  violation, we will check whether ifp->if_ioctl(SIOCSIFADDR) raised the
  IFF_UP flag, and if it did, run the if_up() handler.
  
    This fixes configuring an address under CARP control on an interface
  that was initially !IFF_UP.
  
  P.S. I intentionally omitted handling the IFF_SMART flag. This flag was
  never ever used in any driver since it was introduced, and since it
  means another layering violation, it should be garbage collected instead
  of pretended to be supported.

Modified:
  head/sys/netinet/in.c
  head/sys/netinet6/in6.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Tue Dec 25 13:00:19 2012	(r244677)
+++ head/sys/netinet/in.c	Tue Dec 25 13:01:58 2012	(r244678)
@@ -819,14 +819,19 @@ in_ifinit(struct ifnet *ifp, struct in_i
 		return (error);
 
 	/*
-	 * Give the interface a chance to initialize
-	 * if this is its first address,
-	 * and to validate the address if necessary.
+	 * Give the interface a chance to initialize if this is its first
+	 * address, and to validate the address if necessary.
+	 *
+	 * Historically, drivers managed IFF_UP flag theirselves, so we
+	 * need to check whether driver did that.
 	 */
+	flags = ifp->if_flags;
 	if (ifp->if_ioctl != NULL &&
 	    (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia)) != 0)
 			/* LIST_REMOVE(ia, ia_hash) is done in in_control */
 			return (error);
+	if ((ifp->if_flags & IFF_UP) && (flags & IFF_UP) == 0)
+		if_up(ifp);
 
 	/*
 	 * Be compatible with network classes, if netmask isn't supplied,

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Tue Dec 25 13:00:19 2012	(r244677)
+++ head/sys/netinet6/in6.c	Tue Dec 25 13:01:58 2012	(r244678)
@@ -1874,9 +1874,18 @@ in6_ifinit(struct ifnet *ifp, struct in6
 	ia->ia_addr = *sin6;
 
 	if (ifacount <= 1 && ifp->if_ioctl) {
+		int flags;
+
+		/*
+		 * Historically, drivers managed IFF_UP flag theirselves, so we
+		 * need to check whether driver did that.
+		 */
+		flags = ifp->if_flags;
 		error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia);
 		if (error)
 			return (error);
+		if ((ifp->if_flags & IFF_UP) && (flags & IFF_UP) == 0)
+			if_up(ifp);
 	}
 
 	ia->ia_ifa.ifa_metric = ifp->if_metric;

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 13:43:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2C808DB2;
 Tue, 25 Dec 2012 13:43:02 +0000 (UTC)
 (envelope-from zont@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1041E8FC0A;
 Tue, 25 Dec 2012 13:43:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPDh15s065023;
 Tue, 25 Dec 2012 13:43:01 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPDh1aM065021;
 Tue, 25 Dec 2012 13:43:01 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201212251343.qBPDh1aM065021@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Tue, 25 Dec 2012 13:43:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244679 - head/lib/libc/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 13:43:02 -0000

Author: zont
Date: Tue Dec 25 13:43:01 2012
New Revision: 244679
URL: http://svnweb.freebsd.org/changeset/base/244679

Log:
  - Update manual pages accordingly to r244384 and r244385.
  
  Approved by:	kib (mentor)
  MFC after:	1 week

Modified:
  head/lib/libc/sys/mlock.2
  head/lib/libc/sys/mlockall.2

Modified: head/lib/libc/sys/mlock.2
==============================================================================
--- head/lib/libc/sys/mlock.2	Tue Dec 25 13:01:58 2012	(r244678)
+++ head/lib/libc/sys/mlock.2	Tue Dec 25 13:43:01 2012	(r244679)
@@ -28,7 +28,7 @@
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd July 27, 2010
+.Dd December 25, 2012
 .Dt MLOCK 2
 .Os
 .Sh NAME
@@ -94,12 +94,15 @@ limited in how much they can lock down.
 A single process can
 .Fn mlock
 the minimum of
-a system-wide ``wired pages'' limit and
-the per-process
+a system-wide ``wired pages'' limit
+.Va vm.max_wired
+and the per-process
 .Li RLIMIT_MEMLOCK
 resource limit.
 .Pp
-These calls are only available to the super-user.
+If
+.Va security.bsd.unprivileged_mlock
+is set to 0 these calls are only available to the super-user.
 .Sh RETURN VALUES
 .Rv -std
 .Pp
@@ -112,7 +115,8 @@ system call
 will fail if:
 .Bl -tag -width Er
 .It Bq Er EPERM
-The caller is not the super-user.
+.Va security.bsd.unprivileged_mlock
+is set to 0 and the caller is not the super-user.
 .It Bq Er EINVAL
 The address given is not page aligned or the length is negative.
 .It Bq Er EAGAIN
@@ -129,7 +133,8 @@ system call
 will fail if:
 .Bl -tag -width Er
 .It Bq Er EPERM
-The caller is not the super-user.
+.Va security.bsd.unprivileged_mlock
+is set to 0 and the caller is not the super-user.
 .It Bq Er EINVAL
 The address given is not page aligned or the length is negative.
 .It Bq Er ENOMEM

Modified: head/lib/libc/sys/mlockall.2
==============================================================================
--- head/lib/libc/sys/mlockall.2	Tue Dec 25 13:01:58 2012	(r244678)
+++ head/lib/libc/sys/mlockall.2	Tue Dec 25 13:43:01 2012	(r244679)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 27, 2010
+.Dd December 25, 2012
 .Dt MLOCKALL 2
 .Os
 .Sh NAME
@@ -68,11 +68,22 @@ Since physical memory is a potentially s
 limited in how much they can lock down.
 A single process can lock the minimum of a system-wide
 .Dq wired pages
-limit and the per-process
+limit
+.Va vm.max_wired
+and the per-process
 .Dv RLIMIT_MEMLOCK
 resource limit.
 .Pp
-These calls are only available to the super-user.
+If
+.Va security.bsd.unprivileged_mlock
+is set to 0 these calls are only available to the super-user.
+If
+.Va vm.old_mlock
+is set to 1 the per-process
+.Dv RLIMIT_MEMLOCK
+resource limit will not be applied for
+.Fn mlockall
+calls.
 .Pp
 The
 .Fn munlockall

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 13:55:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 31C261A8;
 Tue, 25 Dec 2012 13:55:22 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1430E8FC13;
 Tue, 25 Dec 2012 13:55:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPDtLxa066672;
 Tue, 25 Dec 2012 13:55:21 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPDtLvL066667;
 Tue, 25 Dec 2012 13:55:21 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212251355.qBPDtLvL066667@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 25 Dec 2012 13:55:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244680 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 13:55:22 -0000

Author: glebius
Date: Tue Dec 25 13:55:21 2012
New Revision: 244680
URL: http://svnweb.freebsd.org/changeset/base/244680

Log:
   Fix sysctl_handle_int() usage. Either arg1 or arg2 should be supplied,
  and arg2 doesn't pass size of arg1.

Modified:
  head/sys/netinet/tcp_reass.c
  head/sys/netinet/tcp_syncache.c

Modified: head/sys/netinet/tcp_reass.c
==============================================================================
--- head/sys/netinet/tcp_reass.c	Tue Dec 25 13:43:01 2012	(r244679)
+++ head/sys/netinet/tcp_reass.c	Tue Dec 25 13:55:21 2012	(r244680)
@@ -160,7 +160,7 @@ tcp_reass_sysctl_qsize(SYSCTL_HANDLER_AR
 	int qsize;
 
 	qsize = uma_zone_get_cur(V_tcp_reass_zone);
-	return (sysctl_handle_int(oidp, &qsize, sizeof(qsize), req));
+	return (sysctl_handle_int(oidp, &qsize, 0, req));
 }
 
 int

Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c	Tue Dec 25 13:43:01 2012	(r244679)
+++ head/sys/netinet/tcp_syncache.c	Tue Dec 25 13:55:21 2012	(r244680)
@@ -312,7 +312,7 @@ syncache_sysctl_count(SYSCTL_HANDLER_ARG
 	int count;
 
 	count = uma_zone_get_cur(V_tcp_syncache.zone);
-	return (sysctl_handle_int(oidp, &count, sizeof(count), req));
+	return (sysctl_handle_int(oidp, &count, 0, req));
 }
 
 /*

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 14:08:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7E389431;
 Tue, 25 Dec 2012 14:08:14 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 628D78FC13;
 Tue, 25 Dec 2012 14:08:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPE8EgP068721;
 Tue, 25 Dec 2012 14:08:14 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPE8Eii068715;
 Tue, 25 Dec 2012 14:08:14 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212251408.qBPE8Eii068715@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 25 Dec 2012 14:08:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244681 - in head: share/man/man4 sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 14:08:14 -0000

Author: glebius
Date: Tue Dec 25 14:08:13 2012
New Revision: 244681
URL: http://svnweb.freebsd.org/changeset/base/244681

Log:
    Change net.inet.carp.demotion sysctl to add the supplied value
  to the current demotion factor instead of assigning it.
  
    This allows external scripts to control demotion factor together
  with kernel in a raceless manner.

Modified:
  head/share/man/man4/carp.4
  head/sys/netinet/ip_carp.c

Modified: head/share/man/man4/carp.4
==============================================================================
--- head/share/man/man4/carp.4	Tue Dec 25 13:55:21 2012	(r244680)
+++ head/share/man/man4/carp.4	Tue Dec 25 14:08:13 2012	(r244681)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 29, 2012
+.Dd December 25, 2012
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -125,15 +125,14 @@ experiences problem with sending announc
 running a vhid goes down, or while the
 .Xr pfsync 4
 interface is not synchronized.
-The demotion value is writable, so that user may alter it
-depending on some external conditions, for example on the status of some
-daemon utility.
-However, altering the value should be performed with care, so as to
-not conflict with subsystems that adjust demotion factor
-automatically:
+The demotion factor can be adjusted writing to the sysctl oid.
+The signed value supplied to the
+.Xr sysctl 8
+command is added to current demotion factor.
+This allows to control
 .Nm
-and
-.Xr pfsync 4 .
+behaviour depending on some external conditions, for example on the status
+of some daemon utility.
 .It Va net.inet.carp.ifdown_demotion_factor
 This value is added to
 .Va net.inet.carp.demotion

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Tue Dec 25 13:55:21 2012	(r244680)
+++ head/sys/netinet/ip_carp.c	Tue Dec 25 14:08:13 2012	(r244681)
@@ -192,6 +192,7 @@ static int carp_log = 1;		/* Log level. 
 static int carp_demotion = 0;		/* Global advskew demotion. */
 static int carp_senderr_adj = CARP_MAXSKEW;	/* Send error demotion factor */
 static int carp_ifdown_adj = CARP_MAXSKEW;	/* Iface down demotion factor */
+static int carp_demote_adj_sysctl(SYSCTL_HANDLER_ARGS);
 
 SYSCTL_NODE(_net_inet, IPPROTO_CARP,	carp,	CTLFLAG_RW, 0,	"CARP");
 SYSCTL_INT(_net_inet_carp, OID_AUTO, allow, CTLFLAG_RW, &carp_allow, 0,
@@ -200,8 +201,9 @@ SYSCTL_INT(_net_inet_carp, OID_AUTO, pre
     "High-priority backup preemption mode");
 SYSCTL_INT(_net_inet_carp, OID_AUTO, log, CTLFLAG_RW, &carp_log, 0,
     "CARP log level");
-SYSCTL_INT(_net_inet_carp, OID_AUTO, demotion, CTLFLAG_RW, &carp_demotion, 0,
-    "Demotion factor (skew of advskew)");
+SYSCTL_PROC(_net_inet_carp, OID_AUTO, demotion, CTLTYPE_INT|CTLFLAG_RW,
+    0, 0, carp_demote_adj_sysctl, "I",
+    "Adjust demotion factor (skew of advskew)");
 SYSCTL_INT(_net_inet_carp, OID_AUTO, senderr_demotion_factor, CTLFLAG_RW,
     &carp_senderr_adj, 0, "Send error demotion factor adjustment");
 SYSCTL_INT(_net_inet_carp, OID_AUTO, ifdown_demotion_factor, CTLFLAG_RW,
@@ -1999,11 +2001,26 @@ carp_sc_state(struct carp_softc *sc)
 static void
 carp_demote_adj(int adj, char *reason)
 {
-	carp_demotion += adj;
+	atomic_add_int(&carp_demotion, adj);
 	CARP_LOG("demoted by %d to %d (%s)\n", adj, carp_demotion, reason);
 	taskqueue_enqueue(taskqueue_swi, &carp_sendall_task);
 }
 
+static int
+carp_demote_adj_sysctl(SYSCTL_HANDLER_ARGS)
+{
+	int new, error;
+
+	new = carp_demotion;
+	error = sysctl_handle_int(oidp, &new, 0, req);
+	if (error || !req->newptr)
+		return (error);
+
+	carp_demote_adj(new, "sysctl");
+
+	return (0);
+}
+
 #ifdef INET
 extern  struct domain inetdomain;
 static struct protosw in_carp_protosw = {

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 14:17:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6F0A35D6;
 Tue, 25 Dec 2012 14:17:10 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 397F98FC0C;
 Tue, 25 Dec 2012 14:17:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPEHARP070178;
 Tue, 25 Dec 2012 14:17:10 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPEHAQC070177;
 Tue, 25 Dec 2012 14:17:10 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201212251417.qBPEHAQC070177@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 25 Dec 2012 14:17:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244682 - head/bin/sh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 14:17:10 -0000

Author: jilles
Date: Tue Dec 25 14:17:09 2012
New Revision: 244682
URL: http://svnweb.freebsd.org/changeset/base/244682

Log:
  sh: Prefer strsignal() to accessing sys_siglist directly.
  
  Accessing sys_siglist directly requires rtld to copy it from libc to the sh
  executable's BSS. Also, strsignal() will put in the signal number for
  unknown signals (FreeBSD-specific) so we need not do that ourselves.
  
  Unfortunately, there is no function for sys_signame.

Modified:
  head/bin/sh/jobs.c

Modified: head/bin/sh/jobs.c
==============================================================================
--- head/bin/sh/jobs.c	Tue Dec 25 14:08:13 2012	(r244681)
+++ head/bin/sh/jobs.c	Tue Dec 25 14:17:09 2012	(r244682)
@@ -298,6 +298,7 @@ showjob(struct job *jp, int mode)
 {
 	char s[64];
 	char statestr[64];
+	const char *sigstr;
 	struct procstat *ps;
 	struct job *j;
 	int col, curr, i, jobno, prev, procno;
@@ -324,8 +325,9 @@ showjob(struct job *jp, int mode)
 			i = WSTOPSIG(ps->status);
 		else
 			i = -1;
-		if (i > 0 && i < sys_nsig && sys_siglist[i])
-			strcpy(statestr, sys_siglist[i]);
+		sigstr = strsignal(i);
+		if (sigstr != NULL)
+			strcpy(statestr, sigstr);
 		else
 			strcpy(statestr, "Suspended");
 #endif
@@ -337,10 +339,11 @@ showjob(struct job *jp, int mode)
 			    WEXITSTATUS(ps->status));
 	} else {
 		i = WTERMSIG(ps->status);
-		if (i > 0 && i < sys_nsig && sys_siglist[i])
-			strcpy(statestr, sys_siglist[i]);
+		sigstr = strsignal(i);
+		if (sigstr != NULL)
+			strcpy(statestr, sigstr);
 		else
-			fmtstr(statestr, 64, "Signal %d", i);
+			strcpy(statestr, "Unknown signal");
 		if (WCOREDUMP(ps->status))
 			strcat(statestr, " (core dumped)");
 	}
@@ -1019,6 +1022,7 @@ dowait(int mode, struct job *job)
 	struct procstat *sp;
 	struct job *jp;
 	struct job *thisjob;
+	const char *sigstr;
 	int done;
 	int stopped;
 	int sig;
@@ -1129,10 +1133,11 @@ dowait(int mode, struct job *job)
 				coredump = WCOREDUMP(sp->status);
 			}
 		if (sig > 0 && sig != SIGINT && sig != SIGPIPE) {
-			if (sig < sys_nsig && sys_siglist[sig])
-				out2str(sys_siglist[sig]);
+			sigstr = strsignal(sig);
+			if (sigstr != NULL)
+				out2str(sigstr);
 			else
-				outfmt(out2, "Signal %d", sig);
+				out2str("Unknown signal");
 			if (coredump)
 				out2str(" (core dumped)");
 			out2c('\n');

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 14:29:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3464189F;
 Tue, 25 Dec 2012 14:29:39 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F2FBA8FC0A;
 Tue, 25 Dec 2012 14:29:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPETc0g071924;
 Tue, 25 Dec 2012 14:29:38 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPETcYh071923;
 Tue, 25 Dec 2012 14:29:38 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212251429.qBPETcYh071923@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 25 Dec 2012 14:29:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244683 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 14:29:39 -0000

Author: glebius
Date: Tue Dec 25 14:29:38 2012
New Revision: 244683
URL: http://svnweb.freebsd.org/changeset/base/244683

Log:
    Garbage collect carp_cksum().

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Tue Dec 25 14:17:09 2012	(r244682)
+++ head/sys/netinet/ip_carp.c	Tue Dec 25 14:29:38 2012	(r244683)
@@ -290,12 +290,6 @@ static struct mtx carp_mtx;
 static struct task carp_sendall_task =
     TASK_INITIALIZER(0, carp_send_ad_all, NULL);
 
-static __inline uint16_t
-carp_cksum(struct mbuf *m, int len)
-{
-	return (in_cksum(m, len));
-}
-
 static void
 carp_hmac_prepare(struct carp_softc *sc)
 {
@@ -478,7 +472,7 @@ carp_input(struct mbuf *m, int hlen)
 
 	/* verify the CARP checksum */
 	m->m_data += iplen;
-	if (carp_cksum(m, len - iplen)) {
+	if (in_cksum(m, len - iplen)) {
 		CARPSTATS_INC(carps_badsum);
 		CARP_DEBUG("%s: checksum failed on %s\n", __func__,
 		    m->m_pkthdr.rcvif->if_xname);
@@ -537,7 +531,7 @@ carp6_input(struct mbuf **mp, int *offp,
 
 	/* verify the CARP checksum */
 	m->m_data += *offp;
-	if (carp_cksum(m, sizeof(*ch))) {
+	if (in_cksum(m, sizeof(*ch))) {
 		CARPSTATS_INC(carps_badsum);
 		CARP_DEBUG("%s: checksum failed, on %s\n", __func__,
 		    m->m_pkthdr.rcvif->if_xname);
@@ -809,7 +803,7 @@ carp_send_ad_locked(struct carp_softc *s
 			goto resched;
 
 		m->m_data += sizeof(*ip);
-		ch_ptr->carp_cksum = carp_cksum(m, len - sizeof(*ip));
+		ch_ptr->carp_cksum = in_cksum(m, len - sizeof(*ip));
 		m->m_data -= sizeof(*ip);
 
 		CARPSTATS_INC(carps_opackets);
@@ -882,7 +876,7 @@ carp_send_ad_locked(struct carp_softc *s
 			goto resched;
 
 		m->m_data += sizeof(*ip6);
-		ch_ptr->carp_cksum = carp_cksum(m, len - sizeof(*ip6));
+		ch_ptr->carp_cksum = in_cksum(m, len - sizeof(*ip6));
 		m->m_data -= sizeof(*ip6);
 
 		CARPSTATS_INC(carps_opackets6);

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 17:06:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D2F68FE3;
 Tue, 25 Dec 2012 17:06:05 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B7C928FC13;
 Tue, 25 Dec 2012 17:06:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPH65X7094673;
 Tue, 25 Dec 2012 17:06:05 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPH65UJ094672;
 Tue, 25 Dec 2012 17:06:05 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201212251706.qBPH65UJ094672@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 25 Dec 2012 17:06:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244686 - head/libexec/tftpd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 17:06:05 -0000

Author: antoine
Date: Tue Dec 25 17:06:05 2012
New Revision: 244686
URL: http://svnweb.freebsd.org/changeset/base/244686

Log:
  Use correct size in snprintf.
  Remove unused buffer.
  
  PR:		174631
  Submitted by:	Henning Petersen
  MFC after:	1 month

Modified:
  head/libexec/tftpd/tftp-io.c

Modified: head/libexec/tftpd/tftp-io.c
==============================================================================
--- head/libexec/tftpd/tftp-io.c	Tue Dec 25 16:44:50 2012	(r244685)
+++ head/libexec/tftpd/tftp-io.c	Tue Dec 25 17:06:05 2012	(r244686)
@@ -87,14 +87,13 @@ errtomsg(int error)
 {
 	static char ebuf[40];
 	struct errmsg *pe;
-	char buf[MAXPKTSIZE];
 
 	if (error == 0)
 		return ("success");
 	for (pe = errmsgs; pe->e_code >= 0; pe++)
 		if (pe->e_code == error)
 			return (pe->e_msg);
-	snprintf(ebuf, sizeof(buf), "error %d", error);
+	snprintf(ebuf, sizeof(ebuf), "error %d", error);
 	return (ebuf);
 }
 

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 22:27:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 158028D8;
 Tue, 25 Dec 2012 22:27:24 +0000 (UTC)
 (envelope-from doginou@kanar.ci0.org)
Received: from kanar.ci0.org (unknown
 [IPv6:2a01:e0b:1:150:ca0a:a9ff:fef1:a4c9])
 by mx1.freebsd.org (Postfix) with ESMTP id 991CA8FC12;
 Tue, 25 Dec 2012 22:27:22 +0000 (UTC)
Received: from kanar.ci0.org (pluxor@localhost [127.0.0.1])
 by kanar.ci0.org (8.14.5/8.14.5) with ESMTP id qBPMQxZ9099964;
 Tue, 25 Dec 2012 23:26:59 +0100 (CET)
 (envelope-from doginou@kanar.ci0.org)
Received: (from doginou@localhost)
 by kanar.ci0.org (8.14.5/8.14.5/Submit) id qBPMQvFa099963;
 Tue, 25 Dec 2012 23:26:57 +0100 (CET) (envelope-from doginou)
Date: Tue, 25 Dec 2012 23:26:57 +0100
From: Olivier Houchard <cognet@ci0.org>
To: Peter Jeremy <peter@rulingia.com>
Subject: Re: svn commit: r244469 - head/sys/arm/arm
Message-ID: <20121225222657.GA98807@ci0.org>
References: <201212200035.qBK0ZRU0022739@svn.freebsd.org>
 <20121224211921.GA54928@server.rulingia.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121224211921.GA54928@server.rulingia.com>
User-Agent: Mutt/1.4.2.3i
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org, Olivier Houchard <cognet@FreeBSD.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 22:27:24 -0000

On Tue, Dec 25, 2012 at 08:19:21AM +1100, Peter Jeremy wrote:
> On 2012-Dec-20 00:35:27 +0000, Olivier Houchard <cognet@FreeBSD.org> wrote:
> >Author: cognet
> >Date: Thu Dec 20 00:35:26 2012
> >New Revision: 244469
> >URL: http://svnweb.freebsd.org/changeset/base/244469
> >
> >Log:
> >  Use the new allocator in bus_dmamem_alloc().
> >
> >Modified:
> >  head/sys/arm/arm/busdma_machdep-v6.c
> 
> Do you have any plans to make similar changes to the other busdma_machdep.c
> files?
> 

Hi Peter,

Similar changes were made to arm busdma_machdep.c, it might be interesting to
do so on mips, but less than it is on arm, as the mips port usually uses KSEG1
to access memory uncached. I guess it's much less interesting on other arches,
which can do cache snooping.

Regards,

Olivier

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 22:34:43 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BC6B7A8B;
 Tue, 25 Dec 2012 22:34:43 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A03418FC0A;
 Tue, 25 Dec 2012 22:34:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPMYhGe043455;
 Tue, 25 Dec 2012 22:34:43 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPMYhWO043454;
 Tue, 25 Dec 2012 22:34:43 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201212252234.qBPMYhWO043454@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 25 Dec 2012 22:34:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244689 - head/usr.sbin/mountd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 22:34:43 -0000

Author: rmacklem
Date: Tue Dec 25 22:34:43 2012
New Revision: 244689
URL: http://svnweb.freebsd.org/changeset/base/244689

Log:
  Attempt to clarify that for ZFS, all file systems under
  the NFSv4 root must be exported. This is because ZFS
  checks exports itself.
  This is a content change.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/mountd/exports.5

Modified: head/usr.sbin/mountd/exports.5
==============================================================================
--- head/usr.sbin/mountd/exports.5	Tue Dec 25 20:23:53 2012	(r244688)
+++ head/usr.sbin/mountd/exports.5	Tue Dec 25 22:34:43 2012	(r244689)
@@ -28,7 +28,7 @@
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd July 12, 2011
+.Dd December 23, 2012
 .Dt EXPORTS 5
 .Os
 .Sh NAME
@@ -311,12 +311,15 @@ For the third form which specifies the N
 specifies the location within the server's file system tree which is the
 root of the NFSv4 tree.
 All entries of this form must specify the same directory path.
-This location can be any directory and does not
+For file systems other than ZFS,
+this location can be any directory and does not
 need to be within an exported file system. If it is not in an exported
 file system, a very limited set of operations are permitted, so that an
 NFSv4 client can traverse the tree to an exported file system.
 Although parts of the NFSv4 tree can be non-exported, the entire NFSv4 tree
 must consist of local file systems capable of being exported via NFS.
+All ZFS file systems in the subtree below the NFSv4 tree root must be
+exported.
 NFSv4 does not use the mount protocol and does permit clients to cross server
 mount point boundaries, although not all clients are capable of crossing the
 mount points.

From owner-svn-src-head@FreeBSD.ORG  Tue Dec 25 22:47:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 87F35CC2;
 Tue, 25 Dec 2012 22:47:50 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6C74D8FC0C;
 Tue, 25 Dec 2012 22:47:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPMloDt045226;
 Tue, 25 Dec 2012 22:47:50 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPMloT0045225;
 Tue, 25 Dec 2012 22:47:50 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201212252247.qBPMloT0045225@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 25 Dec 2012 22:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244690 - head/usr.sbin/nfsd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 22:47:50 -0000

Author: rmacklem
Date: Tue Dec 25 22:47:49 2012
New Revision: 244690
URL: http://svnweb.freebsd.org/changeset/base/244690

Log:
  Attempt to clarify that for ZFS, all file systems under
  the NFSv4 root must be exported. This is because ZFS
  checks exports itself.
  This is a content change.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/nfsd/nfsv4.4

Modified: head/usr.sbin/nfsd/nfsv4.4
==============================================================================
--- head/usr.sbin/nfsd/nfsv4.4	Tue Dec 25 22:34:43 2012	(r244689)
+++ head/usr.sbin/nfsd/nfsv4.4	Tue Dec 25 22:47:49 2012	(r244690)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 15, 2011
+.Dd December 23, 2012
 .Dt NFSV4 4
 .Os
 .Sh NAME
@@ -98,6 +98,8 @@ allows a limited subset of operations to
 of the local file system, so that traversal of the tree to the exported
 subtrees is possible.
 As such, the ``<rootdir>'' can be in a non-exported file system.
+The exception is ZFS, which checks exports and, as such, all ZFS file systems
+below the ``<rootdir>'' must be exported.
 However,
 the entire tree that is rooted at that point must be in local file systems
 that are of types that can be NFS exported.

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 05:11:48 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E82BEFAE;
 Wed, 26 Dec 2012 05:11:48 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CAE448FC12;
 Wed, 26 Dec 2012 05:11:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQ5Bm85001405;
 Wed, 26 Dec 2012 05:11:48 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQ5BmOs001404;
 Wed, 26 Dec 2012 05:11:48 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 26 Dec 2012 05:11:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244692 - head/lib/libproc/test/t1-bkpt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 05:11:49 -0000

Author: pluknet
Date: Wed Dec 26 05:11:48 2012
New Revision: 244692
URL: http://svnweb.freebsd.org/changeset/base/244692

Log:
  Fix libproc test case to work with clang premature optimization
  observed with -O2 (used by default).
  Avoid function inlining for t1_bkpt_t on which we set a breakpoint.
  Otherwise the address of the function is never called thus the
  breakpoint never triggers.
  
  Reported by:	zont
  Reviewed by:	rpaulo

Modified:
  head/lib/libproc/test/t1-bkpt/t1-bkpt.c

Modified: head/lib/libproc/test/t1-bkpt/t1-bkpt.c
==============================================================================
--- head/lib/libproc/test/t1-bkpt/t1-bkpt.c	Tue Dec 25 23:34:20 2012	(r244691)
+++ head/lib/libproc/test/t1-bkpt/t1-bkpt.c	Wed Dec 26 05:11:48 2012	(r244692)
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <libproc.h>
 
-int
+int __noinline
 t1_bkpt_t()
 {
 	printf("TEST OK\n");

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 05:20:16 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 30143203;
 Wed, 26 Dec 2012 05:20:16 +0000 (UTC)
 (envelope-from pluknet@gmail.com)
Received: from mail-qa0-f45.google.com (mail-qa0-f45.google.com
 [209.85.216.45])
 by mx1.freebsd.org (Postfix) with ESMTP id 9E02F8FC0A;
 Wed, 26 Dec 2012 05:20:15 +0000 (UTC)
Received: by mail-qa0-f45.google.com with SMTP id j15so8222291qaq.4
 for <multiple recipients>; Tue, 25 Dec 2012 21:20:09 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:content-type;
 bh=WfY13Nw3r+HyIOX4653B8OH/bNyxbJVy0urWg238IJc=;
 b=Er41QKWrtjkxXJEbDz2Kb/ZwfrV70FgA1e/jv/nd+P2BOjbH3C/gqrDJJHxDJlm800
 Pqgf+gbAhXYhOqRxIa+HfG2xq5il+i5fyKDHOeh98fffB1BqQMg4VbGzJ8eTZ0SPuk79
 MyjKj1PkyGwnP1j3p/iEqkopuY0KlG3FxeozD+DW+/e2pPcV1noapFQrbKxk6EbfxgBH
 6QOXREY4x2dIhe6ax6eMPklmezK2AOYtkEtB1LZnios82WbrxF7gD0ejTtOOn0MyTS/j
 KazcP7Q0tcd96mlEnoqVvlaUtKJsZp7FvtsPpr84bN/4/Z7gkUcTsysI0lb1WYIHxpfF
 CwUQ==
MIME-Version: 1.0
Received: by 10.224.60.12 with SMTP id n12mr12635412qah.23.1356499209264; Tue,
 25 Dec 2012 21:20:09 -0800 (PST)
Sender: pluknet@gmail.com
Received: by 10.229.78.96 with HTTP; Tue, 25 Dec 2012 21:20:09 -0800 (PST)
In-Reply-To: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
References: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
Date: Wed, 26 Dec 2012 08:20:09 +0300
X-Google-Sender-Auth: JcNjidSshA43Yf1LGKSxr-9EQ-0
Message-ID: <CAE-mSOJOUrz0B2DTDq-YF2muefQ+JLkkrfa8EiZPdQJcv2oHfQ@mail.gmail.com>
Subject: Re: svn commit: r244692 - head/lib/libproc/test/t1-bkpt
From: Sergey Kandaurov <pluknet@freebsd.org>
To: src-committers@freebsd.org, svn-src-all@freebsd.org, 
 svn-src-head@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 05:20:16 -0000

On 26 December 2012 09:11, Sergey Kandaurov <pluknet@freebsd.org> wrote:
> Author: pluknet
> Date: Wed Dec 26 05:11:48 2012
> New Revision: 244692
> URL: http://svnweb.freebsd.org/changeset/base/244692
>
> Log:
>   Fix libproc test case to work with clang premature optimization
>   observed with -O2 (used by default).
>   Avoid function inlining for t1_bkpt_t on which we set a breakpoint.
>   Otherwise the address of the function is never called thus the
>   breakpoint never triggers.
>
>   Reported by:  zont
>   Reviewed by:  rpaulo
>
> Modified:
>   head/lib/libproc/test/t1-bkpt/t1-bkpt.c
>
> Modified: head/lib/libproc/test/t1-bkpt/t1-bkpt.c
> ==============================================================================
> --- head/lib/libproc/test/t1-bkpt/t1-bkpt.c     Tue Dec 25 23:34:20 2012        (r244691)
> +++ head/lib/libproc/test/t1-bkpt/t1-bkpt.c     Wed Dec 26 05:11:48 2012        (r244692)
> @@ -36,7 +36,7 @@
>  #include <string.h>
>  #include <libproc.h>
>
> -int
> +int __noinline
>  t1_bkpt_t()
>  {
>         printf("TEST OK\n");

This can be demonstrated with the generated code diff:

 0000000000400b20 <main>:
   400b20:      55                      push   %rbp
   400b21:      48 89 e5                mov    %rsp,%rbp
   400b24:      48 8b 3e                mov    (%rsi),%rdi
-  400b27:      be a9 0b 40 00          mov    $0x400ba9,%esi
+  400b27:      be a0 0b 40 00          mov    $0x400ba0,%esi
   400b2c:      e8 bb fc ff ff          callq  4007ec <strcmp@plt>
   400b31:      85 c0                   test   %eax,%eax
   400b33:      74 07                   je     400b3c <main+0x1c>
   400b35:      e8 f6 fe ff ff          callq  400a30 <t1_bkpt_d>
-  400b3a:      eb 05                   jmp    400b41 <main+0x21>
-  400b3c:      e8 df fe ff ff          callq  400a20 <t1_bkpt_t>
-  400b41:      31 c0                   xor    %eax,%eax
-  400b43:      5d                      pop    %rbp
-  400b44:      c3                      retq
-  400b45:      90                      nop
-  400b46:      90                      nop
-  400b47:      90                      nop
-  400b48:      90                      nop
-  400b49:      90                      nop
+  400b3a:      eb 0a                   jmp    400b46 <main+0x26>
+  400b3c:      bf c3 0b 40 00          mov    $0x400bc3,%edi
+  400b41:      e8 b6 fc ff ff          callq  4007fc <puts@plt>
+  400b46:      31 c0                   xor    %eax,%eax
+  400b48:      5d                      pop    %rbp
+  400b49:      c3                      retq
   400b4a:      90                      nop
   400b4b:      90                      nop
   400b4c:      90                      nop
   400b4d:      90                      nop
   400b4e:      90                      nop
   400b4f:      90                      nop


-- 
wbr,
pluknet

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 13:07:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D9BDC814;
 Wed, 26 Dec 2012 13:07:17 +0000 (UTC)
 (envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BDF708FC08;
 Wed, 26 Dec 2012 13:07:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQD7HKw070611;
 Wed, 26 Dec 2012 13:07:17 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQD7HPQ070610;
 Wed, 26 Dec 2012 13:07:17 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201212261307.qBQD7HPQ070610@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Wed, 26 Dec 2012 13:07:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244695 - head/sys/dev/pci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 13:07:17 -0000

Author: davidxu
Date: Wed Dec 26 13:07:17 2012
New Revision: 244695
URL: http://svnweb.freebsd.org/changeset/base/244695

Log:
  Always initialize pattern_buf pointers to NULL, otherwise AMD64 machine
  panics with:
     free: address xxx(yyy) has not been allocated.
  it can be triggered by hald.

Modified:
  head/sys/dev/pci/pci_user.c

Modified: head/sys/dev/pci/pci_user.c
==============================================================================
--- head/sys/dev/pci/pci_user.c	Wed Dec 26 08:20:27 2012	(r244694)
+++ head/sys/dev/pci/pci_user.c	Wed Dec 26 13:07:17 2012	(r244695)
@@ -425,12 +425,12 @@ pci_ioctl(struct cdev *dev, u_long cmd, 
 #ifdef COMPAT_FREEBSD32
 	struct pci_conf_io32 *cio32 = NULL;
 	struct pci_conf_old32 conf_old32;
-	struct pci_match_conf_old32 *pattern_buf_old32;
+	struct pci_match_conf_old32 *pattern_buf_old32 = NULL;
 #endif
 	struct pci_conf_old conf_old;
 	struct pci_io iodata;
 	struct pci_io_old *io_old;
-	struct pci_match_conf_old *pattern_buf_old;
+	struct pci_match_conf_old *pattern_buf_old = NULL;
 
 	io_old = NULL;
 
@@ -470,10 +470,8 @@ pci_ioctl(struct cdev *dev, u_long cmd, 
 #ifdef PRE7_COMPAT
 #ifdef COMPAT_FREEBSD32
 	case PCIOCGETCONF_OLD32:
-		pattern_buf_old32 = NULL;
 #endif
 	case PCIOCGETCONF_OLD:
-		pattern_buf_old = NULL;
 #endif
 	case PCIOCGETCONF:
 

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 13:28:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7A032CD4;
 Wed, 26 Dec 2012 13:28:25 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
 [IPv6:2001:7b8:2ff:146::2])
 by mx1.freebsd.org (Postfix) with ESMTP id 385408FC12;
 Wed, 26 Dec 2012 13:28:25 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7:0:41f7:b952:3333:5c94] (unknown
 [IPv6:2001:7b8:3a7:0:41f7:b952:3333:5c94])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id 8CA3C5C5A;
 Wed, 26 Dec 2012 14:28:23 +0100 (CET)
Message-ID: <50DAFB77.7070608@FreeBSD.org>
Date: Wed, 26 Dec 2012 14:28:23 +0100
From: Dimitry Andric <dim@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:18.0) Gecko/20121128 Thunderbird/18.0
MIME-Version: 1.0
To: Sergey Kandaurov <pluknet@FreeBSD.org>
Subject: Re: svn commit: r244692 - head/lib/libproc/test/t1-bkpt
References: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
In-Reply-To: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 13:28:25 -0000

On 2012-12-26 06:11, Sergey Kandaurov wrote:
> Author: pluknet
> Date: Wed Dec 26 05:11:48 2012
> New Revision: 244692
> URL: http://svnweb.freebsd.org/changeset/base/244692
>
> Log:
>    Fix libproc test case to work with clang premature optimization
>    observed with -O2 (used by default).

There's nothing premature here; the compiler cannot guess that you
actually want less efficient code. ;-)

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 13:39:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 188751C5;
 Wed, 26 Dec 2012 13:39:14 +0000 (UTC)
 (envelope-from pluknet@gmail.com)
Received: from mail-qc0-f181.google.com (mail-qc0-f181.google.com
 [209.85.216.181])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A9878FC0A;
 Wed, 26 Dec 2012 13:39:11 +0000 (UTC)
Received: by mail-qc0-f181.google.com with SMTP id x40so4382937qcp.40
 for <multiple recipients>; Wed, 26 Dec 2012 05:39:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=JtNsJUHA5YVCsITlQdquSNO0ki9yJsIM7ps8s+/6HCs=;
 b=th+tRxg4Q8ClljmXy3I2jBfpfUVxz+RC25kHy0kxTglILdqmWmtg9oN6Acd1X7UD//
 kf0jaKszKs2apU7nh/IphitW2ikiuPSVszL7ONljUls7X0y06v7OXRy3SfRfJRxQby/V
 V8wz1DQ2ESkv+ghE6mzlundRpDMxzqPtUObRmHn2utf676QdluW4QLxalO2fn3Oc8pJK
 hboe16LUmX0q9YH4CsXyJ24DofdDS4KEp9WWw79zXk90N1vnqTTHtNZHL6oS5mUVtxp3
 Zfy/djxpAtuI4r7jvjydnPsWjRjqh+8kHBUDMoWQWmIN1riELa4U/drW5bx8KP2jmLAN
 10NA==
MIME-Version: 1.0
Received: by 10.229.78.97 with SMTP id j33mr3130838qck.107.1356528702308; Wed,
 26 Dec 2012 05:31:42 -0800 (PST)
Sender: pluknet@gmail.com
Received: by 10.229.78.96 with HTTP; Wed, 26 Dec 2012 05:31:42 -0800 (PST)
In-Reply-To: <50DAFB77.7070608@FreeBSD.org>
References: <201212260511.qBQ5BmOs001404@svn.freebsd.org>
 <50DAFB77.7070608@FreeBSD.org>
Date: Wed, 26 Dec 2012 16:31:42 +0300
X-Google-Sender-Auth: s6QRyI-s-WIco4vsdsh0gbSO5oI
Message-ID: <CAE-mSOJUz4reLAVaQox-LZGLHj1ays7r5O_u5pTbpA=TKb5OBQ@mail.gmail.com>
Subject: Re: svn commit: r244692 - head/lib/libproc/test/t1-bkpt
From: Sergey Kandaurov <pluknet@freebsd.org>
To: Dimitry Andric <dim@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 13:39:14 -0000

On 26 December 2012 17:28, Dimitry Andric <dim@freebsd.org> wrote:
> On 2012-12-26 06:11, Sergey Kandaurov wrote:
>>
>> Author: pluknet
>> Date: Wed Dec 26 05:11:48 2012
>> New Revision: 244692
>> URL: http://svnweb.freebsd.org/changeset/base/244692
>>
>> Log:
>>    Fix libproc test case to work with clang premature optimization
>>    observed with -O2 (used by default).
>
>
> There's nothing premature here; the compiler cannot guess that you
> actually want less efficient code. ;-)

Ok, ok. That was a kind of joke :).

-- 
wbr,
pluknet

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 15:10:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3D1509C1;
 Wed, 26 Dec 2012 15:10:21 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 080D38FC08;
 Wed, 26 Dec 2012 15:10:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQFAKId088778;
 Wed, 26 Dec 2012 15:10:20 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQFAKVK088774;
 Wed, 26 Dec 2012 15:10:20 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212261510.qBQFAKVK088774@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 26 Dec 2012 15:10:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244704 - in head: share/man/man4
 sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 15:10:21 -0000

Author: glebius
Date: Wed Dec 26 15:10:20 2012
New Revision: 244704
URL: http://svnweb.freebsd.org/changeset/base/244704

Log:
  Add vendor IDs for Broadcom USB dongles (BCM20702).
  
  PR:		kern/174707
  Submitted by:	rakuco

Modified:
  head/share/man/man4/ng_ubt.4
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/share/man/man4/ng_ubt.4
==============================================================================
--- head/share/man/man4/ng_ubt.4	Wed Dec 26 15:07:23 2012	(r244703)
+++ head/share/man/man4/ng_ubt.4	Wed Dec 26 15:10:20 2012	(r244704)
@@ -25,7 +25,7 @@
 .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2004
+.Dd December 26, 2012
 .Dt NG_UBT 4
 .Os
 .Sh NAME
@@ -73,6 +73,8 @@ Mitsumi Bluetooth USB adapter
 MSI MS-6967
 .It
 TDK Bluetooth USB adapter
+.It
+Broadcom Bluetooth USB adapter
 .El
 .Sh HOOKS
 This node type supports the following hooks:

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 15:07:23 2012	(r244703)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 15:10:20 2012	(r244704)
@@ -398,6 +398,10 @@ static const STRUCT_USB_HOST_ID ubt_devs
 
 	/* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */
 	{ USB_VPI(USB_VENDOR_AVM, 0x3800, 0) },
+
+	/* Broadcom USB dongles, mostly BCM20702 and BCM20702A0 */
+	{ USB_VENDOR(USB_VENDOR_BROADCOM),
+	  USB_IF_CSI(UICLASS_VENDOR, 0x01, 0x01) },
 };
 
 /*

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 15:20:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8BF1BFFB;
 Wed, 26 Dec 2012 15:20:33 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 712038FC17;
 Wed, 26 Dec 2012 15:20:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQFKX4c090428;
 Wed, 26 Dec 2012 15:20:33 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQFKXDM090427;
 Wed, 26 Dec 2012 15:20:33 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212261520.qBQFKXDM090427@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 26 Dec 2012 15:20:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244706 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 15:20:33 -0000

Author: attilio
Date: Wed Dec 26 15:20:32 2012
New Revision: 244706
URL: http://svnweb.freebsd.org/changeset/base/244706

Log:
  Fixup r244240: mp_ncpus will be 1 also in the !SMP and smp_disabled=1
  case. There is no point in optimizing further the code and use a TRUE
  litteral for a path that does heavyweight stuff anyway (like lock acq),
  at the price of obfuscated code.
  
  Use the appropriate check where necessary and remove a macro.
  
  Sponsored by:	EMC / Isilon storage division
  MFC after:	3 days

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Wed Dec 26 15:13:21 2012	(r244705)
+++ head/sys/kern/vfs_subr.c	Wed Dec 26 15:20:32 2012	(r244706)
@@ -4724,12 +4724,6 @@ mnt_vnode_markerfree_active(struct vnode
 	*mvp = NULL;
 }
 
-#ifdef SMP
-#define	ALWAYS_YIELD	(mp_ncpus == 1)
-#else
-#define	ALWAYS_YIELD	1
-#endif
-
 static struct vnode *
 mnt_vnode_next_active(struct vnode **mvp, struct mount *mp)
 {
@@ -4746,7 +4740,7 @@ restart:
 			continue;
 		}
 		if (!VI_TRYLOCK(vp)) {
-			if (ALWAYS_YIELD || should_yield()) {
+			if (mp_ncpus == 1 || should_yield()) {
 				TAILQ_INSERT_BEFORE(vp, *mvp, v_actfreelist);
 				mtx_unlock(&vnode_free_list_mtx);
 				kern_yield(PRI_USER);
@@ -4777,7 +4771,6 @@ restart:
 	KASSERT((vp->v_iflag & VI_ACTIVE) != 0, ("Non-active vp %p", vp));
 	return (vp);
 }
-#undef ALWAYS_YIELD
 
 struct vnode *
 __mnt_vnode_next_active(struct vnode **mvp, struct mount *mp)

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 16:39:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 95047DC7;
 Wed, 26 Dec 2012 16:39:00 +0000 (UTC)
 (envelope-from hselasky@c2i.net)
Received: from swip.net (mailfe09.c2i.net [212.247.155.2])
 by mx1.freebsd.org (Postfix) with ESMTP id 7E4E98FC0C;
 Wed, 26 Dec 2012 16:38:59 +0000 (UTC)
X-T2-Spam-Status: No, hits=-0.2 required=5.0 tests=ALL_TRUSTED,
	BAYES_50
Received: from [176.74.213.204] (account mc467741@c2i.net HELO
 laptop015.hselasky.homeunix.org)
 by mailfe09.swip.net (CommuniGate Pro SMTP 5.4.4)
 with ESMTPA id 188212469; Wed, 26 Dec 2012 17:38:51 +0100
From: Hans Petter Selasky <hselasky@c2i.net>
To: Gleb Smirnoff <glebius@freebsd.org>
Subject: Re: svn commit: r244704 - in head: share/man/man4
 sys/netgraph/bluetooth/drivers/ubt
Date: Wed, 26 Dec 2012 17:40:27 +0100
User-Agent: KMail/1.13.7 (FreeBSD/9.1-PRERELEASE; KDE/4.8.4; amd64; ; )
References: <201212261510.qBQFAKVK088774@svn.freebsd.org>
In-Reply-To: <201212261510.qBQFAKVK088774@svn.freebsd.org>
X-Face: 'mmZ:T{)),Oru^0c+/}w'`gU1$ubmG?lp!=R4Wy\ELYo2)@'UZ24N@d2+AyewRX}mAm; Yp
 |U[@, _z/([?1bCfM{_"B<.J>mICJCHAzzGHI{y7{%JVz%R~yJHIji`y>Y}k1C4TfysrsUI
 -%GU9V5]iUZF&nRn9mJ'?&>O
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201212261740.27668.hselasky@c2i.net>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 16:39:00 -0000

On Wednesday 26 December 2012 16:10:20 Gleb Smirnoff wrote:
> Author: glebius
> Date: Wed Dec 26 15:10:20 2012
> New Revision: 244704
> URL: http://svnweb.freebsd.org/changeset/base/244704
> 
> Log:
>   Add vendor IDs for Broadcom USB dongles (BCM20702).
> 
>   PR:		kern/174707
>   Submitted by:	rakuco
> 
> Modified:
>   head/share/man/man4/ng_ubt.4
>   head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
Hi,

I think USB_IF_CSI() was not what you meant:

Can you commit and test this patch?

--HPS

=== sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==================================================================
--- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	(revision 244712)
+++ sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	(local)
@@ -401,7 +401,9 @@
 
 	/* Broadcom USB dongles, mostly BCM20702 and BCM20702A0 */
 	{ USB_VENDOR(USB_VENDOR_BROADCOM),
-	  USB_IF_CSI(UICLASS_VENDOR, 0x01, 0x01) },
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
 };
 
 /*
@@ -1764,7 +1766,7 @@
 	DEVMETHOD(device_probe,	ubt_probe),
 	DEVMETHOD(device_attach, ubt_attach),
 	DEVMETHOD(device_detach, ubt_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t		ubt_driver =

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 18:14:46 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6391F3DB;
 Wed, 26 Dec 2012 18:14:46 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 486208FC08;
 Wed, 26 Dec 2012 18:14:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQIEkK4015741;
 Wed, 26 Dec 2012 18:14:46 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQIEkrx015740;
 Wed, 26 Dec 2012 18:14:46 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212261814.qBQIEkrx015740@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Dec 2012 18:14:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244710 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 18:14:46 -0000

Author: bapt
Date: Wed Dec 26 18:14:45 2012
New Revision: 244710
URL: http://svnweb.freebsd.org/changeset/base/244710

Log:
  Fix creating a user and adding it to a group
  
  Reported by:	"Sam Fourman Jr." <sfourman@gmail.com>, dim

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Wed Dec 26 17:58:22 2012	(r244709)
+++ head/usr.sbin/pw/pw_user.c	Wed Dec 26 18:14:45 2012	(r244710)
@@ -747,6 +747,7 @@ pw_user(struct userconf * cnf, int mode,
 	if (mode == M_ADD || getarg(args, 'G') != NULL) {
 		int i, j;
 		for (i = 0; cnf->groups[i] != NULL; i++) {
+			char **members;
 			grp = GETGRNAM(cnf->groups[i]);
 			for (j = 0; grp->gr_mem[j] != NULL; j++) {
 				if (!strcmp(grp->gr_mem[j], pwd->pw_name))
@@ -755,15 +756,15 @@ pw_user(struct userconf * cnf, int mode,
 			if (grp->gr_mem[j] != NULL) /* user already member of group */
 				continue;
 
-			if (j == 0)
-				grp->gr_mem = NULL;
-
-			grp->gr_mem = reallocf(grp->gr_mem, sizeof(*grp->gr_mem) *
-					                    (j + 2));
-
-			grp->gr_mem[j] = pwd->pw_name;
-			grp->gr_mem[j+1] = NULL;
+			members = malloc(sizeof(char *) * (j + 1));
+			for (j = 0; grp->gr_mem[j] != NULL; j++)
+				members[j] = grp->gr_mem[j];
+
+			members[j] = pwd->pw_name;
+			members[j+1] = NULL;
+			grp->gr_mem = members;
 			chggrent(cnf->groups[i], grp);
+			free(members);
 		}
 	}
 

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 18:18:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B5D8756D;
 Wed, 26 Dec 2012 18:18:50 +0000 (UTC)
 (envelope-from kubito@gmail.com)
Received: from mail-la0-f45.google.com (mail-la0-f45.google.com
 [209.85.215.45])
 by mx1.freebsd.org (Postfix) with ESMTP id 99B308FC12;
 Wed, 26 Dec 2012 18:18:49 +0000 (UTC)
Received: by mail-la0-f45.google.com with SMTP id p9so11141767laa.18
 for <multiple recipients>; Wed, 26 Dec 2012 10:18:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:sender:from:to:cc:subject:references:date:in-reply-to
 :message-id:user-agent:mime-version:content-type;
 bh=GUOzxVoJS/K2kLUhz8QYKw0f84m8FcHTQRqVGWQdJ98=;
 b=ewsTr9c5wRfd3hHtHYC6ooL86Bvo9YAJmvRpz3OLyDceBOQgdHWpIQSxWDKXHQm2E7
 BzMRgNjdLZ5GuxBqL42pXVs9mwbGFla/3TlA9mBFVe+keRhG55Mg9qO0BIOkIMeJwGpg
 pW231cfKBNhIoDvuye9k2FUlVjAKq9CyYWZAfywyR+P48ee5mvGsrtEjpk8W0v2fmzX0
 hVBf+O3+xgRlJEK3VXJYCC/SA6XR+GGfCY+LoM6CWfqJpTJdheSfSEIgCE5nZoKlNjsM
 naHi53zDtiTf87uQPCHVpylaIlttRMRm61kOp/wbtuOfw7TRS9GF+JPlFb7WoZOYgtqv
 LdIg==
X-Received: by 10.112.10.232 with SMTP id l8mr11307664lbb.69.1356545927914;
 Wed, 26 Dec 2012 10:18:47 -0800 (PST)
Received: from gibbon.gmail.com (a91-154-115-217.elisa-laajakaista.fi.
 [91.154.115.217])
 by mx.google.com with ESMTPS id ee5sm9742492lbb.14.2012.12.26.10.18.46
 (version=TLSv1/SSLv3 cipher=OTHER);
 Wed, 26 Dec 2012 10:18:47 -0800 (PST)
Sender: Raphael Kubo da Costa <kubito@gmail.com>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
To: Hans Petter Selasky <hselasky@c2i.net>
Subject: Re: svn commit: r244704 - in head: share/man/man4
 sys/netgraph/bluetooth/drivers/ubt
References: <201212261510.qBQFAKVK088774@svn.freebsd.org>
 <201212261740.27668.hselasky@c2i.net>
Date: Wed, 26 Dec 2012 20:18:39 +0200
In-Reply-To: <201212261740.27668.hselasky@c2i.net> (Hans Petter Selasky's
 message of "Wed, 26 Dec 2012 17:40:27 +0100")
Message-ID: <87wqw4oeww.fsf@FreeBSD.org>
User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 Gleb Smirnoff <glebius@freebsd.org>, src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 18:18:50 -0000

Hans Petter Selasky <hselasky@c2i.net> writes:

> On Wednesday 26 December 2012 16:10:20 Gleb Smirnoff wrote:
>> Author: glebius
>> Date: Wed Dec 26 15:10:20 2012
>> New Revision: 244704
>> URL: http://svnweb.freebsd.org/changeset/base/244704
>> 
>> Log:
>>   Add vendor IDs for Broadcom USB dongles (BCM20702).
>> 
>>   PR:		kern/174707
>>   Submitted by:	rakuco
>> 
>> Modified:
>>   head/share/man/man4/ng_ubt.4
>>   head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
> Hi,
>
> I think USB_IF_CSI() was not what you meant:

Ouch, you are right, sorry for the oversight!

In any case, could this change be MFCed to at least 9-STABLE?

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 18:28:18 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5C9D876D;
 Wed, 26 Dec 2012 18:28:18 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3F3238FC0A;
 Wed, 26 Dec 2012 18:28:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQISIIO017586;
 Wed, 26 Dec 2012 18:28:18 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQISIp8017585;
 Wed, 26 Dec 2012 18:28:18 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212261828.qBQISIp8017585@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Dec 2012 18:28:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244711 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 18:28:18 -0000

Author: bapt
Date: Wed Dec 26 18:28:17 2012
New Revision: 244711
URL: http://svnweb.freebsd.org/changeset/base/244711

Log:
  In case of the deletion of a user those whole database has to be regenerated,
  otherwise the user planned to be deleted remain in the pwd.db while removed from
  the plain text password file.

Modified:
  head/usr.sbin/pw/pwupd.c

Modified: head/usr.sbin/pw/pwupd.c
==============================================================================
--- head/usr.sbin/pw/pwupd.c	Wed Dec 26 18:14:45 2012	(r244710)
+++ head/usr.sbin/pw/pwupd.c	Wed Dec 26 18:28:17 2012	(r244711)
@@ -146,7 +146,11 @@ pw_update(struct passwd * pwd, char cons
 			pw_fini();
 			err(1, "pw_copy()");
 		}
-		if (pw_mkdb(user) == -1) {
+		/*
+		 * in case of deletion of a user, the whole database
+		 * needs to be regenerated
+		 */
+		if (pw_mkdb(pw != NULL ? user : NULL) == -1) {
 			pw_fini();
 			err(1, "pw_mkdb()");
 		}

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 18:49:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E1DA7CD5;
 Wed, 26 Dec 2012 18:49:24 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id A658F8FC0C;
 Wed, 26 Dec 2012 18:49:23 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBQInCoh006962;
 Wed, 26 Dec 2012 22:49:12 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBQInCjS006961;
 Wed, 26 Dec 2012 22:49:12 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Wed, 26 Dec 2012 22:49:12 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Subject: Re: svn commit: r244704 - in head: share/man/man4
 sys/netgraph/bluetooth/drivers/ubt
Message-ID: <20121226184912.GP80310@FreeBSD.org>
References: <201212261510.qBQFAKVK088774@svn.freebsd.org>
 <201212261740.27668.hselasky@c2i.net> <87wqw4oeww.fsf@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <87wqw4oeww.fsf@FreeBSD.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org, Hans Petter Selasky <hselasky@c2i.net>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 18:49:25 -0000

On Wed, Dec 26, 2012 at 08:18:39PM +0200, Raphael Kubo da Costa wrote:
R> Hans Petter Selasky <hselasky@c2i.net> writes:
R> 
R> > On Wednesday 26 December 2012 16:10:20 Gleb Smirnoff wrote:
R> >> Author: glebius
R> >> Date: Wed Dec 26 15:10:20 2012
R> >> New Revision: 244704
R> >> URL: http://svnweb.freebsd.org/changeset/base/244704
R> >> 
R> >> Log:
R> >>   Add vendor IDs for Broadcom USB dongles (BCM20702).
R> >> 
R> >>   PR:		kern/174707
R> >>   Submitted by:	rakuco
R> >> 
R> >> Modified:
R> >>   head/share/man/man4/ng_ubt.4
R> >>   head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
R> > Hi,
R> >
R> > I think USB_IF_CSI() was not what you meant:
R> 
R> Ouch, you are right, sorry for the oversight!

Raphael,

if testing goes okay, and Hans has no objections, you got
my approval to commit the fix yourself.

R> In any case, could this change be MFCed to at least 9-STABLE?

Sure it can. Just give it one week in head and proceed with MFC.

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 19:08:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ADC742CF;
 Wed, 26 Dec 2012 19:08:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
 [IPv6:2001:7b8:2ff:146::2])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A81A8FC0C;
 Wed, 26 Dec 2012 19:08:24 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7:0:41f7:b952:3333:5c94] (unknown
 [IPv6:2001:7b8:3a7:0:41f7:b952:3333:5c94])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id DCFE85C5A;
 Wed, 26 Dec 2012 20:08:22 +0100 (CET)
Message-ID: <50DB4B26.8040002@FreeBSD.org>
Date: Wed, 26 Dec 2012 20:08:22 +0100
From: Dimitry Andric <dim@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:18.0) Gecko/20121128 Thunderbird/18.0
MIME-Version: 1.0
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r244710 - head/usr.sbin/pw
References: <201212261814.qBQIEkrx015740@svn.freebsd.org>
In-Reply-To: <201212261814.qBQIEkrx015740@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 19:08:24 -0000

On 2012-12-26 19:14, Baptiste Daroussin wrote:
> Author: bapt
> Date: Wed Dec 26 18:14:45 2012
> New Revision: 244710
> URL: http://svnweb.freebsd.org/changeset/base/244710
>
> Log:
>    Fix creating a user and adding it to a group
>
>    Reported by:	"Sam Fourman Jr." <sfourman@gmail.com>, dim

Thanks for fixing it so quickly!


From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 19:12:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AE581463;
 Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 92DEC8FC0C;
 Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQJCVqY024399;
 Wed, 26 Dec 2012 19:12:31 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQJCVtc024398;
 Wed, 26 Dec 2012 19:12:31 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201212261912.qBQJCVtc024398@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 26 Dec 2012 19:12:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244714 - head/sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 19:12:31 -0000

Author: rakuco (ports committer)
Date: Wed Dec 26 19:12:31 2012
New Revision: 244714
URL: http://svnweb.freebsd.org/changeset/base/244714

Log:
  Use the correct USB interface macros instead of USB_IF_CSI.
  
  As pointed out by hselasky@, USB_IF_CSI is the wrong macro here since we want
  to declare the device's interface class, subclass and protocol, not class,
  subclass and driver info.
  
  Follow-up to r244704.
  
  PR:		kern/174707
  Approved by:	glebius
  MFC after:	1 week

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 18:51:37 2012	(r244713)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 19:12:31 2012	(r244714)
@@ -401,7 +401,9 @@ static const STRUCT_USB_HOST_ID ubt_devs
 
 	/* Broadcom USB dongles, mostly BCM20702 and BCM20702A0 */
 	{ USB_VENDOR(USB_VENDOR_BROADCOM),
-	  USB_IF_CSI(UICLASS_VENDOR, 0x01, 0x01) },
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
 };
 
 /*

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 19:14:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C2A97611;
 Wed, 26 Dec 2012 19:14:21 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A72338FC0C;
 Wed, 26 Dec 2012 19:14:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQJEL08024726;
 Wed, 26 Dec 2012 19:14:21 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQJELS1024725;
 Wed, 26 Dec 2012 19:14:21 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201212261914.qBQJELS1024725@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 26 Dec 2012 19:14:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244715 - head/sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 19:14:21 -0000

Author: rakuco (ports committer)
Date: Wed Dec 26 19:14:21 2012
New Revision: 244715
URL: http://svnweb.freebsd.org/changeset/base/244715

Log:
  Use DEVMETHOD_END, as suggested by hselasky@.
  
  Approved by:	glebius

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 19:12:31 2012	(r244714)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Dec 26 19:14:21 2012	(r244715)
@@ -1766,7 +1766,7 @@ static device_method_t	ubt_methods[] =
 	DEVMETHOD(device_probe,	ubt_probe),
 	DEVMETHOD(device_attach, ubt_attach),
 	DEVMETHOD(device_detach, ubt_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t		ubt_driver =

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 20:01:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D496BD13;
 Wed, 26 Dec 2012 20:01:01 +0000 (UTC)
 (envelope-from hselasky@c2i.net)
Received: from swip.net (mailfe04.c2i.net [212.247.154.98])
 by mx1.freebsd.org (Postfix) with ESMTP id 4CF018FC16;
 Wed, 26 Dec 2012 20:01:00 +0000 (UTC)
X-T2-Spam-Status: No, hits=-0.2 required=5.0 tests=ALL_TRUSTED,
	BAYES_50
Received: from [176.74.213.204] (account mc467741@c2i.net HELO
 laptop015.hselasky.homeunix.org)
 by mailfe04.swip.net (CommuniGate Pro SMTP 5.4.4)
 with ESMTPA id 360955409; Wed, 26 Dec 2012 21:00:53 +0100
From: Hans Petter Selasky <hselasky@c2i.net>
To: Raphael Kubo da Costa <rakuco@freebsd.org>
Subject: Re: svn commit: r244704 - in head: share/man/man4
 sys/netgraph/bluetooth/drivers/ubt
Date: Wed, 26 Dec 2012 21:02:29 +0100
User-Agent: KMail/1.13.7 (FreeBSD/9.1-PRERELEASE; KDE/4.8.4; amd64; ; )
References: <201212261510.qBQFAKVK088774@svn.freebsd.org>
 <201212261740.27668.hselasky@c2i.net> <87wqw4oeww.fsf@FreeBSD.org>
In-Reply-To: <87wqw4oeww.fsf@FreeBSD.org>
X-Face: 'mmZ:T{)),Oru^0c+/}w'`gU1$ubmG?lp!=R4Wy\ELYo2)@'UZ24N@d2+AyewRX}mAm; Yp
 |U[@, _z/([?1bCfM{_"B<.J>mICJCHAzzGHI{y7{%JVz%R~yJHIji`y>Y}k1C4TfysrsUI
 -%GU9V5]iUZF&nRn9mJ'?&>O
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Message-Id: <201212262102.29740.hselasky@c2i.net>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 Gleb Smirnoff <glebius@freebsd.org>, src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 20:01:01 -0000

Hi,

> 
> In any case, could this change be MFCed to at least 9-STABLE?

I'll pick it up if you forward me the MFC e-mail.

--HPS

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 20:07:48 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 82633EE1;
 Wed, 26 Dec 2012 20:07:48 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6761D8FC0C;
 Wed, 26 Dec 2012 20:07:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQK7mZU032281;
 Wed, 26 Dec 2012 20:07:48 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQK7m03032280;
 Wed, 26 Dec 2012 20:07:48 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201212262007.qBQK7m03032280@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 26 Dec 2012 20:07:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244716 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 20:07:48 -0000

Author: pjd
Date: Wed Dec 26 20:07:47 2012
New Revision: 244716
URL: http://svnweb.freebsd.org/changeset/base/244716

Log:
  Reset provider-specific fields when resending I/O request in low memory
  conditions. This fixes assertion which checks those fields when kernel is
  compiled with DIAGNOSTIC.
  
  Reported by:	kib, pho
  MFC after:	1 week

Modified:
  head/sys/geom/geom_io.c

Modified: head/sys/geom/geom_io.c
==============================================================================
--- head/sys/geom/geom_io.c	Wed Dec 26 19:14:21 2012	(r244715)
+++ head/sys/geom/geom_io.c	Wed Dec 26 20:07:47 2012	(r244716)
@@ -567,6 +567,9 @@ g_io_deliver(struct bio *bp, int error)
 		printf("ENOMEM %p on %p(%s)\n", bp, pp, pp->name);
 	bp->bio_children = 0;
 	bp->bio_inbed = 0;
+	bp->bio_driver1 = NULL;
+	bp->bio_driver2 = NULL;
+	bp->bio_pflags = 0;
 	g_io_request(bp, cp);
 	pace++;
 	return;

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 22:21:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8DBB4284;
 Wed, 26 Dec 2012 22:21:28 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5973E8FC12;
 Wed, 26 Dec 2012 22:21:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQMLStd053263;
 Wed, 26 Dec 2012 22:21:28 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQMLSWU053261;
 Wed, 26 Dec 2012 22:21:28 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201212262221.qBQMLSWU053261@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 26 Dec 2012 22:21:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244719 - in head/sys/dev/usb: . quirk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 22:21:28 -0000

Author: markj
Date: Wed Dec 26 22:21:27 2012
New Revision: 244719
URL: http://svnweb.freebsd.org/changeset/base/244719

Log:
  Add the NO_SYNC_CACHE quirk for all Apple USB MSC devices, as they
  typically do not handle the SYNCHRONIZE_CACHE command - they either
  return an error or the firmware enters a reset loop.
  
  Reviewed by:	hselasky
  Approved by:	rstone (co-mentor)
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/quirk/usb_quirk.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- head/sys/dev/usb/quirk/usb_quirk.c	Wed Dec 26 21:47:07 2012	(r244718)
+++ head/sys/dev/usb/quirk/usb_quirk.c	Wed Dec 26 22:21:27 2012	(r244719)
@@ -482,6 +482,7 @@ static struct usb_quirk_entry usb_quirks
 	 * after issuing non-supported commands:
 	 */
 	USB_QUIRK(ALCOR, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, UQ_MSC_NO_TEST_UNIT_READY, UQ_MATCH_VENDOR_ONLY),
+	USB_QUIRK(APPLE, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY),
 	USB_QUIRK(FEIYA, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY),
 	USB_QUIRK(REALTEK, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY),
 	USB_QUIRK(INITIO, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY),

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Wed Dec 26 21:47:07 2012	(r244718)
+++ head/sys/dev/usb/usbdevs	Wed Dec 26 22:21:27 2012	(r244719)
@@ -1050,6 +1050,7 @@ product AOX USB101		0x0008	Ethernet
 product APC UPS			0x0002	Uninterruptible Power Supply
 
 /* Apple Computer products */
+product APPLE DUMMY		0x0000	Dummy product
 product APPLE IMAC_KBD		0x0201	USB iMac Keyboard
 product APPLE KBD		0x0202	USB Keyboard M2452
 product APPLE EXT_KBD		0x020c	Apple Extended USB Keyboard

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 23:14:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8A68DC34;
 Wed, 26 Dec 2012 23:14:34 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6D47D8FC08;
 Wed, 26 Dec 2012 23:14:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQNEYia060910;
 Wed, 26 Dec 2012 23:14:34 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQNEY35060909;
 Wed, 26 Dec 2012 23:14:34 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212262314.qBQNEY35060909@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Dec 2012 23:14:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244720 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 23:14:34 -0000

Author: bapt
Date: Wed Dec 26 23:14:33 2012
New Revision: 244720
URL: http://svnweb.freebsd.org/changeset/base/244720

Log:
  Fix off-by-one error in memory allocation: j entries, one new and a null
  terminator is j + 2.
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Wed Dec 26 22:21:27 2012	(r244719)
+++ head/usr.sbin/pw/pw_user.c	Wed Dec 26 23:14:33 2012	(r244720)
@@ -756,7 +756,7 @@ pw_user(struct userconf * cnf, int mode,
 			if (grp->gr_mem[j] != NULL) /* user already member of group */
 				continue;
 
-			members = malloc(sizeof(char *) * (j + 1));
+			members = malloc(sizeof(char *) * (j + 2));
 			for (j = 0; grp->gr_mem[j] != NULL; j++)
 				members[j] = grp->gr_mem[j];
 

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 23:16:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3DE31DAA;
 Wed, 26 Dec 2012 23:16:25 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2349C8FC12;
 Wed, 26 Dec 2012 23:16:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQNGP1d061199;
 Wed, 26 Dec 2012 23:16:25 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQNGPu3061198;
 Wed, 26 Dec 2012 23:16:25 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212262316.qBQNGPu3061198@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Dec 2012 23:16:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244721 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 23:16:25 -0000

Author: bapt
Date: Wed Dec 26 23:16:24 2012
New Revision: 244721
URL: http://svnweb.freebsd.org/changeset/base/244721

Log:
  Simplify copying of group members by using memcpy
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Wed Dec 26 23:14:33 2012	(r244720)
+++ head/usr.sbin/pw/pw_user.c	Wed Dec 26 23:16:24 2012	(r244721)
@@ -757,8 +757,7 @@ pw_user(struct userconf * cnf, int mode,
 				continue;
 
 			members = malloc(sizeof(char *) * (j + 2));
-			for (j = 0; grp->gr_mem[j] != NULL; j++)
-				members[j] = grp->gr_mem[j];
+			memcpy(members, grp->gr_mem, j * sizeof(*members));
 
 			members[j] = pwd->pw_name;
 			members[j+1] = NULL;

From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 23:22:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BD30A55F;
 Wed, 26 Dec 2012 23:22:37 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 7A5468FC08;
 Wed, 26 Dec 2012 23:22:36 +0000 (UTC)
Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149])
 by mail.dawidek.net (Postfix) with ESMTPSA id DF9CA7CA;
 Thu, 27 Dec 2012 00:20:17 +0100 (CET)
Date: Thu, 27 Dec 2012 00:22:38 +0100
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Jilles Tjoelker <jilles@FreeBSD.org>
Subject: Re: svn commit: r244682 - head/bin/sh
Message-ID: <20121226232238.GB1394@garage.freebsd.pl>
References: <201212251417.qBPEHAQC070177@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="Y7xTucakfITjPcLV"
Content-Disposition: inline
In-Reply-To: <201212251417.qBPEHAQC070177@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Dec 2012 23:22:37 -0000


--Y7xTucakfITjPcLV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 25, 2012 at 02:17:10PM +0000, Jilles Tjoelker wrote:
> Author: jilles
> Date: Tue Dec 25 14:17:09 2012
> New Revision: 244682
> URL: http://svnweb.freebsd.org/changeset/base/244682
>=20
> Log:
>   sh: Prefer strsignal() to accessing sys_siglist directly.
>  =20
>   Accessing sys_siglist directly requires rtld to copy it from libc to th=
e sh
>   executable's BSS. Also, strsignal() will put in the signal number for
>   unknown signals (FreeBSD-specific) so we need not do that ourselves.
>  =20
>   Unfortunately, there is no function for sys_signame.

Yes, that would be very handy.

BTW.

> +		sigstr =3D strsignal(i);
> +		if (sigstr !=3D NULL)
> +			strcpy(statestr, sigstr);
>  		else
>  			strcpy(statestr, "Suspended");

When strsignal(3) can return NULL?

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--Y7xTucakfITjPcLV
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDbhr4ACgkQForvXbEpPzSEvQCfZAMED/fI/aCwp3DGKTzBIWvO
2WIAn21SkxANp+UjbTHKk5iyGUSvyZYD
=0bi7
-----END PGP SIGNATURE-----

--Y7xTucakfITjPcLV--

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 07:52:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8E0D3AB1;
 Thu, 27 Dec 2012 07:52:51 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 729A38FC0A;
 Thu, 27 Dec 2012 07:52:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR7qpEV036149;
 Thu, 27 Dec 2012 07:52:51 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR7qp9b036148;
 Thu, 27 Dec 2012 07:52:51 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212270752.qBR7qp9b036148@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 27 Dec 2012 07:52:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244727 - head/usr.sbin/bsdconfig/startup/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 07:52:51 -0000

Author: dteske
Date: Thu Dec 27 07:52:50 2012
New Revision: 244727
URL: http://svnweb.freebsd.org/changeset/base/244727

Log:
  Comments and fit to 80-columns.

Modified:
  head/usr.sbin/bsdconfig/startup/share/rcvar.subr

Modified: head/usr.sbin/bsdconfig/startup/share/rcvar.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Thu Dec 27 04:29:14 2012	(r244726)
+++ head/usr.sbin/bsdconfig/startup/share/rcvar.subr	Thu Dec 27 07:52:50 2012	(r244727)
@@ -107,11 +107,11 @@ f_startup_rcvar_map()
 	)"
 
 	#
-	# Calculate a digest given the checksums of all dependencies (scripts and
-	# the defaults file). This digest will be used to determine if an on-disk
-	# global persistant cache file (containg this digest on the first line)
-	# is valid and can be used to quickly populate the cache value for
-	# immediate return.
+	# Calculate a digest given the checksums of all dependencies (scripts
+	# and the defaults file). This digest will be used to determine if an
+	# on-disk global persistant cache file (containg this digest on the
+	# first line) is valid and can be used to quickly populate the cache
+	# value for immediate return.
 	#
 	local rc_script_list_digest
 	rc_script_list_digest=$( cd "$ETC_RC_D" &&
@@ -131,11 +131,12 @@ f_startup_rcvar_map()
 				read digest rest_ignored
 
 				#
-				# If the stored digest matches the calculated-one
-				# populate the in-memory cache from the on-disk
-				# cache and provide success exit status.
+				# If the stored digest matches the calculated-
+				# one populate the in-memory cache from the on-
+				# disk cache and provide success exit status.
 				#
-				if [ "$digest" = "$rc_script_list_digest" ]; then
+				if [ "$digest" = "$rc_script_list_digest" ]
+				then
 					cat
 					exit $SUCCESS
 				else
@@ -151,7 +152,7 @@ f_startup_rcvar_map()
 			echo "$STARTUP_RCVAR_MAP"
 			return $SUCCESS
 		fi
-		# Otherwise, fall-through to create in-memory cache from scratch
+		# Otherwise, fall-thru to create in-memory cache from scratch
 	fi
 
 	#

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 08:02:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B67A4CBB;
 Thu, 27 Dec 2012 08:02:58 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B1F88FC0C;
 Thu, 27 Dec 2012 08:02:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR82wTx037746;
 Thu, 27 Dec 2012 08:02:58 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR82wVP037745;
 Thu, 27 Dec 2012 08:02:58 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201212270802.qBR82wVP037745@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 27 Dec 2012 08:02:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244728 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 08:02:58 -0000

Author: tuexen
Date: Thu Dec 27 08:02:58 2012
New Revision: 244728
URL: http://svnweb.freebsd.org/changeset/base/244728

Log:
  Fix a copy and paste error.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Thu Dec 27 07:52:50 2012	(r244727)
+++ head/sys/netinet/sctputil.c	Thu Dec 27 08:02:58 2012	(r244728)
@@ -4955,7 +4955,7 @@ sctp_get_ifa_hash_val(struct sockaddr *a
 		}
 #endif
 #ifdef INET6
-	case INET6:
+	case AF_INET6:
 		{
 			struct sockaddr_in6 *sin6;
 			uint32_t hash_of_addr;

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 08:06:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 706C8E87;
 Thu, 27 Dec 2012 08:06:59 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 53BCF8FC16;
 Thu, 27 Dec 2012 08:06:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR86xTA038504;
 Thu, 27 Dec 2012 08:06:59 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR86xA5038503;
 Thu, 27 Dec 2012 08:06:59 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201212270806.qBR86xA5038503@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 27 Dec 2012 08:06:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244729 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 08:06:59 -0000

Author: tuexen
Date: Thu Dec 27 08:06:58 2012
New Revision: 244729
URL: http://svnweb.freebsd.org/changeset/base/244729

Log:
  Minor cleanups of debug messages.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_pcb.c

Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c	Thu Dec 27 08:02:58 2012	(r244728)
+++ head/sys/netinet/sctp_pcb.c	Thu Dec 27 08:06:58 2012	(r244729)
@@ -2694,9 +2694,9 @@ sctp_inpcb_bind(struct socket *so, struc
 	ip_inp = (struct inpcb *)so->so_pcb;
 #ifdef SCTP_DEBUG
 	if (addr) {
-		SCTPDBG(SCTP_DEBUG_PCB1, "Bind called port:%d\n",
+		SCTPDBG(SCTP_DEBUG_PCB1, "Bind called port: %d\n",
 		    ntohs(((struct sockaddr_in *)addr)->sin_port));
-		SCTPDBG(SCTP_DEBUG_PCB1, "Addr :");
+		SCTPDBG(SCTP_DEBUG_PCB1, "Addr: ");
 		SCTPDBG_ADDR(SCTP_DEBUG_PCB1, addr);
 	}
 #endif

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 08:10:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 36429130;
 Thu, 27 Dec 2012 08:10:59 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1A2728FC14;
 Thu, 27 Dec 2012 08:10:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR8Aw3t039274;
 Thu, 27 Dec 2012 08:10:58 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR8AwWO039273;
 Thu, 27 Dec 2012 08:10:58 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201212270810.qBR8AwWO039273@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 27 Dec 2012 08:10:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244730 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 08:10:59 -0000

Author: tuexen
Date: Thu Dec 27 08:10:58 2012
New Revision: 244730
URL: http://svnweb.freebsd.org/changeset/base/244730

Log:
  Some cleanups.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_usrreq.c

Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c	Thu Dec 27 08:06:58 2012	(r244729)
+++ head/sys/netinet/sctp_usrreq.c	Thu Dec 27 08:10:58 2012	(r244730)
@@ -547,27 +547,21 @@ try_again:
 static int
 sctp_bind(struct socket *so, struct sockaddr *addr, struct thread *p)
 {
-	struct sctp_inpcb *inp = NULL;
-	int error;
+	struct sctp_inpcb *inp;
 
-#ifdef INET
-	if (addr && addr->sa_family != AF_INET) {
-		/* must be a v4 address! */
-		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
-		return (EINVAL);
-	}
-#endif				/* INET6 */
-	if (addr && (addr->sa_len != sizeof(struct sockaddr_in))) {
-		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
-		return (EINVAL);
-	}
 	inp = (struct sctp_inpcb *)so->so_pcb;
 	if (inp == NULL) {
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
 		return (EINVAL);
 	}
-	error = sctp_inpcb_bind(so, addr, NULL, p);
-	return (error);
+	if (addr != NULL) {
+		if ((addr->sa_family != AF_INET) ||
+		    (addr->sa_len != sizeof(struct sockaddr_in))) {
+			SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+			return (EINVAL);
+		}
+	}
+	return (sctp_inpcb_bind(so, addr, NULL, p));
 }
 
 #endif

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 09:15:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 61E4F9CF;
 Thu, 27 Dec 2012 09:15:22 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2DCEF8FC12;
 Thu, 27 Dec 2012 09:15:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR9FMIW048641;
 Thu, 27 Dec 2012 09:15:22 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR9FMDa048640;
 Thu, 27 Dec 2012 09:15:22 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201212270915.qBR9FMDa048640@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 27 Dec 2012 09:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244731 - head/tools/tools/netrate/netsend
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 09:15:22 -0000

Author: luigi
Date: Thu Dec 27 09:15:21 2012
New Revision: 244731
URL: http://svnweb.freebsd.org/changeset/base/244731

Log:
  use nanosecond resolution, make sure gettimeofday
  is called at most every 100 packets.

Modified:
  head/tools/tools/netrate/netsend/netsend.c

Modified: head/tools/tools/netrate/netsend/netsend.c
==============================================================================
--- head/tools/tools/netrate/netsend/netsend.c	Thu Dec 27 08:10:58 2012	(r244730)
+++ head/tools/tools/netrate/netsend/netsend.c	Thu Dec 27 09:15:21 2012	(r244731)
@@ -144,7 +144,7 @@ timing_loop(struct _a *a)
 	long finishtime;
 	long send_errors, send_calls;
 	/* do not call gettimeofday more than every 20us */
-	long minres_ns = 20000;
+	long minres_ns = 200000;
 	int ic, gettimeofday_cycles;
 	int cur_port;
 	uint64_t n, ns;
@@ -154,17 +154,22 @@ timing_loop(struct _a *a)
 		return (-1);
 	}
 
+	ns = a->interval.tv_nsec;
 	if (timespec_ge(&tmptime, &a->interval))
 		fprintf(stderr,
 		    "warning: interval (%jd.%09ld) less than resolution (%jd.%09ld)\n",
 		    (intmax_t)a->interval.tv_sec, a->interval.tv_nsec,
 		    (intmax_t)tmptime.tv_sec, tmptime.tv_nsec);
-	if (a->interval.tv_nsec < minres_ns) {
-		gettimeofday_cycles = minres_ns/(tmptime.tv_nsec + 1);
-		fprintf(stderr,
-		    "calling time every %d cycles\n", gettimeofday_cycles);
-	} else
-		gettimeofday_cycles = 0;
+		/* interval too short, limit the number of gettimeofday()
+		 * calls, but also make sure there is at least one every
+		 * some 100 packets.
+		 */
+	if ((long)ns < minres_ns/100)
+		gettimeofday_cycles = 100;
+	else
+		gettimeofday_cycles = minres_ns/ns;
+	fprintf(stderr,
+	    "calling time every %d cycles\n", gettimeofday_cycles);
 
 	if (clock_gettime(CLOCK_REALTIME, &starttime) == -1) {
 		perror("clock_gettime");

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 12:36:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D6224192;
 Thu, 27 Dec 2012 12:36:58 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BA2B08FC0A;
 Thu, 27 Dec 2012 12:36:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRCawUZ078204;
 Thu, 27 Dec 2012 12:36:58 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRCawuU078203;
 Thu, 27 Dec 2012 12:36:58 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212271236.qBRCawuU078203@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 27 Dec 2012 12:36:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244732 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 12:36:58 -0000

Author: attilio
Date: Thu Dec 27 12:36:58 2012
New Revision: 244732
URL: http://svnweb.freebsd.org/changeset/base/244732

Log:
  br_prod_tail and br_cons_tail members are used as barrier to
  signal bug_ring ownership. However, instructions can be reordered
  around members write leading to stale values for ie. br_prod_bufs.
  
  Use correct memory barriers to ensure proper ordering of the
  ownership tokens updates.
  
  Sponsored by:	EMC / Isilon storage division
  MFC after:	2 weeks

Modified:
  head/sys/sys/buf_ring.h

Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h	Thu Dec 27 09:15:21 2012	(r244731)
+++ head/sys/sys/buf_ring.h	Thu Dec 27 12:36:58 2012	(r244732)
@@ -114,10 +114,10 @@ buf_ring_enqueue(struct buf_ring *br, vo
 	 * that preceeded us, we need to wait for them
 	 * to complete 
 	 */   
-	while (br->br_prod_tail != prod_head)
+	while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
 		cpu_spinwait();
 	br->br_prod_bufs++;
-	br->br_prod_tail = prod_next;
+	atomic_store_rel_32(&br->br_prod_tail, prod_next);
 	critical_exit();
 	return (0);
 }
@@ -161,10 +161,10 @@ buf_ring_dequeue_mc(struct buf_ring *br)
 	 * that preceeded us, we need to wait for them
 	 * to complete 
 	 */   
-	while (br->br_cons_tail != cons_head)
+	while (atomic_load_acq_32(&br->br_cons_tail) != cons_head)
 		cpu_spinwait();
 
-	br->br_cons_tail = cons_next;
+	atomic_store_rel_32(&br->br_cons_tail, cons_next);
 	critical_exit();
 
 	return (buf);
@@ -209,7 +209,7 @@ buf_ring_dequeue_sc(struct buf_ring *br)
 		panic("inconsistent list cons_tail=%d cons_head=%d",
 		    br->br_cons_tail, cons_head);
 #endif
-	br->br_cons_tail = cons_next;
+	atomic_store_rel_32(&br->br_cons_tail, cons_next);
 	return (buf);
 }
 

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 12:47:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 67301424;
 Thu, 27 Dec 2012 12:47:00 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id B83E28FC14;
 Thu, 27 Dec 2012 12:46:59 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBRCkvB4013138;
 Thu, 27 Dec 2012 16:46:57 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBRCkv4O013137;
 Thu, 27 Dec 2012 16:46:57 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Thu, 27 Dec 2012 16:46:57 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Attilio Rao <attilio@FreeBSD.org>
Subject: Re: svn commit: r244732 - head/sys/sys
Message-ID: <20121227124657.GX80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <201212271236.qBRCawuU078203@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 12:47:00 -0000

  Attilio,

On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
A> Author: attilio
A> Date: Thu Dec 27 12:36:58 2012
A> New Revision: 244732
A> URL: http://svnweb.freebsd.org/changeset/base/244732
A> 
A> Log:
A>   br_prod_tail and br_cons_tail members are used as barrier to
A>   signal bug_ring ownership. However, instructions can be reordered
A>   around members write leading to stale values for ie. br_prod_bufs.
A>   
A>   Use correct memory barriers to ensure proper ordering of the
A>   ownership tokens updates.
A>   
A>   Sponsored by:	EMC / Isilon storage division
A>   MFC after:	2 weeks

Have you profiled this?

After this change the buf_ring actually gains its own hand-rolled
mutex:

	while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
		cpu_spinwait();

The only difference with mutex(9) is that this one isn't monitored
by WITNESS.

The idea behind buf_ring was lockless storing and lockless fetching
from a ring and now this vanished.

What does your change actually fixes except precise accounting of
br_prod_bufs that are actually unused and should be better garbage
collected rather than fixed?

A> Modified:
A>   head/sys/sys/buf_ring.h
A> 
A> Modified: head/sys/sys/buf_ring.h
A> ==============================================================================
A> --- head/sys/sys/buf_ring.h	Thu Dec 27 09:15:21 2012	(r244731)
A> +++ head/sys/sys/buf_ring.h	Thu Dec 27 12:36:58 2012	(r244732)
A> @@ -114,10 +114,10 @@ buf_ring_enqueue(struct buf_ring *br, vo
A>  	 * that preceeded us, we need to wait for them
A>  	 * to complete 
A>  	 */   
A> -	while (br->br_prod_tail != prod_head)
A> +	while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
A>  		cpu_spinwait();
A>  	br->br_prod_bufs++;
A> -	br->br_prod_tail = prod_next;
A> +	atomic_store_rel_32(&br->br_prod_tail, prod_next);
A>  	critical_exit();
A>  	return (0);
A>  }
A> @@ -161,10 +161,10 @@ buf_ring_dequeue_mc(struct buf_ring *br)
A>  	 * that preceeded us, we need to wait for them
A>  	 * to complete 
A>  	 */   
A> -	while (br->br_cons_tail != cons_head)
A> +	while (atomic_load_acq_32(&br->br_cons_tail) != cons_head)
A>  		cpu_spinwait();
A>  
A> -	br->br_cons_tail = cons_next;
A> +	atomic_store_rel_32(&br->br_cons_tail, cons_next);
A>  	critical_exit();
A>  
A>  	return (buf);
A> @@ -209,7 +209,7 @@ buf_ring_dequeue_sc(struct buf_ring *br)
A>  		panic("inconsistent list cons_tail=%d cons_head=%d",
A>  		    br->br_cons_tail, cons_head);
A>  #endif
A> -	br->br_cons_tail = cons_next;
A> +	atomic_store_rel_32(&br->br_cons_tail, cons_next);
A>  	return (buf);
A>  }
A>  

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 12:53:46 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E8F31796;
 Thu, 27 Dec 2012 12:53:46 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CD6A88FC0C;
 Thu, 27 Dec 2012 12:53:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRCrkWh080596;
 Thu, 27 Dec 2012 12:53:46 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRCrkwp080595;
 Thu, 27 Dec 2012 12:53:46 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212271253.qBRCrkwp080595@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 27 Dec 2012 12:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244733 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 12:53:47 -0000

Author: attilio
Date: Thu Dec 27 12:53:46 2012
New Revision: 244733
URL: http://svnweb.freebsd.org/changeset/base/244733

Log:
  Remove an unused var.
  
  Sponsored by:	EMC / Isilon storage division
  MFC after:	3 days

Modified:
  head/sys/sys/buf_ring.h

Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h	Thu Dec 27 12:36:58 2012	(r244732)
+++ head/sys/sys/buf_ring.h	Thu Dec 27 12:53:46 2012	(r244733)
@@ -77,7 +77,6 @@ buf_ring_enqueue(struct buf_ring *br, vo
 {
 	uint32_t prod_head, prod_next;
 	uint32_t cons_tail;
-	int success;
 #ifdef DEBUG_BUFRING
 	int i;
 	for (i = br->br_cons_head; i != br->br_prod_head;
@@ -98,10 +97,7 @@ buf_ring_enqueue(struct buf_ring *br, vo
 			critical_exit();
 			return (ENOBUFS);
 		}
-		
-		success = atomic_cmpset_int(&br->br_prod_head, prod_head,
-		    prod_next);
-	} while (success == 0);
+	} while (!atomic_cmpset_int(&br->br_prod_head, prod_head, prod_next));
 #ifdef DEBUG_BUFRING
 	if (br->br_ring[prod_head] != NULL)
 		panic("dangling value in enqueue");

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 12:55:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4A974919;
 Thu, 27 Dec 2012 12:55:31 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f43.google.com (mail-la0-f43.google.com
 [209.85.215.43])
 by mx1.freebsd.org (Postfix) with ESMTP id 3113F8FC12;
 Thu, 27 Dec 2012 12:55:29 +0000 (UTC)
Received: by mail-la0-f43.google.com with SMTP id z14so12247791lag.30
 for <multiple recipients>; Thu, 27 Dec 2012 04:55:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=r6Fel6LeOL247Dpn4oQuu0O2m7t3TJIl6RV0VhWKorE=;
 b=NQzw+bNHnVCRcn5itOPU9loxhHVU8Anw+YqvTs0aU/vumbBVDL5VPruQtjAI+EgKHM
 C9eTcOgl65boDNTzNJjGavBBPfEp5nVjUVVlTyE4OSGv14z6Rzf/gEgcB4MALrYLonNh
 Po2EOOq1jtesUQvA1RLWKLx+ZclNFTQxEE4FJhDnjxrdsfPl4eATipLZNFSGFBDynKPm
 vmUDUrt38/wsSFlTIJNVGT5JhaZtaqBKH4R20oCGZkYc0HZVt3F1fmy0GW4idDX9HiHv
 fIUyDVEu/vpAOXgFuopEg3qdiHjskYSPKempsMT8CjPxThHsYmG98EayHG/MKTxpZwpN
 tjoA==
MIME-Version: 1.0
Received: by 10.112.87.40 with SMTP id u8mr12139761lbz.50.1356612922749; Thu,
 27 Dec 2012 04:55:22 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Thu, 27 Dec 2012 04:55:22 -0800 (PST)
In-Reply-To: <20121227124657.GX80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
Date: Thu, 27 Dec 2012 04:55:22 -0800
X-Google-Sender-Auth: 97SeYChrGgRPsoI2sPT1O4IdO3g
Message-ID: <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 12:55:31 -0000

On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>   Attilio,
>
> On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
> A> Author: attilio
> A> Date: Thu Dec 27 12:36:58 2012
> A> New Revision: 244732
> A> URL: http://svnweb.freebsd.org/changeset/base/244732
> A>
> A> Log:
> A>   br_prod_tail and br_cons_tail members are used as barrier to
> A>   signal bug_ring ownership. However, instructions can be reordered
> A>   around members write leading to stale values for ie. br_prod_bufs.
> A>
> A>   Use correct memory barriers to ensure proper ordering of the
> A>   ownership tokens updates.
> A>
> A>   Sponsored by:      EMC / Isilon storage division
> A>   MFC after: 2 weeks
>
> Have you profiled this?
>
> After this change the buf_ring actually gains its own hand-rolled
> mutex:
>
>         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
>                 cpu_spinwait();
>
> The only difference with mutex(9) is that this one isn't monitored
> by WITNESS.

I think you are not correct. It doesn't disable interrupts (as
spinlock do) and it doesn't sleep.
So your analogy is completely off.

Also, on x86 atomic_store_rel_*() is a simple write. The only thing
that really changes is the atomic_load_acq_*() that introduces a
locked instruction.

> The idea behind buf_ring was lockless storing and lockless fetching
> from a ring and now this vanished.
>
> What does your change actually fixes except precise accounting of
> br_prod_bufs that are actually unused and should be better garbage
> collected rather than fixed?

The write of br_prod_tail must happens as very last thing, also after
the whole buf setup. The only way you can enforce this is with a
memory barrier. I can double-check if we can garbage collect
br_prod_bufs but this should not be enough yet.

Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 13:21:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5EC77C05;
 Thu, 27 Dec 2012 13:21:38 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 43D878FC08;
 Thu, 27 Dec 2012 13:21:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRDLclh085024;
 Thu, 27 Dec 2012 13:21:38 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRDLc63085023;
 Thu, 27 Dec 2012 13:21:38 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201212271321.qBRDLc63085023@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Thu, 27 Dec 2012 13:21:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244734 - head/bin/test
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 13:21:38 -0000

Author: jilles
Date: Thu Dec 27 13:21:37 2012
New Revision: 244734
URL: http://svnweb.freebsd.org/changeset/base/244734

Log:
  test(1): Document == alias for =.
  
  Reviewed by:	gjb
  Requested by:	gjb
  MFC after:	1 week

Modified:
  head/bin/test/test.1

Modified: head/bin/test/test.1
==============================================================================
--- head/bin/test/test.1	Thu Dec 27 12:53:46 2012	(r244733)
+++ head/bin/test/test.1	Thu Dec 27 13:21:37 2012	(r244734)
@@ -32,7 +32,7 @@
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd September 10, 2010
+.Dd December 27, 2012
 .Dt TEST 1
 .Os
 .Sh NAME
@@ -331,6 +331,13 @@ missing.
 .It >1
 An error occurred.
 .El
+.Sh COMPATIBILITY
+For compatibility with some other implementations,
+the
+.Cm =
+primary can be substituted with
+.Cm ==
+with the same meaning.
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr expr 1 ,

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 13:25:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 17709DC1;
 Thu, 27 Dec 2012 13:25:10 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id 8653D8FC17;
 Thu, 27 Dec 2012 13:25:08 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBRDP7cr013300;
 Thu, 27 Dec 2012 17:25:07 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBRDP7eE013299;
 Thu, 27 Dec 2012 17:25:07 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Thu, 27 Dec 2012 17:25:07 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Attilio Rao <attilio@FreeBSD.org>
Subject: Re: svn commit: r244732 - head/sys/sys
Message-ID: <20121227132507.GY80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 13:25:10 -0000

On Thu, Dec 27, 2012 at 04:55:22AM -0800, Attilio Rao wrote:
A> On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
A> >   Attilio,
A> >
A> > On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
A> > A> Author: attilio
A> > A> Date: Thu Dec 27 12:36:58 2012
A> > A> New Revision: 244732
A> > A> URL: http://svnweb.freebsd.org/changeset/base/244732
A> > A>
A> > A> Log:
A> > A>   br_prod_tail and br_cons_tail members are used as barrier to
A> > A>   signal bug_ring ownership. However, instructions can be reordered
A> > A>   around members write leading to stale values for ie. br_prod_bufs.
A> > A>
A> > A>   Use correct memory barriers to ensure proper ordering of the
A> > A>   ownership tokens updates.
A> > A>
A> > A>   Sponsored by:      EMC / Isilon storage division
A> > A>   MFC after: 2 weeks
A> >
A> > Have you profiled this?
A> >
A> > After this change the buf_ring actually gains its own hand-rolled
A> > mutex:
A> >
A> >         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
A> >                 cpu_spinwait();
A> >
A> > The only difference with mutex(9) is that this one isn't monitored
A> > by WITNESS.
A> 
A> I think you are not correct. It doesn't disable interrupts (as
A> spinlock do) and it doesn't sleep.
A> So your analogy is completely off.
A> 
A> Also, on x86 atomic_store_rel_*() is a simple write. The only thing
A> that really changes is the atomic_load_acq_*() that introduces a
A> locked instruction.

This only thing, the locked instruction, affects performance a lot. I
suspect strong forwarding degradation after your change. Can you please
profile that?

A> > The idea behind buf_ring was lockless storing and lockless fetching
A> > from a ring and now this vanished.
A> >
A> > What does your change actually fixes except precise accounting of
A> > br_prod_bufs that are actually unused and should be better garbage
A> > collected rather than fixed?
A> 
A> The write of br_prod_tail must happens as very last thing, also after
A> the whole buf setup. The only way you can enforce this is with a
A> memory barrier. I can double-check if we can garbage collect
A> br_prod_bufs but this should not be enough yet.

Do you have a core file that illustrates that a ring can get into
inconsistent state?

Your original commit message told only about stale values in br_prod_bufs,
and as said the latter is absolutely useless.

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 13:53:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E85307E6;
 Thu, 27 Dec 2012 13:53:24 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f48.google.com (mail-la0-f48.google.com
 [209.85.215.48])
 by mx1.freebsd.org (Postfix) with ESMTP id BBCEE8FC08;
 Thu, 27 Dec 2012 13:53:23 +0000 (UTC)
Received: by mail-la0-f48.google.com with SMTP id m13so12016393lah.7
 for <multiple recipients>; Thu, 27 Dec 2012 05:53:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=UB3BDfmpYfgbTtvNpU28xBDnIieEiJ+d9PZwab+Xqf8=;
 b=tRdN5HXG637YJbvZ+tJVmG8DwZPdy8hfAZvbHqG38/4eS4ZwH16Na8H+ElNCdMG0o0
 AmICMP/1qmUMa6d2Zm3A0d1s2izF7j37Jpe4g6GTI93yfbkdmHawWSOdZcoBIlOZtdCG
 Vji5GwErawSRfITKjrRrltldVCutSeh6AoJnQlRJCYWCsjyKuwfozdOl1/ZLqsvT80JM
 89dhTaEVPWvcOa/F5yrUOA1fNCnhI6xBDQVqwYqibTwHapKnuRKNw/UDifvNGxtdHm/u
 X2ooviXDjEsjUMlYY29iqzrVB9etK9jCrJZGahvYqWHNWdbBmBhLSulGuFqfjkTdsE61
 z/KQ==
MIME-Version: 1.0
Received: by 10.152.122.133 with SMTP id ls5mr29022960lab.9.1356616402361;
 Thu, 27 Dec 2012 05:53:22 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Thu, 27 Dec 2012 05:53:22 -0800 (PST)
In-Reply-To: <20121227132507.GY80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
Date: Thu, 27 Dec 2012 05:53:22 -0800
X-Google-Sender-Auth: DDgmav9Gs3ks_y6ugNlkfe72YTg
Message-ID: <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 13:53:25 -0000

On Thu, Dec 27, 2012 at 5:25 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
> On Thu, Dec 27, 2012 at 04:55:22AM -0800, Attilio Rao wrote:
> A> On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
> A> >   Attilio,
> A> >
> A> > On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
> A> > A> Author: attilio
> A> > A> Date: Thu Dec 27 12:36:58 2012
> A> > A> New Revision: 244732
> A> > A> URL: http://svnweb.freebsd.org/changeset/base/244732
> A> > A>
> A> > A> Log:
> A> > A>   br_prod_tail and br_cons_tail members are used as barrier to
> A> > A>   signal bug_ring ownership. However, instructions can be reordered
> A> > A>   around members write leading to stale values for ie. br_prod_bufs.
> A> > A>
> A> > A>   Use correct memory barriers to ensure proper ordering of the
> A> > A>   ownership tokens updates.
> A> > A>
> A> > A>   Sponsored by:      EMC / Isilon storage division
> A> > A>   MFC after: 2 weeks
> A> >
> A> > Have you profiled this?
> A> >
> A> > After this change the buf_ring actually gains its own hand-rolled
> A> > mutex:
> A> >
> A> >         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
> A> >                 cpu_spinwait();
> A> >
> A> > The only difference with mutex(9) is that this one isn't monitored
> A> > by WITNESS.
> A>
> A> I think you are not correct. It doesn't disable interrupts (as
> A> spinlock do) and it doesn't sleep.
> A> So your analogy is completely off.
> A>
> A> Also, on x86 atomic_store_rel_*() is a simple write. The only thing
> A> that really changes is the atomic_load_acq_*() that introduces a
> A> locked instruction.
>
> This only thing, the locked instruction, affects performance a lot. I
> suspect strong forwarding degradation after your change. Can you please
> profile that?

Yes but it is a matter of incorrect code vs. slower instruction.
Also, you are not considering that there are much heavier-weight
instructions already (wmb(), rmb(), which I'm going to change soon
into actual barriers btw). I highly doubt you can measure the latency
introduced by atomic_load_acq_*() when mfence and stuff is in place.
The pessimization should only account for a small fraction of the
overall performance.

> A> > The idea behind buf_ring was lockless storing and lockless fetching
> A> > from a ring and now this vanished.
> A> >
> A> > What does your change actually fixes except precise accounting of
> A> > br_prod_bufs that are actually unused and should be better garbage
> A> > collected rather than fixed?
> A>
> A> The write of br_prod_tail must happens as very last thing, also after
> A> the whole buf setup. The only way you can enforce this is with a
> A> memory barrier. I can double-check if we can garbage collect
> A> br_prod_bufs but this should not be enough yet.
>
> Do you have a core file that illustrates that a ring can get into
> inconsistent state?

I don't I got it by code inspection. The br_prod_tail update must
happen as very last thing because it means the buf is "ready-to-go"
and it will be owned.

However, the prior wmb() may be helpful in this case, at least for one
case. I will do a follow up soon. For a longer discussion, I plan to
move this into a real atomic_store_rel_*() soon.

Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 14:09:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3FE48EC6;
 Thu, 27 Dec 2012 14:09:51 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 097688FC0C;
 Thu, 27 Dec 2012 14:09:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRE9oVJ092288;
 Thu, 27 Dec 2012 14:09:50 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRE9ogT092286;
 Thu, 27 Dec 2012 14:09:50 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271409.qBRE9ogT092286@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 14:09:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244735 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 14:09:51 -0000

Author: bapt
Date: Thu Dec 27 14:09:50 2012
New Revision: 244735
URL: http://svnweb.freebsd.org/changeset/base/244735

Log:
  Use flopen(3) instead of open(2) + flock(2)

Modified:
  head/lib/libutil/gr_util.c
  head/lib/libutil/pw_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 13:21:37 2012	(r244734)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 14:09:50 2012	(r244735)
@@ -106,10 +106,8 @@ gr_lock(void)
 	for (;;) {
 		struct stat st;
 
-		lockfd = open(group_file, O_RDONLY, 0);
-		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
-			err(1, "%s", group_file);
-		if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
+		lockfd = flopen(group_file, O_RDONLY|O_NONBLOCK, 0);
+		if (lockfd == -1) {
 			if (errno == EWOULDBLOCK) {
 				errx(1, "the group file is busy");
 			} else {

Modified: head/lib/libutil/pw_util.c
==============================================================================
--- head/lib/libutil/pw_util.c	Thu Dec 27 13:21:37 2012	(r244734)
+++ head/lib/libutil/pw_util.c	Thu Dec 27 14:09:50 2012	(r244735)
@@ -179,11 +179,8 @@ pw_lock(void)
 	for (;;) {
 		struct stat st;
 
-		lockfd = open(masterpasswd, O_RDONLY, 0);
-		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
-			err(1, "%s", masterpasswd);
-		/* XXX vulnerable to race conditions */
-		if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
+		lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
+		if (lockfd == -1) {
 			if (errno == EWOULDBLOCK) {
 				errx(1, "the password db file is busy");
 			} else {

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 14:30:20 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6042D3B4;
 Thu, 27 Dec 2012 14:30:20 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B04C8FC0A;
 Thu, 27 Dec 2012 14:30:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBREUKY7095328;
 Thu, 27 Dec 2012 14:30:20 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBREUJp1095325;
 Thu, 27 Dec 2012 14:30:19 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271430.qBREUJp1095325@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 14:30:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244736 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 14:30:20 -0000

Author: bapt
Date: Thu Dec 27 14:30:19 2012
New Revision: 244736
URL: http://svnweb.freebsd.org/changeset/base/244736

Log:
  New gr_add function to provide a clean and safe method to append a new member
  into an existing group.
  
  Submitted by:	db

Modified:
  head/lib/libutil/gr_util.c
  head/lib/libutil/libutil.h

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 14:09:50 2012	(r244735)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 14:30:19 2012	(r244736)
@@ -479,6 +479,46 @@ gr_dup(const struct group *gr)
 }
 
 /*
+ * Add a new member name to a struct group.
+ */
+struct group *
+gr_add(struct group *gr, const char *newmember)
+{
+	size_t mlen;
+	int num_mem=0;
+	char **members;
+	struct group *newgr;
+
+	if (newmember == NULL)
+		return(gr_dup(gr));
+
+	if (gr->gr_mem != NULL) {
+		for (num_mem = 0; gr->gr_mem[num_mem] != NULL; num_mem++) {
+			if (strcmp(gr->gr_mem[num_mem], newmember) == 0) {
+				errno = EEXIST;
+				return (NULL);
+			}
+		}
+	}
+	/* Allocate enough for current pointers + 1 more and NULL marker */
+	mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
+	if ((members = calloc(1, mlen )) == NULL) {
+		errno = ENOMEM;
+		return (NULL);
+	}
+	memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
+	members[num_mem++] = (char *)newmember;
+	members[num_mem] = NULL;
+	gr->gr_mem = members;
+	newgr = gr_dup(gr);
+	if (newgr == NULL)
+		errno = ENOMEM;
+
+	free(members);
+	return (newgr);
+}
+
+/*
  * Scan a line and place it into a group structure.
  */
 static bool

Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h	Thu Dec 27 14:09:50 2012	(r244735)
+++ head/lib/libutil/libutil.h	Thu Dec 27 14:30:19 2012	(r244736)
@@ -166,6 +166,8 @@ int 	gr_copy(int __ffd, int _tfd, const 
 	    struct group *_old_gr);
 struct group *
 	gr_dup(const struct group *_gr);
+struct group *
+	gr_add(struct group *_gr, const char *_newmember);
 int	gr_equal(const struct group *_gr1, const struct group *_gr2);
 void	gr_fini(void);
 int	gr_init(const char *_dir, const char *_master);

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 14:35:07 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2B1095B7;
 Thu, 27 Dec 2012 14:35:07 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0F41A8FC08;
 Thu, 27 Dec 2012 14:35:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBREZ6Cp096086;
 Thu, 27 Dec 2012 14:35:06 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBREZ6Bc096085;
 Thu, 27 Dec 2012 14:35:06 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271435.qBREZ6Bc096085@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 14:35:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244737 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 14:35:07 -0000

Author: bapt
Date: Thu Dec 27 14:35:06 2012
New Revision: 244737
URL: http://svnweb.freebsd.org/changeset/base/244737

Log:
  Simplify the code by using the new gr_add function

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Thu Dec 27 14:30:19 2012	(r244736)
+++ head/usr.sbin/pw/pw_user.c	Thu Dec 27 14:35:06 2012	(r244737)
@@ -745,25 +745,19 @@ pw_user(struct userconf * cnf, int mode,
 	 */
 
 	if (mode == M_ADD || getarg(args, 'G') != NULL) {
-		int i, j;
+		int i;
 		for (i = 0; cnf->groups[i] != NULL; i++) {
-			char **members;
 			grp = GETGRNAM(cnf->groups[i]);
-			for (j = 0; grp->gr_mem[j] != NULL; j++) {
-				if (!strcmp(grp->gr_mem[j], pwd->pw_name))
-					break;
-			}
-			if (grp->gr_mem[j] != NULL) /* user already member of group */
+			grp = gr_add(grp, pwd->pw_name);
+			/*
+			 * grp can only be NULL in 2 cases:
+			 * - the new member is already a member
+			 * - a problem with memory occurs
+			 * in both cases we want to skip now.
+			 */
+			if (grp == NULL)
 				continue;
-
-			members = malloc(sizeof(char *) * (j + 2));
-			memcpy(members, grp->gr_mem, j * sizeof(*members));
-
-			members[j] = pwd->pw_name;
-			members[j+1] = NULL;
-			grp->gr_mem = members;
 			chggrent(cnf->groups[i], grp);
-			free(members);
 		}
 	}
 

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 14:44:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A670B808;
 Thu, 27 Dec 2012 14:44:14 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8A87F8FC08;
 Thu, 27 Dec 2012 14:44:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBREiEXI097373;
 Thu, 27 Dec 2012 14:44:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBREiEw9097372;
 Thu, 27 Dec 2012 14:44:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271444.qBREiEw9097372@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 14:44:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244738 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 14:44:14 -0000

Author: bapt
Date: Thu Dec 27 14:44:13 2012
New Revision: 244738
URL: http://svnweb.freebsd.org/changeset/base/244738

Log:
  Fix a regression in "pw group show" introduced r242349:
  print a newline after printing each group line.
  
  PR:		bin/174731
  Submitted by:	Jan Beich <jbeich@tormail.org>

Modified:
  head/usr.sbin/pw/pw_group.c

Modified: head/usr.sbin/pw/pw_group.c
==============================================================================
--- head/usr.sbin/pw/pw_group.c	Thu Dec 27 14:35:06 2012	(r244737)
+++ head/usr.sbin/pw/pw_group.c	Thu Dec 27 14:44:13 2012	(r244738)
@@ -407,7 +407,7 @@ print_group(struct group * grp, int pret
 		char           *buf = NULL;
 
 		buf = gr_make(grp);
-		fputs(buf, stdout);
+		printf("%s\n", buf);
 		free(buf);
 	} else {
 		int             i;

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 15:26:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A91F55FB;
 Thu, 27 Dec 2012 15:26:28 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f46.google.com (mail-la0-f46.google.com
 [209.85.215.46])
 by mx1.freebsd.org (Postfix) with ESMTP id 906D28FC0A;
 Thu, 27 Dec 2012 15:26:26 +0000 (UTC)
Received: by mail-la0-f46.google.com with SMTP id p5so12121510lag.5
 for <multiple recipients>; Thu, 27 Dec 2012 07:26:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=tXlbl7AbdVHb6TarsR6hZkl0dwJQblewhTYvnPJkH0w=;
 b=a/d646GI8sZYsR6yZ4J4KTTR46dc0wIAjNTdxvu+Nc9p5iiHmz+30VFkk4OWNQzEoK
 exdhgMfkmfTpwVDITxLwyU4wcps4tCXfddhYoUiejJr1YQGD0EKPhy+DwNwfzpyhT55i
 wihYyCP/iz16/6A9WC7ooG4qbDkDGOyD/JAsYv0EFPV/KfSAcwG8Lr28Ct5VhKn5dKKk
 9RrWP6N4dRL3oB9AO8IVb/HspYPo/EYOwTF9/WHJFmATz2SR6N5qQAYkivmsWRFntvoW
 upuCuhJSHA/6YRwNn7gOomyJTHfG4wu5pHUTwMJIuARphE0dVdpon4KVJn0R4AXSleak
 HILQ==
MIME-Version: 1.0
Received: by 10.112.84.168 with SMTP id a8mr11736604lbz.75.1356621980003; Thu,
 27 Dec 2012 07:26:20 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Thu, 27 Dec 2012 07:26:19 -0800 (PST)
In-Reply-To: <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
Date: Thu, 27 Dec 2012 07:26:19 -0800
X-Google-Sender-Auth: NqKW9bOE0I4bftRnJlDMNtzKxCA
Message-ID: <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 15:26:28 -0000

On Thu, Dec 27, 2012 at 5:53 AM, Attilio Rao <attilio@freebsd.org> wrote:
> On Thu, Dec 27, 2012 at 5:25 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>> On Thu, Dec 27, 2012 at 04:55:22AM -0800, Attilio Rao wrote:
>> A> On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>> A> >   Attilio,
>> A> >
>> A> > On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
>> A> > A> Author: attilio
>> A> > A> Date: Thu Dec 27 12:36:58 2012
>> A> > A> New Revision: 244732
>> A> > A> URL: http://svnweb.freebsd.org/changeset/base/244732
>> A> > A>
>> A> > A> Log:
>> A> > A>   br_prod_tail and br_cons_tail members are used as barrier to
>> A> > A>   signal bug_ring ownership. However, instructions can be reordered
>> A> > A>   around members write leading to stale values for ie. br_prod_bufs.
>> A> > A>
>> A> > A>   Use correct memory barriers to ensure proper ordering of the
>> A> > A>   ownership tokens updates.
>> A> > A>
>> A> > A>   Sponsored by:      EMC / Isilon storage division
>> A> > A>   MFC after: 2 weeks
>> A> >
>> A> > Have you profiled this?
>> A> >
>> A> > After this change the buf_ring actually gains its own hand-rolled
>> A> > mutex:
>> A> >
>> A> >         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
>> A> >                 cpu_spinwait();
>> A> >
>> A> > The only difference with mutex(9) is that this one isn't monitored
>> A> > by WITNESS.
>> A>
>> A> I think you are not correct. It doesn't disable interrupts (as
>> A> spinlock do) and it doesn't sleep.
>> A> So your analogy is completely off.
>> A>
>> A> Also, on x86 atomic_store_rel_*() is a simple write. The only thing
>> A> that really changes is the atomic_load_acq_*() that introduces a
>> A> locked instruction.
>>
>> This only thing, the locked instruction, affects performance a lot. I
>> suspect strong forwarding degradation after your change. Can you please
>> profile that?
>
> Yes but it is a matter of incorrect code vs. slower instruction.
> Also, you are not considering that there are much heavier-weight
> instructions already (wmb(), rmb(), which I'm going to change soon
> into actual barriers btw). I highly doubt you can measure the latency
> introduced by atomic_load_acq_*() when mfence and stuff is in place.
> The pessimization should only account for a small fraction of the
> overall performance.
>
>> A> > The idea behind buf_ring was lockless storing and lockless fetching
>> A> > from a ring and now this vanished.
>> A> >
>> A> > What does your change actually fixes except precise accounting of
>> A> > br_prod_bufs that are actually unused and should be better garbage
>> A> > collected rather than fixed?
>> A>
>> A> The write of br_prod_tail must happens as very last thing, also after
>> A> the whole buf setup. The only way you can enforce this is with a
>> A> memory barrier. I can double-check if we can garbage collect
>> A> br_prod_bufs but this should not be enough yet.
>>
>> Do you have a core file that illustrates that a ring can get into
>> inconsistent state?
>
> I don't I got it by code inspection. The br_prod_tail update must
> happen as very last thing because it means the buf is "ready-to-go"
> and it will be owned.
>
> However, the prior wmb() may be helpful in this case, at least for one
> case. I will do a follow up soon. For a longer discussion, I plan to
> move this into a real atomic_store_rel_*() soon.

Speaking of which, as you are here, I just found out that r241037
breaks the alignment of the structure.
Infact the padding member is not updated accordingly.

We don't have a param to control L2 caches, but I think that we can
safely align them to the L1 cacheline for sure.
Also, note that this padding is completely broken for MI requirements
(it just assumes blindly 128 bytes L2 cachelines, which not always
true even on i386).

Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 16:34:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 027D3A44;
 Thu, 27 Dec 2012 16:34:42 +0000 (UTC)
 (envelope-from freebsd@damnhippie.dyndns.org)
Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214])
 by mx1.freebsd.org (Postfix) with ESMTP id ED8EA8FC13;
 Thu, 27 Dec 2012 16:34:28 +0000 (UTC)
Received: from damnhippie.dyndns.org (daffy.symmetricom.us [206.168.13.218])
 by duck.symmetricom.us (8.14.5/8.14.5) with ESMTP id qBRGYRhK028013;
 Thu, 27 Dec 2012 09:34:28 -0700 (MST)
 (envelope-from freebsd@damnhippie.dyndns.org)
Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240])
 by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id qBRGYPus075335;
 Thu, 27 Dec 2012 09:34:25 -0700 (MST)
 (envelope-from freebsd@damnhippie.dyndns.org)
Subject: Re: svn commit: r244469 - head/sys/arm/arm
From: Ian Lepore <freebsd@damnhippie.dyndns.org>
To: Peter Jeremy <peter@rulingia.com>
In-Reply-To: <20121224211921.GA54928@server.rulingia.com>
References: <201212200035.qBK0ZRU0022739@svn.freebsd.org>
 <20121224211921.GA54928@server.rulingia.com>
Content-Type: text/plain; charset="us-ascii"
Date: Thu, 27 Dec 2012 09:34:25 -0700
Message-ID: <1356626065.1144.79.camel@revolution.hippie.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Olivier Houchard <cognet@freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 16:34:42 -0000

On Tue, 2012-12-25 at 08:19 +1100, Peter Jeremy wrote:
> On 2012-Dec-20 00:35:27 +0000, Olivier Houchard <cognet@FreeBSD.org> wrote:
> >Author: cognet
> >Date: Thu Dec 20 00:35:26 2012
> >New Revision: 244469
> >URL: http://svnweb.freebsd.org/changeset/base/244469
> >
> >Log:
> >  Use the new allocator in bus_dmamem_alloc().
> >
> >Modified:
> >  head/sys/arm/arm/busdma_machdep-v6.c
> 
> Do you have any plans to make similar changes to the other busdma_machdep.c
> files?
> 

I wrote that allocator code to address some specific needs of
architectures that use software-assisted cache coherency rather than
hardware bus snooping.  On such platforms, the bus_dmamem_alloc()
implementations treat BUS_DMA_COHERENT as a request for uncacheable
memory, and some drivers have come to rely on that for correct
operation.  (The concept is valid, overloading BUS_DMA_COHERENT to have
different meanings on different platforms, maybe not so much so.)

The old code on arm had the side effect of making an entire page
uncacheable if any small dma buffer got allocated within that page. That
was bad for performance, but it worked.  When armv6 came along that
caused problems with ldrex/strex instructions, which will fault if they
operate on uncacheable memory.

So the main thrust of the allocation changes was to make it easy to
efficiently allocate small(-ish) dma buffers from a pool of pages that
have caching turned off, without accidentally affecting memory that
isn't being used for dma buffers.  A nice secondary benefit is that they
help eliminate partial cacheline flushes, because the allocator ensures
that all dma buffers are aligned and padded to cacheline boundaries.

So any busdma implementation that has similar needs can benefit from the
new allocator code.  I was thinking MIPS would be a good candidate, but
I've only glanced at the mips code and noted its superficial similarity
to the arm code.

-- Ian



From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 16:37:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C684FBD4;
 Thu, 27 Dec 2012 16:37:27 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f43.google.com (mail-la0-f43.google.com
 [209.85.215.43])
 by mx1.freebsd.org (Postfix) with ESMTP id A44A18FC0C;
 Thu, 27 Dec 2012 16:37:26 +0000 (UTC)
Received: by mail-la0-f43.google.com with SMTP id z14so12342484lag.2
 for <multiple recipients>; Thu, 27 Dec 2012 08:37:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=XQAQ8oVv1oVHOspYPgoYlJnimCtzHbcQ0cnHbjoySVg=;
 b=s1ow7vOnqJdcyTpt0wvIpR/plhQ2sMsJXHTBV4n5pYfJ8xSaxwHyt9CipaMLX4laG3
 65ft4SwmsFM2kiLyMB3OWueKmI7/AJ/a7c/pgd7ap5wJ5ubdry0d5BNSChdhgOEbK9Nq
 Z8jT0A/yZguNWvroAEfzn3tt0hZ7Q8Gpd5qLsZghWqPv94dK+rMQh+28DwgOMtz/R0Vz
 yFLUwvI3APprhJvwOjmH86Vw+HWUAOtQPsXXsSb7Afyx5lBJPaNorUvkgRyNRIR8pLKa
 zUGsOUtxyiSLcyWxsAHhmZJEkrKd+dwlBkSwoloJIWWlsJ8zKyir740uF2ecSqMBSGgF
 FcOw==
MIME-Version: 1.0
Received: by 10.112.14.169 with SMTP id q9mr12241295lbc.110.1356626245068;
 Thu, 27 Dec 2012 08:37:25 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Thu, 27 Dec 2012 08:37:24 -0800 (PST)
In-Reply-To: <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
 <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
Date: Thu, 27 Dec 2012 08:37:24 -0800
X-Google-Sender-Auth: xlBHeqK6szZshJ8AQBGa71Ad6Xg
Message-ID: <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 16:37:27 -0000

On Thu, Dec 27, 2012 at 7:26 AM, Attilio Rao <attilio@freebsd.org> wrote:
> On Thu, Dec 27, 2012 at 5:53 AM, Attilio Rao <attilio@freebsd.org> wrote:
>> On Thu, Dec 27, 2012 at 5:25 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>>> On Thu, Dec 27, 2012 at 04:55:22AM -0800, Attilio Rao wrote:
>>> A> On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>>> A> >   Attilio,
>>> A> >
>>> A> > On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
>>> A> > A> Author: attilio
>>> A> > A> Date: Thu Dec 27 12:36:58 2012
>>> A> > A> New Revision: 244732
>>> A> > A> URL: http://svnweb.freebsd.org/changeset/base/244732
>>> A> > A>
>>> A> > A> Log:
>>> A> > A>   br_prod_tail and br_cons_tail members are used as barrier to
>>> A> > A>   signal bug_ring ownership. However, instructions can be reordered
>>> A> > A>   around members write leading to stale values for ie. br_prod_bufs.
>>> A> > A>
>>> A> > A>   Use correct memory barriers to ensure proper ordering of the
>>> A> > A>   ownership tokens updates.
>>> A> > A>
>>> A> > A>   Sponsored by:      EMC / Isilon storage division
>>> A> > A>   MFC after: 2 weeks
>>> A> >
>>> A> > Have you profiled this?
>>> A> >
>>> A> > After this change the buf_ring actually gains its own hand-rolled
>>> A> > mutex:
>>> A> >
>>> A> >         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
>>> A> >                 cpu_spinwait();
>>> A> >
>>> A> > The only difference with mutex(9) is that this one isn't monitored
>>> A> > by WITNESS.
>>> A>
>>> A> I think you are not correct. It doesn't disable interrupts (as
>>> A> spinlock do) and it doesn't sleep.
>>> A> So your analogy is completely off.
>>> A>
>>> A> Also, on x86 atomic_store_rel_*() is a simple write. The only thing
>>> A> that really changes is the atomic_load_acq_*() that introduces a
>>> A> locked instruction.
>>>
>>> This only thing, the locked instruction, affects performance a lot. I
>>> suspect strong forwarding degradation after your change. Can you please
>>> profile that?
>>
>> Yes but it is a matter of incorrect code vs. slower instruction.
>> Also, you are not considering that there are much heavier-weight
>> instructions already (wmb(), rmb(), which I'm going to change soon
>> into actual barriers btw). I highly doubt you can measure the latency
>> introduced by atomic_load_acq_*() when mfence and stuff is in place.
>> The pessimization should only account for a small fraction of the
>> overall performance.
>>
>>> A> > The idea behind buf_ring was lockless storing and lockless fetching
>>> A> > from a ring and now this vanished.
>>> A> >
>>> A> > What does your change actually fixes except precise accounting of
>>> A> > br_prod_bufs that are actually unused and should be better garbage
>>> A> > collected rather than fixed?
>>> A>
>>> A> The write of br_prod_tail must happens as very last thing, also after
>>> A> the whole buf setup. The only way you can enforce this is with a
>>> A> memory barrier. I can double-check if we can garbage collect
>>> A> br_prod_bufs but this should not be enough yet.
>>>
>>> Do you have a core file that illustrates that a ring can get into
>>> inconsistent state?
>>
>> I don't I got it by code inspection. The br_prod_tail update must
>> happen as very last thing because it means the buf is "ready-to-go"
>> and it will be owned.
>>
>> However, the prior wmb() may be helpful in this case, at least for one
>> case. I will do a follow up soon. For a longer discussion, I plan to
>> move this into a real atomic_store_rel_*() soon.
>
> Speaking of which, as you are here, I just found out that r241037
> breaks the alignment of the structure.
> Infact the padding member is not updated accordingly.
>
> We don't have a param to control L2 caches, but I think that we can
> safely align them to the L1 cacheline for sure.
> Also, note that this padding is completely broken for MI requirements
> (it just assumes blindly 128 bytes L2 cachelines, which not always
> true even on i386).

More specifically this patch:
http://www.freebsd.org/~attilio/bufring_pad.patch

Of course I don't think the optimization is important in the
DEBUG_BUFRING on case, so the patch should be fine.

Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 16:51:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C874B113;
 Thu, 27 Dec 2012 16:51:30 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 941A68FC08;
 Thu, 27 Dec 2012 16:51:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRGpUlq016606;
 Thu, 27 Dec 2012 16:51:30 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRGpUJx016604;
 Thu, 27 Dec 2012 16:51:30 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271651.qBRGpUJx016604@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 16:51:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244739 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 16:51:30 -0000

Author: bapt
Date: Thu Dec 27 16:51:29 2012
New Revision: 244739
URL: http://svnweb.freebsd.org/changeset/base/244739

Log:
  - Clean up previous gr_add use malloc instead of calloc
  - Fix tinderbox error
  
  Submitted by:	db

Modified:
  head/lib/libutil/gr_util.c
  head/lib/libutil/libutil.h

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 14:44:13 2012	(r244738)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 16:51:29 2012	(r244739)
@@ -482,7 +482,7 @@ gr_dup(const struct group *gr)
  * Add a new member name to a struct group.
  */
 struct group *
-gr_add(struct group *gr, const char *newmember)
+gr_add(struct group *gr, char *newmember)
 {
 	size_t mlen;
 	int num_mem=0;
@@ -502,18 +502,17 @@ gr_add(struct group *gr, const char *new
 	}
 	/* Allocate enough for current pointers + 1 more and NULL marker */
 	mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
-	if ((members = calloc(1, mlen )) == NULL) {
+	if ((members = malloc(mlen)) == NULL) {
 		errno = ENOMEM;
 		return (NULL);
 	}
 	memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
-	members[num_mem++] = (char *)newmember;
+	members[num_mem++] = newmember;
 	members[num_mem] = NULL;
 	gr->gr_mem = members;
 	newgr = gr_dup(gr);
 	if (newgr == NULL)
 		errno = ENOMEM;
-
 	free(members);
 	return (newgr);
 }

Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h	Thu Dec 27 14:44:13 2012	(r244738)
+++ head/lib/libutil/libutil.h	Thu Dec 27 16:51:29 2012	(r244739)
@@ -167,7 +167,7 @@ int 	gr_copy(int __ffd, int _tfd, const 
 struct group *
 	gr_dup(const struct group *_gr);
 struct group *
-	gr_add(struct group *_gr, const char *_newmember);
+	gr_add(struct group *_gr, char *_newmember);
 int	gr_equal(const struct group *_gr1, const struct group *_gr2);
 void	gr_fini(void);
 int	gr_init(const char *_dir, const char *_master);

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 18:01:04 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E661D388;
 Thu, 27 Dec 2012 18:01:04 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f44.google.com (mail-la0-f44.google.com
 [209.85.215.44])
 by mx1.freebsd.org (Postfix) with ESMTP id C0B158FC0A;
 Thu, 27 Dec 2012 18:01:03 +0000 (UTC)
Received: by mail-la0-f44.google.com with SMTP id d3so12668916lah.3
 for <multiple recipients>; Thu, 27 Dec 2012 10:01:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=4ZwKJvHisjZgHQJMc3cH/xx2/crJMZaaw+AQE0LZQEA=;
 b=QHSd5ILF747odBTZylOYAH6ywWjeMM2rC8yDphLFqcSJy5r/q+F0jyxXay+C2Xe8o1
 O1YZH+JlPSlPePPZJ82DglkzydPKEEXCBxA18coHmSslNnAtNjBXev9Ny+xzfpQuO/2G
 uFk0bjKxPP8dp/REHdGUeYGnw61CIy777FJUYqtqoqR2T1vDuZDGjvkZEkSaizoEhDi1
 lrKUvND9Km5Bw+CHgcmPMlIEXUh6mHNJfK1PHHdE8azbuLuM+yy4hYAJw58Hfhmvp9ro
 5ZdCTFGZuOCmXWm78G3xNmgBooPOizxyEtRrDCYR9NZdlaZLqrrEmXc2qrzvOO2KpGeE
 h2XQ==
MIME-Version: 1.0
Received: by 10.152.122.133 with SMTP id ls5mr29590888lab.9.1356631261657;
 Thu, 27 Dec 2012 10:01:01 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Thu, 27 Dec 2012 10:01:01 -0800 (PST)
In-Reply-To: <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
 <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
 <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
Date: Thu, 27 Dec 2012 10:01:01 -0800
X-Google-Sender-Auth: LS7ZS69pGL6KCPGo0_wNBhBT4qo
Message-ID: <CAJ-FndACoX4ZFiSvjpDnXT6OPFXhS=vgFU6aCqWm_GqQMgxxjw@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 18:01:05 -0000

On Thu, Dec 27, 2012 at 8:37 AM, Attilio Rao <attilio@freebsd.org> wrote:
> On Thu, Dec 27, 2012 at 7:26 AM, Attilio Rao <attilio@freebsd.org> wrote:
>> On Thu, Dec 27, 2012 at 5:53 AM, Attilio Rao <attilio@freebsd.org> wrote:
>>> On Thu, Dec 27, 2012 at 5:25 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>>>> On Thu, Dec 27, 2012 at 04:55:22AM -0800, Attilio Rao wrote:
>>>> A> On Thu, Dec 27, 2012 at 4:46 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
>>>> A> >   Attilio,
>>>> A> >
>>>> A> > On Thu, Dec 27, 2012 at 12:36:58PM +0000, Attilio Rao wrote:
>>>> A> > A> Author: attilio
>>>> A> > A> Date: Thu Dec 27 12:36:58 2012
>>>> A> > A> New Revision: 244732
>>>> A> > A> URL: http://svnweb.freebsd.org/changeset/base/244732
>>>> A> > A>
>>>> A> > A> Log:
>>>> A> > A>   br_prod_tail and br_cons_tail members are used as barrier to
>>>> A> > A>   signal bug_ring ownership. However, instructions can be reordered
>>>> A> > A>   around members write leading to stale values for ie. br_prod_bufs.
>>>> A> > A>
>>>> A> > A>   Use correct memory barriers to ensure proper ordering of the
>>>> A> > A>   ownership tokens updates.
>>>> A> > A>
>>>> A> > A>   Sponsored by:      EMC / Isilon storage division
>>>> A> > A>   MFC after: 2 weeks
>>>> A> >
>>>> A> > Have you profiled this?
>>>> A> >
>>>> A> > After this change the buf_ring actually gains its own hand-rolled
>>>> A> > mutex:
>>>> A> >
>>>> A> >         while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
>>>> A> >                 cpu_spinwait();
>>>> A> >
>>>> A> > The only difference with mutex(9) is that this one isn't monitored
>>>> A> > by WITNESS.
>>>> A>
>>>> A> I think you are not correct. It doesn't disable interrupts (as
>>>> A> spinlock do) and it doesn't sleep.
>>>> A> So your analogy is completely off.
>>>> A>
>>>> A> Also, on x86 atomic_store_rel_*() is a simple write. The only thing
>>>> A> that really changes is the atomic_load_acq_*() that introduces a
>>>> A> locked instruction.
>>>>
>>>> This only thing, the locked instruction, affects performance a lot. I
>>>> suspect strong forwarding degradation after your change. Can you please
>>>> profile that?
>>>
>>> Yes but it is a matter of incorrect code vs. slower instruction.
>>> Also, you are not considering that there are much heavier-weight
>>> instructions already (wmb(), rmb(), which I'm going to change soon
>>> into actual barriers btw). I highly doubt you can measure the latency
>>> introduced by atomic_load_acq_*() when mfence and stuff is in place.
>>> The pessimization should only account for a small fraction of the
>>> overall performance.
>>>
>>>> A> > The idea behind buf_ring was lockless storing and lockless fetching
>>>> A> > from a ring and now this vanished.
>>>> A> >
>>>> A> > What does your change actually fixes except precise accounting of
>>>> A> > br_prod_bufs that are actually unused and should be better garbage
>>>> A> > collected rather than fixed?
>>>> A>
>>>> A> The write of br_prod_tail must happens as very last thing, also after
>>>> A> the whole buf setup. The only way you can enforce this is with a
>>>> A> memory barrier. I can double-check if we can garbage collect
>>>> A> br_prod_bufs but this should not be enough yet.
>>>>
>>>> Do you have a core file that illustrates that a ring can get into
>>>> inconsistent state?
>>>
>>> I don't I got it by code inspection. The br_prod_tail update must
>>> happen as very last thing because it means the buf is "ready-to-go"
>>> and it will be owned.
>>>
>>> However, the prior wmb() may be helpful in this case, at least for one
>>> case. I will do a follow up soon. For a longer discussion, I plan to
>>> move this into a real atomic_store_rel_*() soon.
>>
>> Speaking of which, as you are here, I just found out that r241037
>> breaks the alignment of the structure.
>> Infact the padding member is not updated accordingly.
>>
>> We don't have a param to control L2 caches, but I think that we can
>> safely align them to the L1 cacheline for sure.
>> Also, note that this padding is completely broken for MI requirements
>> (it just assumes blindly 128 bytes L2 cachelines, which not always
>> true even on i386).
>
> More specifically this patch:
> http://www.freebsd.org/~attilio/bufring_pad.patch
>
> Of course I don't think the optimization is important in the
> DEBUG_BUFRING on case, so the patch should be fine.

And this further patch (so that you can see incremental changes)
improves the membar situation, IMHO:
http://www.freebsd.org/~attilio/bufring_pad_membar.patch

It basically reverts latest introduced changes and uses full membar to
ensure consistency. Comments should be self-explanatory.

Please review.

Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 19:33:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6625B70F;
 Thu, 27 Dec 2012 19:33:44 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32A3F8FC16;
 Thu, 27 Dec 2012 19:33:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRJXiLP042716;
 Thu, 27 Dec 2012 19:33:44 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRJXiWn042715;
 Thu, 27 Dec 2012 19:33:44 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271933.qBRJXiWn042715@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 19:33:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244742 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 19:33:44 -0000

Author: bapt
Date: Thu Dec 27 19:33:43 2012
New Revision: 244742
URL: http://svnweb.freebsd.org/changeset/base/244742

Log:
  gr_dup: simplify duplication of group
  
  Submitted by:	db

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 19:13:00 2012	(r244741)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 19:33:43 2012	(r244742)
@@ -44,11 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-struct group_storage {
-	struct group	 gr;
-	char		*members[];
-};
-
 static int lockfd = -1;
 static char group_dir[PATH_MAX];
 static char group_file[PATH_MAX];
@@ -434,14 +429,14 @@ gr_make(const struct group *gr)
 struct group *
 gr_dup(const struct group *gr)
 {
+	struct group *newgr;
 	char *dst;
 	size_t len;
-	struct group_storage *gs;
 	int ndx;
 	int num_mem;
 
 	/* Calculate size of the group. */
-	len = sizeof(*gs);
+	len = sizeof(*newgr);
 	if (gr->gr_name != NULL)
 		len += strlen(gr->gr_name) + 1;
 	if (gr->gr_passwd != NULL)
@@ -452,30 +447,34 @@ gr_dup(const struct group *gr)
 		len += (num_mem + 1) * sizeof(*gr->gr_mem);
 	} else
 		num_mem = -1;
-
 	/* Create new group and copy old group into it. */
-	if ((gs = calloc(1, len)) == NULL)
+	if ((newgr = malloc(len)) == NULL)
 		return (NULL);
-	dst = (char *)&gs->members[num_mem + 1];
+	/* point new gr_mem to end of struct + 1 */
+	if (gr->gr_mem != NULL)
+		newgr->gr_mem = (char **)newgr + sizeof(struct group);
+	else
+		newgr->gr_mem = NULL;
+	/* point dst after the end of all the gr_mem pointers in newgr */
+	dst = (char *)newgr + sizeof(struct group) +
+	    (num_mem + 1) * sizeof(*gr->gr_mem);
 	if (gr->gr_name != NULL) {
-		gs->gr.gr_name = dst;
-		dst = stpcpy(gs->gr.gr_name, gr->gr_name) + 1;
+		newgr->gr_name = dst;
+		dst = stpcpy(dst, gr->gr_name) + 1;
 	}
 	if (gr->gr_passwd != NULL) {
-		gs->gr.gr_passwd = dst;
-		dst = stpcpy(gs->gr.gr_passwd, gr->gr_passwd) + 1;
+		newgr->gr_passwd = dst;
+		dst = stpcpy(dst, gr->gr_passwd) + 1;
 	}
-	gs->gr.gr_gid = gr->gr_gid;
+	newgr->gr_gid = gr->gr_gid;
 	if (gr->gr_mem != NULL) {
-		gs->gr.gr_mem = gs->members;
 		for (ndx = 0; ndx < num_mem; ndx++) {
-			gs->gr.gr_mem[ndx] = dst;
-			dst = stpcpy(gs->gr.gr_mem[ndx], gr->gr_mem[ndx]) + 1;
+			newgr->gr_mem[ndx] = dst;
+			dst = stpcpy(dst, gr->gr_mem[ndx]) + 1;
 		}
-		gs->gr.gr_mem[ndx] = NULL;
+		newgr->gr_mem[ndx] = NULL;
 	}
-
-	return (&gs->gr);
+	return (newgr);
 }
 
 /*

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 19:43:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2C060B2D;
 Thu, 27 Dec 2012 19:43:30 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1189E8FC08;
 Thu, 27 Dec 2012 19:43:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRJhTx2044140;
 Thu, 27 Dec 2012 19:43:29 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRJhTQs044139;
 Thu, 27 Dec 2012 19:43:29 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212271943.qBRJhTQs044139@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 19:43:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244743 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 19:43:30 -0000

Author: bapt
Date: Thu Dec 27 19:43:29 2012
New Revision: 244743
URL: http://svnweb.freebsd.org/changeset/base/244743

Log:
  Simplify vnextgrent and vnextpwent reusing pw_scan and gr_scan from libutil.

Modified:
  head/usr.sbin/pw/pw_vpw.c

Modified: head/usr.sbin/pw/pw_vpw.c
==============================================================================
--- head/usr.sbin/pw/pw_vpw.c	Thu Dec 27 19:33:43 2012	(r244742)
+++ head/usr.sbin/pw/pw_vpw.c	Thu Dec 27 19:43:29 2012	(r244743)
@@ -30,6 +30,10 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <pwd.h>
+#include <grp.h>
+#include <libutil.h>
+#define _WITH_GETLINE
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -55,101 +59,44 @@ vsetpwent(void)
 }
 
 static struct passwd *
-vnextpwent(char const * nam, uid_t uid, int doclose)
+vnextpwent(char const *nam, uid_t uid, int doclose)
 {
-	struct passwd * pw = NULL;
-	static char pwtmp[1024];
+	struct passwd *pw;
+	char *line;
+	size_t linecap;
+	ssize_t linelen;
+
+	pw = NULL;
+	line = NULL;
+	linecap = 0;
+	linelen = 0;
 
-        strlcpy(pwtmp, getpwpath(_MASTERPASSWD), sizeof(pwtmp));
-
-        if (pwd_fp != NULL || (pwd_fp = fopen(pwtmp, "r")) != NULL) {
-                int done = 0;
-
-                static struct passwd pwd;
-
-                while (!done && fgets(pwtmp, sizeof pwtmp, pwd_fp) != NULL)
-                {
-                        int i, quickout = 0;
-                        char * q;
-                        char * p = strchr(pwtmp, '\n');
-
-                        if (p == NULL) {
-		  		while (fgets(pwtmp, sizeof pwtmp, pwd_fp) != NULL && strchr(pwtmp, '\n')==NULL)
-		  			; /* Skip long lines */
-		  		continue;
-                        }
-
-			/* skip comments & empty lines */
-	       		if (*pwtmp =='\n' || *pwtmp == '#')
+	if (pwd_fp != NULL || (pwd_fp = fopen(getpwpath(_MASTERPASSWD), "r")) != NULL) {
+		while ((linelen = getline(&line, &linecap, pwd_fp)) > 0) {
+			/* Skip comments and empty lines */
+			if (*line == '\n' || *line == '#')
 				continue;
-
-                        i = 0;
-                        q = p = pwtmp;
-                        bzero(&pwd, sizeof pwd);
-                        while (!quickout && (p = strsep(&q, ":\n")) != NULL) {
-                          	switch (i++)
-                          	{
-                                case 0:   /* username */
-        				pwd.pw_name = p;
-        				if (nam) {
-        					if (strcmp(nam, p) == 0)
-        						done = 1;
-        					else
-        						quickout = 1;
-        				}
-        				break;
-                                case 1:   /* password */
-        				pwd.pw_passwd = p;
-        				break;
-                                case 2:   /* uid */
-        				pwd.pw_uid = atoi(p);
-        				if (uid != (uid_t)-1) {
-        					if (uid == pwd.pw_uid)
-        						done = 1;
-        					else
-        						quickout = 1;
-        				}
-        				break;
-                                case 3:   /* gid */
-        				pwd.pw_gid = atoi(p);
-        				break;
-                                case 4:   /* class */
-					if (nam == NULL && uid == (uid_t)-1)
-						done = 1;
-        				pwd.pw_class = p;
-        				break;
-                                case 5:   /* change */
-        				pwd.pw_change = (time_t)atol(p);
-        				break;
-                                case 6:   /* expire */
-        				pwd.pw_expire = (time_t)atol(p);
-        				break;
-                                case 7:   /* gecos */
-        				pwd.pw_gecos = p;
-        				break;
-                                case 8:   /* directory */
-        				pwd.pw_dir = p;
-        				break;
-                                case 9:   /* shell */
-        				pwd.pw_shell = p;
-        				break;
-                                }
-        		}
-                }
+			/* trim latest \n */
+			if (line[linelen - 1 ] == '\n')
+				line[linelen - 1] = '\0';
+			pw = pw_scan(line, PWSCAN_MASTER);
+			if (uid != (uid_t)-1) {
+				if (uid == pw->pw_uid)
+					break;
+			} else if (nam != NULL) {
+				if (strcmp(nam, pw->pw_name) == 0)
+					break;
+			} else
+				break;
+			free(pw);
+			pw = NULL;
+		}
 		if (doclose)
 			vendpwent();
-		if (done && pwd.pw_name) {
-			pw = &pwd;
+	}
+	free(line);
 
-			#define CKNULL(s)   s = s ? s : ""
-			CKNULL(pwd.pw_passwd);
-			CKNULL(pwd.pw_class);
-			CKNULL(pwd.pw_gecos);
-			CKNULL(pwd.pw_dir);
-			CKNULL(pwd.pw_shell);
-                }
-        }
-        return pw;
+	return (pw);
 }
 
 struct passwd *
@@ -192,93 +139,44 @@ vsetgrent(void)
 }
 
 static struct group *
-vnextgrent(char const * nam, gid_t gid, int doclose)
+vnextgrent(char const *nam, gid_t gid, int doclose)
 {
-	struct group * gr = NULL;
+	struct group *gr;
+	char *line;
+	size_t linecap;
+	ssize_t linelen;
+
+	gr = NULL;
+	line = NULL;
+	linecap = 0;
+	linelen = 0;
 
-	static char * grtmp = NULL;
-	static int grlen = 0;
-	static char ** mems = NULL;
-	static int memlen = 0;
-
-	extendline(&grtmp, &grlen, MAXPATHLEN);
-	strlcpy(grtmp, getgrpath(_GROUP), MAXPATHLEN);
-
-	if (grp_fp != NULL || (grp_fp = fopen(grtmp, "r")) != NULL) {
-		int done = 0;
-
-		static struct group grp;
-
-		while (!done && fgets(grtmp, grlen, grp_fp) != NULL)
-		{
-			int i, quickout = 0;
-			int mno = 0;
-			char * q, * p;
-			const char * sep = ":\n";
-
-			if ((p = strchr(grtmp, '\n')) == NULL) {
-				int l;
-				extendline(&grtmp, &grlen, grlen + PWBUFSZ);
-				l = strlen(grtmp);
-				if (fgets(grtmp + l, grlen - l, grp_fp) == NULL)
-				  break;	/* No newline terminator on last line */
-			}
+	if (grp_fp != NULL || (grp_fp = fopen(getgrpath(_GROUP), "r")) != NULL) {
+		while ((linelen = getline(&line, &linecap, grp_fp)) > 0) {
 			/* Skip comments and empty lines */
-			if (*grtmp == '\n' || *grtmp == '#')
+			if (*line == '\n' || *line == '#')
 				continue;
-			i = 0;
-			q = p = grtmp;
-			bzero(&grp, sizeof grp);
-			extendarray(&mems, &memlen, 200);
-			while (!quickout && (p = strsep(&q, sep)) != NULL) {
-				switch (i++)
-				{
-				case 0:   /* groupname */
-					grp.gr_name = p;
-					if (nam) {
-						if (strcmp(nam, p) == 0)
-							done = 1;
-						else
-							quickout = 1;
-					}
-					break;
-				case 1:   /* password */
-					grp.gr_passwd = p;
-					break;
-				case 2:   /* gid */
-					grp.gr_gid = atoi(p);
-					if (gid != (gid_t)-1) {
-						if (gid == (gid_t)grp.gr_gid)
-							done = 1;
-						else
-							quickout = 1;
-					} else if (nam == NULL)
-						done = 1;
-					break;
-				case 3:
-					q = p;
-					sep = ",\n";
+			/* trim latest \n */
+			if (line[linelen - 1 ] == '\n')
+				line[linelen - 1] = '\0';
+			gr = gr_scan(line);
+			if (gid != (gid_t)-1) {
+				if (gid == gr->gr_gid)
 					break;
-				default:
-					if (*p) {
-						extendarray(&mems, &memlen, mno + 2);
-						mems[mno++] = p;
-					}
+			} else if (nam != NULL) {
+				if (strcmp(nam, gr->gr_name) == 0)
 					break;
-				}
-			}
-			grp.gr_mem = mems;
-			mems[mno] = NULL;
-                }
+			} else
+				break;
+			free(gr);
+			gr = NULL;
+		}
 		if (doclose)
 			vendgrent();
-		if (done && grp.gr_name) {
-			gr = &grp;
-
-			CKNULL(grp.gr_passwd);
-		}
 	}
-	return gr;
+	free(line);
+
+	return (gr);
 }
 
 struct group *

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:21:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DF0084AB;
 Thu, 27 Dec 2012 20:21:17 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (unknown [IPv6:2001:610:1108:5012::107])
 by mx1.freebsd.org (Postfix) with ESMTP id 4795A8FC08;
 Thu, 27 Dec 2012 20:21:17 +0000 (UTC)
Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131])
 by mx1.stack.nl (Postfix) with ESMTP id AE4D7120209;
 Thu, 27 Dec 2012 21:21:13 +0100 (CET)
Received: by snail.stack.nl (Postfix, from userid 1677)
 id 89C332848C; Thu, 27 Dec 2012 21:21:13 +0100 (CET)
Date: Thu, 27 Dec 2012 21:21:13 +0100
From: Jilles Tjoelker <jilles@stack.nl>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r244735 - head/lib/libutil
Message-ID: <20121227202113.GA36622@stack.nl>
References: <201212271409.qBRE9ogT092286@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201212271409.qBRE9ogT092286@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:21:18 -0000

On Thu, Dec 27, 2012 at 02:09:50PM +0000, Baptiste Daroussin wrote:
> Author: bapt
> Date: Thu Dec 27 14:09:50 2012
> New Revision: 244735
> URL: http://svnweb.freebsd.org/changeset/base/244735

> Log:
>   Use flopen(3) instead of open(2) + flock(2)

> Modified:
>   head/lib/libutil/gr_util.c
>   head/lib/libutil/pw_util.c

> Modified: head/lib/libutil/gr_util.c
> ==============================================================================
> --- head/lib/libutil/gr_util.c	Thu Dec 27 13:21:37 2012	(r244734)
> +++ head/lib/libutil/gr_util.c	Thu Dec 27 14:09:50 2012	(r244735)
> @@ -106,10 +106,8 @@ gr_lock(void)
>  	for (;;) {
>  		struct stat st;
>  
> -		lockfd = open(group_file, O_RDONLY, 0);
> -		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
> -			err(1, "%s", group_file);
> -		if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
> +		lockfd = flopen(group_file, O_RDONLY|O_NONBLOCK, 0);
> +		if (lockfd == -1) {
>  			if (errno == EWOULDBLOCK) {
>  				errx(1, "the group file is busy");
>  			} else {
> 
> Modified: head/lib/libutil/pw_util.c
> ==============================================================================
> --- head/lib/libutil/pw_util.c	Thu Dec 27 13:21:37 2012	(r244734)
> +++ head/lib/libutil/pw_util.c	Thu Dec 27 14:09:50 2012	(r244735)
> @@ -179,11 +179,8 @@ pw_lock(void)
>  	for (;;) {
>  		struct stat st;
>  
> -		lockfd = open(masterpasswd, O_RDONLY, 0);
> -		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
> -			err(1, "%s", masterpasswd);
> -		/* XXX vulnerable to race conditions */
> -		if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
> +		lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
> +		if (lockfd == -1) {
>  			if (errno == EWOULDBLOCK) {
>  				errx(1, "the password db file is busy");
>  			} else {

The fcntl(lockfd, F_SETFD, 1) was removed and not replaced by anything.
The comment in pw_util.c gives the impression that this is vital for
security; in fact, chpass does not keep the password file locked across
a user's editor. However, the idea of setting close-on-exec on this file
descriptor is good. Please add |O_CLOEXEC to the flopen() flags in both
cases.

-- 
Jilles Tjoelker

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:24:45 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6FEB262C;
 Thu, 27 Dec 2012 20:24:45 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 547788FC0A;
 Thu, 27 Dec 2012 20:24:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRKOjLL050738;
 Thu, 27 Dec 2012 20:24:45 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRKOjXd050735;
 Thu, 27 Dec 2012 20:24:45 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212272024.qBRKOjXd050735@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:24:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244744 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:24:45 -0000

Author: bapt
Date: Thu Dec 27 20:24:44 2012
New Revision: 244744
URL: http://svnweb.freebsd.org/changeset/base/244744

Log:
  Add O_CLOEXEC to flopen
  
  Requested by:	jilles

Modified:
  head/lib/libutil/gr_util.c
  head/lib/libutil/pw_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 19:43:29 2012	(r244743)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 20:24:44 2012	(r244744)
@@ -101,7 +101,7 @@ gr_lock(void)
 	for (;;) {
 		struct stat st;
 
-		lockfd = flopen(group_file, O_RDONLY|O_NONBLOCK, 0);
+		lockfd = flopen(group_file, O_RDONLY|O_NONBLOCK|O_CLOEXEC, 0);
 		if (lockfd == -1) {
 			if (errno == EWOULDBLOCK) {
 				errx(1, "the group file is busy");

Modified: head/lib/libutil/pw_util.c
==============================================================================
--- head/lib/libutil/pw_util.c	Thu Dec 27 19:43:29 2012	(r244743)
+++ head/lib/libutil/pw_util.c	Thu Dec 27 20:24:44 2012	(r244744)
@@ -179,7 +179,7 @@ pw_lock(void)
 	for (;;) {
 		struct stat st;
 
-		lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
+		lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK|O_CLOEXEC, 0);
 		if (lockfd == -1) {
 			if (errno == EWOULDBLOCK) {
 				errx(1, "the password db file is busy");

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:25:57 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8E69E79E;
 Thu, 27 Dec 2012 20:25:57 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com
 [IPv6:2a00:1450:400c:c05::22a])
 by mx1.freebsd.org (Postfix) with ESMTP id C09748FC08;
 Thu, 27 Dec 2012 20:25:56 +0000 (UTC)
Received: by mail-wi0-f170.google.com with SMTP id hq7so4780249wib.5
 for <multiple recipients>; Thu, 27 Dec 2012 12:25:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:sender:date:from:to:cc:subject:message-id:references
 :mime-version:content-type:content-disposition:in-reply-to
 :user-agent; bh=CtpHTZfhoQkJMNGQ5m4TgbGiQtaeXmSHCHjHrlix+yo=;
 b=HkgKs4AgHhhvyCxYETzRWhA19740nEfCjGHhErYtYDmkZ6vlHPTDBSI2jiYQ4J7piF
 tgnTKP3Reg/3jg6VQ502vNQI5EVW1PGluiIz2dM9eQ0ZB0ZZInboyoUXHFdsGwgTkseh
 GeaG1q+M4MK3mSfILB0PYQoRgcV7+IAMQ98C13XZr+l58OYU5lRPPDpVZVG0fJDVCJB0
 NzXtXIEPFnW/17FdeVR41M2C0Ntvkb4+G9x0zvNDfjuORjOMnRzX81eTSWjC+QryCWon
 cGGKAyx0+kPGQ2cZf0fCqxSEp5I+04kg3BbhHHWS9HA7lTeZ47uYqtmulAr9aLuIwzKx
 FK4Q==
X-Received: by 10.194.5.74 with SMTP id q10mr50873600wjq.13.1356639955880;
 Thu, 27 Dec 2012 12:25:55 -0800 (PST)
Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188])
 by mx.google.com with ESMTPS id u6sm50982844wif.2.2012.12.27.12.25.54
 (version=TLSv1/SSLv3 cipher=OTHER);
 Thu, 27 Dec 2012 12:25:55 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Thu, 27 Dec 2012 21:25:53 +0100
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Jilles Tjoelker <jilles@stack.nl>
Subject: Re: svn commit: r244735 - head/lib/libutil
Message-ID: <20121227202553.GA48771@ithaqua.etoilebsd.net>
References: <201212271409.qBRE9ogT092286@svn.freebsd.org>
 <20121227202113.GA36622@stack.nl>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="OXfL5xGRrasGEqWY"
Content-Disposition: inline
In-Reply-To: <20121227202113.GA36622@stack.nl>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:25:57 -0000


--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 27, 2012 at 09:21:13PM +0100, Jilles Tjoelker wrote:
> On Thu, Dec 27, 2012 at 02:09:50PM +0000, Baptiste Daroussin wrote:
> > Author: bapt
> > Date: Thu Dec 27 14:09:50 2012
> > New Revision: 244735
> > URL: http://svnweb.freebsd.org/changeset/base/244735
>=20
> > Log:
> >   Use flopen(3) instead of open(2) + flock(2)
>=20
> > Modified:
> >   head/lib/libutil/gr_util.c
> >   head/lib/libutil/pw_util.c
>=20
> > Modified: head/lib/libutil/gr_util.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/lib/libutil/gr_util.c	Thu Dec 27 13:21:37 2012	(r244734)
> > +++ head/lib/libutil/gr_util.c	Thu Dec 27 14:09:50 2012	(r244735)
> > @@ -106,10 +106,8 @@ gr_lock(void)
> >  	for (;;) {
> >  		struct stat st;
> > =20
> > -		lockfd =3D open(group_file, O_RDONLY, 0);
> > -		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) =3D=3D -1)
> > -			err(1, "%s", group_file);
> > -		if (flock(lockfd, LOCK_EX|LOCK_NB) =3D=3D -1) {
> > +		lockfd =3D flopen(group_file, O_RDONLY|O_NONBLOCK, 0);
> > +		if (lockfd =3D=3D -1) {
> >  			if (errno =3D=3D EWOULDBLOCK) {
> >  				errx(1, "the group file is busy");
> >  			} else {
> >=20
> > Modified: head/lib/libutil/pw_util.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/lib/libutil/pw_util.c	Thu Dec 27 13:21:37 2012	(r244734)
> > +++ head/lib/libutil/pw_util.c	Thu Dec 27 14:09:50 2012	(r244735)
> > @@ -179,11 +179,8 @@ pw_lock(void)
> >  	for (;;) {
> >  		struct stat st;
> > =20
> > -		lockfd =3D open(masterpasswd, O_RDONLY, 0);
> > -		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) =3D=3D -1)
> > -			err(1, "%s", masterpasswd);
> > -		/* XXX vulnerable to race conditions */
> > -		if (flock(lockfd, LOCK_EX|LOCK_NB) =3D=3D -1) {
> > +		lockfd =3D flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
> > +		if (lockfd =3D=3D -1) {
> >  			if (errno =3D=3D EWOULDBLOCK) {
> >  				errx(1, "the password db file is busy");
> >  			} else {
>=20
> The fcntl(lockfd, F_SETFD, 1) was removed and not replaced by anything.
> The comment in pw_util.c gives the impression that this is vital for
> security; in fact, chpass does not keep the password file locked across
> a user's editor. However, the idea of setting close-on-exec on this file
> descriptor is good. Please add |O_CLOEXEC to the flopen() flags in both
> cases.

done concerning the |O_CLOEXEC

Thanks,
Bapt

--OXfL5xGRrasGEqWY
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDcrtEACgkQ8kTtMUmk6EycFwCdF1xPYXG5A6f2wTEKP3a676E3
DDAAn1INZDmCDUeL2jjekC43iJpQ+d8N
=ZfCq
-----END PGP SIGNATURE-----

--OXfL5xGRrasGEqWY--

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:31:12 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E33FEA7D;
 Thu, 27 Dec 2012 20:31:12 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C96838FC08;
 Thu, 27 Dec 2012 20:31:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRKVC4X051718;
 Thu, 27 Dec 2012 20:31:12 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRKVCh7051717;
 Thu, 27 Dec 2012 20:31:12 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212272031.qBRKVCh7051717@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:31:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244745 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:31:13 -0000

Author: bapt
Date: Thu Dec 27 20:31:12 2012
New Revision: 244745
URL: http://svnweb.freebsd.org/changeset/base/244745

Log:
  cast to uintptr_t to properly calculate offset
  
  Reported by:	mdf
  Submitted by:	db

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 20:24:44 2012	(r244744)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 20:31:12 2012	(r244745)
@@ -452,7 +452,7 @@ gr_dup(const struct group *gr)
 		return (NULL);
 	/* point new gr_mem to end of struct + 1 */
 	if (gr->gr_mem != NULL)
-		newgr->gr_mem = (char **)newgr + sizeof(struct group);
+		newgr->gr_mem = (char **)((uintptr_t)newgr + sizeof(struct group));
 	else
 		newgr->gr_mem = NULL;
 	/* point dst after the end of all the gr_mem pointers in newgr */

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:47:35 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 379B3DC4;
 Thu, 27 Dec 2012 20:47:35 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1AFF88FC08;
 Thu, 27 Dec 2012 20:47:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRKlYsm053994;
 Thu, 27 Dec 2012 20:47:34 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRKlYNQ053993;
 Thu, 27 Dec 2012 20:47:34 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212272047.qBRKlYNQ053993@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:47:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244747 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:47:35 -0000

Author: bapt
Date: Thu Dec 27 20:47:34 2012
New Revision: 244747
URL: http://svnweb.freebsd.org/changeset/base/244747

Log:
  avoid arithmetic on uintptr_t
  
  Submitted by:	pjd
  Reviewed by:	jilles

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 20:46:17 2012	(r244746)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 20:47:34 2012	(r244747)
@@ -452,7 +452,7 @@ gr_dup(const struct group *gr)
 		return (NULL);
 	/* point new gr_mem to end of struct + 1 */
 	if (gr->gr_mem != NULL)
-		newgr->gr_mem = (char **)((uintptr_t)newgr + sizeof(struct group));
+		newgr->gr_mem = (char **)(newgr + 1);
 	else
 		newgr->gr_mem = NULL;
 	/* point dst after the end of all the gr_mem pointers in newgr */

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 20:59:23 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 637EA249;
 Thu, 27 Dec 2012 20:59:23 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2E05F8FC14;
 Thu, 27 Dec 2012 20:59:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRKxNSN055745;
 Thu, 27 Dec 2012 20:59:23 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRKxMfo055743;
 Thu, 27 Dec 2012 20:59:22 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212272059.qBRKxMfo055743@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:59:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244750 - in head: share/man/man4 sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 20:59:23 -0000

Author: ae
Date: Thu Dec 27 20:59:22 2012
New Revision: 244750
URL: http://svnweb.freebsd.org/changeset/base/244750

Log:
  Add net.link.stf.permit_rfc1918 sysctl variable. It can be used to allow
  the use of private IPv4 addresses with stf(4).
  
  MFC after:	2 weeks

Modified:
  head/share/man/man4/stf.4
  head/sys/net/if_stf.c

Modified: head/share/man/man4/stf.4
==============================================================================
--- head/share/man/man4/stf.4	Thu Dec 27 20:52:39 2012	(r244749)
+++ head/share/man/man4/stf.4	Thu Dec 27 20:59:22 2012	(r244750)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 23, 2011
+.Dd December 28, 2012
 .Dt STF 4
 .Os
 .Sh NAME
@@ -180,6 +180,22 @@ Note, however, there are other security 
 If you wish to use the configuration,
 you must not advertise your 6to4 address to others.
 .\"
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm stf .
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va net.link.stf.permit_rfc1918 : No 0
+The RFC3056 requires the use of globally unique 32-bit IPv4
+addresses. This sysctl variable controls the behaviour of this
+requirement. When it set to not 0, 
+.Nm stf 
+allows the use of private IPv4 addresses described in the RFC1918.
+This may be useful for an Intranet environment or when some mechanisms
+of network address translation (NAT) are used.
+.El
 .Sh EXAMPLES
 Note that
 .Li 8504:0506

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c	Thu Dec 27 20:52:39 2012	(r244749)
+++ head/sys/net/if_stf.c	Thu Dec 27 20:59:22 2012	(r244750)
@@ -127,6 +127,10 @@ static int stf_route_cache = 1;
 SYSCTL_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW,
     &stf_route_cache, 0, "Caching of IPv4 routes for 6to4 Output");
 
+static int stf_permit_rfc1918 = 0;
+SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW,
+    &stf_permit_rfc1918, 0, "Permit the use of private IPv4 addresses");
+
 #define STFUNIT		0
 
 #define IN6_IS_ADDR_6TO4(x)	(ntohs((x)->s6_addr16[0]) == 0x2002)
@@ -581,9 +585,10 @@ isrfc1918addr(in)
 	 * returns 1 if private address range:
 	 * 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16
 	 */
-	if ((ntohl(in->s_addr) & 0xff000000) >> 24 == 10 ||
+	if (stf_permit_rfc1918 == 0 && (
+	    (ntohl(in->s_addr) & 0xff000000) >> 24 == 10 ||
 	    (ntohl(in->s_addr) & 0xfff00000) >> 16 == 172 * 256 + 16 ||
-	    (ntohl(in->s_addr) & 0xffff0000) >> 16 == 192 * 256 + 168)
+	    (ntohl(in->s_addr) & 0xffff0000) >> 16 == 192 * 256 + 168))
 		return 1;
 
 	return 0;

From owner-svn-src-head@FreeBSD.ORG  Thu Dec 27 21:26:09 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5381A86D;
 Thu, 27 Dec 2012 21:26:09 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 393D78FC08;
 Thu, 27 Dec 2012 21:26:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRLQ9xg060201;
 Thu, 27 Dec 2012 21:26:09 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRLQ9fq060200;
 Thu, 27 Dec 2012 21:26:09 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212272126.qBRLQ9fq060200@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 27 Dec 2012 21:26:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244752 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 21:26:09 -0000

Author: ae
Date: Thu Dec 27 21:26:08 2012
New Revision: 244752
URL: http://svnweb.freebsd.org/changeset/base/244752

Log:
  Add an ability to set net.link.stf.permit_rfc1918 from the loader.
  
  MFC after:	2 weeks

Modified:
  head/sys/net/if_stf.c

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c	Thu Dec 27 21:14:29 2012	(r244751)
+++ head/sys/net/if_stf.c	Thu Dec 27 21:26:08 2012	(r244752)
@@ -128,7 +128,8 @@ SYSCTL_INT(_net_link_stf, OID_AUTO, rout
     &stf_route_cache, 0, "Caching of IPv4 routes for 6to4 Output");
 
 static int stf_permit_rfc1918 = 0;
-SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW,
+TUNABLE_INT("net.link.stf.permit_rfc1918", &stf_permit_rfc1918);
+SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW | CTLFLAG_TUN,
     &stf_permit_rfc1918, 0, "Permit the use of private IPv4 addresses");
 
 #define STFUNIT		0

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 00:55:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5DCF6E6F;
 Fri, 28 Dec 2012 00:55:44 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 41E3F8FC12;
 Fri, 28 Dec 2012 00:55:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS0tiee015310;
 Fri, 28 Dec 2012 00:55:44 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS0tikE015308;
 Fri, 28 Dec 2012 00:55:44 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201212280055.qBS0tikE015308@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 28 Dec 2012 00:55:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244755 - head/sys/arm/versatile
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 00:55:44 -0000

Author: gonzo
Date: Fri Dec 28 00:55:43 2012
New Revision: 244755
URL: http://svnweb.freebsd.org/changeset/base/244755

Log:
  Add custom renderer for poor man's cursor support for framebuffer console

Modified:
  head/sys/arm/versatile/versatile_clcd.c

Modified: head/sys/arm/versatile/versatile_clcd.c
==============================================================================
--- head/sys/arm/versatile/versatile_clcd.c	Thu Dec 27 22:15:22 2012	(r244754)
+++ head/sys/arm/versatile/versatile_clcd.c	Fri Dec 28 00:55:43 2012	(r244755)
@@ -194,6 +194,12 @@ static struct argb versatilefb_palette[1
 	{0x00, 0xff, 0xff, 0xff}
 };
 
+/* mouse pointer from dev/syscons/scgfbrndr.c */
+static u_char mouse_pointer[16] = {
+        0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x68,
+        0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00
+};
+
 #define FB_WIDTH		640
 #define FB_HEIGHT		480
 #define FB_DEPTH		16
@@ -450,10 +456,131 @@ static video_switch_t versatilefbvidsw =
 
 VIDEO_DRIVER(versatilefb, versatilefbvidsw, versatilefb_configure);
 
-extern sc_rndr_sw_t txtrndrsw;
-RENDERER(versatilefb, 0, txtrndrsw, gfb_set);
+static vr_init_t clcdr_init;
+static vr_clear_t clcdr_clear;
+static vr_draw_border_t clcdr_draw_border;
+static vr_draw_t clcdr_draw;
+static vr_set_cursor_t clcdr_set_cursor;
+static vr_draw_cursor_t clcdr_draw_cursor;
+static vr_blink_cursor_t clcdr_blink_cursor;
+static vr_set_mouse_t clcdr_set_mouse;
+static vr_draw_mouse_t clcdr_draw_mouse;
+
+/*
+ * We use our own renderer; this is because we must emulate a hardware
+ * cursor.
+ */
+static sc_rndr_sw_t clcdrend = {
+	clcdr_init,
+	clcdr_clear,
+	clcdr_draw_border,
+	clcdr_draw,
+	clcdr_set_cursor,
+	clcdr_draw_cursor,
+	clcdr_blink_cursor,
+	clcdr_set_mouse,
+	clcdr_draw_mouse
+};
+
+RENDERER(versatilefb, 0, clcdrend, gfb_set);
 RENDERER_MODULE(versatilefb, gfb_set);
 
+static void
+clcdr_init(scr_stat* scp)
+{
+}
+
+static void
+clcdr_clear(scr_stat* scp, int c, int attr)
+{
+}
+
+static void
+clcdr_draw_border(scr_stat* scp, int color)
+{
+}
+
+static void
+clcdr_draw(scr_stat* scp, int from, int count, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	int i, c, a;
+
+	if (!flip) {
+		/* Normal printing */
+		vidd_puts(adp, from, (uint16_t*)sc_vtb_pointer(&scp->vtb, from), count);
+	} else {	
+		/* This is for selections and such: invert the color attribute */
+		for (i = count; i-- > 0; ++from) {
+			c = sc_vtb_getc(&scp->vtb, from);
+			a = sc_vtb_geta(&scp->vtb, from) >> 8;
+			vidd_putc(adp, from, c, (a >> 4) | ((a & 0xf) << 4));
+		}
+	}
+}
+
+static void
+clcdr_set_cursor(scr_stat* scp, int base, int height, int blink)
+{
+}
+
+static void
+clcdr_draw_cursor(scr_stat* scp, int off, int blink, int on, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	struct video_adapter_softc *sc;
+	int row, col;
+	uint8_t *addr;
+	int i,j;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	if (scp->curs_attr.height <= 0)
+		return;
+
+	if (sc->fb_addr == 0)
+		return;
+
+	if (off >= adp->va_info.vi_width * adp->va_info.vi_height)
+		return;
+
+	/* calculate the coordinates in the video buffer */
+	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
+	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
+
+	addr = (uint8_t *)sc->fb_addr
+	    + (row + sc->ymargin)*(sc->stride)
+	    + (sc->depth/8) * (col + sc->xmargin);
+
+	/* our cursor consists of simply inverting the char under it */
+	for (i = 0; i < adp->va_info.vi_cheight; i++) {
+		for (j = 0; j < adp->va_info.vi_cwidth; j++) {
+
+			addr[2*j] ^= 0xff;
+			addr[2*j + 1] ^= 0xff;
+		}
+
+		addr += sc->stride;
+	}
+}
+
+static void
+clcdr_blink_cursor(scr_stat* scp, int at, int flip)
+{
+}
+
+static void
+clcdr_set_mouse(scr_stat* scp)
+{
+}
+
+static void
+clcdr_draw_mouse(scr_stat* scp, int x, int y, int on)
+{
+	vidd_putm(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8);
+
+}
+
 static uint16_t versatilefb_static_window[ROW*COL];
 extern u_char dflt_font_16[];
 
@@ -629,6 +756,7 @@ versatilefb_read_hw_cursor(video_adapter
 static int
 versatilefb_set_hw_cursor(video_adapter_t *adp, int col, int row)
 {
+
 	return (0);
 }
 
@@ -753,6 +881,9 @@ versatilefb_putc(video_adapter_t *adp, v
 	if (sc->fb_addr == 0)
 		return (0);
 
+	if (off >= adp->va_info.vi_width * adp->va_info.vi_height)
+		return (0);
+
 	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
 	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
 	p = sc->font + c*VERSATILE_FONT_HEIGHT;

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 01:09:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7C2C4174;
 Fri, 28 Dec 2012 01:09:31 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 60D9D8FC0A;
 Fri, 28 Dec 2012 01:09:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS19V4M017931;
 Fri, 28 Dec 2012 01:09:31 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS19VYT017929;
 Fri, 28 Dec 2012 01:09:31 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212280109.qBS19VYT017929@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Dec 2012 01:09:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244756 - head/lib/libc/nls
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 01:09:31 -0000

Author: delphij
Date: Fri Dec 28 01:09:30 2012
New Revision: 244756
URL: http://svnweb.freebsd.org/changeset/base/244756

Log:
  Add zh_CN.UTF-8 catalog.
  
  Reviewed by:	alphachi <alphachi mediaspirit.org>
  MFC after:	2 weeks

Added:
  head/lib/libc/nls/zh_CN.UTF-8.msg   (contents, props changed)
Modified:
  head/lib/libc/nls/Makefile.inc

Modified: head/lib/libc/nls/Makefile.inc
==============================================================================
--- head/lib/libc/nls/Makefile.inc	Fri Dec 28 00:55:43 2012	(r244755)
+++ head/lib/libc/nls/Makefile.inc	Fri Dec 28 01:09:30 2012	(r244756)
@@ -36,3 +36,4 @@ NLS+=	ru_RU.KOI8-R
 NLS+=	sk_SK.ISO8859-2
 NLS+=	sv_SE.ISO8859-1
 NLS+=	uk_UA.UTF-8
+NLS+=	zh_CN.UTF-8

Added: head/lib/libc/nls/zh_CN.UTF-8.msg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/nls/zh_CN.UTF-8.msg	Fri Dec 28 01:09:30 2012	(r244756)
@@ -0,0 +1,295 @@
+$ $FreeBSD$
+$
+$ Message catalog for zh_CN.UTF-8 locale
+$
+$ strerror() support catalog
+$
+$set 1
+$ EPERM
+1 ��许的�作
+$ ENOENT
+2 文件或目录�存在
+$ ESRCH
+3 进程�存在
+$ EINTR
+4 系统调用中止
+$ EIO
+5 输入/输出错误
+$ ENXIO
+6 未�置的设备
+$ E2BIG
+7 �数表过长
+$ ENOEXEC
+8 �执行文件格�错误
+$ EBADF
+9 文件�述符无效
+$ ECHILD
+10 指定�进程�存在
+$ EDEADLK
+11 此�作会导致死�
+$ ENOMEM
+12 无法分�内存
+$ EACCES
+13 拒�访问
+$ EFAULT
+14 无效地�
+$ ENOTBLK
+15 该�作需��设备
+$ EBUSY
+16 设备使用中
+$ EEXIST
+17 文件已存在
+$ EXDEV
+18 链接跨设备
+$ ENODEV
+19 设备�支�此�作
+$ ENOTDIR
+20 对象�目录
+$ EISDIR
+21 对象为目录
+$ EINVAL
+22 �数无效
+$ ENFILE
+23 系统打开文件过多
+$ EMFILE
+24 进程打开文件过多
+$ ENOTTY
+25 无效设备 ioctl
+$ ETXTBSY
+26 �执行文件忙
+$ EFBIG
+27 文件过大
+$ ENOSPC
+28 设备无�用空间
+$ ESPIPE
+29 ��许执行 seek �作
+$ EROFS
+30 文件系统�读
+$ EMLINK
+31 文件链接过多
+$ EPIPE
+32 管�已中止
+$ EDOM
+33 数值�数越界
+$ ERANGE
+34 结果过大
+$ EAGAIN, EWOULDBLOCK
+35 资�暂时��用
+$ EINPROGRESS
+36 �作进行中
+$ EALREADY
+37 �作已开始
+$ ENOTSOCK
+38 �试在� socket 上执行 socket �作
+$ EDESTADDRREQ
+39 需�目的地�
+$ EMSGSIZE
+40 消�过长
+$ EPROTOTYPE
+41 socket�议类型错误
+$ ENOPROTOOPT
+42 �议��用
+$ EPROTONOSUPPORT
+43 �支�的�议
+$ ESOCKTNOSUPPORT
+44 �支�的 socket 类型
+$ EOPNOTSUPP
+45 �支�的�作
+$ EPFNOSUPPORT
+46 �支�的�议�
+$ EAFNOSUPPORT
+47 �议��支�的地��
+$ EADDRINUSE
+48 地�已被�用
+$ EADDRNOTAVAIL
+49 无法指定请求的地�
+$ ENETDOWN
+50 网络已关闭
+$ ENETUNREACH
+51 网络��达
+$ ENETRESET
+52 ��导致网络连接丢失
+$ ECONNABORTED
+53 软件导致的连接中止
+$ ECONNRESET
+54 对方��了连接
+$ ENOBUFS
+55 缓冲区空间�足
+$ EISCONN
+56 socket 已连接
+$ ENOTCONN
+57 socket 未连接
+$ ESHUTDOWN
+58 socket shutdown 之�无法��数�
+$ ETOOMANYREFS
+59 引用数过多：无法拼接
+$ ETIMEDOUT
+60 �作超时
+$ ECONNREFUSED
+61 拒�连接
+$ ELOOP
+62 符�链接层数过多
+$ ENAMETOOLONG
+63 文件�过长
+$ EHOSTDOWN
+64 主机已关闭
+$ EHOSTUNREACH
+65 没有到主机的路由
+$ ENOTEMPTY
+66 目录�空
+$ EPROCLIM
+67 进程数超�
+$ EUSERS
+68 用户数超�
+$ EDQUOT
+69 �盘空间��超�
+$ ESTALE
+70 NFS 文件�柄已失效
+$ EREMOTE
+71 远程目录层数过多
+$ EBADRPC
+72 RPC 结构无效
+$ ERPCMISMATCH
+73 RPC 版本错误
+$ EPROGUNAVAIL
+74 RPC 程���用
+$ EPROGMISMATCH
+75 程�版本错误
+$ EPROCUNAVAIL
+76 未�供的远程函数
+$ ENOLCK
+77 �支��
+$ ENOSYS
+78 功能未实现
+$ EFTYPE
+79 文件类型或格�无效
+$ EAUTH
+80 身份无效
+$ ENEEDAUTH
+81 无信任凭�
+$ EIDRM
+82 无标识符
+$ ENOMSG
+83 无消�类型
+$ EOVERFLOW
+84 数值溢出
+$ ECANCELED
+85 �作已�消
+$ EILSEQ
+86 无效字符�列
+$ ENOATTR
+87 无扩展属性
+$ EDOOFUS
+88 程�设计错误
+$ EBADMSG
+89 无效消�
+$ EMULTIHOP
+90 Multihop attempted
+$ ENOLINK
+91 Link has been severed
+$ EPROTO
+92 �议错误
+$ ENOTCAPABLE
+93 �能�足
+$
+$ strsignal() support catalog
+$
+$set 2
+$ SIGHUP
+1 终端线路挂断
+$ SIGINT
+2 中断
+$ SIGQUIT
+3 退出
+$ SIGILL
+4 无效指令
+$ SIGTRAP
+5 跟踪/BPT 陷阱
+$ SIGABRT
+6 终止陷阱
+$ SIGEMT
+7 EMT 陷阱
+$ SIGFPE
+8 浮点异常
+$ SIGKILL
+9 强制终止进程
+$ SIGBUS
+10 系统内存访问越界
+$ SIGSEGV
+11 内存访问越界
+$ SIGSYS
+12 无效系统调用
+$ SIGPIPE
+13 写管�时读�者�存在
+$ SIGALRM
+14 实时倒计时到期
+$ SIGTERM
+15 终止
+$ SIGURG
+16 需立�处�的 I/O 紧急状况
+$ SIGSTOP
+17 挂起 (信�)
+$ SIGTSTP
+18 挂起
+$ SIGCONT
+19 继续�行
+$ SIGCHLD
+20 �进程终止
+$ SIGTTIN
+21 TTY 输入阻塞
+$ SIGTTOU
+22 TTY 输出阻塞
+$ SIGIO
+23 I/O 就绪
+$ SIGXCPU
+24 CPU 使用时间过长
+$ SIGXFSZ
+25 文件尺寸过大
+$ SIGVTALRM
+26 虚拟倒计时到期
+$ SIGPROF
+27 剖�倒计时到期
+$ SIGWINCH
+28 窗�尺寸�化
+$ SIGINFO
+29 请求信�
+$ SIGUSR1
+30 用户自定义信� 1
+$ SIGUSR2
+31 用户自定义信� 2
+$
+$ gai_strerror() support catalog
+$
+$set 3
+$ 1 (obsolete)
+1 主机�使用了�支�的地�类型
+$ EAI_AGAIN
+2 暂时无法解��称
+$ EAI_BADFLAGS
+3 无效的 ai_flags 值
+$ EAI_FAIL
+4 解��称时出现无法��的错误
+$ EAI_FAMILY
+5 �支�的地�信�类型
+$ EAI_MEMORY
+6 内存分�失败
+$ 7 (obsolete)
+7 主机�无相关�的地�
+$ EAI_NONAME
+8 未知的主机�或�务�
+$ EAI_SERVICE
+9 套接字类型�支�此�务�
+$ EAI_SOCKTYPE
+10 �支�的套接字类型
+$ EAI_SYSTEM
+11 系统调用返回了 errno 错误
+$ EAI_BADHINTS
+12 无效�示�数
+$ EAI_PROTOCOL
+13 未知�议
+$ EAI_OVERFLOW
+14 �数缓冲溢出
+$ 0
+32766 �功
+$ NL_MSGMAX
+32767 未知错误

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 01:23:13 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 36E8C488;
 Fri, 28 Dec 2012 01:23:13 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1A3C58FC08;
 Fri, 28 Dec 2012 01:23:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS1NDgC020061;
 Fri, 28 Dec 2012 01:23:13 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS1NCaB020058;
 Fri, 28 Dec 2012 01:23:12 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212280123.qBS1NCaB020058@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Dec 2012 01:23:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244757 - head/lib/libc/nls
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 01:23:13 -0000

Author: delphij
Date: Fri Dec 28 01:23:12 2012
New Revision: 244757
URL: http://svnweb.freebsd.org/changeset/base/244757

Log:
  Add derived versions for common Simplified Chinese encodings.
  
  MFC after:	2 weeks

Added:
  head/lib/libc/nls/zh_CN.GB18030.msg
     - copied, changed from r244756, head/lib/libc/nls/zh_CN.UTF-8.msg
  head/lib/libc/nls/zh_CN.GB2312.msg
     - copied, changed from r244756, head/lib/libc/nls/zh_CN.UTF-8.msg
Modified:
  head/lib/libc/nls/Makefile.inc

Modified: head/lib/libc/nls/Makefile.inc
==============================================================================
--- head/lib/libc/nls/Makefile.inc	Fri Dec 28 01:09:30 2012	(r244756)
+++ head/lib/libc/nls/Makefile.inc	Fri Dec 28 01:23:12 2012	(r244757)
@@ -36,4 +36,6 @@ NLS+=	ru_RU.KOI8-R
 NLS+=	sk_SK.ISO8859-2
 NLS+=	sv_SE.ISO8859-1
 NLS+=	uk_UA.UTF-8
+NLS+=	zh_CN.GB18030
+NLS+=	zh_CN.GB2312
 NLS+=	zh_CN.UTF-8

Copied and modified: head/lib/libc/nls/zh_CN.GB18030.msg (from r244756, head/lib/libc/nls/zh_CN.UTF-8.msg)
==============================================================================
--- head/lib/libc/nls/zh_CN.UTF-8.msg	Fri Dec 28 01:09:30 2012	(r244756, copy source)
+++ head/lib/libc/nls/zh_CN.GB18030.msg	Fri Dec 28 01:23:12 2012	(r244757)
@@ -1,295 +1,297 @@
 $ $FreeBSD$
 $
-$ Message catalog for zh_CN.UTF-8 locale
+$ Message catalog for zh_CN.GB18030 locale
+$
+$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
 $
 $ strerror() support catalog
 $
 $set 1
 $ EPERM
-1 ��许的�作
+1 ²»ÔÊÐíµÄ²Ù×÷
 $ ENOENT
-2 文件或目录�存在
+2 Îļþ»òĿ¼²»´æÔÚ
 $ ESRCH
-3 进程�存在
+3 ½ø³Ì²»´æÔÚ
 $ EINTR
-4 系统调用中止
+4 ϵͳµ÷ÓÃÖÐÖ¹
 $ EIO
-5 输入/输出错误
+5 ÊäÈë/Êä³ö´íÎó
 $ ENXIO
-6 未�置的设备
+6 δÅäÖõÄÉ豸
 $ E2BIG
-7 �数表过长
+7 ²ÎÊý±í¹ý³¤
 $ ENOEXEC
-8 �执行文件格�错误
+8 ¿ÉÖ´ÐÐÎļþ¸ñʽ´íÎó
 $ EBADF
-9 文件�述符无效
+9 ÎļþÃèÊö·ûÎÞЧ
 $ ECHILD
-10 指定�进程�存在
+10 Ö¸¶¨×Ó½ø³Ì²»´æÔÚ
 $ EDEADLK
-11 此�作会导致死�
+11 ´Ë²Ù×÷»áµ¼ÖÂËÀËø
 $ ENOMEM
-12 无法分�内存
+12 ÎÞ·¨·ÖÅäÄÚ´æ
 $ EACCES
-13 拒�访问
+13 ¾Ü¾ø·ÃÎÊ
 $ EFAULT
-14 无效地�
+14 ÎÞЧµØÖ·
 $ ENOTBLK
-15 该�作需��设备
+15 ¸Ã²Ù×÷ÐèÒª¿éÉ豸
 $ EBUSY
-16 设备使用中
+16 É豸ʹÓÃÖÐ
 $ EEXIST
-17 文件已存在
+17 ÎļþÒÑ´æÔÚ
 $ EXDEV
-18 链接跨设备
+18 Á´½Ó¿çÉ豸
 $ ENODEV
-19 设备�支�此�作
+19 É豸²»Ö§³Ö´Ë²Ù×÷
 $ ENOTDIR
-20 对象�目录
+20 ¶ÔÏó·ÇĿ¼
 $ EISDIR
-21 对象为目录
+21 ¶ÔÏóΪĿ¼
 $ EINVAL
-22 �数无效
+22 ²ÎÊýÎÞЧ
 $ ENFILE
-23 系统打开文件过多
+23 ϵͳ´ò¿ªÎļþ¹ý¶à
 $ EMFILE
-24 进程打开文件过多
+24 ½ø³Ì´ò¿ªÎļþ¹ý¶à
 $ ENOTTY
-25 无效设备 ioctl
+25 ÎÞЧÉ豸 ioctl
 $ ETXTBSY
-26 �执行文件忙
+26 ¿ÉÖ´ÐÐÎļþæ
 $ EFBIG
-27 文件过大
+27 Îļþ¹ý´ó
 $ ENOSPC
-28 设备无�用空间
+28 É豸ÎÞ¿ÉÓÿռä
 $ ESPIPE
-29 ��许执行 seek �作
+29 ²»ÔÊÐíÖ´ÐÐ seek ²Ù×÷
 $ EROFS
-30 文件系统�读
+30 Îļþϵͳֻ¶Á
 $ EMLINK
-31 文件链接过多
+31 ÎļþÁ´½Ó¹ý¶à
 $ EPIPE
-32 管�已中止
+32 ¹ÜµÀÒÑÖÐÖ¹
 $ EDOM
-33 数值�数越界
+33 ÊýÖµ²ÎÊýÔ½½ç
 $ ERANGE
-34 结果过大
+34 ½á¹û¹ý´ó
 $ EAGAIN, EWOULDBLOCK
-35 资�暂时��用
+35 ×ÊÔ´ÔÝʱ²»¿ÉÓÃ
 $ EINPROGRESS
-36 �作进行中
+36 ²Ù×÷½øÐÐÖÐ
 $ EALREADY
-37 �作已开始
+37 ²Ù×÷ÒÑ¿ªÊ¼
 $ ENOTSOCK
-38 �试在� socket 上执行 socket �作
+38 ³¢ÊÔÔÚ·Ç socket ÉÏÖ´ÐÐ socket ²Ù×÷
 $ EDESTADDRREQ
-39 需�目的地�
+39 ÐèҪĿµÄµØÖ·
 $ EMSGSIZE
-40 消�过长
+40 ÏûÏ¢¹ý³¤
 $ EPROTOTYPE
-41 socket�议类型错误
+41 socketЭÒéÀàÐÍ´íÎó
 $ ENOPROTOOPT
-42 �议��用
+42 ЭÒé²»¿ÉÓÃ
 $ EPROTONOSUPPORT
-43 �支�的�议
+43 ²»Ö§³ÖµÄЭÒé
 $ ESOCKTNOSUPPORT
-44 �支�的 socket 类型
+44 ²»Ö§³ÖµÄ socket ÀàÐÍ
 $ EOPNOTSUPP
-45 �支�的�作
+45 ²»Ö§³ÖµÄ²Ù×÷
 $ EPFNOSUPPORT
-46 �支�的�议�
+46 ²»Ö§³ÖµÄЭÒé×å
 $ EAFNOSUPPORT
-47 �议��支�的地��
+47 ЭÒé×å²»Ö§³ÖµÄµØÖ·×å
 $ EADDRINUSE
-48 地�已被�用
+48 µØÖ·Òѱ»Õ¼ÓÃ
 $ EADDRNOTAVAIL
-49 无法指定请求的地�
+49 ÎÞ·¨Ö¸¶¨ÇëÇóµÄµØÖ·
 $ ENETDOWN
-50 网络已关闭
+50 ÍøÂçÒѹرÕ
 $ ENETUNREACH
-51 网络��达
+51 ÍøÂç²»¿É´ï
 $ ENETRESET
-52 ��导致网络连接丢失
+52 ¸´Î»µ¼ÖÂÍøÂçÁ¬½Ó¶ªÊ§
 $ ECONNABORTED
-53 软件导致的连接中止
+53 Èí¼þµ¼ÖµÄÁ¬½ÓÖÐÖ¹
 $ ECONNRESET
-54 对方��了连接
+54 ¶Ô·½¸´Î»ÁËÁ¬½Ó
 $ ENOBUFS
-55 缓冲区空间�足
+55 »º³åÇø¿Õ¼ä²»×ã
 $ EISCONN
-56 socket 已连接
+56 socket ÒÑÁ¬½Ó
 $ ENOTCONN
-57 socket 未连接
+57 socket δÁ¬½Ó
 $ ESHUTDOWN
-58 socket shutdown 之�无法��数�
+58 socket shutdown Ö®ºóÎÞ·¨·¢ËÍÊý¾Ý
 $ ETOOMANYREFS
-59 引用数过多：无法拼接
+59 ÒýÓÃÊý¹ý¶à£ºÎÞ·¨Æ´½Ó
 $ ETIMEDOUT
-60 �作超时
+60 ²Ù×÷³¬Ê±
 $ ECONNREFUSED
-61 拒�连接
+61 ¾Ü¾øÁ¬½Ó
 $ ELOOP
-62 符�链接层数过多
+62 ·ûºÅÁ´½Ó²ãÊý¹ý¶à
 $ ENAMETOOLONG
-63 文件�过长
+63 ÎļþÃû¹ý³¤
 $ EHOSTDOWN
-64 主机已关闭
+64 Ö÷»úÒѹرÕ
 $ EHOSTUNREACH
-65 没有到主机的路由
+65 ûÓе½Ö÷»úµÄ·ÓÉ
 $ ENOTEMPTY
-66 目录�空
+66 Ŀ¼·Ç¿Õ
 $ EPROCLIM
-67 进程数超�
+67 ½ø³ÌÊý³¬ÏÞ
 $ EUSERS
-68 用户数超�
+68 Óû§Êý³¬ÏÞ
 $ EDQUOT
-69 �盘空间��超�
+69 ´ÅÅÌ¿Õ¼äÅä¶î³¬ÏÞ
 $ ESTALE
-70 NFS 文件�柄已失效
+70 NFS Îļþ¾ä±úÒÑʧЧ
 $ EREMOTE
-71 远程目录层数过多
+71 Ô¶³ÌĿ¼²ãÊý¹ý¶à
 $ EBADRPC
-72 RPC 结构无效
+72 RPC ½á¹¹ÎÞЧ
 $ ERPCMISMATCH
-73 RPC 版本错误
+73 RPC °æ±¾´íÎó
 $ EPROGUNAVAIL
-74 RPC 程���用
+74 RPC ³ÌÐò²»¿ÉÓÃ
 $ EPROGMISMATCH
-75 程�版本错误
+75 ³ÌÐò°æ±¾´íÎó
 $ EPROCUNAVAIL
-76 未�供的远程函数
+76 δÌṩµÄÔ¶³Ìº¯Êý
 $ ENOLCK
-77 �支��
+77 ²»Ö§³ÖËø
 $ ENOSYS
-78 功能未实现
+78 ¹¦ÄÜδʵÏÖ
 $ EFTYPE
-79 文件类型或格�无效
+79 ÎļþÀàÐÍ»ò¸ñʽÎÞЧ
 $ EAUTH
-80 身份无效
+80 Éí·ÝÎÞЧ
 $ ENEEDAUTH
-81 无信任凭�
+81 ÎÞÐÅÈÎƾ¾Ý
 $ EIDRM
-82 无标识符
+82 ÎÞ±êʶ·û
 $ ENOMSG
-83 无消�类型
+83 ÎÞÏûÏ¢ÀàÐÍ
 $ EOVERFLOW
-84 数值溢出
+84 ÊýÖµÒç³ö
 $ ECANCELED
-85 �作已�消
+85 ²Ù×÷ÒÑÈ¡Ïû
 $ EILSEQ
-86 无效字符�列
+86 ÎÞЧ×Ö·ûÐòÁÐ
 $ ENOATTR
-87 无扩展属性
+87 ÎÞÀ©Õ¹ÊôÐÔ
 $ EDOOFUS
-88 程�设计错误
+88 ³ÌÐòÉè¼Æ´íÎó
 $ EBADMSG
-89 无效消�
+89 ÎÞЧÏûÏ¢
 $ EMULTIHOP
 90 Multihop attempted
 $ ENOLINK
 91 Link has been severed
 $ EPROTO
-92 �议错误
+92 ЭÒé´íÎó
 $ ENOTCAPABLE
-93 �能�足
+93 ȨÄܲ»×ã
 $
 $ strsignal() support catalog
 $
 $set 2
 $ SIGHUP
-1 终端线路挂断
+1 ÖÕ¶ËÏß·¹Ò¶Ï
 $ SIGINT
-2 中断
+2 ÖжÏ
 $ SIGQUIT
-3 退出
+3 Í˳ö
 $ SIGILL
-4 无效指令
+4 ÎÞЧָÁî
 $ SIGTRAP
-5 跟踪/BPT 陷阱
+5 ¸ú×Ù/BPT ÏÝÚå
 $ SIGABRT
-6 终止陷阱
+6 ÖÕÖ¹ÏÝÚå
 $ SIGEMT
-7 EMT 陷阱
+7 EMT ÏÝÚå
 $ SIGFPE
-8 浮点异常
+8 ¸¡µãÒì³£
 $ SIGKILL
-9 强制终止进程
+9 Ç¿ÖÆÖÕÖ¹½ø³Ì
 $ SIGBUS
-10 系统内存访问越界
+10 ϵͳÄÚ´æ·ÃÎÊÔ½½ç
 $ SIGSEGV
-11 内存访问越界
+11 ÄÚ´æ·ÃÎÊÔ½½ç
 $ SIGSYS
-12 无效系统调用
+12 ÎÞЧϵͳµ÷ÓÃ
 $ SIGPIPE
-13 写管�时读�者�存在
+13 д¹ÜµÀʱ¶ÁÈ¡Õß²»´æÔÚ
 $ SIGALRM
-14 实时倒计时到期
+14 ʵʱµ¹¼Æʱµ½ÆÚ
 $ SIGTERM
-15 终止
+15 ÖÕÖ¹
 $ SIGURG
-16 需立�处�的 I/O 紧急状况
+16 ÐèÁ¢¼´´¦ÀíµÄ I/O ½ô¼±×´¿ö
 $ SIGSTOP
-17 挂起 (信�)
+17 ¹ÒÆð (ÐźÅ)
 $ SIGTSTP
-18 挂起
+18 ¹ÒÆð
 $ SIGCONT
-19 继续�行
+19 ¼ÌÐøÔËÐÐ
 $ SIGCHLD
-20 �进程终止
+20 ×Ó½ø³ÌÖÕÖ¹
 $ SIGTTIN
-21 TTY 输入阻塞
+21 TTY ÊäÈë×èÈû
 $ SIGTTOU
-22 TTY 输出阻塞
+22 TTY Êä³ö×èÈû
 $ SIGIO
-23 I/O 就绪
+23 I/O ¾ÍÐ÷
 $ SIGXCPU
-24 CPU 使用时间过长
+24 CPU ʹÓÃʱ¼ä¹ý³¤
 $ SIGXFSZ
-25 文件尺寸过大
+25 Îļþ³ß´ç¹ý´ó
 $ SIGVTALRM
-26 虚拟倒计时到期
+26 ÐéÄâµ¹¼Æʱµ½ÆÚ
 $ SIGPROF
-27 剖�倒计时到期
+27 ÆÊÎöµ¹¼Æʱµ½ÆÚ
 $ SIGWINCH
-28 窗�尺寸�化
+28 ´°¿Ú³ß´ç±ä»¯
 $ SIGINFO
-29 请求信�
+29 ÇëÇóÐÅÏ¢
 $ SIGUSR1
-30 用户自定义信� 1
+30 Óû§×Ô¶¨ÒåÐźŠ1
 $ SIGUSR2
-31 用户自定义信� 2
+31 Óû§×Ô¶¨ÒåÐźŠ2
 $
 $ gai_strerror() support catalog
 $
 $set 3
 $ 1 (obsolete)
-1 主机�使用了�支�的地�类型
+1 Ö÷»úÃûʹÓÃÁ˲»Ö§³ÖµÄµØÖ·ÀàÐÍ
 $ EAI_AGAIN
-2 暂时无法解��称
+2 ÔÝʱÎÞ·¨½âÎöÃû³Æ
 $ EAI_BADFLAGS
-3 无效的 ai_flags 值
+3 ÎÞЧµÄ ai_flags Öµ
 $ EAI_FAIL
-4 解��称时出现无法��的错误
+4 ½âÎöÃû³Æʱ³öÏÖÎÞ·¨»Ö¸´µÄ´íÎó
 $ EAI_FAMILY
-5 �支�的地�信�类型
+5 ²»Ö§³ÖµÄµØÖ·ÐÅÏ¢ÀàÐÍ
 $ EAI_MEMORY
-6 内存分�失败
+6 ÄÚ´æ·ÖÅäʧ°Ü
 $ 7 (obsolete)
-7 主机�无相关�的地�
+7 Ö÷»úÃûÎÞÏà¹ØÁªµÄµØÖ·
 $ EAI_NONAME
-8 未知的主机�或�务�
+8 δ֪µÄÖ÷»úÃû»ò·þÎñÃû
 $ EAI_SERVICE
-9 套接字类型�支�此�务�
+9 Ì×½Ó×ÖÀàÐͲ»Ö§³Ö´Ë·þÎñÃû
 $ EAI_SOCKTYPE
-10 �支�的套接字类型
+10 ²»Ö§³ÖµÄÌ×½Ó×ÖÀàÐÍ
 $ EAI_SYSTEM
-11 系统调用返回了 errno 错误
+11 ϵͳµ÷Ó÷µ»ØÁË errno ´íÎó
 $ EAI_BADHINTS
-12 无效�示�数
+12 ÎÞЧÌáʾ²ÎÊý
 $ EAI_PROTOCOL
-13 未知�议
+13 δ֪ЭÒé
 $ EAI_OVERFLOW
-14 �数缓冲溢出
+14 ²ÎÊý»º³åÒç³ö
 $ 0
-32766 �功
+32766 ³É¹¦
 $ NL_MSGMAX
-32767 未知错误
+32767 δ֪´íÎó

Copied and modified: head/lib/libc/nls/zh_CN.GB2312.msg (from r244756, head/lib/libc/nls/zh_CN.UTF-8.msg)
==============================================================================
--- head/lib/libc/nls/zh_CN.UTF-8.msg	Fri Dec 28 01:09:30 2012	(r244756, copy source)
+++ head/lib/libc/nls/zh_CN.GB2312.msg	Fri Dec 28 01:23:12 2012	(r244757)
@@ -1,295 +1,297 @@
 $ $FreeBSD$
 $
-$ Message catalog for zh_CN.UTF-8 locale
+$ Message catalog for zh_CN.GB2312 locale
+$
+$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
 $
 $ strerror() support catalog
 $
 $set 1
 $ EPERM
-1 ��许的�作
+1 ²»ÔÊÐíµÄ²Ù×÷
 $ ENOENT
-2 文件或目录�存在
+2 Îļþ»òĿ¼²»´æÔÚ
 $ ESRCH
-3 进程�存在
+3 ½ø³Ì²»´æÔÚ
 $ EINTR
-4 系统调用中止
+4 ϵͳµ÷ÓÃÖÐÖ¹
 $ EIO
-5 输入/输出错误
+5 ÊäÈë/Êä³ö´íÎó
 $ ENXIO
-6 未�置的设备
+6 δÅäÖõÄÉ豸
 $ E2BIG
-7 �数表过长
+7 ²ÎÊý±í¹ý³¤
 $ ENOEXEC
-8 �执行文件格�错误
+8 ¿ÉÖ´ÐÐÎļþ¸ñʽ´íÎó
 $ EBADF
-9 文件�述符无效
+9 ÎļþÃèÊö·ûÎÞЧ
 $ ECHILD
-10 指定�进程�存在
+10 Ö¸¶¨×Ó½ø³Ì²»´æÔÚ
 $ EDEADLK
-11 此�作会导致死�
+11 ´Ë²Ù×÷»áµ¼ÖÂËÀËø
 $ ENOMEM
-12 无法分�内存
+12 ÎÞ·¨·ÖÅäÄÚ´æ
 $ EACCES
-13 拒�访问
+13 ¾Ü¾ø·ÃÎÊ
 $ EFAULT
-14 无效地�
+14 ÎÞЧµØÖ·
 $ ENOTBLK
-15 该�作需��设备
+15 ¸Ã²Ù×÷ÐèÒª¿éÉ豸
 $ EBUSY
-16 设备使用中
+16 É豸ʹÓÃÖÐ
 $ EEXIST
-17 文件已存在
+17 ÎļþÒÑ´æÔÚ
 $ EXDEV
-18 链接跨设备
+18 Á´½Ó¿çÉ豸
 $ ENODEV
-19 设备�支�此�作
+19 É豸²»Ö§³Ö´Ë²Ù×÷
 $ ENOTDIR
-20 对象�目录
+20 ¶ÔÏó·ÇĿ¼
 $ EISDIR
-21 对象为目录
+21 ¶ÔÏóΪĿ¼
 $ EINVAL
-22 �数无效
+22 ²ÎÊýÎÞЧ
 $ ENFILE
-23 系统打开文件过多
+23 ϵͳ´ò¿ªÎļþ¹ý¶à
 $ EMFILE
-24 进程打开文件过多
+24 ½ø³Ì´ò¿ªÎļþ¹ý¶à
 $ ENOTTY
-25 无效设备 ioctl
+25 ÎÞЧÉ豸 ioctl
 $ ETXTBSY
-26 �执行文件忙
+26 ¿ÉÖ´ÐÐÎļþæ
 $ EFBIG
-27 文件过大
+27 Îļþ¹ý´ó
 $ ENOSPC
-28 设备无�用空间
+28 É豸ÎÞ¿ÉÓÿռä
 $ ESPIPE
-29 ��许执行 seek �作
+29 ²»ÔÊÐíÖ´ÐÐ seek ²Ù×÷
 $ EROFS
-30 文件系统�读
+30 Îļþϵͳֻ¶Á
 $ EMLINK
-31 文件链接过多
+31 ÎļþÁ´½Ó¹ý¶à
 $ EPIPE
-32 管�已中止
+32 ¹ÜµÀÒÑÖÐÖ¹
 $ EDOM
-33 数值�数越界
+33 ÊýÖµ²ÎÊýÔ½½ç
 $ ERANGE
-34 结果过大
+34 ½á¹û¹ý´ó
 $ EAGAIN, EWOULDBLOCK
-35 资�暂时��用
+35 ×ÊÔ´ÔÝʱ²»¿ÉÓÃ
 $ EINPROGRESS
-36 �作进行中
+36 ²Ù×÷½øÐÐÖÐ
 $ EALREADY
-37 �作已开始
+37 ²Ù×÷ÒÑ¿ªÊ¼
 $ ENOTSOCK
-38 �试在� socket 上执行 socket �作
+38 ³¢ÊÔÔÚ·Ç socket ÉÏÖ´ÐÐ socket ²Ù×÷
 $ EDESTADDRREQ
-39 需�目的地�
+39 ÐèҪĿµÄµØÖ·
 $ EMSGSIZE
-40 消�过长
+40 ÏûÏ¢¹ý³¤
 $ EPROTOTYPE
-41 socket�议类型错误
+41 socketЭÒéÀàÐÍ´íÎó
 $ ENOPROTOOPT
-42 �议��用
+42 ЭÒé²»¿ÉÓÃ
 $ EPROTONOSUPPORT
-43 �支�的�议
+43 ²»Ö§³ÖµÄЭÒé
 $ ESOCKTNOSUPPORT
-44 �支�的 socket 类型
+44 ²»Ö§³ÖµÄ socket ÀàÐÍ
 $ EOPNOTSUPP
-45 �支�的�作
+45 ²»Ö§³ÖµÄ²Ù×÷
 $ EPFNOSUPPORT
-46 �支�的�议�
+46 ²»Ö§³ÖµÄЭÒé×å
 $ EAFNOSUPPORT
-47 �议��支�的地��
+47 ЭÒé×å²»Ö§³ÖµÄµØÖ·×å
 $ EADDRINUSE
-48 地�已被�用
+48 µØÖ·Òѱ»Õ¼ÓÃ
 $ EADDRNOTAVAIL
-49 无法指定请求的地�
+49 ÎÞ·¨Ö¸¶¨ÇëÇóµÄµØÖ·
 $ ENETDOWN
-50 网络已关闭
+50 ÍøÂçÒѹرÕ
 $ ENETUNREACH
-51 网络��达
+51 ÍøÂç²»¿É´ï
 $ ENETRESET
-52 ��导致网络连接丢失
+52 ¸´Î»µ¼ÖÂÍøÂçÁ¬½Ó¶ªÊ§
 $ ECONNABORTED
-53 软件导致的连接中止
+53 Èí¼þµ¼ÖµÄÁ¬½ÓÖÐÖ¹
 $ ECONNRESET
-54 对方��了连接
+54 ¶Ô·½¸´Î»ÁËÁ¬½Ó
 $ ENOBUFS
-55 缓冲区空间�足
+55 »º³åÇø¿Õ¼ä²»×ã
 $ EISCONN
-56 socket 已连接
+56 socket ÒÑÁ¬½Ó
 $ ENOTCONN
-57 socket 未连接
+57 socket δÁ¬½Ó
 $ ESHUTDOWN
-58 socket shutdown 之�无法��数�
+58 socket shutdown Ö®ºóÎÞ·¨·¢ËÍÊý¾Ý
 $ ETOOMANYREFS
-59 引用数过多：无法拼接
+59 ÒýÓÃÊý¹ý¶à£ºÎÞ·¨Æ´½Ó
 $ ETIMEDOUT
-60 �作超时
+60 ²Ù×÷³¬Ê±
 $ ECONNREFUSED
-61 拒�连接
+61 ¾Ü¾øÁ¬½Ó
 $ ELOOP
-62 符�链接层数过多
+62 ·ûºÅÁ´½Ó²ãÊý¹ý¶à
 $ ENAMETOOLONG
-63 文件�过长
+63 ÎļþÃû¹ý³¤
 $ EHOSTDOWN
-64 主机已关闭
+64 Ö÷»úÒѹرÕ
 $ EHOSTUNREACH
-65 没有到主机的路由
+65 ûÓе½Ö÷»úµÄ·ÓÉ
 $ ENOTEMPTY
-66 目录�空
+66 Ŀ¼·Ç¿Õ
 $ EPROCLIM
-67 进程数超�
+67 ½ø³ÌÊý³¬ÏÞ
 $ EUSERS
-68 用户数超�
+68 Óû§Êý³¬ÏÞ
 $ EDQUOT
-69 �盘空间��超�
+69 ´ÅÅÌ¿Õ¼äÅä¶î³¬ÏÞ
 $ ESTALE
-70 NFS 文件�柄已失效
+70 NFS Îļþ¾ä±úÒÑʧЧ
 $ EREMOTE
-71 远程目录层数过多
+71 Ô¶³ÌĿ¼²ãÊý¹ý¶à
 $ EBADRPC
-72 RPC 结构无效
+72 RPC ½á¹¹ÎÞЧ
 $ ERPCMISMATCH
-73 RPC 版本错误
+73 RPC °æ±¾´íÎó
 $ EPROGUNAVAIL
-74 RPC 程���用
+74 RPC ³ÌÐò²»¿ÉÓÃ
 $ EPROGMISMATCH
-75 程�版本错误
+75 ³ÌÐò°æ±¾´íÎó
 $ EPROCUNAVAIL
-76 未�供的远程函数
+76 δÌṩµÄÔ¶³Ìº¯Êý
 $ ENOLCK
-77 �支��
+77 ²»Ö§³ÖËø
 $ ENOSYS
-78 功能未实现
+78 ¹¦ÄÜδʵÏÖ
 $ EFTYPE
-79 文件类型或格�无效
+79 ÎļþÀàÐÍ»ò¸ñʽÎÞЧ
 $ EAUTH
-80 身份无效
+80 Éí·ÝÎÞЧ
 $ ENEEDAUTH
-81 无信任凭�
+81 ÎÞÐÅÈÎƾ¾Ý
 $ EIDRM
-82 无标识符
+82 ÎÞ±êʶ·û
 $ ENOMSG
-83 无消�类型
+83 ÎÞÏûÏ¢ÀàÐÍ
 $ EOVERFLOW
-84 数值溢出
+84 ÊýÖµÒç³ö
 $ ECANCELED
-85 �作已�消
+85 ²Ù×÷ÒÑÈ¡Ïû
 $ EILSEQ
-86 无效字符�列
+86 ÎÞЧ×Ö·ûÐòÁÐ
 $ ENOATTR
-87 无扩展属性
+87 ÎÞÀ©Õ¹ÊôÐÔ
 $ EDOOFUS
-88 程�设计错误
+88 ³ÌÐòÉè¼Æ´íÎó
 $ EBADMSG
-89 无效消�
+89 ÎÞЧÏûÏ¢
 $ EMULTIHOP
 90 Multihop attempted
 $ ENOLINK
 91 Link has been severed
 $ EPROTO
-92 �议错误
+92 ЭÒé´íÎó
 $ ENOTCAPABLE
-93 �能�足
+93 ȨÄܲ»×ã
 $
 $ strsignal() support catalog
 $
 $set 2
 $ SIGHUP
-1 终端线路挂断
+1 ÖÕ¶ËÏß·¹Ò¶Ï
 $ SIGINT
-2 中断
+2 ÖжÏ
 $ SIGQUIT
-3 退出
+3 Í˳ö
 $ SIGILL
-4 无效指令
+4 ÎÞЧָÁî
 $ SIGTRAP
-5 跟踪/BPT 陷阱
+5 ¸ú×Ù/BPT ÏÝÚå
 $ SIGABRT
-6 终止陷阱
+6 ÖÕÖ¹ÏÝÚå
 $ SIGEMT
-7 EMT 陷阱
+7 EMT ÏÝÚå
 $ SIGFPE
-8 浮点异常
+8 ¸¡µãÒì³£
 $ SIGKILL
-9 强制终止进程
+9 Ç¿ÖÆÖÕÖ¹½ø³Ì
 $ SIGBUS
-10 系统内存访问越界
+10 ϵͳÄÚ´æ·ÃÎÊÔ½½ç
 $ SIGSEGV
-11 内存访问越界
+11 ÄÚ´æ·ÃÎÊÔ½½ç
 $ SIGSYS
-12 无效系统调用
+12 ÎÞЧϵͳµ÷ÓÃ
 $ SIGPIPE
-13 写管�时读�者�存在
+13 д¹ÜµÀʱ¶ÁÈ¡Õß²»´æÔÚ
 $ SIGALRM
-14 实时倒计时到期
+14 ʵʱµ¹¼Æʱµ½ÆÚ
 $ SIGTERM
-15 终止
+15 ÖÕÖ¹
 $ SIGURG
-16 需立�处�的 I/O 紧急状况
+16 ÐèÁ¢¼´´¦ÀíµÄ I/O ½ô¼±×´¿ö
 $ SIGSTOP
-17 挂起 (信�)
+17 ¹ÒÆð (ÐźÅ)
 $ SIGTSTP
-18 挂起
+18 ¹ÒÆð
 $ SIGCONT
-19 继续�行
+19 ¼ÌÐøÔËÐÐ
 $ SIGCHLD
-20 �进程终止
+20 ×Ó½ø³ÌÖÕÖ¹
 $ SIGTTIN
-21 TTY 输入阻塞
+21 TTY ÊäÈë×èÈû
 $ SIGTTOU
-22 TTY 输出阻塞
+22 TTY Êä³ö×èÈû
 $ SIGIO
-23 I/O 就绪
+23 I/O ¾ÍÐ÷
 $ SIGXCPU
-24 CPU 使用时间过长
+24 CPU ʹÓÃʱ¼ä¹ý³¤
 $ SIGXFSZ
-25 文件尺寸过大
+25 Îļþ³ß´ç¹ý´ó
 $ SIGVTALRM
-26 虚拟倒计时到期
+26 ÐéÄâµ¹¼Æʱµ½ÆÚ
 $ SIGPROF
-27 剖�倒计时到期
+27 ÆÊÎöµ¹¼Æʱµ½ÆÚ
 $ SIGWINCH
-28 窗�尺寸�化
+28 ´°¿Ú³ß´ç±ä»¯
 $ SIGINFO
-29 请求信�
+29 ÇëÇóÐÅÏ¢
 $ SIGUSR1
-30 用户自定义信� 1
+30 Óû§×Ô¶¨ÒåÐźŠ1
 $ SIGUSR2
-31 用户自定义信� 2
+31 Óû§×Ô¶¨ÒåÐźŠ2
 $
 $ gai_strerror() support catalog
 $
 $set 3
 $ 1 (obsolete)
-1 主机�使用了�支�的地�类型
+1 Ö÷»úÃûʹÓÃÁ˲»Ö§³ÖµÄµØÖ·ÀàÐÍ
 $ EAI_AGAIN
-2 暂时无法解��称
+2 ÔÝʱÎÞ·¨½âÎöÃû³Æ
 $ EAI_BADFLAGS
-3 无效的 ai_flags 值
+3 ÎÞЧµÄ ai_flags Öµ
 $ EAI_FAIL
-4 解��称时出现无法��的错误
+4 ½âÎöÃû³Æʱ³öÏÖÎÞ·¨»Ö¸´µÄ´íÎó
 $ EAI_FAMILY
-5 �支�的地�信�类型
+5 ²»Ö§³ÖµÄµØÖ·ÐÅÏ¢ÀàÐÍ
 $ EAI_MEMORY
-6 内存分�失败
+6 ÄÚ´æ·ÖÅäʧ°Ü
 $ 7 (obsolete)
-7 主机�无相关�的地�
+7 Ö÷»úÃûÎÞÏà¹ØÁªµÄµØÖ·
 $ EAI_NONAME
-8 未知的主机�或�务�
+8 δ֪µÄÖ÷»úÃû»ò·þÎñÃû
 $ EAI_SERVICE
-9 套接字类型�支�此�务�
+9 Ì×½Ó×ÖÀàÐͲ»Ö§³Ö´Ë·þÎñÃû
 $ EAI_SOCKTYPE
-10 �支�的套接字类型
+10 ²»Ö§³ÖµÄÌ×½Ó×ÖÀàÐÍ
 $ EAI_SYSTEM
-11 系统调用返回了 errno 错误
+11 ϵͳµ÷Ó÷µ»ØÁË errno ´íÎó
 $ EAI_BADHINTS
-12 无效�示�数
+12 ÎÞЧÌáʾ²ÎÊý
 $ EAI_PROTOCOL
-13 未知�议
+13 δ֪ЭÒé
 $ EAI_OVERFLOW
-14 �数缓冲溢出
+14 ²ÎÊý»º³åÒç³ö
 $ 0
-32766 �功
+32766 ³É¹¦
 $ NL_MSGMAX
-32767 未知错误
+32767 δ֪´íÎó

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 01:38:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2A52B69E;
 Fri, 28 Dec 2012 01:38:44 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0DE578FC08;
 Fri, 28 Dec 2012 01:38:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS1chl4022182;
 Fri, 28 Dec 2012 01:38:43 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS1chFm022181;
 Fri, 28 Dec 2012 01:38:43 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201212280138.qBS1chFm022181@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 28 Dec 2012 01:38:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244758 - head/sys/arm/broadcom/bcm2835
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 01:38:44 -0000

Author: gonzo
Date: Fri Dec 28 01:38:43 2012
New Revision: 244758
URL: http://svnweb.freebsd.org/changeset/base/244758

Log:
  Fix event timer on Raspberry Pi
  
  - Disable interrupt when updating compare value in order to
     make this operation atomical
  
  - Increase minimum period for event timer. Systimer on BCM2835
      is compare timer, so if minimum period is too small it might
      be less then fraction of time between "read current value" and
      "set compare timer" operations. It means that when timer is armed
      actual counter value is more then compare value and it will take
      whole cycle (~32sec for 1MHz timer) to fire interrupt.
  
  Submitted by:	Daisuke Aoyama <aoyama at peach.ne.jp>

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c	Fri Dec 28 01:23:12 2012	(r244757)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c	Fri Dec 28 01:38:43 2012	(r244758)
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 
 #define	DEFAULT_TIMER		3
 #define	DEFAULT_FREQUENCY	1000000
+#define	MIN_PERIOD		100LLU
 
 #define	SYSTIMER_CS	0x00
 #define	SYSTIMER_CLO	0x04
@@ -123,17 +124,24 @@ bcm_systimer_start(struct eventtimer *et
 	struct systimer *st = et->et_priv;
 	uint32_t clo;
 	uint32_t count;
+	register_t s;
 
 	if (first != NULL) {
-		st->enabled = 1;
 
 		count = (st->et.et_frequency * (first->frac >> 32)) >> 32;
 		if (first->sec != 0)
 			count += st->et.et_frequency * first->sec;
 
+		s = intr_disable();
 		clo = bcm_systimer_tc_read_4(SYSTIMER_CLO);
 		clo += count;
+		/*
+		 * Clear pending interrupts
+		 */
+		bcm_systimer_tc_write_4(SYSTIMER_CS, (1 << st->index));
 		bcm_systimer_tc_write_4(SYSTIMER_C0 + st->index*4, clo);
+		st->enabled = 1;
+		intr_restore(s);
 
 		return (0);
 	} 
@@ -154,7 +162,13 @@ static int
 bcm_systimer_intr(void *arg)
 {
 	struct systimer *st = (struct systimer *)arg;
+	uint32_t cs;
+
+ 	cs = bcm_systimer_tc_read_4(SYSTIMER_CS);
+	if ((cs & (1 << st->index)) == 0)
+		return (FILTER_STRAY);
 
+	/* ACK interrupt */
 	bcm_systimer_tc_write_4(SYSTIMER_CS, (1 << st->index));
 	if (st->enabled) {
 		if (st->et.et_active) {
@@ -226,7 +240,7 @@ bcm_systimer_attach(device_t dev)
 	sc->st[DEFAULT_TIMER].et.et_frequency = sc->sysclk_freq;
 	sc->st[DEFAULT_TIMER].et.et_min_period.sec = 0;
 	sc->st[DEFAULT_TIMER].et.et_min_period.frac =
-	    ((0x00000002LLU << 32) / sc->st[DEFAULT_TIMER].et.et_frequency) << 32;
+	    ((MIN_PERIOD << 32) / sc->st[DEFAULT_TIMER].et.et_frequency) << 32;
 	sc->st[DEFAULT_TIMER].et.et_max_period.sec = 0xfffffff0U / sc->st[DEFAULT_TIMER].et.et_frequency;
 	sc->st[DEFAULT_TIMER].et.et_max_period.frac =
 	    ((0xfffffffeLLU << 32) / sc->st[DEFAULT_TIMER].et.et_frequency) << 32;

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:03:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EABDDA33;
 Fri, 28 Dec 2012 02:03:39 +0000 (UTC)
 (envelope-from gonzo@id.bluezbox.com)
Received: from id.bluezbox.com (id.bluezbox.com [88.198.91.248])
 by mx1.freebsd.org (Postfix) with ESMTP id 8C6748FC0A;
 Fri, 28 Dec 2012 02:03:39 +0000 (UTC)
Received: from [88.198.91.248] (helo=[IPv6:::1])
 by id.bluezbox.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
 (Exim 4.77 (FreeBSD)) (envelope-from <gonzo@id.bluezbox.com>)
 id 1ToPII-0008o9-44; Thu, 27 Dec 2012 18:03:32 -0800
Message-ID: <50DCFDEE.8080404@freebsd.org>
Date: Thu, 27 Dec 2012 18:03:26 -0800
From: Oleksandr Tymoshenko <gonzo@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Jeff Roberson <jeff@FreeBSD.org>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
In-Reply-To: <201212192010.qBJKA0lb075959@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Sender: gonzo@id.bluezbox.com
X-Spam-Level: --
X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com",
 has
 identified this incoming email as possible spam.  The original message
 has been attached to this so you can view it (if it isn't spam) or label
 similar future email.  If you have any questions, see
 The administrator of that system for details.
 Content preview:  On 12/19/2012 12:10 PM, Jeff Roberson wrote: > Author: jeff
 > Date: Wed Dec 19 20:10:00 2012 > New Revision: 244445 > URL:
 http://svnweb.freebsd.org/changeset/base/244445
 > > Log: > - Add new machine parsable KTR macros for timing events. > - Use
 this new format to automatically handle syscalls and VOPs. This > changes
 the earlier format but is still human readable. > > Sponsored by: EMC / Isilon
 Storage Division [...] 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:03:40 -0000

On 12/19/2012 12:10 PM, Jeff Roberson wrote:
> Author: jeff
> Date: Wed Dec 19 20:10:00 2012
> New Revision: 244445
> URL: http://svnweb.freebsd.org/changeset/base/244445
>
> Log:
>     - Add new machine parsable KTR macros for timing events.
>     - Use this new format to automatically handle syscalls and VOPs.  This
>       changes the earlier format but is still human readable.
>    
>    Sponsored by:	EMC / Isilon Storage Division

Jeff,

please fix tinderbox breakage caused by this commit

ARM kernel build with KTR option is still broken as of today:

http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief

In file included from /src/sys/arm/arm/trap.c:900:
/src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
/src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
/src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
*** [trap.o] Error code 1


Thank you


From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:14:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 33AB7C8E;
 Fri, 28 Dec 2012 02:14:38 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 by mx1.freebsd.org (Postfix) with ESMTP id 745528FC0C;
 Fri, 28 Dec 2012 02:14:37 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qBS2EPO7089541;
 Fri, 28 Dec 2012 04:14:25 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.7.3 kib.kiev.ua qBS2EPO7089541
Received: (from kostik@localhost)
 by tom.home (8.14.5/8.14.5/Submit) id qBS2EPD4089540;
 Fri, 28 Dec 2012 04:14:25 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Fri, 28 Dec 2012 04:14:25 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Oleksandr Tymoshenko <gonzo@freebsd.org>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
Message-ID: <20121228021425.GO82219@kib.kiev.ua>
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
 <50DCFDEE.8080404@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="TYjWXklH5JTzT8n9"
Content-Disposition: inline
In-Reply-To: <50DCFDEE.8080404@freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home
Cc: svn-src-head@freebsd.org, Jeff Roberson <jeff@freebsd.org>,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:14:38 -0000


--TYjWXklH5JTzT8n9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote:
> On 12/19/2012 12:10 PM, Jeff Roberson wrote:
> > Author: jeff
> > Date: Wed Dec 19 20:10:00 2012
> > New Revision: 244445
> > URL: http://svnweb.freebsd.org/changeset/base/244445
> >
> > Log:
> >     - Add new machine parsable KTR macros for timing events.
> >     - Use this new format to automatically handle syscalls and VOPs.  T=
his
> >       changes the earlier format but is still human readable.
> >   =20
> >    Sponsored by:	EMC / Isilon Storage Division
>=20
> Jeff,
>=20
> please fix tinderbox breakage caused by this commit
>=20
> ARM kernel build with KTR option is still broken as of today:
>=20
> http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
>=20
> In file included from /src/sys/arm/arm/trap.c:900:
> /src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
> /src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from pointer=
 to integer of different size [-Wpointer-to-int-cast]
> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointe=
r to integer of different size [-Wpointer-to-int-cast]
> *** [trap.o] Error code 1
>=20
>=20
> Thank you

I am running a fix through the make universe right now.
If you can compile just ARM and confirm that gcc is silenced by this,
I will commit it before make universe finishes.

diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index 3dcfcf5..349b410 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
 	if (KTRPOINT(td, KTR_SYSCALL))
 		ktrsyscall(sa->code, sa->narg, sa->args);
 #endif
-	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
+	KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
 	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
 	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
=20
@@ -151,7 +151,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
 		syscall_thread_exit(td, sa->callp);
 	}
  retval:
-	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
+	KTR_STOP4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
 	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
 	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
 	    td->td_retval[1]);

--TYjWXklH5JTzT8n9
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQIcBAEBAgAGBQJQ3QCBAAoJEJDCuSvBvK1BwoYP/1vlrEZu1V4oKq79XOgLmGI3
Pl13nAdPe6HsQHDuW3WHzIQyG+WYDKHT/qy1+xwalxQ5N4RqQCQoHRwpb5UvgmyK
i2E1jQk0GgUAAOIDr5fi+8eNlr1yyg2PsguXz6UiTKV76pmOhHjHBYVZZZO8uD3u
Y++D8wDQn+SL/DIU7wTV571BYXYZt1C4AHt3CmVbvEtSYkTndgUPmgHkSwUjeueq
Dio25f7Lajs9SEZUIvhTK1GoVdhfVBP0UjKdUH3USLb9NLF3l8YeLscglLzzE0hR
5pdLcI/1Lyk6ZJ6CvZ+Q51Tjk/rbsJjZpNeKkJkGgCPlMaXWBTs7yFYwqRUufVuy
yALTFlvQzuTj2u2CbXYBRUXG1gvuF3CU1jryFBFcsNKu9p1dJRYV/7vgpxxClk9q
AAOXqRCfEQ2RPMoBxQckOPTggJck488pDUD0eg2wwcvmSOaxnHcgmCmVxDMe+MsA
WDl+sWJc26rkyVkL4hOYff9BLjYNZ14lsZFwr9JgJFe2QZZsLdq8Vc1RdggVs5MD
a7q04x+NmGkSz4TRallIl+9SnLUDZ791qzdw8DRAY7+SOzV1qB4B1IADBtQ6iXa9
IfYd2GOffcabfndlVeagx+n1ZYyEJZF4bgzUAP0g/ZEGfxgiJr4qoyx1qv4qU16X
DPvsvfanAydBB7cbHDgm
=1fWz
-----END PGP SIGNATURE-----

--TYjWXklH5JTzT8n9--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:25:41 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6EBE2F96;
 Fri, 28 Dec 2012 02:25:41 +0000 (UTC)
 (envelope-from gonzo@id.bluezbox.com)
Received: from id.bluezbox.com (id.bluezbox.com [88.198.91.248])
 by mx1.freebsd.org (Postfix) with ESMTP id CB5F48FC08;
 Fri, 28 Dec 2012 02:25:40 +0000 (UTC)
Received: from [88.198.91.248] (helo=[IPv6:::1])
 by id.bluezbox.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
 (Exim 4.77 (FreeBSD)) (envelope-from <gonzo@id.bluezbox.com>)
 id 1ToPdh-0008wT-IC; Thu, 27 Dec 2012 18:25:39 -0800
Message-ID: <50DD031E.409@freebsd.org>
Date: Thu, 27 Dec 2012 18:25:34 -0800
From: Oleksandr Tymoshenko <gonzo@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Konstantin Belousov <kostikbel@gmail.com>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
 <50DCFDEE.8080404@freebsd.org> <20121228021425.GO82219@kib.kiev.ua>
In-Reply-To: <20121228021425.GO82219@kib.kiev.ua>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: gonzo@id.bluezbox.com
X-Spam-Level: --
X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com",
 has
 identified this incoming email as possible spam.  The original message
 has been attached to this so you can view it (if it isn't spam) or label
 similar future email.  If you have any questions, see
 The administrator of that system for details.
 Content preview:  On 12/27/2012 6:14 PM, Konstantin Belousov wrote: > On Thu, 
 Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote: >> On 12/19/2012
 12:10 PM, Jeff Roberson wrote: >>> Author: jeff >>> Date: Wed Dec 19 20:10:00
 2012 >>> New Revision: 244445 >>> URL:
 http://svnweb.freebsd.org/changeset/base/244445
 >>> >>> Log: >>> - Add new machine parsable KTR macros for timing events.
 >>> - Use this new format to automatically handle syscalls and VOPs. This
 >>> changes the earlier format but is still human readable. >>> >>> Sponsored
 by: EMC / Isilon Storage Division >> Jeff, >> >> please fix tinderbox breakage
 caused by this commit >> >> ARM kernel build with KTR option is still broken
 as of today: >> >>
 http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
 >> >> In file included from /src/sys/arm/arm/trap.c:900: >>
 /src/sys/arm/arm/../../kern/subr_syscall.c:
 In function 'syscallenter': >> /src/sys/arm/arm/../../kern/subr_syscall.c:80:
 warning: cast from pointer to integer of different size
 [-Wpointer-to-int-cast]
 >> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointer
 to integer of different size [-Wpointer-to-int-cast] >> *** [trap.o] Error
 code 1 >> >> >> Thank you > I am running a fix through the make universe
 right now. > If you can compile just ARM and confirm that gcc is silenced
 by this, > I will commit it before make universe finishes. > > diff --git
 a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c > index 3dcfcf5..349b410
 100644 > --- a/sys/kern/subr_syscall.c > +++ b/sys/kern/subr_syscall.c >
 @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
 > if (KTRPOINT(td, KTR_SYSCALL)) > ktrsyscall(sa->code, sa->narg, sa->args);
 > #endif > - KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code), >
 + KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code), > td,
 "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0], > "arg1:%p", sa->args[1],
 "arg2:%p", sa->args[2]); > > @@ -151,7 +151,7 @@ syscallenter(struct thread
 *td, struct syscall_args [...] 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
Cc: svn-src-head@freebsd.org, Jeff Roberson <jeff@freebsd.org>,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:25:41 -0000

On 12/27/2012 6:14 PM, Konstantin Belousov wrote:
> On Thu, Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote:
>> On 12/19/2012 12:10 PM, Jeff Roberson wrote:
>>> Author: jeff
>>> Date: Wed Dec 19 20:10:00 2012
>>> New Revision: 244445
>>> URL: http://svnweb.freebsd.org/changeset/base/244445
>>>
>>> Log:
>>>      - Add new machine parsable KTR macros for timing events.
>>>      - Use this new format to automatically handle syscalls and VOPs.  This
>>>        changes the earlier format but is still human readable.
>>>     
>>>     Sponsored by:	EMC / Isilon Storage Division
>> Jeff,
>>
>> please fix tinderbox breakage caused by this commit
>>
>> ARM kernel build with KTR option is still broken as of today:
>>
>> http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
>>
>> In file included from /src/sys/arm/arm/trap.c:900:
>> /src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
>> /src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>> *** [trap.o] Error code 1
>>
>>
>> Thank you
> I am running a fix through the make universe right now.
> If you can compile just ARM and confirm that gcc is silenced by this,
> I will commit it before make universe finishes.
>
> diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
> index 3dcfcf5..349b410 100644
> --- a/sys/kern/subr_syscall.c
> +++ b/sys/kern/subr_syscall.c
> @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
>   	if (KTRPOINT(td, KTR_SYSCALL))
>   		ktrsyscall(sa->code, sa->narg, sa->args);
>   #endif
> -	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> +	KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
>   	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
>   	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
>   
> @@ -151,7 +151,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
>   		syscall_thread_exit(td, sa->callp);
>   	}
>    retval:
> -	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> +	KTR_STOP4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
>   	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
>   	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
>   	    td->td_retval[1]);

Didn't help. It's td, not sysclalname result that gcc complains about:

http://people.freebsd.org/~gonzo/patches/ktr-syscall-fix.diff

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:29:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2F0D119A;
 Fri, 28 Dec 2012 02:29:28 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 by mx1.freebsd.org (Postfix) with ESMTP id 767F08FC08;
 Fri, 28 Dec 2012 02:29:27 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qBS2TNft091031;
 Fri, 28 Dec 2012 04:29:23 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.7.3 kib.kiev.ua qBS2TNft091031
Received: (from kostik@localhost)
 by tom.home (8.14.5/8.14.5/Submit) id qBS2TNMh091030;
 Fri, 28 Dec 2012 04:29:23 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Fri, 28 Dec 2012 04:29:23 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Oleksandr Tymoshenko <gonzo@freebsd.org>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
Message-ID: <20121228022923.GP82219@kib.kiev.ua>
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
 <50DCFDEE.8080404@freebsd.org> <20121228021425.GO82219@kib.kiev.ua>
 <50DD031E.409@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="Sk71+Upln2BLuDmg"
Content-Disposition: inline
In-Reply-To: <50DD031E.409@freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home
Cc: svn-src-head@freebsd.org, Jeff Roberson <jeff@freebsd.org>,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:29:28 -0000


--Sk71+Upln2BLuDmg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 27, 2012 at 06:25:34PM -0800, Oleksandr Tymoshenko wrote:
> On 12/27/2012 6:14 PM, Konstantin Belousov wrote:
> > On Thu, Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote:
> >> On 12/19/2012 12:10 PM, Jeff Roberson wrote:
> >>> Author: jeff
> >>> Date: Wed Dec 19 20:10:00 2012
> >>> New Revision: 244445
> >>> URL: http://svnweb.freebsd.org/changeset/base/244445
> >>>
> >>> Log:
> >>>      - Add new machine parsable KTR macros for timing events.
> >>>      - Use this new format to automatically handle syscalls and VOPs.=
  This
> >>>        changes the earlier format but is still human readable.
> >>>    =20
> >>>     Sponsored by:	EMC / Isilon Storage Division
> >> Jeff,
> >>
> >> please fix tinderbox breakage caused by this commit
> >>
> >> ARM kernel build with KTR option is still broken as of today:
> >>
> >> http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
> >>
> >> In file included from /src/sys/arm/arm/trap.c:900:
> >> /src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
> >> /src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from poin=
ter to integer of different size [-Wpointer-to-int-cast]
> >> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from poi=
nter to integer of different size [-Wpointer-to-int-cast]
> >> *** [trap.o] Error code 1
> >>
> >>
> >> Thank you
> > I am running a fix through the make universe right now.
> > If you can compile just ARM and confirm that gcc is silenced by this,
> > I will commit it before make universe finishes.
> >
> > diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
> > index 3dcfcf5..349b410 100644
> > --- a/sys/kern/subr_syscall.c
> > +++ b/sys/kern/subr_syscall.c
> > @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *=
sa)
> >   	if (KTRPOINT(td, KTR_SYSCALL))
> >   		ktrsyscall(sa->code, sa->narg, sa->args);
> >   #endif
> > -	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> > +	KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
> >   	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
> >   	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
> >  =20
> > @@ -151,7 +151,7 @@ syscallenter(struct thread *td, struct syscall_args=
 *sa)
> >   		syscall_thread_exit(td, sa->callp);
> >   	}
> >    retval:
> > -	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> > +	KTR_STOP4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
> >   	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
> >   	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
> >   	    td->td_retval[1]);
>=20
> Didn't help. It's td, not sysclalname result that gcc complains about:
>=20
> http://people.freebsd.org/~gonzo/patches/ktr-syscall-fix.diff
Ok, commit ? Assuming it compiles.

--Sk71+Upln2BLuDmg
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQIcBAEBAgAGBQJQ3QQCAAoJEJDCuSvBvK1BA/MP/izLo5XE9EbMCjtTbpsNdj8W
Go5jzPY2JeMDgXuaoXuCjIxEEepJwVyOgeBui+7auChDwm0se42GgtnPmB0fiEKy
+cDIdvLS/HZNeprq9thWnlz8r1+rl0O3Qm5Q+Jr9v15kpKrEFvf2FTQA3+8qm0FK
TyUKh5KcZCIJ6lfACu3A6vFvPVEVF9syggjKbZcCjoDtb+BbCyokrMQKBLnEzhTA
R1AfNcvGZP8+iSFdRfwM9CnVEt3xj3qLRzgjSRb0tOGr+fpwdA8DUj3zFWD5RIqr
6YwtVrGZab/L99W1vrXFeFY4aXFLeoQPkrQr2+cILFYDE+2Qmtzxi1bSv/EDhaT2
NGhaLpQQRuFBHce6LKK/2Qytzzz6NjQOKEE+XThZmw4cTcu4QETzY07xxHG90dwJ
6unfc9RMuc2XohixCm5pxTsCKo8B/G4tPcrCO8LgwsGuELmXK1y5t+B6SNOpj8KY
QeOHAdDFNzuZqE+FKivR8e6EERh0xy8oQrjQXTPqk102yuLpHBKsC9vqIRm8fiCv
+PoCdFRJ1GlDdDLBeIrZ8cI0GyR6LmvA4FFTY6Hx2JZJKVcY89CJGegm+Lv8BNrl
fIaQd6CXuNPK3wV9TtxSHr9bjeEwpHBVRwE8rI64jnL/evYbcSdkVEOuvl+UtmjV
kA+wzs8vAFIHmSWo9jCf
=Zhyv
-----END PGP SIGNATURE-----

--Sk71+Upln2BLuDmg--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:34:07 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C0BC03EE;
 Fri, 28 Dec 2012 02:34:07 +0000 (UTC)
 (envelope-from gonzo@id.bluezbox.com)
Received: from id.bluezbox.com (id.bluezbox.com [88.198.91.248])
 by mx1.freebsd.org (Postfix) with ESMTP id 2C5438FC0A;
 Fri, 28 Dec 2012 02:34:07 +0000 (UTC)
Received: from [88.198.91.248] (helo=[IPv6:::1])
 by id.bluezbox.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
 (Exim 4.77 (FreeBSD)) (envelope-from <gonzo@id.bluezbox.com>)
 id 1ToPls-000906-6A; Thu, 27 Dec 2012 18:34:06 -0800
Message-ID: <50DD0518.5000202@freebsd.org>
Date: Thu, 27 Dec 2012 18:34:00 -0800
From: Oleksandr Tymoshenko <gonzo@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Konstantin Belousov <kostikbel@gmail.com>
Subject: Re: svn commit: r244445 - in head/sys: kern sys tools
References: <201212192010.qBJKA0lb075959@svn.freebsd.org>
 <50DCFDEE.8080404@freebsd.org> <20121228021425.GO82219@kib.kiev.ua>
 <50DD031E.409@freebsd.org> <20121228022923.GP82219@kib.kiev.ua>
In-Reply-To: <20121228022923.GP82219@kib.kiev.ua>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: gonzo@id.bluezbox.com
X-Spam-Level: --
X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com",
 has
 identified this incoming email as possible spam.  The original message
 has been attached to this so you can view it (if it isn't spam) or label
 similar future email.  If you have any questions, see
 The administrator of that system for details.
 Content preview:  On 12/27/2012 6:29 PM, Konstantin Belousov wrote: > On Thu, 
 Dec 27, 2012 at 06:25:34PM -0800, Oleksandr Tymoshenko wrote: >> On 12/27/2012
 6:14 PM, Konstantin Belousov wrote: >>> On Thu, Dec 27, 2012 at 06:03:26PM
 -0800, Oleksandr Tymoshenko wrote: >>>> On 12/19/2012 12:10 PM, Jeff Roberson
 wrote: >>>>> Author: jeff >>>>> Date: Wed Dec 19 20:10:00 2012 >>>>> New
 Revision: 244445 >>>>> URL: http://svnweb.freebsd.org/changeset/base/244445
 >>>>> >>>>> Log: >>>>> - Add new machine parsable KTR macros for timing
 events.
 >>>>> - Use this new format to automatically handle syscalls and VOPs. This
 >>>>> changes the earlier format but is still human readable. >>>>> >>>>>
 Sponsored by: EMC / Isilon Storage Division >>>> Jeff, >>>> >>>> please fix
 tinderbox breakage caused by this commit >>>> >>>> ARM kernel build with
 KTR option is still broken as of today: >>>> >>>>
 http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
 >>>> >>>> In file included from /src/sys/arm/arm/trap.c:900: >>>>
 /src/sys/arm/arm/../../kern/subr_syscall.c:
 In function 'syscallenter': >>>>
 /src/sys/arm/arm/../../kern/subr_syscall.c:80:
 warning: cast from pointer to integer of different size
 [-Wpointer-to-int-cast]
 >>>> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from
 pointer
 to integer of different size [-Wpointer-to-int-cast] >>>> *** [trap.o] Error
 code 1 >>>> >>>> >>>> Thank you >>> I am running a fix through the make
 universe
 right now. >>> If you can compile just ARM and confirm that gcc is silenced
 by this, >>> I will commit it before make universe finishes. >>> >>> diff
 --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c >>> index
 3dcfcf5..349b410
 100644 >>> --- a/sys/kern/subr_syscall.c >>> +++ b/sys/kern/subr_syscall.c
 >>> @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args
 *sa) >>> if (KTRPOINT(td, KTR_SYSCALL)) >>> ktrsyscall(sa->code, sa->narg,
 sa->args); >>> #endif >>> - KTR_START4(KTR_SYSC, "syscall", syscallname(p,
 sa->code), >>> + KTR_START4(KTR_SYSC, "syscall", [...] 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
Cc: svn-src-head@freebsd.org, Jeff Roberson <jeff@freebsd.org>,
 src-committers@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:34:07 -0000

On 12/27/2012 6:29 PM, Konstantin Belousov wrote:
> On Thu, Dec 27, 2012 at 06:25:34PM -0800, Oleksandr Tymoshenko wrote:
>> On 12/27/2012 6:14 PM, Konstantin Belousov wrote:
>>> On Thu, Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote:
>>>> On 12/19/2012 12:10 PM, Jeff Roberson wrote:
>>>>> Author: jeff
>>>>> Date: Wed Dec 19 20:10:00 2012
>>>>> New Revision: 244445
>>>>> URL: http://svnweb.freebsd.org/changeset/base/244445
>>>>>
>>>>> Log:
>>>>>       - Add new machine parsable KTR macros for timing events.
>>>>>       - Use this new format to automatically handle syscalls and VOPs.  This
>>>>>         changes the earlier format but is still human readable.
>>>>>      
>>>>>      Sponsored by:	EMC / Isilon Storage Division
>>>> Jeff,
>>>>
>>>> please fix tinderbox breakage caused by this commit
>>>>
>>>> ARM kernel build with KTR option is still broken as of today:
>>>>
>>>> http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
>>>>
>>>> In file included from /src/sys/arm/arm/trap.c:900:
>>>> /src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
>>>> /src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>>>> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>>>> *** [trap.o] Error code 1
>>>>
>>>>
>>>> Thank you
>>> I am running a fix through the make universe right now.
>>> If you can compile just ARM and confirm that gcc is silenced by this,
>>> I will commit it before make universe finishes.
>>>
>>> diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
>>> index 3dcfcf5..349b410 100644
>>> --- a/sys/kern/subr_syscall.c
>>> +++ b/sys/kern/subr_syscall.c
>>> @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
>>>    	if (KTRPOINT(td, KTR_SYSCALL))
>>>    		ktrsyscall(sa->code, sa->narg, sa->args);
>>>    #endif
>>> -	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
>>> +	KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
>>>    	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
>>>    	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
>>>    
>>> @@ -151,7 +151,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
>>>    		syscall_thread_exit(td, sa->callp);
>>>    	}
>>>     retval:
>>> -	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
>>> +	KTR_STOP4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
>>>    	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
>>>    	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
>>>    	    td->td_retval[1]);
>> Didn't help. It's td, not sysclalname result that gcc complains about:
>>
>> http://people.freebsd.org/~gonzo/patches/ktr-syscall-fix.diff
> Ok, commit ? Assuming it compiles.

Let me check it with "make universe"

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:43:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 253F55B7;
 Fri, 28 Dec 2012 02:43:34 +0000 (UTC)
 (envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 099BA8FC0C;
 Fri, 28 Dec 2012 02:43:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS2hXJU033068;
 Fri, 28 Dec 2012 02:43:33 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS2hXIW033067;
 Fri, 28 Dec 2012 02:43:33 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201212280243.qBS2hXIW033067@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Fri, 28 Dec 2012 02:43:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244760 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:43:34 -0000

Author: davidxu
Date: Fri Dec 28 02:43:33 2012
New Revision: 244760
URL: http://svnweb.freebsd.org/changeset/base/244760

Log:
  Use strlcpy to NULL-terminate error message even if user provided a short
  buffer.

Modified:
  head/sys/kern/vfs_mount.c

Modified: head/sys/kern/vfs_mount.c
==============================================================================
--- head/sys/kern/vfs_mount.c	Fri Dec 28 01:42:32 2012	(r244759)
+++ head/sys/kern/vfs_mount.c	Fri Dec 28 02:43:33 2012	(r244760)
@@ -559,7 +559,7 @@ vfs_donmount(struct thread *td, uint64_t
 	if (error || fstype[fstypelen - 1] != '\0') {
 		error = EINVAL;
 		if (errmsg != NULL)
-			strncpy(errmsg, "Invalid fstype", errmsg_len);
+			strlcpy(errmsg, "Invalid fstype", errmsg_len);
 		goto bail;
 	}
 	fspathlen = 0;
@@ -567,7 +567,7 @@ vfs_donmount(struct thread *td, uint64_t
 	if (error || fspath[fspathlen - 1] != '\0') {
 		error = EINVAL;
 		if (errmsg != NULL)
-			strncpy(errmsg, "Invalid fspath", errmsg_len);
+			strlcpy(errmsg, "Invalid fspath", errmsg_len);
 		goto bail;
 	}
 
@@ -1447,7 +1447,7 @@ vfs_filteropt(struct vfsoptlist *opts, c
 	if (ret != 0) {
 		TAILQ_FOREACH(opt, opts, link) {
 			if (strcmp(opt->name, "errmsg") == 0) {
-				strncpy((char *)opt->value, errmsg, opt->len);
+				strlcpy((char *)opt->value, errmsg, opt->len);
 				break;
 			}
 		}

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:47:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 41166856;
 Fri, 28 Dec 2012 02:47:02 +0000 (UTC)
 (envelope-from gonzo@id.bluezbox.com)
Received: from id.bluezbox.com (id.bluezbox.com [88.198.91.248])
 by mx1.freebsd.org (Postfix) with ESMTP id 997CE8FC12;
 Fri, 28 Dec 2012 02:47:01 +0000 (UTC)
Received: from [88.198.91.248] (helo=[IPv6:::1])
 by id.bluezbox.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
 (Exim 4.77 (FreeBSD)) (envelope-from <gonzo@id.bluezbox.com>)
 id 1ToPyM-0004fa-F0; Thu, 27 Dec 2012 18:47:00 -0800
Message-ID: <50DD081E.8000409@bluezbox.com>
Date: Thu, 27 Dec 2012 18:46:54 -0800
From: Oleksandr Tymoshenko <gonzo@bluezbox.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Alan Cox <alc@rice.edu>
Subject: Re: svn commit: r243631 - in head/sys: kern sys
References: <201211272119.qARLJxXV061083@svn.freebsd.org>
 <ABB3E29B-91F3-4C25-8FAB-869BBD7459E1@bluezbox.com>
 <50C1BC90.90106@freebsd.org> <50C25A27.4060007@bluezbox.com>
 <50C26331.6030504@freebsd.org> <50C26AE9.4020600@bluezbox.com>
 <50C3A3D3.9000804@freebsd.org> <50C3AF72.4010902@rice.edu>
 <330405A1-312A-45A5-BB86-4969478D8BBD@bluezbox.com>
 <50D03E83.8060908@rice.edu>
In-Reply-To: <50D03E83.8060908@rice.edu>
Content-Type: multipart/mixed; boundary="------------000507020005010409010409"
Sender: gonzo@id.bluezbox.com
X-Spam-Level: --
X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com",
 has
 identified this incoming email as possible spam.  The original message
 has been attached to this so you can view it (if it isn't spam) or label
 similar future email.  If you have any questions, see
 The administrator of that system for details.
 Content preview:  On 12/18/2012 1:59 AM, Alan Cox wrote: > On 12/17/2012 23:40,
 Oleksandr Tymoshenko wrote: >> On 2012-12-08, at 1:21 PM,
 Alan Cox <alc@rice.edu>
 wrote: >> >>> On 12/08/2012 14:32, Andre Oppermann wrote: >> .. skipped ..
 >> >>>> The trouble seems to come from NSFBUFS which is (512 + maxusers *
 16) >>>> resulting in a kernel map of (512 + 400 * 16) * PAGE_SIZE = 27MB.
 This >>>> seem to be pushing it with the smaller ARM kmap layout. >>>> >>>>
 Does it boot and run when you set the tunable kern.ipc.nsfbufs=3500? >>>>
 >>>> ARM does have a direct map mode as well which doesn't require the >>>>
 allocation >>>> of sfbufs. I'm not sure which other problems that approach
 has. >>>> >>> Only a few (3?) platforms use it. It reduces the size of the
 user >>> address space, and translation between physical addresses and direct
 map >>> addresses is not computationally trivial as it is on other >>>
 architectures, 
 e.g., amd64, ia64. However, it does try to use large >>> page mappings. >>>
 >>> >>>> Hopefully alc@ (added to cc) can answer that and also why the kmap
 of >>>> 27MB >>>> manages to wrench the ARM kernel. >>>> >>> Arm does not
 define caps on either the buffer map size (param.h) or the >>> kmem map size
 (vmparam.h). It would probably make sense to copy these >>> definitions from
 i386. >> Adding caps didn't help. I did some digging and found out that
 although
 address range >> 0xc0000000 .. 0xffffffff is indeed valid for ARM in general
 actual KVA space varies for >> each specific hardware platform. This "real"
 KVA is defined by <virtual_avail, virtual_end> >> pair and ifI use them instead
 of <VM_MIN_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS> >> in init_param2 function
 my pandaboard successfully boots. Since former pair is used for defining
 >> kernel_map boundaries I believe it should be used for auto tuning as well.
 > > That makes sense. However, "virtual_avail" isn't the start of the > kernel
 address space. The kernel map always starts at > VM_MIN_KERNEL_ADDRESS. (See
 kmem_init().) "virtual_avail" represents > the next [...] 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Andre Oppermann <andre@freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:47:02 -0000

This is a multi-part message in MIME format.
--------------000507020005010409010409
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

On 12/18/2012 1:59 AM, Alan Cox wrote:
> On 12/17/2012 23:40, Oleksandr Tymoshenko wrote:
>> On 2012-12-08, at 1:21 PM, Alan Cox <alc@rice.edu> wrote:
>>
>>> On 12/08/2012 14:32, Andre Oppermann wrote:
>> .. skipped ..
>>
>>>> The trouble seems to come from NSFBUFS which is (512 + maxusers * 16)
>>>> resulting in a kernel map of (512 + 400 * 16) * PAGE_SIZE = 27MB.  This
>>>> seem to be pushing it with the smaller ARM kmap layout.
>>>>
>>>> Does it boot and run when you set the tunable kern.ipc.nsfbufs=3500?
>>>>
>>>> ARM does have a direct map mode as well which doesn't require the
>>>> allocation
>>>> of sfbufs.  I'm not sure which other problems that approach has.
>>>>
>>> Only a few (3?) platforms use it.  It reduces the size of the user
>>> address space, and translation between physical addresses and direct map
>>> addresses is not computationally trivial as it is on other
>>> architectures, e.g., amd64, ia64.  However, it does try to use large
>>> page mappings.
>>>
>>>
>>>> Hopefully alc@ (added to cc) can answer that and also why the kmap of
>>>> 27MB
>>>> manages to wrench the ARM kernel.
>>>>
>>> Arm does not define caps on either the buffer map size (param.h) or the
>>> kmem map size (vmparam.h).  It would probably make sense to copy these
>>> definitions from i386.
>> Adding caps didn't help. I did some digging and found out that although address range
>> 0xc0000000 .. 0xffffffff is indeed valid for ARM in general actual KVA space varies for
>> each specific hardware platform. This "real" KVA is defined by <virtual_avail, virtual_end>
>> pair and ifI use them instead of <VM_MIN_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS>
>> in init_param2 function my pandaboard successfully boots. Since former pair is used for defining
>> kernel_map boundaries I believe it should be used for auto tuning as well.
>
> That makes sense.  However, "virtual_avail" isn't the start of the
> kernel address space.  The kernel map always starts at
> VM_MIN_KERNEL_ADDRESS.  (See kmem_init().)  "virtual_avail" represents
> the next unallocated virtual address in the kernel address space at an
> early point in initialization.  "virtual_avail" and "virtual_end" aren't
> used after that, or outside the VM system.  Please use
> vm_map_min(kernel_map) and vm_map_max(kernel_map) instead.

I checked: kernel_map is not available (NULL) at this point.  So we 
can't use it to
determine real KVA size. Closest thing we can get is 
virtual_avail/virtual_end pair.

Andre, could you approve attached patch for commit or suggest better 
solution?

>
> That said, I would still add caps on the buffer map and kmem map size.
> As memory sizes on arm systems grow, you'll eventually need them, just
> like we did on i386.
What's the names for #defines for these?



--------------000507020005010409010409
Content-Type: text/plain; charset=windows-1252;
 name="autotune-kva-fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="autotune-kva-fix.diff"

Index: kern/subr_param.c
===================================================================
--- kern/subr_param.c	(revision 244665)
+++ kern/subr_param.c	(working copy)
@@ -333,7 +333,7 @@
 	 * At most it can be 3/4 of available kernel memory.
 	 */
 	realmem = qmin((quad_t)physpages * PAGE_SIZE,
-	    VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS);
+	    virtual_end - virtual_avail);
 	maxmbufmem = realmem / 2;
 	TUNABLE_QUAD_FETCH("kern.maxmbufmem", &maxmbufmem);
 	if (maxmbufmem > (realmem / 4) * 3)
@@ -347,8 +347,8 @@
 	TUNABLE_LONG_FETCH("kern.ipc.maxpipekva", &maxpipekva);
 	if (maxpipekva < 512 * 1024)
 		maxpipekva = 512 * 1024;
-	if (maxpipekva > (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) / 64)
-		maxpipekva = (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) /
+	if (maxpipekva > (virtual_end - virtual_avail) / 64)
+		maxpipekva = (virtual_end - virtual_avail) /
 		    64;
 }
 

--------------000507020005010409010409--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 02:49:46 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 22E4AA2B;
 Fri, 28 Dec 2012 02:49:46 +0000 (UTC)
 (envelope-from gonzo@id.bluezbox.com)
Received: from id.bluezbox.com (id.bluezbox.com [88.198.91.248])
 by mx1.freebsd.org (Postfix) with ESMTP id B7E038FC08;
 Fri, 28 Dec 2012 02:49:45 +0000 (UTC)
Received: from [88.198.91.248] (helo=[IPv6:::1])
 by id.bluezbox.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
 (Exim 4.77 (FreeBSD)) (envelope-from <gonzo@id.bluezbox.com>)
 id 1ToQ10-000Ezv-Ct; Thu, 27 Dec 2012 18:49:44 -0800
Message-ID: <50DD08C3.3080801@freebsd.org>
Date: Thu, 27 Dec 2012 18:49:39 -0800
From: Oleksandr Tymoshenko <gonzo@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
Subject: Re: svn commit: r244758 - head/sys/arm/broadcom/bcm2835
References: <201212280138.qBS1chFm022181@svn.freebsd.org>
In-Reply-To: <201212280138.qBS1chFm022181@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Sender: gonzo@id.bluezbox.com
X-Spam-Level: -
X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com",
 has
 identified this incoming email as possible spam.  The original message
 has been attached to this so you can view it (if it isn't spam) or label
 similar future email.  If you have any questions, see
 The administrator of that system for details.
 Content preview:  On 12/27/2012 5:38 PM, Oleksandr Tymoshenko wrote: > Author:
 gonzo > Date: Fri Dec 28 01:38:43 2012 > New Revision: 244758 > URL:
 http://svnweb.freebsd.org/changeset/base/244758
 > > Log: > Fix event timer on Raspberry Pi > > - Disable interrupt when
 updating
 compare value in order to > make this operation atomical > > - Increase
 minimum
 period for event timer. Systimer on BCM2835 > is compare timer, so if minimum
 period is too small it might > be less then fraction of time between "read
 current value" and > "set compare timer" operations. It means that when timer
 is armed > actual counter value is more then compare value and it will take
 > whole cycle (~32sec for 1MHz timer) to fire interrupt. > [...] 
 Content analysis details:   (-1.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 1.0 MISSING_HEADERS        Missing To: header
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:49:46 -0000

On 12/27/2012 5:38 PM, Oleksandr Tymoshenko wrote:
> Author: gonzo
> Date: Fri Dec 28 01:38:43 2012
> New Revision: 244758
> URL: http://svnweb.freebsd.org/changeset/base/244758
>
> Log:
>    Fix event timer on Raspberry Pi
>    
>    - Disable interrupt when updating compare value in order to
>       make this operation atomical
>    
>    - Increase minimum period for event timer. Systimer on BCM2835
>        is compare timer, so if minimum period is too small it might
>        be less then fraction of time between "read current value" and
>        "set compare timer" operations. It means that when timer is armed
>        actual counter value is more then compare value and it will take
>        whole cycle (~32sec for 1MHz timer) to fire interrupt.
>    

It's not 32, it's ~4294 seconds

Spotted by: Ian Lepore

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 03:18:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7A494152;
 Fri, 28 Dec 2012 03:18:06 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 563DC8FC13;
 Fri, 28 Dec 2012 03:18:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS3I6Qu040156;
 Fri, 28 Dec 2012 03:18:06 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS3I6sL040155;
 Fri, 28 Dec 2012 03:18:06 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201212280318.qBS3I6sL040155@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 28 Dec 2012 03:18:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244762 - head/sys/arm/broadcom/bcm2835
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 03:18:06 -0000

Author: gonzo
Date: Fri Dec 28 03:18:05 2012
New Revision: 244762
URL: http://svnweb.freebsd.org/changeset/base/244762

Log:
  Add makeshift implementation for framebuffer console's cursor
  
  Basically it's replica of VersatilePB code which is replica of XBox FB
  code. All of them are linear framebuffers and should have common bits
  moved to reusable framework.

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_fb.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 28 02:46:34 2012	(r244761)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 28 03:18:05 2012	(r244762)
@@ -94,6 +94,12 @@ static struct argb bcmfb_palette[16] = {
 	{0x00, 0xff, 0xff, 0xff}
 };
 
+/* mouse pointer from dev/syscons/scgfbrndr.c */
+static u_char mouse_pointer[16] = {
+        0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x68,
+        0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00
+};
+
 #define FB_WIDTH		640
 #define FB_HEIGHT		480
 #define FB_DEPTH		24
@@ -420,10 +426,141 @@ static video_switch_t bcmfbvidsw = {
 
 VIDEO_DRIVER(bcmfb, bcmfbvidsw, bcmfb_configure);
 
-extern sc_rndr_sw_t txtrndrsw;
-RENDERER(bcmfb, 0, txtrndrsw, gfb_set);
+static vr_init_t bcmrend_init;
+static vr_clear_t bcmrend_clear;
+static vr_draw_border_t bcmrend_draw_border;
+static vr_draw_t bcmrend_draw;
+static vr_set_cursor_t bcmrend_set_cursor;
+static vr_draw_cursor_t bcmrend_draw_cursor;
+static vr_blink_cursor_t bcmrend_blink_cursor;
+static vr_set_mouse_t bcmrend_set_mouse;
+static vr_draw_mouse_t bcmrend_draw_mouse;
+
+/*
+ * We use our own renderer; this is because we must emulate a hardware
+ * cursor.
+ */
+static sc_rndr_sw_t bcmrend = {
+	bcmrend_init,
+	bcmrend_clear,
+	bcmrend_draw_border,
+	bcmrend_draw,
+	bcmrend_set_cursor,
+	bcmrend_draw_cursor,
+	bcmrend_blink_cursor,
+	bcmrend_set_mouse,
+	bcmrend_draw_mouse
+};
+
+RENDERER(bcmfb, 0, bcmrend, gfb_set);
 RENDERER_MODULE(bcmfb, gfb_set);
 
+static void
+bcmrend_init(scr_stat* scp)
+{
+}
+
+static void
+bcmrend_clear(scr_stat* scp, int c, int attr)
+{
+}
+
+static void
+bcmrend_draw_border(scr_stat* scp, int color)
+{
+}
+
+static void
+bcmrend_draw(scr_stat* scp, int from, int count, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	int i, c, a;
+
+	if (!flip) {
+		/* Normal printing */
+		vidd_puts(adp, from, (uint16_t*)sc_vtb_pointer(&scp->vtb, from), count);
+	} else {	
+		/* This is for selections and such: invert the color attribute */
+		for (i = count; i-- > 0; ++from) {
+			c = sc_vtb_getc(&scp->vtb, from);
+			a = sc_vtb_geta(&scp->vtb, from) >> 8;
+			vidd_putc(adp, from, c, (a >> 4) | ((a & 0xf) << 4));
+		}
+	}
+}
+
+static void
+bcmrend_set_cursor(scr_stat* scp, int base, int height, int blink)
+{
+}
+
+static void
+bcmrend_draw_cursor(scr_stat* scp, int off, int blink, int on, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	struct video_adapter_softc *sc;
+	int row, col;
+	uint8_t *addr;
+	int i, j, bytes;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	if (scp->curs_attr.height <= 0)
+		return;
+
+	if (sc->fb_addr == 0)
+		return;
+
+	if (off >= adp->va_info.vi_width * adp->va_info.vi_height)
+		return;
+
+	/* calculate the coordinates in the video buffer */
+	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
+	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
+
+	addr = (uint8_t *)sc->fb_addr
+	    + (row + sc->ymargin)*(sc->stride)
+	    + (sc->depth/8) * (col + sc->xmargin);
+
+	bytes = sc->depth/8;
+
+	/* our cursor consists of simply inverting the char under it */
+	for (i = 0; i < adp->va_info.vi_cheight; i++) {
+		for (j = 0; j < adp->va_info.vi_cwidth; j++) {
+			switch (sc->depth) {
+			case 32:
+			case 24:
+				addr[bytes*j + 2] ^= 0xff;
+				/* FALLTHROUGH */
+			case 16:
+				addr[bytes*j + 1] ^= 0xff;
+				addr[bytes*j] ^= 0xff;
+				break;
+			default:
+				break;
+			}
+		}
+
+		addr += sc->stride;
+	}
+}
+
+static void
+bcmrend_blink_cursor(scr_stat* scp, int at, int flip)
+{
+}
+
+static void
+bcmrend_set_mouse(scr_stat* scp)
+{
+}
+
+static void
+bcmrend_draw_mouse(scr_stat* scp, int x, int y, int on)
+{
+	vidd_putm(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8);
+}
+
 static uint16_t bcmfb_static_window[ROW*COL];
 extern u_char dflt_font_16[];
 

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 06:24:35 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BE5BB115;
 Fri, 28 Dec 2012 06:24:35 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id D29258FC0A;
 Fri, 28 Dec 2012 06:24:34 +0000 (UTC)
Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149])
 by mail.dawidek.net (Postfix) with ESMTPSA id 48FE3B22;
 Fri, 28 Dec 2012 07:22:14 +0100 (CET)
Date: Fri, 28 Dec 2012 07:24:34 +0100
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r244747 - head/lib/libutil
Message-ID: <20121228062434.GG1400@garage.freebsd.pl>
References: <201212272047.qBRKlYNQ053993@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="+sHJum3is6Tsg7/J"
Content-Disposition: inline
In-Reply-To: <201212272047.qBRKlYNQ053993@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 06:24:35 -0000


--+sHJum3is6Tsg7/J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 27, 2012 at 08:47:34PM +0000, Baptiste Daroussin wrote:
> Author: bapt
> Date: Thu Dec 27 20:47:34 2012
> New Revision: 244747
> URL: http://svnweb.freebsd.org/changeset/base/244747
>=20
> Log:
>   avoid arithmetic on uintptr_t

	/* point dst after the end of all the gr_mem pointers in newgr */
	dst =3D (char *)newgr + sizeof(struct group) +
	    (num_mem + 1) * sizeof(*gr->gr_mem);

Wouldn't it look better to do something like this (untested):

	dst =3D (char *)&newgr->gr_mem[num_mem + 1];

In the code below I think you should reset newgr memebers (gr_name,
gr_passwd and gr_mem) to NULL if their corresponding gr members are
NULL.

	if (gr->gr_name !=3D NULL) {
		newgr->gr_name =3D dst;
		dst =3D stpcpy(dst, gr->gr_name) + 1;
	}
	if (gr->gr_passwd !=3D NULL) {
		newgr->gr_passwd =3D dst;
		dst =3D stpcpy(dst, gr->gr_passwd) + 1;
	}
	newgr->gr_gid =3D gr->gr_gid;
	if (gr->gr_mem !=3D NULL) {
		for (ndx =3D 0; ndx < num_mem; ndx++) {
			newgr->gr_mem[ndx] =3D dst;
			dst =3D stpcpy(dst, gr->gr_mem[ndx]) + 1;
		}
		newgr->gr_mem[ndx] =3D NULL;
	}

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--+sHJum3is6Tsg7/J
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDdOyIACgkQForvXbEpPzSspACg6VOm7nTvwRy0bP1xw/EqEyoj
or8AoLgYE4wW0cCqfBDRHQxWCyJw2JEv
=xZyP
-----END PGP SIGNATURE-----

--+sHJum3is6Tsg7/J--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 06:25:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4140829A;
 Fri, 28 Dec 2012 06:25:34 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id F1AF48FC08;
 Fri, 28 Dec 2012 06:25:33 +0000 (UTC)
Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149])
 by mail.dawidek.net (Postfix) with ESMTPSA id 86558B24;
 Fri, 28 Dec 2012 07:23:19 +0100 (CET)
Date: Fri, 28 Dec 2012 07:25:40 +0100
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: "Andrey V. Elsukov" <ae@FreeBSD.org>
Subject: Re: svn commit: r244752 - head/sys/net
Message-ID: <20121228062534.GH1400@garage.freebsd.pl>
References: <201212272126.qBRLQ9fq060200@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="AqCDj3hiknadvR6t"
Content-Disposition: inline
In-Reply-To: <201212272126.qBRLQ9fq060200@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 06:25:34 -0000


--AqCDj3hiknadvR6t
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 27, 2012 at 09:26:09PM +0000, Andrey V. Elsukov wrote:
> Author: ae
> Date: Thu Dec 27 21:26:08 2012
> New Revision: 244752
> URL: http://svnweb.freebsd.org/changeset/base/244752
>=20
> Log:
>   Add an ability to set net.link.stf.permit_rfc1918 from the loader.

I added (very recently) CTLFLAG_RWTUN, which you might want to use here.

>   MFC after:	2 weeks
>=20
> Modified:
>   head/sys/net/if_stf.c
>=20
> Modified: head/sys/net/if_stf.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/net/if_stf.c	Thu Dec 27 21:14:29 2012	(r244751)
> +++ head/sys/net/if_stf.c	Thu Dec 27 21:26:08 2012	(r244752)
> @@ -128,7 +128,8 @@ SYSCTL_INT(_net_link_stf, OID_AUTO, rout
>      &stf_route_cache, 0, "Caching of IPv4 routes for 6to4 Output");
> =20
>  static int stf_permit_rfc1918 =3D 0;
> -SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW,
> +TUNABLE_INT("net.link.stf.permit_rfc1918", &stf_permit_rfc1918);
> +SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW | CTLFLAG=
_TUN,
>      &stf_permit_rfc1918, 0, "Permit the use of private IPv4 addresses");
> =20
>  #define STFUNIT		0

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--AqCDj3hiknadvR6t
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDdO14ACgkQForvXbEpPzTCmQCg6v5m0wlUdskia4hH6Qcx04I1
BAsAnirPeovUULY9jx7qaFbXU+vg739a
=lVz1
-----END PGP SIGNATURE-----

--AqCDj3hiknadvR6t--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 06:52:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 40B535A8;
 Fri, 28 Dec 2012 06:52:54 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0C4498FC08;
 Fri, 28 Dec 2012 06:52:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS6qrjV072250;
 Fri, 28 Dec 2012 06:52:53 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS6qrj7072246;
 Fri, 28 Dec 2012 06:52:53 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201212280652.qBS6qrj7072246@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 28 Dec 2012 06:52:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244765 - in head/sys: kern tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 06:52:54 -0000

Author: gonzo
Date: Fri Dec 28 06:52:53 2012
New Revision: 244765
URL: http://svnweb.freebsd.org/changeset/base/244765

Log:
  Fix build on ARM (and probably other platforms)

Modified:
  head/sys/kern/subr_syscall.c
  head/sys/tools/vnode_if.awk

Modified: head/sys/kern/subr_syscall.c
==============================================================================
--- head/sys/kern/subr_syscall.c	Fri Dec 28 05:48:44 2012	(r244764)
+++ head/sys/kern/subr_syscall.c	Fri Dec 28 06:52:53 2012	(r244765)
@@ -78,7 +78,7 @@ syscallenter(struct thread *td, struct s
 		ktrsyscall(sa->code, sa->narg, sa->args);
 #endif
 	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
-	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
+	    (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
 	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
 
 	if (error == 0) {
@@ -152,7 +152,7 @@ syscallenter(struct thread *td, struct s
 	}
  retval:
 	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
-	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
+	    (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
 	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
 	    td->td_retval[1]);
 	if (traced) {

Modified: head/sys/tools/vnode_if.awk
==============================================================================
--- head/sys/tools/vnode_if.awk	Fri Dec 28 05:48:44 2012	(r244764)
+++ head/sys/tools/vnode_if.awk	Fri Dec 28 06:52:53 2012	(r244765)
@@ -270,7 +270,7 @@ while ((getline < srcfile) > 0) {
 		ctrargs = 4;
 	else
 		ctrargs = numargs;
-	ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", a,\n\t    "; 
+	ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", (uintptr_t)a,\n\t    "; 
 	ctrstr = ctrstr "\"" args[0] ":0x%jX\", (uintptr_t)a->a_" args[0];
 	for (i = 1; i < ctrargs; ++i)
 		ctrstr = ctrstr ", \"" args[i] ":0x%jX\", a->a_" args[i];

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 07:49:46 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0597AD1A;
 Fri, 28 Dec 2012 07:49:46 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DE6448FC15;
 Fri, 28 Dec 2012 07:49:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS7njNd080795;
 Fri, 28 Dec 2012 07:49:45 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS7njqq080794;
 Fri, 28 Dec 2012 07:49:45 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201212280749.qBS7njqq080794@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 28 Dec 2012 07:49:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244767 - head/sys/dev/ath/ath_hal/ar5416
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 07:49:46 -0000

Author: adrian
Date: Fri Dec 28 07:49:45 2012
New Revision: 244767
URL: http://svnweb.freebsd.org/changeset/base/244767

Log:
  Add radar_bin_thresh_sel (bit 24:26), which defines when
  to consider the radar FFT report bins as "strong".

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h	Fri Dec 28 07:45:06 2012	(r244766)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h	Fri Dec 28 07:49:45 2012	(r244767)
@@ -64,6 +64,8 @@
 #define	AR_PHY_RADAR_EXT_ENA		0x00004000
 
 #define	AR_PHY_RADAR_1			0x9958
+#define	AR_PHY_RADAR_1_BIN_THRESH_SEL	0x07000000
+#define	AR_PHY_RADAR_1_BIN_THRESH_SEL_S	24
 #define	AR_PHY_RADAR_1_RELPWR_ENA	0x00800000
 #define	AR_PHY_RADAR_1_USE_FIR128	0x00400000
 #define	AR_PHY_RADAR_1_RELPWR_THRESH	0x003F0000

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 07:53:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DC3F2ED6
 for <svn-src-head@freebsd.org>; Fri, 28 Dec 2012 07:53:00 +0000 (UTC)
 (envelope-from juli@clockworksquid.com)
Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com
 [209.85.161.181])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E2418FC08
 for <svn-src-head@freebsd.org>; Fri, 28 Dec 2012 07:53:00 +0000 (UTC)
Received: by mail-gg0-f181.google.com with SMTP id s6so1659960ggc.12
 for <svn-src-head@freebsd.org>; Thu, 27 Dec 2012 23:52:54 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=WRT0Q4fhaF3Cho5ineLHlxa+M7MpoJqLId666yuhseM=;
 b=bCha5jn7KWVvpe5Y5tw/48RNZljxP9ENIT9afjdFYmIXNBFyFlNrrduWogcwmGLeM+
 kuIZ1NWHgFLkNELknnACV5mwetSlufLlre9vgQVORXxbj6JKj7sgk9AvATorV+6LRTGQ
 U5uSjZa/rupAIxYmCQgGy1MCoAYWDrCjIUWoFAj9CEVBfmwEMrmCjPZW9D1LriuX/ecq
 hNCH2BvS0X8AKQAKsmTN4cp9d583+YcxWnKlb10FrsAGFMxX9tlMaeRU1lmpKI3eQb+Z
 aLAnb9lL4WeBCLYI5nv1pUauCQiqExge5xs+Xvs0RKQtWpSFoZXCgJnTO6PSG5BvvSHJ
 ObHQ==
Received: by 10.236.137.172 with SMTP id y32mr28662925yhi.124.1356680763505;
 Thu, 27 Dec 2012 23:46:03 -0800 (PST)
MIME-Version: 1.0
Sender: juli@clockworksquid.com
Received: by 10.147.119.38 with HTTP; Thu, 27 Dec 2012 23:45:43 -0800 (PST)
In-Reply-To: <201212280652.qBS6qrj7072246@svn.freebsd.org>
References: <201212280652.qBS6qrj7072246@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 27 Dec 2012 23:45:43 -0800
X-Google-Sender-Auth: 0zW-SNbbf7Wg1g1fn1VOOJDvvtQ
Message-ID: <CACVs6=-D_z7609-6xDz4gKWVFmX1Bfv-+hueMviLbt0sPte5Rw@mail.gmail.com>
Subject: Re: svn commit: r244765 - in head/sys: kern tools
To: Oleksandr Tymoshenko <gonzo@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQl19of3zFkwZo2wsoCqtMX/6TXyCZkYDTYFpky8SITzS6D+O78Gwc8442thZbtukP8S/TTT
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 07:53:00 -0000

Seems like uintmax_t and %ju might be better?  At least, truncating a
syscall arg to a pointer seems like it could be misleading (e.g. on
MIPS n32, even though it's an abomination.)

On Thu, Dec 27, 2012 at 10:52 PM, Oleksandr Tymoshenko
<gonzo@freebsd.org> wrote:
> Author: gonzo
> Date: Fri Dec 28 06:52:53 2012
> New Revision: 244765
> URL: http://svnweb.freebsd.org/changeset/base/244765
>
> Log:
>   Fix build on ARM (and probably other platforms)
>
> Modified:
>   head/sys/kern/subr_syscall.c
>   head/sys/tools/vnode_if.awk
>
> Modified: head/sys/kern/subr_syscall.c
> ==============================================================================
> --- head/sys/kern/subr_syscall.c        Fri Dec 28 05:48:44 2012        (r244764)
> +++ head/sys/kern/subr_syscall.c        Fri Dec 28 06:52:53 2012        (r244765)
> @@ -78,7 +78,7 @@ syscallenter(struct thread *td, struct s
>                 ktrsyscall(sa->code, sa->narg, sa->args);
>  #endif
>         KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> -           td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
> +           (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
>             "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
>
>         if (error == 0) {
> @@ -152,7 +152,7 @@ syscallenter(struct thread *td, struct s
>         }
>   retval:
>         KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> -           td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
> +           (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
>             "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
>             td->td_retval[1]);
>         if (traced) {
>
> Modified: head/sys/tools/vnode_if.awk
> ==============================================================================
> --- head/sys/tools/vnode_if.awk Fri Dec 28 05:48:44 2012        (r244764)
> +++ head/sys/tools/vnode_if.awk Fri Dec 28 06:52:53 2012        (r244765)
> @@ -270,7 +270,7 @@ while ((getline < srcfile) > 0) {
>                 ctrargs = 4;
>         else
>                 ctrargs = numargs;
> -       ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", a,\n\t    ";
> +       ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", (uintptr_t)a,\n\t    ";
>         ctrstr = ctrstr "\"" args[0] ":0x%jX\", (uintptr_t)a->a_" args[0];
>         for (i = 1; i < ctrargs; ++i)
>                 ctrstr = ctrstr ", \"" args[i] ":0x%jX\", a->a_" args[i];

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 08:00:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5E796FAE;
 Fri, 28 Dec 2012 08:00:32 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 42A638FC17;
 Fri, 28 Dec 2012 08:00:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS80WJG082409;
 Fri, 28 Dec 2012 08:00:32 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS80WGI082407;
 Fri, 28 Dec 2012 08:00:32 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201212280800.qBS80WGI082407@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 28 Dec 2012 08:00:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244768 - head/sys/dev/ath/ath_hal/ar5416
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 08:00:32 -0000

Author: adrian
Date: Fri Dec 28 08:00:31 2012
New Revision: 244768
URL: http://svnweb.freebsd.org/changeset/base/244768

Log:
  Add the AR9280 and later spectral scan register definitions.
  
  Obtained from:	Linux ath9k, Qualcomm Atheros (datasheet)

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h	Fri Dec 28 07:49:45 2012	(r244767)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h	Fri Dec 28 08:00:31 2012	(r244768)
@@ -57,6 +57,20 @@
 #define	AR_BT_DISABLE_BT_ANT       0x00100000
 #define	AR_BT_DISABLE_BT_ANT_S     20
 
+#define	AR_PHY_SPECTRAL_SCAN		0x9910
+#define	AR_PHY_SPECTRAL_SCAN_ENA	0x00000001
+#define	AR_PHY_SPECTRAL_SCAN_ENA_S	0
+#define	AR_PHY_SPECTRAL_SCAN_ACTIVE	0x00000002
+#define	AR_PHY_SPECTRAL_SCAN_ACTIVE_S	1
+#define	AR_PHY_SPECTRAL_SCAN_FFT_PERIOD	0x000000F0
+#define	AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S	4
+#define	AR_PHY_SPECTRAL_SCAN_PERIOD	0x0000FF00
+#define	AR_PHY_SPECTRAL_SCAN_PERIOD_S	8
+#define	AR_PHY_SPECTRAL_SCAN_COUNT	0x00FF0000
+#define	AR_PHY_SPECTRAL_SCAN_COUNT_S	16
+#define	AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT	0x01000000
+#define	AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S	24
+
 /* For AR_PHY_RADAR0 */
 #define	AR_PHY_RADAR_0_FFT_ENA		0x80000000
 

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 08:20:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C0F4428B;
 Fri, 28 Dec 2012 08:20:47 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id 3649B8FC08;
 Fri, 28 Dec 2012 08:20:46 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBS8KcGV017634;
 Fri, 28 Dec 2012 12:20:38 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBS8KcIP017633;
 Fri, 28 Dec 2012 12:20:38 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Fri, 28 Dec 2012 12:20:38 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Attilio Rao <attilio@FreeBSD.org>
Subject: Re: svn commit: r244732 - head/sys/sys
Message-ID: <20121228082038.GZ80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
 <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
 <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 08:20:47 -0000

On Thu, Dec 27, 2012 at 08:37:24AM -0800, Attilio Rao wrote:
A> > Speaking of which, as you are here, I just found out that r241037
A> > breaks the alignment of the structure.
A> > Infact the padding member is not updated accordingly.
A> >
A> > We don't have a param to control L2 caches, but I think that we can
A> > safely align them to the L1 cacheline for sure.
A> > Also, note that this padding is completely broken for MI requirements
A> > (it just assumes blindly 128 bytes L2 cachelines, which not always
A> > true even on i386).
A> 
A> More specifically this patch:
A> http://www.freebsd.org/~attilio/bufring_pad.patch
A> 
A> Of course I don't think the optimization is important in the
A> DEBUG_BUFRING on case, so the patch should be fine.

Agreed, thanks. And thanks for removing the br_prod_bufs.

Sorry for breaking alignment in r241037.

And last time we talked about alignment, it was noticed that our
current CACHE_LINE_SIZE on amd64 is 128, while real size is 64.
This 128 was some optimisation proposed by Intel for some past
generation of CPUs and is no longer actual. Shouldn't we change it
back to 64?

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 09:19:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A2F03959;
 Fri, 28 Dec 2012 09:19:51 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 85A018FC0A;
 Fri, 28 Dec 2012 09:19:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS9Jpwo094570;
 Fri, 28 Dec 2012 09:19:51 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS9JnvH094555;
 Fri, 28 Dec 2012 09:19:49 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212280919.qBS9JnvH094555@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 28 Dec 2012 09:19:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244769 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 09:19:51 -0000

Author: glebius
Date: Fri Dec 28 09:19:49 2012
New Revision: 244769
URL: http://svnweb.freebsd.org/changeset/base/244769

Log:
  In netpfil/pf:
    - Add my copyright to files I've touched a lot this year.
    - Add dash in front of all copyright notices according to style(9).
    - Move $OpenBSD$ down below copyright notices.
    - Remove extra line between cdefs.h and __FBSDID.

Modified:
  head/sys/netpfil/pf/if_pflog.c
  head/sys/netpfil/pf/if_pfsync.c
  head/sys/netpfil/pf/pf.c
  head/sys/netpfil/pf/pf_if.c
  head/sys/netpfil/pf/pf_ioctl.c
  head/sys/netpfil/pf/pf_lb.c
  head/sys/netpfil/pf/pf_norm.c
  head/sys/netpfil/pf/pf_osfp.c
  head/sys/netpfil/pf/pf_ruleset.c
  head/sys/netpfil/pf/pf_table.c

Modified: head/sys/netpfil/pf/if_pflog.c
==============================================================================
--- head/sys/netpfil/pf/if_pflog.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/if_pflog.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,5 +1,4 @@
-/*	$OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $	*/
-/*
+/*-
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
  * Niels Provos (provos@physnet.uni-hamburg.de).
@@ -31,6 +30,8 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
+ *
+ *	$OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- head/sys/netpfil/pf/if_pfsync.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/if_pfsync.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,7 +1,6 @@
-/*	$OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $	*/
-
-/*
+/*-
  * Copyright (c) 2002 Michael Shalayeff
+ * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,7 +25,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -43,6 +42,8 @@
  */
 
 /*
+ * $OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $
+ *
  * Revisions picked from OpenBSD after revision 1.110 import:
  * 1.119 - don't m_copydata() beyond the len of mbuf in pfsync_input()
  * 1.118, 1.124, 1.148, 1.149, 1.151, 1.171 - fixes to bulk updates

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,8 +1,7 @@
-/*	$OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */
-
-/*
+/*-
  * Copyright (c) 2001 Daniel Hartmeier
  * Copyright (c) 2002 - 2008 Henning Brauer
+ * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,10 +32,10 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
+ *	$OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"

Modified: head/sys/netpfil/pf/pf_if.c
==============================================================================
--- head/sys/netpfil/pf/pf_if.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_if.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,10 +1,9 @@
-/*	$OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $ */
-
-/*
- * Copyright 2005 Henning Brauer <henning@openbsd.org>
- * Copyright 2005 Ryan McBride <mcbride@openbsd.org>
+/*-
  * Copyright (c) 2001 Daniel Hartmeier
  * Copyright (c) 2003 Cedric Berger
+ * Copyright (c) 2005 Henning Brauer <henning@openbsd.org>
+ * Copyright (c) 2005 Ryan McBride <mcbride@openbsd.org>
+ * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,10 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"

Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_ioctl.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,8 +1,7 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $ */
-
-/*
+/*-
  * Copyright (c) 2001 Daniel Hartmeier
  * Copyright (c) 2002,2003 Henning Brauer
+ * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,6 +32,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
+ *	$OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/pf_lb.c
==============================================================================
--- head/sys/netpfil/pf/pf_lb.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_lb.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,6 +1,4 @@
-/*	$OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $ */
-
-/*
+/*-
  * Copyright (c) 2001 Daniel Hartmeier
  * Copyright (c) 2002 - 2008 Henning Brauer
  * All rights reserved.
@@ -33,6 +31,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
+ *	$OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/pf_norm.c
==============================================================================
--- head/sys/netpfil/pf/pf_norm.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_norm.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,6 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $ */
-
-/*
+/*-
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
  *
@@ -23,6 +21,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/pf_osfp.c
==============================================================================
--- head/sys/netpfil/pf/pf_osfp.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_osfp.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,6 +1,4 @@
-/*	$OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $ */
-
-/*
+/*-
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,6 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ *	$OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/pf_ruleset.c
==============================================================================
--- head/sys/netpfil/pf/pf_ruleset.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_ruleset.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,6 +1,4 @@
-/*	$OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $ */
-
-/*
+/*-
  * Copyright (c) 2001 Daniel Hartmeier
  * Copyright (c) 2002,2003 Henning Brauer
  * All rights reserved.
@@ -33,6 +31,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
+ *	$OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $
  */
 
 #include <sys/cdefs.h>

Modified: head/sys/netpfil/pf/pf_table.c
==============================================================================
--- head/sys/netpfil/pf/pf_table.c	Fri Dec 28 08:00:31 2012	(r244768)
+++ head/sys/netpfil/pf/pf_table.c	Fri Dec 28 09:19:49 2012	(r244769)
@@ -1,6 +1,4 @@
-/*	$OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $	*/
-
-/*
+/*-
  * Copyright (c) 2002 Cedric Berger
  * All rights reserved.
  *
@@ -28,6 +26,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
+ *	$OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $
  */
 
 #include <sys/cdefs.h>

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 10:42:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2ADF3773;
 Fri, 28 Dec 2012 10:42:02 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E60018FC12;
 Fri, 28 Dec 2012 10:42:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSAg17d007087;
 Fri, 28 Dec 2012 10:42:01 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSAg1vm007086;
 Fri, 28 Dec 2012 10:42:01 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201212281042.qBSAg1vm007086@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 28 Dec 2012 10:42:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244770 - head/etc/mtree
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 10:42:02 -0000

Author: ume
Date: Fri Dec 28 10:42:01 2012
New Revision: 244770
URL: http://svnweb.freebsd.org/changeset/base/244770

Log:
  Fix location of /var/audit/dist and /var/audit/remote.
  Note that those who did installworld after r243752 should
  remove wrongly created /var/dist and /var/remote.
  
  Reviewed by:	pjd

Modified:
  head/etc/mtree/BSD.var.dist

Modified: head/etc/mtree/BSD.var.dist
==============================================================================
--- head/etc/mtree/BSD.var.dist	Fri Dec 28 09:19:49 2012	(r244769)
+++ head/etc/mtree/BSD.var.dist	Fri Dec 28 10:42:01 2012	(r244770)
@@ -18,11 +18,11 @@
 /set mode=0750
 /set gname=audit
     audit
-    ..
         dist            uname=auditdistd gname=audit mode=0770
         ..
         remote          uname=auditdistd gname=wheel mode=0700
         ..
+    ..
 /set gname=wheel
     backups
     ..

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 12:53:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CD963A12;
 Fri, 28 Dec 2012 12:53:38 +0000 (UTC)
 (envelope-from asmrookie@gmail.com)
Received: from mail-la0-f48.google.com (mail-la0-f48.google.com
 [209.85.215.48])
 by mx1.freebsd.org (Postfix) with ESMTP id B3C968FC0C;
 Fri, 28 Dec 2012 12:53:37 +0000 (UTC)
Received: by mail-la0-f48.google.com with SMTP id ej20so738254lab.7
 for <multiple recipients>; Fri, 28 Dec 2012 04:53:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:reply-to:sender:in-reply-to:references:date
 :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
 bh=gbk1fsMNZKREvvx6rHflvzsFBqIt8Qtvc68GlyGA/6Y=;
 b=UorYlU4A38OYCjzG4RFeb1cZNGR7YxzVZ5A2vIlr0WXDpxFfrvJmeKAmxBFFOGpYnf
 FHNlkeav4AlrLaJBas7wVGrDWcmvFs6hfL26RA7SIIUrl3/bN/4CBrX7SxrJFdEK0adq
 6RiGwubjTI3GXh/uoiLaDhDVBwn8igxrKx8PrAJI2C1diOVRJkV72Q8Sli/DxUPGLOhE
 S/DbX/xw8+IlW9bf7brc0aNDu+oVT86GkIfiKb1Lc+Ww0J1CZrkUdYMEzbAu/aGWwYVl
 myPmT0glPsJFSRT2L72SD8jliB4EbRSw+oONY3sMCyB9F4HAYxGOfuo4kPzcIDhCvQ9f
 aBMQ==
MIME-Version: 1.0
Received: by 10.112.14.169 with SMTP id q9mr13227042lbc.110.1356699215927;
 Fri, 28 Dec 2012 04:53:35 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Fri, 28 Dec 2012 04:53:35 -0800 (PST)
In-Reply-To: <20121228082038.GZ80310@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
 <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
 <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
 <20121228082038.GZ80310@FreeBSD.org>
Date: Fri, 28 Dec 2012 13:53:35 +0100
X-Google-Sender-Auth: crAALthJRXjAPn4VFhmgCvXg2Uc
Message-ID: <CAJ-FndA5aeu_rbyNh4g_bOn_hsnVMNJ+STB7NLq+RMDismN78Q@mail.gmail.com>
Subject: Re: svn commit: r244732 - head/sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Gleb Smirnoff <glebius@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 12:53:38 -0000

On Fri, Dec 28, 2012 at 9:20 AM, Gleb Smirnoff <glebius@freebsd.org> wrote:
> On Thu, Dec 27, 2012 at 08:37:24AM -0800, Attilio Rao wrote:
> A> > Speaking of which, as you are here, I just found out that r241037
> A> > breaks the alignment of the structure.
> A> > Infact the padding member is not updated accordingly.
> A> >
> A> > We don't have a param to control L2 caches, but I think that we can
> A> > safely align them to the L1 cacheline for sure.
> A> > Also, note that this padding is completely broken for MI requirements
> A> > (it just assumes blindly 128 bytes L2 cachelines, which not always
> A> > true even on i386).
> A>
> A> More specifically this patch:
> A> http://www.freebsd.org/~attilio/bufring_pad.patch
> A>
> A> Of course I don't think the optimization is important in the
> A> DEBUG_BUFRING on case, so the patch should be fine.
>
> Agreed, thanks. And thanks for removing the br_prod_bufs.
>
> Sorry for breaking alignment in r241037.
>
> And last time we talked about alignment, it was noticed that our
> current CACHE_LINE_SIZE on amd64 is 128, while real size is 64.
> This 128 was some optimisation proposed by Intel for some past
> generation of CPUs and is no longer actual. Shouldn't we change it
> back to 64?

There was a recent thread on -arch about it. By Intel devs tests it
seems that CACHE_LINE_SIZE=128 really gives a performance boost when
NLM prefetcher is enabled while it doesn't hurt otherwise.

Did you also rewview the second patch I sent?

Thanks,
Attilio


-- 
Peace can only be achieved by understanding - A. Einstein

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 14:25:41 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C4193684;
 Fri, 28 Dec 2012 14:25:41 +0000 (UTC)
 (envelope-from brde@optusnet.com.au)
Received: from mail03.syd.optusnet.com.au (mail03.syd.optusnet.com.au
 [211.29.132.184])
 by mx1.freebsd.org (Postfix) with ESMTP id 5524B8FC0C;
 Fri, 28 Dec 2012 14:25:40 +0000 (UTC)
Received: from c122-106-175-26.carlnfd1.nsw.optusnet.com.au
 (c122-106-175-26.carlnfd1.nsw.optusnet.com.au [122.106.175.26])
 by mail03.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id qBSEPVXi016509
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Sat, 29 Dec 2012 01:25:33 +1100
Date: Sat, 29 Dec 2012 01:25:31 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Juli Mallett <jmallett@freebsd.org>
Subject: Re: svn commit: r244765 - in head/sys: kern tools
In-Reply-To: <CACVs6=-D_z7609-6xDz4gKWVFmX1Bfv-+hueMviLbt0sPte5Rw@mail.gmail.com>
Message-ID: <20121229010402.K1464@besplex.bde.org>
References: <201212280652.qBS6qrj7072246@svn.freebsd.org>
 <CACVs6=-D_z7609-6xDz4gKWVFmX1Bfv-+hueMviLbt0sPte5Rw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.0 cv=e5de0tV/ c=1 sm=1 a=uCOecJ8eGE4A:10
 a=kj9zAlcOel0A:10 a=PO7r1zJSAAAA:8 a=JzwRw_2MAAAA:8 a=LNCWVHfIY9kA:10
 a=PbejLz-6Xlbcm8SuJw8A:9 a=CjuIK1q_8ugA:10 a=bxQHXO5Py4tHmhUgaywp5w==:117
Cc: svn-src-head@freebsd.org, Oleksandr Tymoshenko <gonzo@freebsd.org>,
 svn-src-all@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 14:25:41 -0000

On Thu, 27 Dec 2012, Juli Mallett wrote:

> Seems like uintmax_t and %ju might be better?  At least, truncating a
> syscall arg to a pointer seems like it could be misleading (e.g. on
> MIPS n32, even though it's an abomination.)

Seems unlikely.  At least the old KTR calls only support u_long args,
the type mismatches for uintmax_t and %ju are more fatal than the
type mismatches for int and %d -- uintmax_t is just too large for
KTR on all 32-bit arches.

>> Modified: head/sys/kern/subr_syscall.c
>> ==============================================================================
>> --- head/sys/kern/subr_syscall.c        Fri Dec 28 05:48:44 2012        (r244764)
>> +++ head/sys/kern/subr_syscall.c        Fri Dec 28 06:52:53 2012        (r244765)
>> @@ -78,7 +78,7 @@ syscallenter(struct thread *td, struct s
>>                 ktrsyscall(sa->code, sa->narg, sa->args);
>>  #endif
>>         KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
>> -           td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
>> +           (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
>>             "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
>>
>>         if (error == 0) {

I don't see where the format td is.  Anything except %lx would be wrong.

Note that all the visible formats are wrong:
- %p for pointers is never compatible with u_long for the args
- %d for pids is normally compatible with pid_t = int32_t for the original
   args, but becomes incompatible when the args are converted to u_long.

I think the format string is only used in userland.  ktrdump uses bugs
like the following to print it:

% 		fprintf(out, desc, parms[0], parms[1], parms[2], parms[3],
% 		    parms[4], parms[5]);

Here the format 'desc' is the original string from the kernel, so it usually
has %p's and %d's in it, while parms[N] is a u_long containing a copy of
the u_long parameter in the kernel, so it never matches %p's and %d's in
the format string.  Correct code would parse `desc' and either change the
parameters to match the format or change the format to match the parameters.

fmtcheck(3) should notice these bugs.  -Wformat in the kernel doesn't notice
these bugs (or the more fatal ones for %ju formats) because CTR*() is not
variadic -- it just converts all args to u_long.

Bruce

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 15:25:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 708D5F3D;
 Fri, 28 Dec 2012 15:25:54 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id D8E768FC24;
 Fri, 28 Dec 2012 15:25:53 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id qBSFPpRG018969;
 Fri, 28 Dec 2012 19:25:51 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id qBSFPp6X018968;
 Fri, 28 Dec 2012 19:25:51 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Fri, 28 Dec 2012 19:25:51 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Attilio Rao <attilio@FreeBSD.org>
Subject: Re: svn commit: r244732 - head/sys/sys
Message-ID: <20121228152551.GA18694@FreeBSD.org>
References: <201212271236.qBRCawuU078203@svn.freebsd.org>
 <20121227124657.GX80310@FreeBSD.org>
 <CAJ-FndD9aDfPprwBYC+3T1WsfE1b4aZJENRAjo+hFEL1NLBKmw@mail.gmail.com>
 <20121227132507.GY80310@FreeBSD.org>
 <CAJ-FndC6Xq4EWcU203E4ucgr=jzOAutBBBkn+O1Qs0nL0i_Q3A@mail.gmail.com>
 <CAJ-FndAzqHCNtLGFH=6Cm3rshMestSZz_naF1=saMEKuX9cyog@mail.gmail.com>
 <CAJ-FndDeE15ygFKm1=euyvE8PW=HyUiK7WUcfgpX04Nj4GuExA@mail.gmail.com>
 <20121228082038.GZ80310@FreeBSD.org>
 <CAJ-FndA5aeu_rbyNh4g_bOn_hsnVMNJ+STB7NLq+RMDismN78Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <CAJ-FndA5aeu_rbyNh4g_bOn_hsnVMNJ+STB7NLq+RMDismN78Q@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 15:25:54 -0000

On Fri, Dec 28, 2012 at 01:53:35PM +0100, Attilio Rao wrote:
A> Did you also rewview the second patch I sent?

I did. I just don't have anything to comment on it. I guess it is correct,
and you should go forward with it.

However, benchmarking of overall changes to the buf_ring is important.

-- 
Totus tuus, Glebius.

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 17:41:36 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C71BFA81;
 Fri, 28 Dec 2012 17:41:36 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ACB288FC12;
 Fri, 28 Dec 2012 17:41:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSHfaSa071180;
 Fri, 28 Dec 2012 17:41:36 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSHfaYL071179;
 Fri, 28 Dec 2012 17:41:36 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212281741.qBSHfaYL071179@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 28 Dec 2012 17:41:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244774 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 17:41:36 -0000

Author: attilio
Date: Fri Dec 28 17:41:36 2012
New Revision: 244774
URL: http://svnweb.freebsd.org/changeset/base/244774

Log:
  Improve bufring impl:
  - Remove unused br_prod_bufs member
  - Fixup r241037: buf_ring pads br_prod_* and br_cons_* members at 128
    bytes, assuming a fixed cache line size for all the architectures.
    However, the above mentioned revision broke the padding.
    Use explicit padding to the CACHE_LINE_SIZE on the members that
    mark the initial new padded sections. Of course, the padding is not
    important for performance reasons in the DEBUG_BUFRING case, leaving
    br_cons members to share the cache line with br_lock.
  - Fixup r244732: by removing incorrectly added membar in
    buf_ring_dequeue_sc() where surrounding locking shoud be enough.
  - Drastically reduce the number of membar used (pratically reverting
    r244732) by switching rmb() in buf_ring_dequeue_mc() and wmb() in
    buf_ring_enqueue() to be complete barriers.  This, along with
    br_prod_bufs departure, should fix ordering issues as explained in
    the provided comments.
  
  This patch is not targeted for MFC.
  
  Sponsored by:	EMC / Isilon storage division
  Reviewed by:	glebius

Modified:
  head/sys/sys/buf_ring.h

Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h	Fri Dec 28 14:47:34 2012	(r244773)
+++ head/sys/sys/buf_ring.h	Fri Dec 28 17:41:36 2012	(r244774)
@@ -47,25 +47,14 @@ struct buf_ring {
 	int              	br_prod_size;
 	int              	br_prod_mask;
 	uint64_t		br_drops;
-	uint64_t		br_prod_bufs;
-	/*
-	 * Pad out to next L2 cache line
-	 */
-	uint64_t	  	_pad0[11];
-
-	volatile uint32_t	br_cons_head;
+	volatile uint32_t	br_cons_head __aligned(CACHE_LINE_SIZE);
 	volatile uint32_t	br_cons_tail;
 	int		 	br_cons_size;
 	int              	br_cons_mask;
-	
-	/*
-	 * Pad out to next L2 cache line
-	 */
-	uint64_t	  	_pad1[14];
 #ifdef DEBUG_BUFRING
 	struct mtx		*br_lock;
 #endif	
-	void			*br_ring[0];
+	void			*br_ring[0] __aligned(CACHE_LINE_SIZE);
 };
 
 /*
@@ -103,17 +92,21 @@ buf_ring_enqueue(struct buf_ring *br, vo
 		panic("dangling value in enqueue");
 #endif	
 	br->br_ring[prod_head] = buf;
-	wmb();
+
+	/*
+	 * The full memory barrier also avoids that br_prod_tail store
+	 * is reordered before the br_ring[prod_head] is full setup.
+	 */
+	mb();
 
 	/*
 	 * If there are other enqueues in progress
 	 * that preceeded us, we need to wait for them
 	 * to complete 
 	 */   
-	while (atomic_load_acq_32(&br->br_prod_tail) != prod_head)
+	while (br->br_prod_tail != prod_head)
 		cpu_spinwait();
-	br->br_prod_bufs++;
-	atomic_store_rel_32(&br->br_prod_tail, prod_next);
+	br->br_prod_tail = prod_next;
 	critical_exit();
 	return (0);
 }
@@ -150,17 +143,22 @@ buf_ring_dequeue_mc(struct buf_ring *br)
 #ifdef DEBUG_BUFRING
 	br->br_ring[cons_head] = NULL;
 #endif
-	rmb();
+
+	/*
+	 * The full memory barrier also avoids that br_ring[cons_read]
+	 * load is reordered after br_cons_tail is set.
+	 */
+	mb();
 	
 	/*
 	 * If there are other dequeues in progress
 	 * that preceeded us, we need to wait for them
 	 * to complete 
 	 */   
-	while (atomic_load_acq_32(&br->br_cons_tail) != cons_head)
+	while (br->br_cons_tail != cons_head)
 		cpu_spinwait();
 
-	atomic_store_rel_32(&br->br_cons_tail, cons_next);
+	br->br_cons_tail = cons_next;
 	critical_exit();
 
 	return (buf);
@@ -205,7 +203,7 @@ buf_ring_dequeue_sc(struct buf_ring *br)
 		panic("inconsistent list cons_tail=%d cons_head=%d",
 		    br->br_cons_tail, cons_head);
 #endif
-	atomic_store_rel_32(&br->br_cons_tail, cons_next);
+	br->br_cons_tail = cons_next;
 	return (buf);
 }
 

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 19:02:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 06B03BD2;
 Fri, 28 Dec 2012 19:02:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C515E8FC08;
 Fri, 28 Dec 2012 19:02:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSJ2Sjw083395;
 Fri, 28 Dec 2012 19:02:28 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSJ2SNS083394;
 Fri, 28 Dec 2012 19:02:28 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201212281902.qBSJ2SNS083394@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 28 Dec 2012 19:02:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244776 - head/contrib/gcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 19:02:29 -0000

Author: pfg
Date: Fri Dec 28 19:02:28 2012
New Revision: 244776
URL: http://svnweb.freebsd.org/changeset/base/244776

Log:
  gcc: avoid generating negative values to DW_AT_byte_size.
  
  There is a bug in gcc (GCC/35998) where dwarf reports
  sizes of unsigned -1 (0xffffffff).
  
  On NetBSD this generated a faulty CTF entry which then
  caused a segfault in ctfmerge. The issue was worked
  around in NetBSD's Dtrace but since the issue originated
  in gcc, it seems reasonable to fix it here.
  
  Upstream gcc has been slow to react to this issue and
  the author that submitted the patch is not interested
  in licensing the change to us, so I did an independent
  workaround for the issue.
  
  MFC after:	1 week

Modified:
  head/contrib/gcc/dwarf2out.c

Modified: head/contrib/gcc/dwarf2out.c
==============================================================================
--- head/contrib/gcc/dwarf2out.c	Fri Dec 28 18:59:10 2012	(r244775)
+++ head/contrib/gcc/dwarf2out.c	Fri Dec 28 19:02:28 2012	(r244776)
@@ -10812,9 +10812,9 @@ add_byte_size_attribute (dw_die_ref die,
 
   /* Note that `size' might be -1 when we get to this point.  If it is, that
      indicates that the byte size of the entity in question is variable.  We
-     have no good way of expressing this fact in Dwarf at the present time,
-     so just let the -1 pass on through.  */
-  add_AT_unsigned (die, DW_AT_byte_size, size);
+     have no good way of expressing this fact in Dwarf at the present time.
+     GCC/35998: Avoid passing negative sizes to Dtrace and gdb.  */
+  add_AT_unsigned (die, DW_AT_byte_size, (size > 0 ? size : 0));
 }
 
 /* For a FIELD_DECL node which represents a bit-field, output an attribute

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:19:55 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F3330CCA;
 Fri, 28 Dec 2012 20:19:54 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D91BF8FC12;
 Fri, 28 Dec 2012 20:19:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKJs4E096000;
 Fri, 28 Dec 2012 20:19:54 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKJsXi095999;
 Fri, 28 Dec 2012 20:19:54 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282019.qBSKJsXi095999@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:19:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244777 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:19:55 -0000

Author: bapt
Date: Fri Dec 28 20:19:54 2012
New Revision: 244777
URL: http://svnweb.freebsd.org/changeset/base/244777

Log:
  Do not leave parts of the new group uninitialized in gr_dup().
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
  Reported by:	pjd

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Fri Dec 28 19:02:28 2012	(r244776)
+++ head/lib/libutil/gr_util.c	Fri Dec 28 20:19:54 2012	(r244777)
@@ -461,10 +461,14 @@ gr_dup(const struct group *gr)
 	if (gr->gr_name != NULL) {
 		newgr->gr_name = dst;
 		dst = stpcpy(dst, gr->gr_name) + 1;
+	} else {
+		newgr->gr_name = NULL;
 	}
 	if (gr->gr_passwd != NULL) {
 		newgr->gr_passwd = dst;
 		dst = stpcpy(dst, gr->gr_passwd) + 1;
+	} else {
+		newgr->gr_passwd = NULL;
 	}
 	newgr->gr_gid = gr->gr_gid;
 	if (gr->gr_mem != NULL) {

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:21:15 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2E1DAE3E;
 Fri, 28 Dec 2012 20:21:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 12B108FC0C;
 Fri, 28 Dec 2012 20:21:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKLEjf096327;
 Fri, 28 Dec 2012 20:21:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKLEeG096326;
 Fri, 28 Dec 2012 20:21:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282021.qBSKLEeG096326@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:21:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244778 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:21:15 -0000

Author: bapt
Date: Fri Dec 28 20:21:14 2012
New Revision: 244778
URL: http://svnweb.freebsd.org/changeset/base/244778

Log:
  malloc() sets errno to ENOMEM already.
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Fri Dec 28 20:19:54 2012	(r244777)
+++ head/lib/libutil/gr_util.c	Fri Dec 28 20:21:14 2012	(r244778)
@@ -505,17 +505,13 @@ gr_add(struct group *gr, char *newmember
 	}
 	/* Allocate enough for current pointers + 1 more and NULL marker */
 	mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
-	if ((members = malloc(mlen)) == NULL) {
+	if ((members = malloc(mlen)) == NULL)
 		errno = ENOMEM;
-		return (NULL);
-	}
 	memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
 	members[num_mem++] = newmember;
 	members[num_mem] = NULL;
 	gr->gr_mem = members;
 	newgr = gr_dup(gr);
-	if (newgr == NULL)
-		errno = ENOMEM;
 	free(members);
 	return (newgr);
 }

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:23:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3ACAF137;
 Fri, 28 Dec 2012 20:23:01 +0000 (UTC)
 (envelope-from yanegomi@gmail.com)
Received: from mail-ob0-f174.google.com (mail-ob0-f174.google.com
 [209.85.214.174])
 by mx1.freebsd.org (Postfix) with ESMTP id A9B228FC0C;
 Fri, 28 Dec 2012 20:23:00 +0000 (UTC)
Received: by mail-ob0-f174.google.com with SMTP id ta14so9987491obb.19
 for <multiple recipients>; Fri, 28 Dec 2012 12:22:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=i3iD0zVl/3ZSTj6LIm0yv2RxJwrlXhSKEp/vnY06lA4=;
 b=xezSGLn17iQAOdvVETirvrk/nHe7ArTcM8+t7AROmv1rj7BQAYQt5o96OwWBdt9t3b
 OxUDj9sq6pM6H5x2ymK1tHEtTfoFBfdi8QJa3cT6DEKXehHST+ZbqjQtDR7y4NqsLZz4
 FrhsNRJ87V8q6o5kzAZF6hsjmfBfrj/2x170c8dBaZk6s4yiuUStPVfphuMMeO06m3IR
 ETlo/gsva0EcevdfJhWjpu+gMYXWaDjwzqzvU3K0kA+d8LfP7BZ+M1pduRTa14EL8HNm
 Py0lEXqmhh1hp7EtJQG2hUJSpgR35PcUPvH9/f5obLW7KIhD4q5GVvxnyBcUqkEekKMW
 5YCA==
MIME-Version: 1.0
Received: by 10.182.172.74 with SMTP id ba10mr28448025obc.83.1356726174762;
 Fri, 28 Dec 2012 12:22:54 -0800 (PST)
Received: by 10.76.143.33 with HTTP; Fri, 28 Dec 2012 12:22:54 -0800 (PST)
In-Reply-To: <201212282021.qBSKLEeG096326@svn.freebsd.org>
References: <201212282021.qBSKLEeG096326@svn.freebsd.org>
Date: Fri, 28 Dec 2012 12:22:54 -0800
Message-ID: <CAGH67wQ8t1bPt4TxzvTzsfH8DA4vMd_k3+wv08yFEvys=uxxdQ@mail.gmail.com>
Subject: Re: svn commit: r244778 - head/lib/libutil
From: Garrett Cooper <yanegomi@gmail.com>
To: Baptiste Daroussin <bapt@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:23:01 -0000

On Fri, Dec 28, 2012 at 12:21 PM, Baptiste Daroussin <bapt@freebsd.org> wrote:
> Author: bapt
> Date: Fri Dec 28 20:21:14 2012
> New Revision: 244778
> URL: http://svnweb.freebsd.org/changeset/base/244778
>
> Log:
>   malloc() sets errno to ENOMEM already.
>
>   Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
>
> Modified:
>   head/lib/libutil/gr_util.c
>
> Modified: head/lib/libutil/gr_util.c
> ==============================================================================
> --- head/lib/libutil/gr_util.c  Fri Dec 28 20:19:54 2012        (r244777)
> +++ head/lib/libutil/gr_util.c  Fri Dec 28 20:21:14 2012        (r244778)
> @@ -505,17 +505,13 @@ gr_add(struct group *gr, char *newmember
>         }
>         /* Allocate enough for current pointers + 1 more and NULL marker */
>         mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
> -       if ((members = malloc(mlen)) == NULL) {
> +       if ((members = malloc(mlen)) == NULL)
>                 errno = ENOMEM;
> -               return (NULL);
> -       }

    Didn't you mean to remove errno = ENOMEM?
Thanks,
-Garrett

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:30:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2B6E53B9;
 Fri, 28 Dec 2012 20:30:05 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1140E8FC15;
 Fri, 28 Dec 2012 20:30:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKU4De097599;
 Fri, 28 Dec 2012 20:30:04 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKU4kk097598;
 Fri, 28 Dec 2012 20:30:04 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282030.qBSKU4kk097598@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:30:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244779 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:30:05 -0000

Author: bapt
Date: Fri Dec 28 20:30:04 2012
New Revision: 244779
URL: http://svnweb.freebsd.org/changeset/base/244779

Log:
  errno = ENOMEM was supposed to be removed not return (NULL);
  
  Submitted by:	gcooper

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Fri Dec 28 20:21:14 2012	(r244778)
+++ head/lib/libutil/gr_util.c	Fri Dec 28 20:30:04 2012	(r244779)
@@ -506,7 +506,7 @@ gr_add(struct group *gr, char *newmember
 	/* Allocate enough for current pointers + 1 more and NULL marker */
 	mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
 	if ((members = malloc(mlen)) == NULL)
-		errno = ENOMEM;
+		return (NULL);
 	memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
 	members[num_mem++] = newmember;
 	members[num_mem] = NULL;

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:31:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EAD90622;
 Fri, 28 Dec 2012 20:31:31 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51])
 by mx1.freebsd.org (Postfix) with ESMTP id 23EFF8FC13;
 Fri, 28 Dec 2012 20:31:30 +0000 (UTC)
Received: by mail-wg0-f51.google.com with SMTP id gg4so4821649wgb.18
 for <multiple recipients>; Fri, 28 Dec 2012 12:31:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:sender:date:from:to:cc:subject:message-id:references
 :mime-version:content-type:content-disposition:in-reply-to
 :user-agent; bh=nak0jeBCOm/tpanl1lQYEvdJFt6sV6KTqBREQ6PimJ8=;
 b=pRLl3ormazihvcj2S2+/4rCdg0ODY8282gzVxLueQ6ISyd9+r6678byWfGZEwIP2Rx
 rzbn+KlhSV1W6PXckd7dCSRHEgpcKf9AyS+fpawRLhsM+gxXVWcMpWkzRh5QEge8GNpd
 Sn8NvASMLWXU+kJxIgkCNbKtreODyXnydApwqI+MV58bsLp4+1IKqKbmFnluM1bEkvZz
 z3eH4slGyLSyfBceIL1uww2AuVGvwQ+W+g7kNLq05Ng7WDahVMLYpKvTGZkuj6m7v5TE
 6nWdO15Y77w1JGetiMO+97ejFVObbOCxr9Pe5SspUvcmSXjw7dhCXuCcsEFKwf6RRTXk
 qvIA==
X-Received: by 10.180.82.69 with SMTP id g5mr54775118wiy.21.1356726690055;
 Fri, 28 Dec 2012 12:31:30 -0800 (PST)
Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188])
 by mx.google.com with ESMTPS id i2sm63747483wiw.3.2012.12.28.12.31.29
 (version=TLSv1/SSLv3 cipher=OTHER);
 Fri, 28 Dec 2012 12:31:29 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Fri, 28 Dec 2012 21:31:28 +0100
From: Baptiste Daroussin <bapt@freebsd.org>
To: Garrett Cooper <yanegomi@gmail.com>
Subject: Re: svn commit: r244778 - head/lib/libutil
Message-ID: <20121228203128.GF48771@ithaqua.etoilebsd.net>
References: <201212282021.qBSKLEeG096326@svn.freebsd.org>
 <CAGH67wQ8t1bPt4TxzvTzsfH8DA4vMd_k3+wv08yFEvys=uxxdQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="O98KdSgI27dgYlM5"
Content-Disposition: inline
In-Reply-To: <CAGH67wQ8t1bPt4TxzvTzsfH8DA4vMd_k3+wv08yFEvys=uxxdQ@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:31:32 -0000


--O98KdSgI27dgYlM5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Dec 28, 2012 at 12:22:54PM -0800, Garrett Cooper wrote:
> On Fri, Dec 28, 2012 at 12:21 PM, Baptiste Daroussin <bapt@freebsd.org> w=
rote:
> > Author: bapt
> > Date: Fri Dec 28 20:21:14 2012
> > New Revision: 244778
> > URL: http://svnweb.freebsd.org/changeset/base/244778
> >
> > Log:
> >   malloc() sets errno to ENOMEM already.
> >
> >   Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
> >
> > Modified:
> >   head/lib/libutil/gr_util.c
> >
> > Modified: head/lib/libutil/gr_util.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/lib/libutil/gr_util.c  Fri Dec 28 20:19:54 2012        (r24477=
7)
> > +++ head/lib/libutil/gr_util.c  Fri Dec 28 20:21:14 2012        (r24477=
8)
> > @@ -505,17 +505,13 @@ gr_add(struct group *gr, char *newmember
> >         }
> >         /* Allocate enough for current pointers + 1 more and NULL marke=
r */
> >         mlen =3D (num_mem + 2) * sizeof(*gr->gr_mem);
> > -       if ((members =3D malloc(mlen)) =3D=3D NULL) {
> > +       if ((members =3D malloc(mlen)) =3D=3D NULL)
> >                 errno =3D ENOMEM;
> > -               return (NULL);
> > -       }
>=20
>     Didn't you mean to remove errno =3D ENOMEM?

Thank you, fixed.

Bapt

--O98KdSgI27dgYlM5
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDeAZ8ACgkQ8kTtMUmk6Ez1EQCfRLU5vTJV4Si+uPqrHavpobDE
oKgAn2Gg4w7uXdSrKUQ/KT+Dzb+Wu/Vo
=8zd5
-----END PGP SIGNATURE-----

--O98KdSgI27dgYlM5--

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:31:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4F3D378B;
 Fri, 28 Dec 2012 20:31:51 +0000 (UTC)
 (envelope-from yanegomi@gmail.com)
Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com
 [209.85.214.182])
 by mx1.freebsd.org (Postfix) with ESMTP id D451C8FC0C;
 Fri, 28 Dec 2012 20:31:50 +0000 (UTC)
Received: by mail-ob0-f182.google.com with SMTP id 16so9955848obc.27
 for <multiple recipients>; Fri, 28 Dec 2012 12:31:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=6RZETl+/qtnAhhAUB+18JFctSwh6JiQBoo//VOVjMAA=;
 b=pyZhutHiEJBc8BU+97BIOJKFG+cOb59j3inoACVnGWIFIoxdAJO06bvjYU9y3Yeoc+
 2XjJdk7JQW5qv6edzEQqBaKNWUBPMmIZNT8ugUM5Z21S14zQgjhHZsa3nZwsA6sWZjCV
 4f14D54yzcYLV1v0UNoIb416RIsg/USNK7X7MoiMeDkL6mWIJgmJV+7wS+FMjbd4n9Jw
 1vk9NyQaHi0cyXN3UqsQfX74T4bblcoD9H/DDjFHicLg7Hd9gaLiUx1aAvvGsy/1iftD
 GrWg+4eR+kZm4+z+Ss2Eta/gO9PZ0M7FZVsZecMdEcdSUYIJ6hTD/+2soABzN1OO+sYG
 0uuQ==
MIME-Version: 1.0
Received: by 10.60.6.226 with SMTP id e2mr17311120oea.56.1356726704713; Fri,
 28 Dec 2012 12:31:44 -0800 (PST)
Received: by 10.76.143.33 with HTTP; Fri, 28 Dec 2012 12:31:44 -0800 (PST)
In-Reply-To: <201212282030.qBSKU4kk097598@svn.freebsd.org>
References: <201212282030.qBSKU4kk097598@svn.freebsd.org>
Date: Fri, 28 Dec 2012 12:31:44 -0800
Message-ID: <CAGH67wQRMf_xYiwbTjibMLrqTSHj2=D_g8qDP7jY7MouQEf8qQ@mail.gmail.com>
Subject: Re: svn commit: r244779 - head/lib/libutil
From: Garrett Cooper <yanegomi@gmail.com>
To: Baptiste Daroussin <bapt@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:31:51 -0000

On Fri, Dec 28, 2012 at 12:30 PM, Baptiste Daroussin <bapt@freebsd.org> wrote:
> Author: bapt
> Date: Fri Dec 28 20:30:04 2012
> New Revision: 244779
> URL: http://svnweb.freebsd.org/changeset/base/244779
>
> Log:
>   errno = ENOMEM was supposed to be removed not return (NULL);
>
>   Submitted by: gcooper

Thanks!

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:44:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6A82B9E6;
 Fri, 28 Dec 2012 20:44:11 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4E2E28FC08;
 Fri, 28 Dec 2012 20:44:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKiB7g099609;
 Fri, 28 Dec 2012 20:44:11 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKiBUq099608;
 Fri, 28 Dec 2012 20:44:11 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282044.qBSKiBUq099608@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:44:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244780 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:44:11 -0000

Author: bapt
Date: Fri Dec 28 20:44:10 2012
New Revision: 244780
URL: http://svnweb.freebsd.org/changeset/base/244780

Log:
  Simplify pointing dst after the end of all the gr_mem pointers in newgr
  
  Submitted by:	pjd
  Reviewed by:	db

Modified:
  head/lib/libutil/gr_util.c

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Fri Dec 28 20:30:04 2012	(r244779)
+++ head/lib/libutil/gr_util.c	Fri Dec 28 20:44:10 2012	(r244780)
@@ -456,8 +456,7 @@ gr_dup(const struct group *gr)
 	else
 		newgr->gr_mem = NULL;
 	/* point dst after the end of all the gr_mem pointers in newgr */
-	dst = (char *)newgr + sizeof(struct group) +
-	    (num_mem + 1) * sizeof(*gr->gr_mem);
+	dst = (char *)&newgr->gr_mem[num_mem + 1];
 	if (gr->gr_name != NULL) {
 		newgr->gr_name = dst;
 		dst = stpcpy(dst, gr->gr_name) + 1;

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 20:44:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 398D2B4F;
 Fri, 28 Dec 2012 20:44:24 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1E8A08FC12;
 Fri, 28 Dec 2012 20:44:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKiN5V099670;
 Fri, 28 Dec 2012 20:44:24 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKiNDs099669;
 Fri, 28 Dec 2012 20:44:23 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212282044.qBSKiNDs099669@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:44:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244781 - head/sys/dev/wbwd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:44:24 -0000

Author: delphij
Date: Fri Dec 28 20:44:23 2012
New Revision: 244781
URL: http://svnweb.freebsd.org/changeset/base/244781

Log:
  Use DEVMETHOD_END.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/wbwd/wbwd.c

Modified: head/sys/dev/wbwd/wbwd.c
==============================================================================
--- head/sys/dev/wbwd/wbwd.c	Fri Dec 28 20:44:10 2012	(r244780)
+++ head/sys/dev/wbwd/wbwd.c	Fri Dec 28 20:44:23 2012	(r244781)
@@ -714,7 +714,7 @@ static device_method_t wb_methods[] = {
 	DEVMETHOD(device_attach,	wb_attach),
 	DEVMETHOD(device_detach,	wb_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t wb_isa_driver = {

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 21:35:48 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A45AAD8D;
 Fri, 28 Dec 2012 21:35:48 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 863508FC0A;
 Fri, 28 Dec 2012 21:35:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSLZmFC008081;
 Fri, 28 Dec 2012 21:35:48 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSLZmaM008080;
 Fri, 28 Dec 2012 21:35:48 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212282135.qBSLZmaM008080@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Dec 2012 21:35:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244787 - head/sys/dev/wbwd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 21:35:48 -0000

Author: delphij
Date: Fri Dec 28 21:35:47 2012
New Revision: 244787
URL: http://svnweb.freebsd.org/changeset/base/244787

Log:
  Add DEVICE_IDENTIFY method for wbwd(4), required on most of recent
  Supermicro motherboards.
  
  Tested on X8STi and X8DTH boards.
  
  Sponsored by:	iXsystems, Inc.
  MFC after:	2 weeks

Modified:
  head/sys/dev/wbwd/wbwd.c

Modified: head/sys/dev/wbwd/wbwd.c
==============================================================================
--- head/sys/dev/wbwd/wbwd.c	Fri Dec 28 21:26:40 2012	(r244786)
+++ head/sys/dev/wbwd/wbwd.c	Fri Dec 28 21:35:47 2012	(r244787)
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2011 Sandvine Incorporated ULC.
+ * Copyright (c) 2012 iXsystems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,15 +94,6 @@ __FBSDID("$FreeBSD$");
 #define	WB_LDN8_CRF7_CLEAR_MASK	\
     (WB_LDN8_CRF7_MOUSE|WB_LDN8_CRF7_KEYB|WB_LDN8_CRF7_TS|WB_LDN8_CRF7_IRQS)
 
-#define	write_efir_1(sc, value)						\
-	bus_space_write_1((sc)->bst, (sc)->bsh, 0, (value))
-#define	read_efir_1(sc)							\
-	bus_space_read_1((sc)->bst, (sc)->bsh, 0)
-#define	write_efdr_1(sc, value)						\
-	bus_space_write_1((sc)->bst, (sc)->bsh, 1, (value))
-#define	read_efdr_1(sc)							\
-	bus_space_read_1((sc)->bst, (sc)->bsh, 1)
-
 struct wb_softc {
 	device_t		dev;
 	struct resource		*portres;
@@ -109,8 +101,8 @@ struct wb_softc {
 	bus_space_handle_t	bsh;
 	int			rid;
 	eventhandler_tag	ev_tag;
-	int			(*ext_cfg_enter_f)(struct wb_softc *);
-	void			(*ext_cfg_exit_f)(struct wb_softc *);
+	int			(*ext_cfg_enter_f)(struct wb_softc *, u_short);
+	void			(*ext_cfg_exit_f)(struct wb_softc *, u_short);
 	int			debug_verbose;
 
 	/*
@@ -131,13 +123,13 @@ struct wb_softc {
 	uint8_t			reg_2;
 };
 
-static int	ext_cfg_enter_0x87_0x87(struct wb_softc *);
-static void	ext_cfg_exit_0xaa(struct wb_softc *);
+static int	ext_cfg_enter_0x87_0x87(struct wb_softc *, u_short);
+static void	ext_cfg_exit_0xaa(struct wb_softc *, u_short);
 
 struct winbond_superio_cfg {
 	uint8_t			efer;	/* and efir */
-	int			(*ext_cfg_enter_f)(struct wb_softc *);
-	void			(*ext_cfg_exit_f)(struct wb_softc *);
+	int			(*ext_cfg_enter_f)(struct wb_softc *, u_short);
+	void			(*ext_cfg_exit_f)(struct wb_softc *, u_short);
 } probe_addrs[] = {
 	{
 		.efer			= 0x2e,
@@ -189,6 +181,50 @@ struct winbond_vendor_device_id {
 	},
 };
 
+static void
+write_efir_1(struct wb_softc *sc, u_short baseport, uint8_t value)
+{
+
+	MPASS(sc != NULL || baseport != 0);
+	if (sc != NULL)
+		bus_space_write_1((sc)->bst, (sc)->bsh, 0, (value));
+	else
+		outb(baseport, value);
+}
+
+static uint8_t __unused
+read_efir_1(struct wb_softc *sc, u_short baseport)
+{
+
+	MPASS(sc != NULL || baseport != 0);
+	if (sc != NULL)
+		return (bus_space_read_1((sc)->bst, (sc)->bsh, 0));
+	else
+		return (inb(baseport));
+}
+
+static void
+write_efdr_1(struct wb_softc *sc, u_short baseport, uint8_t value)
+{
+
+	MPASS(sc != NULL || baseport != 0);
+	if (sc != NULL)
+		bus_space_write_1((sc)->bst, (sc)->bsh, 1, (value));
+	else
+		outb(baseport + 1, value);
+}
+
+static uint8_t
+read_efdr_1(struct wb_softc *sc, u_short baseport)
+{
+
+	MPASS(sc != NULL || baseport != 0);
+	if (sc != NULL)
+		return (bus_space_read_1((sc)->bst, (sc)->bsh, 1));
+	else
+		return (inb(baseport + 1));
+}
+
 /*
  * Return the watchdog related registers as we last read them.  This will
  * usually not give the current timeout or state on whether the watchdog
@@ -231,19 +267,19 @@ sysctl_wb_debug_current(SYSCTL_HANDLER_A
 	 * Enter extended function mode in case someone else has been
 	 * poking on the registers.  We will not leave it though.
 	 */
-	if ((*sc->ext_cfg_enter_f)(sc) != 0)
+	if ((*sc->ext_cfg_enter_f)(sc, 0) != 0)
 		return (ENXIO);
 
 	/* Watchdog is configured as part of LDN 8 (GPIO Port2, Watchdog). */
-	write_efir_1(sc, WB_LDN_REG);
-	write_efdr_1(sc, WB_LDN_REG_LDN8);
+	write_efir_1(sc, 0, WB_LDN_REG);
+	write_efdr_1(sc, 0, WB_LDN_REG_LDN8);
 
-	write_efir_1(sc, WB_LDN8_CRF5);
-	sc->reg_1 = read_efdr_1(sc);
-	write_efir_1(sc, WB_LDN8_CRF6);
-	sc->reg_timeout = read_efdr_1(sc);
-	write_efir_1(sc, WB_LDN8_CRF7);
-	sc->reg_2 = read_efdr_1(sc);
+	write_efir_1(sc, 0, WB_LDN8_CRF5);
+	sc->reg_1 = read_efdr_1(sc, 0);
+	write_efir_1(sc, 0, WB_LDN8_CRF6);
+	sc->reg_timeout = read_efdr_1(sc, 0);
+	write_efir_1(sc, 0, WB_LDN8_CRF7);
+	sc->reg_2 = read_efdr_1(sc, 0);
 
 	return (sysctl_wb_debug(oidp, arg1, arg2, req));
 }
@@ -288,7 +324,7 @@ sysctl_wb_force_test_nmi(SYSCTL_HANDLER_
 	 * Enter extended function mode in case someone else has been
 	 * poking on the registers.  We will not leave it though.
 	 */
-	if ((*sc->ext_cfg_enter_f)(sc) != 0)
+	if ((*sc->ext_cfg_enter_f)(sc, 0) != 0)
 		return (ENXIO);
 
 #ifdef notyet
@@ -301,16 +337,16 @@ sysctl_wb_force_test_nmi(SYSCTL_HANDLER_
 #endif
 
 	/* Watchdog is configured as part of LDN 8 (GPIO Port2, Watchdog). */
-	write_efir_1(sc, WB_LDN_REG);
-	write_efdr_1(sc, WB_LDN_REG_LDN8);
+	write_efir_1(sc, 0, WB_LDN_REG);
+	write_efdr_1(sc, 0, WB_LDN_REG_LDN8);
 
 	/* Force watchdog to fire. */
-	write_efir_1(sc, WB_LDN8_CRF7);
-	sc->reg_2 = read_efdr_1(sc);
+	write_efir_1(sc, 0, WB_LDN8_CRF7);
+	sc->reg_2 = read_efdr_1(sc, 0);
 	sc->reg_2 |= WB_LDN8_CRF7_FORCE;
 
-	write_efir_1(sc, WB_LDN8_CRF7);
-	write_efdr_1(sc, sc->reg_2);
+	write_efir_1(sc, 0, WB_LDN8_CRF7);
+	write_efdr_1(sc, 0, sc->reg_2);
 
 	return (0);
 }
@@ -344,24 +380,24 @@ wb_print_state(struct wb_softc *sc, cons
  * between different chips.
  */
 static int
-ext_cfg_enter_0x87_0x87(struct wb_softc *sc)
+ext_cfg_enter_0x87_0x87(struct wb_softc *sc, u_short baseport)
 {
 
 	/*
 	 * Enable extended function mode.
 	 * Winbond does not allow us to validate so always return success.
 	 */
-	write_efir_1(sc, 0x87);
-	write_efir_1(sc, 0x87);
+	write_efir_1(sc, baseport, 0x87);
+	write_efir_1(sc, baseport, 0x87);
 
 	return (0);
 }
 
 static void
-ext_cfg_exit_0xaa(struct wb_softc *sc)
+ext_cfg_exit_0xaa(struct wb_softc *sc, u_short baseport)
 {
 
-	write_efir_1(sc, 0xaa);
+	write_efir_1(sc, baseport, 0xaa);
 }
 
 /*
@@ -379,22 +415,22 @@ wb_set_watchdog(struct wb_softc *sc, uns
 	 * Enter extended function mode in case someone else has been
 	 * poking on the registers.  We will not leave it though.
 	 */
-	if ((*sc->ext_cfg_enter_f)(sc) != 0)
+	if ((*sc->ext_cfg_enter_f)(sc, 0) != 0)
 		return (ENXIO);
 
 	/* Watchdog is configured as part of LDN 8 (GPIO Port2, Watchdog) */
-	write_efir_1(sc, WB_LDN_REG);
-	write_efdr_1(sc, WB_LDN_REG_LDN8);
+	write_efir_1(sc, 0, WB_LDN_REG);
+	write_efdr_1(sc, 0, WB_LDN_REG_LDN8);
 
 	/* Disable and validate or arm/reset watchdog. */
 	if (timeout == 0) {
 		/* Disable watchdog. */
-		write_efir_1(sc, WB_LDN8_CRF6);
-		write_efdr_1(sc, 0x00);
+		write_efir_1(sc, 0, WB_LDN8_CRF6);
+		write_efdr_1(sc, 0, 0x00);
 
 		/* Re-check. */
-		write_efir_1(sc, WB_LDN8_CRF6);
-		sc->reg_timeout = read_efdr_1(sc);
+		write_efir_1(sc, 0, WB_LDN8_CRF6);
+		sc->reg_timeout = read_efdr_1(sc, 0);
 		
 		if (sc->reg_timeout != 0x00) {
 			device_printf(sc->dev, "Failed to disable watchdog: "
@@ -415,8 +451,8 @@ wb_set_watchdog(struct wb_softc *sc, uns
 			return (EINVAL);
 
 		/* Read current scaling factor. */
-		write_efir_1(sc, WB_LDN8_CRF5);
-		sc->reg_1 = read_efdr_1(sc);
+		write_efir_1(sc, 0, WB_LDN8_CRF5);
+		sc->reg_1 = read_efdr_1(sc, 0);
 
 		if (timeout > 255) {
 			/* Set scaling factor to 60s. */
@@ -431,21 +467,21 @@ wb_set_watchdog(struct wb_softc *sc, uns
 		}
 
 		/* In case we fired before we need to clear to fire again. */
-		write_efir_1(sc, WB_LDN8_CRF7);
-		sc->reg_2 = read_efdr_1(sc);
+		write_efir_1(sc, 0, WB_LDN8_CRF7);
+		sc->reg_2 = read_efdr_1(sc, 0);
 		if (sc->reg_2 & WB_LDN8_CRF7_TS) {
 			sc->reg_2 &= ~WB_LDN8_CRF7_TS;
-			write_efir_1(sc, WB_LDN8_CRF7);
-			write_efdr_1(sc, sc->reg_2);
+			write_efir_1(sc, 0, WB_LDN8_CRF7);
+			write_efdr_1(sc, 0, sc->reg_2);
 		}
 
 		/* Write back scaling factor. */
-		write_efir_1(sc, WB_LDN8_CRF5);
-		write_efdr_1(sc, sc->reg_1);
+		write_efir_1(sc, 0, WB_LDN8_CRF5);
+		write_efdr_1(sc, 0, sc->reg_1);
 
 		/* Set timer and arm/reset the watchdog. */
-		write_efir_1(sc, WB_LDN8_CRF6);
-		write_efdr_1(sc, sc->reg_timeout);
+		write_efir_1(sc, 0, WB_LDN8_CRF6);
+		write_efdr_1(sc, 0, sc->reg_timeout);
 	}
 
 	if (sc->debug_verbose)
@@ -515,62 +551,71 @@ wb_probe_enable(device_t dev, int probe)
 	int error, found, i, j;
 	uint8_t dev_id, dev_rev, cr26;
 
-	sc = device_get_softc(dev);
-	bzero(sc, sizeof(*sc));
-	sc->dev = dev;
+	if (dev == NULL)
+		sc = NULL;
+	else {
+		sc = device_get_softc(dev);
+		bzero(sc, sizeof(*sc));
+		sc->dev = dev;
+	}
 
 	error = ENXIO;
 	for (i = 0; i < sizeof(probe_addrs) / sizeof(*probe_addrs); i++) {
 
-		/* Allocate bus resources for IO index/data register access. */
-		sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->rid,
-		    probe_addrs[i].efer, probe_addrs[i].efer + 1, 2, RF_ACTIVE);
-		if (sc->portres == NULL)
-			continue;
-		sc->bst = rman_get_bustag(sc->portres);
-		sc->bsh = rman_get_bushandle(sc->portres);
+		if (sc != NULL) {
+			/* Allocate bus resources for IO index/data register access. */
+			sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->rid,
+			    probe_addrs[i].efer, probe_addrs[i].efer + 1, 2, RF_ACTIVE);
+			if (sc->portres == NULL)
+				continue;
+			sc->bst = rman_get_bustag(sc->portres);
+			sc->bsh = rman_get_bushandle(sc->portres);
+		}
 
 		found = 0;
-		error = (*probe_addrs[i].ext_cfg_enter_f)(sc);
+		error = (*probe_addrs[i].ext_cfg_enter_f)(sc, probe_addrs[i].efer);
 		if (error != 0)
 			goto cleanup;
 
 		/* Identify the SuperIO chip. */
-		write_efir_1(sc, WB_DEVICE_ID_REG);
-		dev_id = read_efdr_1(sc);
-		write_efir_1(sc, WB_DEVICE_REV_REG);
-		dev_rev = read_efdr_1(sc);
-		write_efir_1(sc, WB_CR26);
-		cr26 = read_efdr_1(sc);
+		write_efir_1(sc, probe_addrs[i].efer, WB_DEVICE_ID_REG);
+		dev_id = read_efdr_1(sc, probe_addrs[i].efer);
+		write_efir_1(sc, probe_addrs[i].efer, WB_DEVICE_REV_REG);
+		dev_rev = read_efdr_1(sc, probe_addrs[i].efer);
+		write_efir_1(sc, probe_addrs[i].efer, WB_CR26);
+		cr26 = read_efdr_1(sc, probe_addrs[i].efer);
 
 		/* HEFRAS of 0 means EFER at 0x2e, 1 means EFER at 0x4e. */
 		if (((cr26 & 0x40) == 0x00 && probe_addrs[i].efer != 0x2e) ||
 		    ((cr26 & 0x40) == 0x40 && probe_addrs[i].efer != 0x4e)) {
-			device_printf(dev, "HEFRAS and EFER do not align: EFER "
-			    "0x%02x DevID 0x%02x DevRev 0x%02x CR26 0x%02x\n",
-			     probe_addrs[i].efer, dev_id, dev_rev, cr26);
+			if (dev != NULL)
+				device_printf(dev, "HEFRAS and EFER do not "
+				    "align: EFER 0x%02x DevID 0x%02x DevRev "
+				    "0x%02x CR26 0x%02x\n",
+				    probe_addrs[i].efer, dev_id, dev_rev, cr26);
 			goto cleanup;
 		}
 
 		for (j = 0; j < sizeof(wb_devs) / sizeof(*wb_devs); j++) {
 			if (wb_devs[j].device_id == dev_id &&
 			    wb_devs[j].device_rev == dev_rev) {
-				if (probe)
+				if (probe && dev != NULL)
 					device_set_desc(dev, wb_devs[j].descr);
 				found++;
 				break;
 			}
 		}
-		if (probe && found && bootverbose)
+		if (probe && found && bootverbose && dev != NULL)
 			device_printf(dev, "%s EFER 0x%02x ID 0x%02x Rev 0x%02x"
 			     " CR26 0x%02x (probing)\n", device_get_desc(dev),
 			     probe_addrs[i].efer, dev_id, dev_rev, cr26);
 cleanup:
 		if (probe || !found) {
-			(*probe_addrs[i].ext_cfg_exit_f)(sc);
+			(*probe_addrs[i].ext_cfg_exit_f)(sc, probe_addrs[i].efer);
 
-			(void) bus_release_resource(dev, SYS_RES_IOPORT, sc->rid,
-			    sc->portres);
+			if (sc != NULL)
+				(void) bus_release_resource(dev, SYS_RES_IOPORT,
+				    sc->rid, sc->portres);
 		}
 
 		/*
@@ -579,8 +624,10 @@ cleanup:
 		 * for operations.
 		 */
 		if (found) {
-			sc->ext_cfg_enter_f = probe_addrs[i].ext_cfg_enter_f;
-			sc->ext_cfg_exit_f = probe_addrs[i].ext_cfg_exit_f;
+			if (sc != NULL) {
+				sc->ext_cfg_enter_f = probe_addrs[i].ext_cfg_enter_f;
+				sc->ext_cfg_exit_f = probe_addrs[i].ext_cfg_exit_f;
+			}
 			error = BUS_PROBE_DEFAULT;
 			break;
 		} else
@@ -590,6 +637,21 @@ cleanup:
 	return (error);
 }
 
+static void
+wb_identify(driver_t *driver, device_t parent)
+{
+	device_t dev;
+
+	if ((dev = device_find_child(parent, driver->name, 0)) == NULL) {
+		if (wb_probe_enable(dev, 1) != BUS_PROBE_DEFAULT) {
+			if (bootverbose)
+				device_printf(dev, "can not find compatible Winbond chip.\n");
+		} else
+			dev = BUS_ADD_CHILD(parent, 0, driver->name, 0);
+		return;
+	}
+}
+
 static int
 wb_probe(device_t dev)
 {
@@ -619,20 +681,20 @@ wb_attach(device_t dev)
 	    ("%s: successfull probe result but not setup correctly", __func__));
 
 	/* Watchdog is configured as part of LDN 8 (GPIO Port2, Watchdog). */
-	write_efir_1(sc, WB_LDN_REG);
-	write_efdr_1(sc, WB_LDN_REG_LDN8);
+	write_efir_1(sc, 0, WB_LDN_REG);
+	write_efdr_1(sc, 0, WB_LDN_REG_LDN8);
 
 	/* Make sure LDN8 is enabled (Do we need to? Also affects GPIO). */
-	write_efir_1(sc, WB_LDN8_CR30);
-	write_efdr_1(sc, WB_LDN8_CR30_ACTIVE);
+	write_efir_1(sc, 0, WB_LDN8_CR30);
+	write_efdr_1(sc, 0, WB_LDN8_CR30_ACTIVE);
 
 	/* Read the current watchdog configuration. */
-	write_efir_1(sc, WB_LDN8_CRF5);
-	sc->reg_1 = read_efdr_1(sc);
-	write_efir_1(sc, WB_LDN8_CRF6);
-	sc->reg_timeout = read_efdr_1(sc);
-	write_efir_1(sc, WB_LDN8_CRF7);
-	sc->reg_2 = read_efdr_1(sc);
+	write_efir_1(sc, 0, WB_LDN8_CRF5);
+	sc->reg_1 = read_efdr_1(sc, 0);
+	write_efir_1(sc, 0, WB_LDN8_CRF6);
+	sc->reg_timeout = read_efdr_1(sc, 0);
+	write_efir_1(sc, 0, WB_LDN8_CRF7);
+	sc->reg_2 = read_efdr_1(sc, 0);
 
 	/* Print current state if bootverbose or watchdog already enabled. */
 	if (bootverbose || (sc->reg_timeout > 0x00))
@@ -644,12 +706,12 @@ wb_attach(device_t dev)
 	 */
 	sc->reg_1 &= ~(WB_LDN8_CRF5_KEYB_P20);
 	sc->reg_1 |= WB_LDN8_CRF5_KBRST;
-	write_efir_1(sc, WB_LDN8_CRF5);
-	write_efdr_1(sc, sc->reg_1);
+	write_efir_1(sc, 0, WB_LDN8_CRF5);
+	write_efdr_1(sc, 0, sc->reg_1);
 
 	sc->reg_2 &= ~WB_LDN8_CRF7_CLEAR_MASK;
-	write_efir_1(sc, WB_LDN8_CRF7);
-	write_efdr_1(sc, sc->reg_2);
+	write_efir_1(sc, 0, WB_LDN8_CRF7);
+	write_efdr_1(sc, 0, sc->reg_2);
 
 	/* Read global timeout override tunable, Add per device sysctls. */
 	if (TUNABLE_ULONG_FETCH("hw.wbwd.timeout_override", &timeout)) {
@@ -698,7 +760,7 @@ wb_detach(device_t dev)
 	wb_set_watchdog(sc, 0);
 
 	/* Disable extended function mode. */
-	(*sc->ext_cfg_exit_f)(sc);
+	(*sc->ext_cfg_exit_f)(sc, 0);
 
 	/* Cleanup resources. */
 	(void) bus_release_resource(dev, SYS_RES_IOPORT, sc->rid, sc->portres);
@@ -710,6 +772,7 @@ wb_detach(device_t dev)
 
 static device_method_t wb_methods[] = {
 	/* Device interface */
+	DEVMETHOD(device_identify,	wb_identify),
 	DEVMETHOD(device_probe,		wb_probe),
 	DEVMETHOD(device_attach,	wb_attach),
 	DEVMETHOD(device_detach,	wb_detach),

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 21:59:48 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 79CE7607;
 Fri, 28 Dec 2012 21:59:48 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5D1318FC08;
 Fri, 28 Dec 2012 21:59:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSLxmiB011634;
 Fri, 28 Dec 2012 21:59:48 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSLxmMi011633;
 Fri, 28 Dec 2012 21:59:48 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282159.qBSLxmMi011633@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 21:59:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244790 - head/sys/dev/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 21:59:48 -0000

Author: bapt
Date: Fri Dec 28 21:59:47 2012
New Revision: 244790
URL: http://svnweb.freebsd.org/changeset/base/244790

Log:
  Fix typo in comment.
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Fri Dec 28 21:49:40 2012	(r244789)
+++ head/sys/dev/ath/if_ath.c	Fri Dec 28 21:59:47 2012	(r244790)
@@ -5620,7 +5620,7 @@ ath_node_set_tim(struct ieee80211_node *
 	struct ath_vap *avp = ATH_VAP(ni->ni_vap);
 
 	/*
-	 * Some operating omdes don't set av_set_tim(), so don't
+	 * Some operating modes don't set av_set_tim(), so don't
 	 * update it here.
 	 */
 	if (avp->av_set_tim == NULL)

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 22:06:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 13EC4988;
 Fri, 28 Dec 2012 22:06:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDB7C8FC0A;
 Fri, 28 Dec 2012 22:06:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSM6XFc012938;
 Fri, 28 Dec 2012 22:06:33 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSM6XMq012937;
 Fri, 28 Dec 2012 22:06:33 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212282206.qBSM6XMq012937@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 28 Dec 2012 22:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244791 - head/bin/ln
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 22:06:34 -0000

Author: gjb (doc,ports committer)
Date: Fri Dec 28 22:06:33 2012
New Revision: 244791
URL: http://svnweb.freebsd.org/changeset/base/244791

Log:
  Fix wording nit.
  
  PR:		174787
  Submitted by:	Cody Rank
  MFC after:	3 days

Modified:
  head/bin/ln/ln.1

Modified: head/bin/ln/ln.1
==============================================================================
--- head/bin/ln/ln.1	Fri Dec 28 21:59:47 2012	(r244790)
+++ head/bin/ln/ln.1	Fri Dec 28 22:06:33 2012	(r244791)
@@ -291,7 +291,7 @@ implementations.
 .Pp
 The
 .Fl F
-option is
+option is a
 .Fx
 extension and should not be used in portable scripts.
 .Sh SEE ALSO

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 22:06:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DC6B6AF3;
 Fri, 28 Dec 2012 22:06:50 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C06688FC14;
 Fri, 28 Dec 2012 22:06:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSM6o3v013020;
 Fri, 28 Dec 2012 22:06:50 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSM6ofg013019;
 Fri, 28 Dec 2012 22:06:50 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201212282206.qBSM6ofg013019@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 28 Dec 2012 22:06:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244792 - head/contrib/gcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 22:06:50 -0000

Author: pfg
Date: Fri Dec 28 22:06:50 2012
New Revision: 244792
URL: http://svnweb.freebsd.org/changeset/base/244792

Log:
  gcc: avoid generating negative values to DW_AT_byte_size.
  
  The previous change was actually a NOP because size is
  unsigned and compilers are dumb.
  
  Submitted by:	Christoph Mallon
  MFC after:	1 week

Modified:
  head/contrib/gcc/dwarf2out.c

Modified: head/contrib/gcc/dwarf2out.c
==============================================================================
--- head/contrib/gcc/dwarf2out.c	Fri Dec 28 22:06:33 2012	(r244791)
+++ head/contrib/gcc/dwarf2out.c	Fri Dec 28 22:06:50 2012	(r244792)
@@ -10814,7 +10814,7 @@ add_byte_size_attribute (dw_die_ref die,
      indicates that the byte size of the entity in question is variable.  We
      have no good way of expressing this fact in Dwarf at the present time.
      GCC/35998: Avoid passing negative sizes to Dtrace and gdb.  */
-  add_AT_unsigned (die, DW_AT_byte_size, (size > 0 ? size : 0));
+  add_AT_unsigned (die, DW_AT_byte_size, (size != (unsigned)-1 ? size : 0));
 }
 
 /* For a FIELD_DECL node which represents a bit-field, output an attribute

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 23:08:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BE9CFD08;
 Fri, 28 Dec 2012 23:08:31 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A1FB98FC0A;
 Fri, 28 Dec 2012 23:08:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSN8VjO022991;
 Fri, 28 Dec 2012 23:08:31 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSN8Vk5022988;
 Fri, 28 Dec 2012 23:08:31 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201212282308.qBSN8Vk5022988@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 28 Dec 2012 23:08:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244795 - in head/sys: kern sys ufs/ffs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 23:08:31 -0000

Author: kib
Date: Fri Dec 28 23:08:30 2012
New Revision: 244795
URL: http://svnweb.freebsd.org/changeset/base/244795

Log:
  Make it possible to atomically resume writes on the mount and account
  the write start, by adding a variation of the vfs_write_resume(9)
  which accepts flags.
  
  Use the new function to prevent a deadlock between parallel suspension
  and snapshotting a UFS mount.  The ffs_snapshot() code performed
  vfs_write_resume() followed by vn_start_write() while owning the
  snaplock.  If the suspension intervene between resume and
  vn_start_write(), the deadlock occured after the suspending thread
  tried to lock the snaplock, most typically during the write in the
  ffs_copyonwrite().
  
  Reported and tested by:	Andreas Longwitz <longwitz@incore.de>
  Reviewed by:	mckusick
  MFC after:	2 weeks
  X-MFC-note:	make the vfs_write_resume(9) function a macro after the MFC,
  	in HEAD

Modified:
  head/sys/kern/vfs_vnops.c
  head/sys/sys/vnode.h
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/kern/vfs_vnops.c
==============================================================================
--- head/sys/kern/vfs_vnops.c	Fri Dec 28 22:21:25 2012	(r244794)
+++ head/sys/kern/vfs_vnops.c	Fri Dec 28 23:08:30 2012	(r244795)
@@ -1434,6 +1434,40 @@ vn_closefile(fp, td)
  * proceed. If a suspend request is in progress, we wait until the
  * suspension is over, and then proceed.
  */
+static int
+vn_start_write_locked(struct mount *mp, int flags)
+{
+	int error;
+
+	mtx_assert(MNT_MTX(mp), MA_OWNED);
+	error = 0;
+
+	/*
+	 * Check on status of suspension.
+	 */
+	if ((curthread->td_pflags & TDP_IGNSUSP) == 0 ||
+	    mp->mnt_susp_owner != curthread) {
+		while ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0) {
+			if (flags & V_NOWAIT) {
+				error = EWOULDBLOCK;
+				goto unlock;
+			}
+			error = msleep(&mp->mnt_flag, MNT_MTX(mp),
+			    (PUSER - 1) | (flags & PCATCH), "suspfs", 0);
+			if (error)
+				goto unlock;
+		}
+	}
+	if (flags & V_XSLEEP)
+		goto unlock;
+	mp->mnt_writeopcount++;
+unlock:
+	if (error != 0 || (flags & V_XSLEEP) != 0)
+		MNT_REL(mp);
+	MNT_IUNLOCK(mp);
+	return (error);
+}
+
 int
 vn_start_write(vp, mpp, flags)
 	struct vnode *vp;
@@ -1470,30 +1504,7 @@ vn_start_write(vp, mpp, flags)
 	if (vp == NULL)
 		MNT_REF(mp);
 
-	/*
-	 * Check on status of suspension.
-	 */
-	if ((curthread->td_pflags & TDP_IGNSUSP) == 0 ||
-	    mp->mnt_susp_owner != curthread) {
-		while ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0) {
-			if (flags & V_NOWAIT) {
-				error = EWOULDBLOCK;
-				goto unlock;
-			}
-			error = msleep(&mp->mnt_flag, MNT_MTX(mp),
-			    (PUSER - 1) | (flags & PCATCH), "suspfs", 0);
-			if (error)
-				goto unlock;
-		}
-	}
-	if (flags & V_XSLEEP)
-		goto unlock;
-	mp->mnt_writeopcount++;
-unlock:
-	if (error != 0 || (flags & V_XSLEEP) != 0)
-		MNT_REL(mp);
-	MNT_IUNLOCK(mp);
-	return (error);
+	return (vn_start_write_locked(mp, flags));
 }
 
 /*
@@ -1639,8 +1650,7 @@ vfs_write_suspend(mp)
  * Request a filesystem to resume write operations.
  */
 void
-vfs_write_resume(mp)
-	struct mount *mp;
+vfs_write_resume_flags(struct mount *mp, int flags)
 {
 
 	MNT_ILOCK(mp);
@@ -1652,10 +1662,25 @@ vfs_write_resume(mp)
 		wakeup(&mp->mnt_writeopcount);
 		wakeup(&mp->mnt_flag);
 		curthread->td_pflags &= ~TDP_IGNSUSP;
+		if ((flags & VR_START_WRITE) != 0) {
+			MNT_REF(mp);
+			mp->mnt_writeopcount++;
+		}
 		MNT_IUNLOCK(mp);
 		VFS_SUSP_CLEAN(mp);
-	} else
+	} else if ((flags & VR_START_WRITE) != 0) {
+		MNT_REF(mp);
+		vn_start_write_locked(mp, 0);
+	} else {
 		MNT_IUNLOCK(mp);
+	}
+}
+
+void
+vfs_write_resume(struct mount *mp)
+{
+
+	vfs_write_resume_flags(mp, 0);
 }
 
 /*

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Fri Dec 28 22:21:25 2012	(r244794)
+++ head/sys/sys/vnode.h	Fri Dec 28 23:08:30 2012	(r244795)
@@ -392,6 +392,8 @@ extern int		vttoif_tab[];
 #define	V_NOWAIT	0x0002	/* vn_start_write: don't sleep for suspend */
 #define	V_XSLEEP	0x0004	/* vn_start_write: just return after sleep */
 
+#define	VR_START_WRITE	0x0001	/* vfs_write_resume: start write atomically */
+
 #define	VREF(vp)	vref(vp)
 
 #ifdef DIAGNOSTIC
@@ -701,6 +703,7 @@ int	vn_io_fault_uiomove(char *data, int 
 int	vfs_cache_lookup(struct vop_lookup_args *ap);
 void	vfs_timestamp(struct timespec *);
 void	vfs_write_resume(struct mount *mp);
+void	vfs_write_resume_flags(struct mount *mp, int flags);
 int	vfs_write_suspend(struct mount *mp);
 int	vop_stdbmap(struct vop_bmap_args *);
 int	vop_stdfsync(struct vop_fsync_args *);

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- head/sys/ufs/ffs/ffs_snapshot.c	Fri Dec 28 22:21:25 2012	(r244794)
+++ head/sys/ufs/ffs/ffs_snapshot.c	Fri Dec 28 23:08:30 2012	(r244795)
@@ -687,8 +687,7 @@ out1:
 	/*
 	 * Resume operation on filesystem.
 	 */
-	vfs_write_resume(vp->v_mount);
-	vn_start_write(NULL, &wrtmp, V_WAIT);
+	vfs_write_resume_flags(vp->v_mount, VR_START_WRITE);
 	if (collectsnapstats && starttime.tv_sec > 0) {
 		nanotime(&endtime);
 		timespecsub(&endtime, &starttime);

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 23:21:55 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F29242B8;
 Fri, 28 Dec 2012 23:21:54 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D69A98FC12;
 Fri, 28 Dec 2012 23:21:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSNLsGW025270;
 Fri, 28 Dec 2012 23:21:54 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSNLscB025269;
 Fri, 28 Dec 2012 23:21:54 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212282321.qBSNLscB025269@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Dec 2012 23:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244796 - head/share/man/man4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 23:21:55 -0000

Author: delphij
Date: Fri Dec 28 23:21:54 2012
New Revision: 244796
URL: http://svnweb.freebsd.org/changeset/base/244796

Log:
  It's no longer necessary to explicitly specify isa bus.
  
  MFC after:	2 weeks

Modified:
  head/share/man/man4/wbwd.4

Modified: head/share/man/man4/wbwd.4
==============================================================================
--- head/share/man/man4/wbwd.4	Fri Dec 28 23:08:30 2012	(r244795)
+++ head/share/man/man4/wbwd.4	Fri Dec 28 23:21:54 2012	(r244796)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2012
+.Dd December 28, 2012
 .Dt WBWD 4
 .Os
 .Sh NAME
@@ -44,10 +44,6 @@ line in
 .Bd -literal -offset indent
 wbwd_load="YES"
 .Ed
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.wbwd.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 23:27:18 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 092624DD;
 Fri, 28 Dec 2012 23:27:18 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DF0C78FC08;
 Fri, 28 Dec 2012 23:27:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSNRHtv025998;
 Fri, 28 Dec 2012 23:27:17 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSNRHvQ025997;
 Fri, 28 Dec 2012 23:27:17 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212282327.qBSNRHvQ025997@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Fri, 28 Dec 2012 23:27:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244797 - head/usr.sbin/bsdconfig/networking/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 23:27:18 -0000

Author: dteske
Date: Fri Dec 28 23:27:17 2012
New Revision: 244797
URL: http://svnweb.freebsd.org/changeset/base/244797

Log:
  Fix incorrect function name. s/[[:<:]]dialog_clear/f_&/

Modified:
  head/usr.sbin/bsdconfig/networking/share/hostname.subr

Modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/hostname.subr	Fri Dec 28 23:21:54 2012	(r244796)
+++ head/usr.sbin/bsdconfig/networking/share/hostname.subr	Fri Dec 28 23:27:17 2012	(r244797)
@@ -190,7 +190,7 @@ f_dialog_input_hostname()
 	# the stored configuration (in rc.conf(5)).
 	#
 	if [ "$( hostname )" != "$( f_sysrc_get hostname )" ]; then
-		[ ! "$USE_XDIALOG" ] && dialog_clear
+		[ ! "$USE_XDIALOG" ] && f_dialog_clear
 
 		#
 		# If connected via ssh(1) and performing X11-Forwarding, don't

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 23:40:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 40FE47BB;
 Fri, 28 Dec 2012 23:40:14 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2583B8FC0C;
 Fri, 28 Dec 2012 23:40:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSNeEcd027754;
 Fri, 28 Dec 2012 23:40:14 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSNeDGP027753;
 Fri, 28 Dec 2012 23:40:14 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212282340.qBSNeDGP027753@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Fri, 28 Dec 2012 23:40:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244798 - head/usr.sbin/bsdconfig/networking/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 23:40:14 -0000

Author: dteske
Date: Fri Dec 28 23:40:13 2012
New Revision: 244798
URL: http://svnweb.freebsd.org/changeset/base/244798

Log:
  Whitespace.

Modified:
  head/usr.sbin/bsdconfig/networking/share/ipaddr.subr

Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Fri Dec 28 23:27:17 2012	(r244797)
+++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr	Fri Dec 28 23:40:13 2012	(r244798)
@@ -104,6 +104,7 @@ f_validate_ipaddr()
 		[ $noctets -eq 4 ] || exit 4
 	)
 }
+
 # f_dialog_iperror $error $ipaddr
 #
 # Display a msgbox with the appropriate error message for an error returned by

From owner-svn-src-head@FreeBSD.ORG  Fri Dec 28 23:49:18 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8DAA89F9;
 Fri, 28 Dec 2012 23:49:18 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 59ED88FC0C;
 Fri, 28 Dec 2012 23:49:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSNnIQI029048;
 Fri, 28 Dec 2012 23:49:18 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSNnILu029047;
 Fri, 28 Dec 2012 23:49:18 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212282349.qBSNnILu029047@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Fri, 28 Dec 2012 23:49:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244799 - head/usr.sbin/bsdconfig/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 23:49:18 -0000

Author: dteske
Date: Fri Dec 28 23:49:17 2012
New Revision: 244799
URL: http://svnweb.freebsd.org/changeset/base/244799

Log:
  Allow debug output to be logged to a file (set $debugFile to target pathname)
  or both stdout and a file (precede $debugFile pathname with a plus-sign, `+').

Modified:
  head/usr.sbin/bsdconfig/share/common.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr	Fri Dec 28 23:40:13 2012	(r244798)
+++ head/usr.sbin/bsdconfig/share/common.subr	Fri Dec 28 23:49:17 2012	(r244799)
@@ -72,7 +72,12 @@ f_dprintf()
 {
 	[ "$debug" ] || return $SUCCESS
 	local fmt="$1"; shift
+	case "$debugFile" in ""|+*)
 	printf "DEBUG: $fmt${fmt:+\n}" "$@" >&${TERMINAL_STDOUT_PASSTHRU:-1}
+	esac
+	[ "${debugFile#+}" ] &&
+		printf "DEBUG: $fmt${fmt:+\n}" "$@" >> "${debugFile#+}"
+	return $SUCCESS
 }
 
 # f_err $fmt [ $opts ... ]
@@ -517,6 +522,25 @@ eval exec $TERMINAL_STDERR_PASSTHRU\>\&2
 [ "$debug" ] && export debug
 
 #
+# Truncate the debug file upon initialization (now). Note that we will trim a
+# leading plus (`+') from the value of debugFile to support persistant meaning
+# that f_dprintf() should print both to standard output and $debugFile (minus
+# the leading plus, of course).
+#
+_debug_file="${debugFile#+}"
+if [ "$_debug_file" ]; then
+	if ( umask 022 && :> "$_debug_file" ); then
+		f_dprintf "Successfully initialized debugFile \`%s'" \
+		          "$_debug_file"
+	else
+		unset debugFile
+		f_dprintf "Unable to initialize debugFile \`%s'" \
+		          "$_debug_file"
+	fi
+fi
+unset _debug_file
+
+#
 # Log our operating environment for debugging purposes
 #
 f_dprintf "UNAME_S=[%s] UNAME_P=[%s] UNAME_R=[%s]" \

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 00:01:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6D7CFD3B;
 Sat, 29 Dec 2012 00:01:25 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 522DD8FC0C;
 Sat, 29 Dec 2012 00:01:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBT01P7n030930;
 Sat, 29 Dec 2012 00:01:25 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBT01PV3030929;
 Sat, 29 Dec 2012 00:01:25 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212290001.qBT01PV3030929@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 29 Dec 2012 00:01:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244801 - head/usr.sbin/bsdconfig/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 00:01:25 -0000

Author: dteske
Date: Sat Dec 29 00:01:24 2012
New Revision: 244801
URL: http://svnweb.freebsd.org/changeset/base/244801

Log:
  Add support for running without a controlling terminal (for example, when
  running as an rvalue to a pipe).

Modified:
  head/usr.sbin/bsdconfig/share/dialog.subr

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Fri Dec 28 23:52:46 2012	(r244800)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Sat Dec 29 00:01:24 2012	(r244801)
@@ -77,6 +77,11 @@ unset XDIALOG_INFOBOX_TIMEOUT
 #
 : ${DIALOG_SELF_INITIALIZE=1}
 
+#
+# Default terminal size (used if/when running without a controlling terminal)
+#
+: ${DEFAULT_TERMINAL_SIZE:=24 80}
+
 ############################################################ GENERIC FUNCTIONS
 
 # f_dialog_title [$new_title]
@@ -193,7 +198,8 @@ f_dialog_infobox_size()
 		max_size="$XDIALOG_MAXSIZE" # see CONFIGURATION
 	else
 		min_width=24
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 
 	local max_height="${max_size%%[$IFS]*}"
@@ -325,7 +331,8 @@ f_dialog_buttonbox_size()
 	if [ "$USE_XDIALOG" ]; then
 		max_size="$XDIALOG_MAXSIZE" # see CONFIGURATION
 	else
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 	local max_height="${max_size%%[$IFS]*}"
 	[ $height -le $max_height ] || height=$max_height
@@ -363,7 +370,8 @@ f_dialog_inputbox_size()
 		max_size="$XDIALOG_MAXSIZE" # see CONFIGURATION
 	else
 		min_width=24
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 	local max_height="${max_size%%[$IFS]*}"
 	local max_width="${max_size##*[$IFS]}"
@@ -521,7 +529,8 @@ f_dialog_menu_size()
 	else
 		min_width=24
 		min_rows=0
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 
 	local max_width="${max_size##*[$IFS]}"
@@ -603,7 +612,8 @@ f_dialog_menu_with_help_size()
 	else
 		min_width=24
 		min_rows=0
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 
 	local max_width="${max_size##*[$IFS]}"
@@ -702,7 +712,8 @@ f_dialog_radiolist_size()
 	else
 		min_width=24
 		min_rows=0
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 
 	local max_width="${max_size##*[$IFS]}"
@@ -788,7 +799,8 @@ f_dialog_calendar_size()
 	else
 		min_height=0
 		min_width=40
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 	local max_height="${max_size%%[$IFS]*}"
 	local max_width="${max_size##*[$IFS]}"
@@ -866,7 +878,8 @@ f_dialog_timebox_size()
 	else
 		min_height=0
 		min_width=20
-		max_size=$( stty size ) # usually "24 80"
+		max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		: ${max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 	local max_height="${max_size%%[$IFS]*}"
 	local max_width="${max_size##*[$IFS]}"

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 00:06:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4BDC3105;
 Sat, 29 Dec 2012 00:06:27 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3062E8FC0A;
 Sat, 29 Dec 2012 00:06:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBT06Rqa031870;
 Sat, 29 Dec 2012 00:06:27 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBT06Rba031869;
 Sat, 29 Dec 2012 00:06:27 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212290006.qBT06Rba031869@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 29 Dec 2012 00:06:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244802 - head/usr.sbin/bsdconfig/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 00:06:27 -0000

Author: dteske
Date: Sat Dec 29 00:06:26 2012
New Revision: 244802
URL: http://svnweb.freebsd.org/changeset/base/244802

Log:
  Add missing enforcement of height restriction after minor adjustment.

Modified:
  head/usr.sbin/bsdconfig/share/dialog.subr

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Sat Dec 29 00:01:24 2012	(r244801)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Sat Dec 29 00:06:26 2012	(r244802)
@@ -480,6 +480,7 @@ f_xdialog_2inputsbox_size()
 
 	# Add height for a second inputbox
 	height=$(( $height + 2 ))
+	[ $height -le $max_height ] || height=$max_height
 
 	#
 	# Bump width for second initial text (if not already at maximum width).

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 00:30:31 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1923A687;
 Sat, 29 Dec 2012 00:30:31 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EFAA58FC0C;
 Sat, 29 Dec 2012 00:30:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBT0UU3O035477;
 Sat, 29 Dec 2012 00:30:30 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBT0UUiB035476;
 Sat, 29 Dec 2012 00:30:30 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201212290030.qBT0UUiB035476@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 29 Dec 2012 00:30:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244804 - head/usr.sbin/bsdconfig/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 00:30:31 -0000

Author: dteske
Date: Sat Dec 29 00:30:30 2012
New Revision: 244804
URL: http://svnweb.freebsd.org/changeset/base/244804

Log:
  Comments.

Modified:
  head/usr.sbin/bsdconfig/share/dialog.subr

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Sat Dec 29 00:21:02 2012	(r244803)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Sat Dec 29 00:30:30 2012	(r244804)
@@ -938,7 +938,7 @@ f_dialog_clear()
 # f_dialog_info $info_text ...
 #
 # Throw up a dialog(1) infobox. The infobox remains until another dialog is
-# displayed or `dialog --clear' (or dialog_clear) is called.
+# displayed or `dialog --clear' (or f_dialog_clear) is called.
 #
 f_dialog_info()
 {
@@ -1494,6 +1494,9 @@ f_dialog_init()
 
 ############################################################ MAIN
 
+#
+# Self-initialize unless requested otherwise
+#
 f_dprintf "%s: DIALOG_SELF_INITIALIZE=[%s]" \
           dialog.subr "$DIALOG_SELF_INITIALIZE"
 case "$DIALOG_SELF_INITIALIZE" in

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 16:03:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AFC217E2;
 Sat, 29 Dec 2012 16:03:24 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 95B738FC0A;
 Sat, 29 Dec 2012 16:03:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTG3Ofe001874;
 Sat, 29 Dec 2012 16:03:24 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTG3Oh3001873;
 Sat, 29 Dec 2012 16:03:24 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201212291603.qBTG3Oh3001873@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 29 Dec 2012 16:03:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244822 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 16:03:24 -0000

Author: peter
Date: Sat Dec 29 16:03:23 2012
New Revision: 244822
URL: http://svnweb.freebsd.org/changeset/base/244822

Log:
  Test commit to make sure commit mail works after moving the server.
  
  Approved by:	core (implicit)

Modified:
  head/LOCKS

Modified: head/LOCKS
==============================================================================
--- head/LOCKS	Sat Dec 29 14:22:40 2012	(r244821)
+++ head/LOCKS	Sat Dec 29 16:03:23 2012	(r244822)
@@ -11,3 +11,4 @@ releng/4.*	Requires Security Officer app
 releng/5.*	Requires Security Officer approval.
 releng/6.*	Requires Security Officer approval.
 releng/7.*	Requires Security Officer approval.
+releng/8.*	Requires Security Officer approval.

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 19:57:53 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3820E1C7;
 Sat, 29 Dec 2012 19:57:53 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1B7968FC08;
 Sat, 29 Dec 2012 19:57:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTJvqGx038910;
 Sat, 29 Dec 2012 19:57:52 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTJvq6X038909;
 Sat, 29 Dec 2012 19:57:52 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Message-Id: <201212291957.qBTJvq6X038909@svn.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 29 Dec 2012 19:57:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244830 - head/etc/sendmail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 19:57:53 -0000

Author: gshapiro
Date: Sat Dec 29 19:57:52 2012
New Revision: 244830
URL: http://svnweb.freebsd.org/changeset/base/244830

Log:
  Add missing closing quote on commented out example
  
  PR:		bin/174108
  Obtained from:	Julian H. Stacey
  MFC after:	1 day

Modified:
  head/etc/sendmail/freebsd.mc

Modified: head/etc/sendmail/freebsd.mc
==============================================================================
--- head/etc/sendmail/freebsd.mc	Sat Dec 29 19:13:16 2012	(r244829)
+++ head/etc/sendmail/freebsd.mc	Sat Dec 29 19:57:52 2012	(r244830)
@@ -69,7 +69,7 @@ dnl http://www.google.com/Top/Computers/
 dnl Uncomment to activate your chosen DNS based blacklist
 dnl FEATURE(dnsbl, `dnsbl.example.com')
 dnl Alternatively, you can provide your own server and rejection message:
-dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'')
+dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
 
 dnl Dialup users should uncomment and define this appropriately
 dnl define(`SMART_HOST', `your.isp.mail.server')

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 20:30:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F1947BA9;
 Sat, 29 Dec 2012 20:30:50 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D32888FC08;
 Sat, 29 Dec 2012 20:30:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTKUour044365;
 Sat, 29 Dec 2012 20:30:50 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTKUk7w044332;
 Sat, 29 Dec 2012 20:30:46 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Message-Id: <201212292030.qBTKUk7w044332@svn.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 29 Dec 2012 20:30:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244833 - in head/contrib/sendmail: . cf cf/cf cf/feature
 cf/m4 doc/op include/libmilter include/sm libmilter libmilter/docs src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 20:30:51 -0000

Author: gshapiro
Date: Sat Dec 29 20:30:46 2012
New Revision: 244833
URL: http://svnweb.freebsd.org/changeset/base/244833

Log:
  Merge sendmail 8.14.6 to HEAD
  
  MFC after:	4 days

Modified:
  head/contrib/sendmail/LICENSE
  head/contrib/sendmail/PGPKEYS
  head/contrib/sendmail/RELEASE_NOTES
  head/contrib/sendmail/cf/README
  head/contrib/sendmail/cf/cf/submit.cf
  head/contrib/sendmail/cf/feature/ldap_routing.m4
  head/contrib/sendmail/cf/m4/proto.m4
  head/contrib/sendmail/cf/m4/version.m4
  head/contrib/sendmail/doc/op/op.me
  head/contrib/sendmail/include/libmilter/mfapi.h
  head/contrib/sendmail/include/sm/clock.h
  head/contrib/sendmail/include/sm/tailq.h
  head/contrib/sendmail/libmilter/Makefile.m4
  head/contrib/sendmail/libmilter/docs/api.html
  head/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
  head/contrib/sendmail/libmilter/docs/smfi_settimeout.html
  head/contrib/sendmail/libmilter/worker.c
  head/contrib/sendmail/src/Makefile.m4
  head/contrib/sendmail/src/TRACEFLAGS
  head/contrib/sendmail/src/collect.c
  head/contrib/sendmail/src/conf.c
  head/contrib/sendmail/src/daemon.c
  head/contrib/sendmail/src/deliver.c
  head/contrib/sendmail/src/headers.c
  head/contrib/sendmail/src/main.c
  head/contrib/sendmail/src/map.c
  head/contrib/sendmail/src/milter.c
  head/contrib/sendmail/src/parseaddr.c
  head/contrib/sendmail/src/queue.c
  head/contrib/sendmail/src/sasl.c
  head/contrib/sendmail/src/savemail.c
  head/contrib/sendmail/src/sendmail.h
  head/contrib/sendmail/src/srvrsmtp.c
  head/contrib/sendmail/src/stab.c
  head/contrib/sendmail/src/util.c
  head/contrib/sendmail/src/version.c
Directory Properties:
  head/contrib/sendmail/   (props changed)

Modified: head/contrib/sendmail/LICENSE
==============================================================================
--- head/contrib/sendmail/LICENSE	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/LICENSE	Sat Dec 29 20:30:46 2012	(r244833)
@@ -35,7 +35,7 @@ each of the following conditions is met:
    forth as paragraph 6 below, in the documentation and/or other materials
    provided with the distribution.  For the purposes of binary distribution
    the "Copyright Notice" refers to the following language:
-   "Copyright (c) 1998-2010 Sendmail, Inc.  All rights reserved."
+   "Copyright (c) 1998-2012 Sendmail, Inc.  All rights reserved."
 
 4. Neither the name of Sendmail, Inc. nor the University of California nor
    names of their contributors may be used to endorse or promote
@@ -78,4 +78,4 @@ each of the following conditions is met:
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-$Revision: 8.17 $, Last updated $Date: 2010/12/03 01:10:00 $, Document 139848.1	
+$Revision: 8.18 $, Last updated $Date: 2012/05/15 21:49:03 $, Document 139848.1	

Modified: head/contrib/sendmail/PGPKEYS
==============================================================================
--- head/contrib/sendmail/PGPKEYS	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/PGPKEYS	Sat Dec 29 20:30:46 2012	(r244833)
@@ -142,7 +142,149 @@ gpExpdV7qPrw9k01j5rod5PjZlG8zV0=
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
-pub  2048 A97884B0  2011-01-04  -------    RSA             Sign & Encrypt
+pub  2048 CEEEF43B   2011-12-14 -------    RSA             Sign & Encrypt
+fingerprint: CA7A 8F39 A241 9FFF B0A9  AB27 8E5A E9FB CEEE F43B
+uid  Sendmail Signing Key/2012 <sendmail@Sendmail.ORG>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (OpenBSD)
+
+mQENBE7pIE8BCACutGAvfg9rwfaVBRb6EKjcWABZUFsLt1yF+hzrhR6llVVAv/P9
+aYiSwJHYUSu/GfZ53HL12NhowhhmjkFt4MeIo67gmVmxlTkMVXrb+TROqr67f3H8
+pM/vCKMnc9iCBNXgv0QjeM4qr8gz+TIroxq3ip3RNcZXOMvSOEmflK3Ts56vhnMK
+nzWMlfIhKXmXG6o57Qb6pwYLcT9Sp1rrJaal/GnkwEScDmFv90jBIk/RWVao1NAG
+8sJruv4kLUTRwwddvd954/cC6S/3F3VNxisVXNEagNTaedTc+pBVXWv9yn2P4Jvm
+gSYzrvq3QP8PH8hJdtiWvgOnm2YkrZ+Xz37TABEBAAG0MVNlbmRtYWlsIFNpZ25p
+bmcgS2V5LzIwMTIgPHNlbmRtYWlsQFNlbmRtYWlsLk9SRz6JATkEEwECACMFAk7p
+IE8CGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRCOWun7zu70O4MSCACN
+dAjK+prDB6YdIQZdjn1rV0Ba8pWX0PSv2HY7wlduBlec5HOV1s0Yram6yOQwv6Uj
+Ns/3t/7+ikA5/HpvSHo5uuxKLjL+duprCUSQko8XlLVZCiKjpFyD/ZFsCBlbaVCc
+u2OjjJ2Kg1FRwijIJdZfers4fbm9Aa+gLcMqdtmSa+gI7mkpEJJWIz3rPHbIcYPe
+Hy2wMSSpk3eSQtU5JzA18vUhdVujzwcRvs925JOT6g3VZ7Qhf53QSo7IaoPPPEVT
+g3BW3iQKaXz94k4EDhODBL3g2Q7zYOhxceNnL23vNxs+yWPcyg645nrcsfcK9osM
+sHxlsh0zLl8dm6HnkUAxiQEcBBABAgAGBQJO6SCWAAoJEDmkx32peISwEUkH+wXg
+N4/NlcKJwRgmXRqiiADEI8L3otyWI/v2Yp/8nFCyxzhSH8p+4ggDNDgngPHJuV5l
+WGQuGr+UbqDAicIOPeyKD2/EAUFm41aN8ATN/KlAhxeW7iK4LxPWUlPLkfQu1Gng
+dj0vzaYMR7v5B8y3bg0yJCo3PlHIkWmYhEJmv5xajKLMpz3+K6igrjH8GzUfoMp3
+Q6VrIdvVd+E6/wm/qZw3xu0bXclip/YYDxOLvKF/vpVfiHiLpI3lBoGQig1keHOw
+0TD0ol3WwifqarwlMWdaLQCH41CnjMT01mkHd2ew78dAlfNkW4OiHxJd0AcQrqAO
+WgxFMOX9JowFlIeCjoSJARwEEAECAAYFAk7pIK8ACgkQYE378oVBCr4dwAf9GOKz
+d1CAGJgKtu3crfUvS6xBd66pFpsnGOm6xwjG+QSTIIRayev5i50LcYUr2LU0unnS
+ZsSwYQiZ27wC2l3Y4WFVSrViif1x4CoDSM9CGleh8FBdctzeUU9huQmBHftq0Q3j
+WzZSBoiDJBGT/Ug1rKiyN5J5eAufGIkSS/WQGvJaBirL0QtGBWSeHhTjpMKGp/ox
+dJ+zvT2ZsHxsCROaA64jceNQOt+jrTGt043ABxdUaF2Pqr4CC7myRIhrVWlkPfs0
+V1N3SSQJsx8MgWUD5OeJLuQ10HjZ0GgYvofOo+ysG8/SEz3ltwvDwJwkrGsjM8y0
+DFcqosySncFHOcijC4icBBABAgAGBQJO6SC0AAoJEBKJbpunfyQpqX0EAJH2pzz0
+Vp5gGBVhyuJ5NKQe8rC7m6oj4p/2OAVee/+6/3YEA8v6J43iuuoIMhNH8nHGJxhJ
+Xmh5Ho3RVgZE+G/Vyr63JwMZ/tMwaUX+Deh5czKW60A/bpX+CFAU7caqBZhbjNoq
+yVdN/3f356xIJk0CXgCfkYywRg+h+KtwD1xciJwEEAECAAYFAk7pILgACgkQ2Krw
+yvazBykUTAP/R4bhldibVY/6Q8ctxCA3DEnBK0d6qeA1kFydee3cu0fgBqrh70C0
+XFJIhuHW/bdkJdh41XYVWACANBY+1Uvt4GyoE+DB9Z779i2P4JG/bpl67D7/bjLg
+gLuO8zze0NiKlylEWPtO5o1CFGi0O13HbzjF1UxY16OdnKPK1KJA2ZOInAQQAQIA
+BgUCTukguwAKCRCXQwEYcJO4QctmA/0RRMOn5GA88kp70hF29HLMgB5zAw3ZjMC2
+p/pC/SiuPSzh9n8Fkode3qCeQ8Fm7z3UVrywV3373litYMcl+TG6Q3c14qo0BDIT
+H6EZUjP4Msoo2fAkMM6XrBdyLYSCKilJGsqDS25Ox2BuJGKIbMHFnJy4SR5rrIAB
+J1c/PIqNO4icBBABAgAGBQJO6SC/AAoJEB57s8ivlZYlILcD/j9DxcUcJbDeFDxj
+KsuQpN2cWU+KItF6hPWgP+n4VXokPzCWQOxKZ72BoERukQB0zVuogUbFrDwPIVjp
+bNK+n9A/CC+FvfBkm4nMBpnZRFRRaafcT3IwiqmWa21/hzvDqZI50NwBn7ev57sM
+rCtg4n5uiNejGwwTQCgff48bd7aZiJwEEAECAAYFAk7pIMQACgkQcKAkTR75klE/
+8gP9G7BjyxYUDg+2F+GrLQGZEq8ijpMK930o3Vc8O33zhZFQqqCuUX3RRvHSDzqL
+JI/7J5xIiAjWVo/8QyP7HKScLTiBV0r1iB6JTjVy/Y73GvInTi6y6jrlfpqg4lTw
+b375/8ijdG9uCH6go5F0PH1vPI+ibrwgLVgpx552edzRbkaInAQQAQIABgUCTukg
+xwAKCRDI1e0plfYXcVQYA/4svozwEiTmCvNGr22IOMqL1vr12sgzymIeISzjAXeR
+9/kxwyi9Ah5UX4orLwQqXzOB7IZ+SEN4WRo6dCO8QzMG6alx2A+gU/14j0jvPhxk
+jCtO+CBMoMc9lQ0yEpz0XIcO/FGJX3RUex8L4/mYyP4LTijseU8D8F3kqry/Iaxc
+qYicBBABAgAGBQJO6SDKAAoJECGD4bE5bweJAhoEAJYXG6BkWixVK8XZw6oNIs/b
+48oumiCgHxErlaT64QLQ/7qknzmJ+nF3VvkqHqxk0u+zQRf2+oOQlgAnFxwTBvAm
+E5Zf3bzqOGcq2aKyQpyaOi40+lIZTV3mpjB4fRtWCiF52TVdh8dtZ156CkjpOupb
+g7sKqV0h79X+x1FhiukYiJwEEAECAAYFAk7pINYACgkQiWliuGeMCgOx7wP9GXqz
+C9Q2JhgNA/jig8SqtIn2EVHqtvNv5OYuxrgh6Xiy/5ZoBfghDfZP46cffsSUFrI6
+QI17QEg9t0rUIdipXRn7S7sUfz99lKGqKMszCqvECdnfuwnsYBO73XF89MDgIAH8
+Clm06seRjSPwqxOY2BU9egBHsWg7sIEqbQCGY1iInAQQAQIABgUCTukg2QAKCRA4
+IttHzDdPLfRuA/40Mk8Q6uw8IfWxNZh9q/tOMIo2Qzy0QIpTx5CyuuzlA9qUgZ8f
+NpT9S7z78WLj+TuWoHrtFVRZaDkbMafT9VLDMPdveI62FI2z2mCaBHFGr3kOPo04
+xrRvwgdMCgbm/63fJl5264xfjS3b/iuNGAgOOcMPnV4WWdhBTmtTUXHVMoicBBAB
+AgAGBQJO6SDcAAoJEJwcveLjXFY1bVsD/1FkSDWMeet7ZGjLplUHbyudbTqqq2Lk
+tpBhOHANXvffJSLHVIcPiEIkUCtyCW1jsAWbNH5th/e08aNjNuHnA9sfoG+stlNc
+9pAyd2c8MMXpe4DP1osggEKLSCJf7u3xU7SUsM86n5r9s4pNiZldWmMqYKkWOtyk
+6HOWyaVeK7k4iJwEEAECAAYFAk7pIN8ACgkQb1KT2KObplUSQAQAqcAwuZnx+uZW
+pKiT/FYUs/vCC3XFrnJ0iK/Sv6ScQiDZ8cdTk96ipCSEpV1i7iaTDK5PhpNhP9p6
+HQgyWme/w0I3s4g//3SYH9fmSAjm9m/U8v3tJjs/mRQIr3HUXck3K7oC71jANnhH
+A0xlM2eT76EvN0ShnuZ0Ph5GL4umk/aInAQQAQIABgUCTukg4wAKCRDvWJZk1DLh
+nSDQA/9pE5yzmw/S5hPN2n1u8CpWtyi1cDT0rmEe5Oc2cmcgNj++rMi6hOtUKnoM
+y1A3GTkLiVnx9BhOAW4xGANRBTsuPfM7QOxBZKmDSsiH4Mgy+olbfW55Kgj1R4jF
+bFOj8vDrS6toBUeFDA0WB6kHCjhhkE+xLypYN+xTQGrTeLsMKoicBBABAgAGBQJO
+6SDmAAoJEMGcHSUS00YdIqYD/2mady6csrrS2myjDkom+r5P/LvA8fsGI5MyCRhQ
+Rv1eRL0QFgbnl0dWw4Q1AKAl3XB9GTYssWk7orbgxrO+4ciWIjC2Btnkq1hZtc5C
+boXvQXbX5vzW7xat7twh2lkhUi46x+qrIHrQ3vR3D9EbsuPDlxDqTg4v/u39xmFo
+yFabiJwEEAECAAYFAk7pIOkACgkQwCnKQBb0zOlxWwP/SNfpUlVER1Rj2uoy24J/
+7k26lBxc84uqVRq+fowz7EYB/knQ+aL40AUsypXpSnJesDjAmx2Eyuz2nBuFjws7
+UZt8v6ALFJbLP3MFrfeM/mD2hijGOeVuGsord4OaAZ/9isuToMZijcOW2Fgdyc7c
+HYPikO6FtNswXuKea2e4numIRgQQEQIABgUCTuo/DwAKCRAY9QOAJMJ4Amt/AKDv
+QsB9bhJOfhCzMonD4LYq3bpmHgCgoW9RYrPyb7iSD1tHx0hM4n0sA6CInAQQAQIA
+BgUCTuo/FgAKCRB8S2dtoA4VY0gwA/9LI9Kf/eXItmItIoCO51KmeG3w+twehwUp
+Mgc3RI5hxF0J11nSRInuwKS5hC6jO8QnpWMjrL57JmwK+VTjJje+zjigt3tJVO+Q
+rFdOE5Atla4yChjsXn++ffEI92ZFIhalYEEs5bWzOrBjcOQOkkZz84G3rHRbG49d
+m2N8iY9ndoicBBABAgAGBQJO6j8aAAoJENbgof5PvirdNqgEAK2oImfkowMelxfb
+WTLvHx2yX0vN56fpLgjAsZIcLKUJ8N9fm95vpG0Zz2J/KyXphTlcsJO/Hm+oHeos
+7mx/9MjXsO+tmDmU7kI+0PFxWmucZR6wBoMbPmZtuC/GqIk9wFeKGtkEgr2+En10
+hChgGqIvE5LsmlVfaD2R8jFNs2jOiEYEEBECAAYFAk7qPx8ACgkQIfnFvPdqm/U5
+AgCgxe+sFly6JTaO1N2EwjLVxI8ErvYAnAj8lhOAkBEqnzVpeSt8mNw+sywFiEYE
+EBECAAYFAk7qTvMACgkQCaeiStHlggd6IgCcCK5KjbY2e72mtDMne6VQwr2F/sAA
+n3hBsophnhJjLGxEfblJc0XihWcriJwEEAECAAYFAk7qXhgACgkQzx61AyIyegE+
++gP/blnJpgybp/4Swsrfqw5jnBzFzyvyOkQ2stAtmyCiEYJLhDQDZIYIc5viy4ay
+i5D6f4yAUUaA5/V4dWGv1aEDiO27GU5tzUuUnBmzz6KJcAN0kmkiSG4eMwdAcspI
+zZbGI16OpZVhO2N762Qfhf9yi6VQy7v5/b7FCqoHP1uAG3iInAQQAQIABgUCTutf
+5gAKCRBfHshviAyeVTu8A/9rWm+tqZTM2Nb5lWh4H8XAYXH24TdXY3dWpEIFYy8r
+vudLF/RhIx6UzMwMDiN7NEnb93ota78HQf6uRVIHBkCR8oHzhR7TCrSEC59IKGXL
+IONCbF9IQOR+Yc0rT/Gz3lN53flSorhs6LIfXDLiiGmlOi13BIEhDbJ2f1ZZyiR5
+gYkCHAQQAQIABgUCTuyeYAAKCRBQg+yIQOhvcUvTD/9RagF2zavJM9PX2aQ6C/s7
+BcjF77n1Vt++H4NJ6wpAkVxlfY1v+y8b21F668R9DhFYNLepSvrasDgc8XAdnn9H
+l/Mn66YVFyUDOYoTr96b/zk+GnBYPcFso/XkIBgmSOfNNs6n0WweR8QfDY4q0yHT
+2nUSUGre0Hxs4awA1/dMHlAumSS4p7nqc7+q3b7LXKaxqGUVoShsokoYF+bsj1X+
+dI7c9R3kt2LmVtof0POn1P9sNf/FZrE/eKDYP8wYyJhhonMZAnlbWHxxMJJevXdQ
+Bk6HF9UMx7R7a0cctZJQ013BIejGLZmR7kPZhLAyQabp6ILqJzNO3W+ckk+y6Z6/
+sqnC9bSEw21TDgk3q4+1wD/0Dqt+pddRtNyag1Ru3zFRYS6ok6g6smlrp/RVbpVg
+cdXWps39LX7+UI8XoUyNQgxIYQ2xd0eMpFtFrgLAllIU7cCpD6w7Q7B+/C4ZwjCn
+/Yt5jAtMsOJ121kfuUIAC4vnNwRYn0iGmkN86Ti7PSdR4rbn/5SpIU/FUUYwFNln
+Jwy0As/+DhuBXmtEdb/AMvI2n3P1rrTvcEYycfCqAXGNO98i8jCSVOzjml3PTQfz
+chhe8F74q/L3iOzFaS7FC2t/bZ9FaCWYJzMH6blSZ+yPK5x5KxedfQJo32c1oXnM
+N7BO+MXyq4iTddCaRuIIYohGBBARAgAGBQJO6l4HAAoJEDEZgFHPGk0sYBMAoPhW
+UodY6dFC+jbfua4wCm0SDxibAJ9cH0ocPU84mrTJUls6/05f5wKhiYkCHAQQAQIA
+BgUCTvCQGAAKCRBvD514lfyZ1JLkEACODPksw2LebOLPjzqnEihvaf4FUHwSKYQ6
+VSn6ojZdNz2L1FJK1qTBEsFXfmqe5GiweVKk1N+AeTHFYXKoSmBfU4SgAOT3Q6ti
+UHtyKuJhhzANUe0RjFT/LA1c2fOZrJYWkavqusA1nmOy6/AeCMjg44QIiSEF5ALJ
+UYZp4npkU8nzAatdzMMVseKEDqKrUfSe+YC9N/P6yCxLdYYidlyg4MYsNBT+f4kl
+mpJJk+RVi3AHKH5a+QShFJZMfHD6/rd2yOEq2DFAIO/wPIi4Emq1O96g4FBfwD9r
+6FyTqiNcz8Y1SJsVa+1ScSDBlM5JcOWKj+JCoox6a5qjyr34i4o/TNOesEVtXVVw
+bvSoikA2sQb5aVVTw0r0rGTy2V5ksN8rTXD8n5mGOKSVwQ88crHUI2JZkXapvWp3
+/jmwHUhjCZxBnOUUtnsILV7gB8ohCxLaTu2pt1obbHH8DPZ3kHBA6rrmyvyBM22U
+Xmx92/XjbtrTHGUzdzGrxrxZHISwaFtneVCCAHhTYgESzwNZr61rA6DrCn3mRR9N
+JuwZvhC0u42kGkC2ulEoAu/OgFjarmu/6dbgwYfvLAi3y7BAL+otrjjq5cJB8oQj
+C80N1LqLuWfsatMOlgk1annhh/i5RdXiOmlg1WbW9zh9jRM1Sha7d7BlkoJ2LJzQ
+ySc/sELhHIkBIgQTAQIADAUCTwWTigWDB4YfgAAKCRDvHmkz/z+rnHJyCACaELza
+3TxkZtLhZlJxxorWt/AHZS2Uui5BRU36+A7plALIdgIqH7cah47EK/kG/AJH9uiX
+Zd0cBM/QaigfSBVPdk+s9WBn1A9c7zAbUG5/VbR975g5txMhA5SC4LTVRIsw0Lau
+tFHnlWSXs3ga/11oxEsOvplayFeNDDlZHo7bqNsKmL7PjbAqKola3zSy+/ARIQ4P
+UpDEyAgUp/OAP0qZarzCQnZY884dzXcXMbaoyyYa8D2cDrrHFDAh5nlcv0jpRvGK
+ze6i1ONwoW77QajoaJaRE3DPSG3LahFSeZassN4540cA7r6oS3q1fUkL6yfbFbN2
+8tTIWWWkYsFtZT0TuQENBE7pIE8BCADSaPflswYkibLPKss2XiKNpvBF66rDLuv7
+Y2dIRic38H0gVjBeFbGowesobgnKgTIe+zFtAzS1tw170Gp5osZNg1fLhXZezA02
+wbBuPZ7QIh1/Kxum9mP1uiB7ZYx3cu48zB3Ajf3GjGdsn7o92gXx1P+y71N6QZ1g
+PtK2Wi871zT+J236LZUPhHfdG9zxsYKcGbPHWDI7iVlIl3/IU1kmQAjX74hbdLMN
+erE5kEHfYqwQRBXUx299e4kjYWmPQcQqCOiWve016KwyJ19FzYcJM3PbRf/UO0aX
++KoYEkQqDqj4UHJpL9V5/8I6evI5Bx6I+e0GC4RxXyYN+2XL+MHFABEBAAGJAR8E
+GAECAAkFAk7pIE8CGwwACgkQjlrp+87u9DsU7ggAkJ24CSgtqc2pWnQFGHAiyFHS
+iYfaGQbg1evtI7nLtk4Wyskabu3FRQRyFGxOUSoBx9H6MlBlbxjRrQljKU7b6WCy
+DSUcKW6IfcvKP5NXqArDnnBf1J454DRzip33CW3vKUROvgWPcxi+2wdj2yXcqM23
+nG/2klg4JJHEsvKH89fuu5wMf/gE/7opVpxm3G2tQw51rb0oNyCrReDHUnlvnWsZ
++7BKywQ6vFb9LrCWmnwuqOLkFqNQo4XB0HcHjGa3AY4+y/RXNuWNcL886FwD6R5G
+qrpfZZmSAqWA5sdTeBXeJTOCvPrRgvDQod1kpyVNQHn0VFR4dT8XDGk2TBgmtA==
+=qHzF
+-----END PGP PUBLIC KEY BLOCK-----
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
+pub  2048 A97884B0   2011-01-04 -------    RSA             Sign & Encrypt
 fingerprint: 5872 6218 A913 400D E660  3601 39A4 C77D A978 84B0
 uid  Sendmail Signing Key/2011 <sendmail@Sendmail.ORG>
 
@@ -251,7 +393,7 @@ KH6d5q94eHcPD56A4cYD275DIZzAYqRpwzmB9O84
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
-pub  2048 85410ABE  2010-02-19  -------    RSA             Sign
+pub  2048 85410ABE   2010-02-19 -------    RSA             Sign
 fingerprint: B175 9644 5303 5DCE DD7B  E919 604D FBF2 8541 0ABE
 uid  Sendmail Signing Key/2010 <sendmail@Sendmail.ORG>
 
@@ -1453,13 +1595,79 @@ aBteGdu18ACeNXYmxUhQN/ogZuSaBhd/51aBD8SI
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
+pub  2048 0x0C8B8333 2011-12-14 ---------- RSA             Sign & Encrypt
+f20    Fingerprint20 = B080 979F 4D04 3E19 D05A  369C 629E F8EE 0C8B 8333
+sub  2048 0x6763ED11 2011-12-14 ---------- RSA
+uid  Sendmail, Inc. Security Officer <security-officer@sendmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (Darwin)
+
+mQENBE7o89QBCADOc3//yYNlUk1zTEPaiskclluwz6o+kkKp+k2x/rGYm+UYHMl1
+w5B1sLs3greR7eGNBmE3Eftr94v/YZrDqcq4mBzQL4qoS+4Bvrjl9GEbAc7Ke08s
+ZG0QC5en6mdn0QY3ZSb98GTlImPjiGC0tVCBylJLeyvBSgUTSkkLmp4lsmH6aa2G
+IhTatCIV7I/mAB2lM/KyfwmTf2/q8GsyszC4dwVRUSwfkQDfS+dxc60Krf8GNDsj
+bPolwAQi+YWMb6renYV2pNA7n9A5nKAE0oq9pe43fv9Pvek+07JJ3YnP0nS2yS4P
+PVewsRhEYllEYSmYmEwwCb0682A3HIVZWkalABEBAAG0P1NlbmRtYWlsLCBJbmMu
+IFNlY3VyaXR5IE9mZmljZXIgPHNlY3VyaXR5LW9mZmljZXJAc2VuZG1haWwuY29t
+PokBOQQTAQIAIwUCTujz1AIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJ
+EGKe+O4Mi4Mz80MH/0h6qv/sca1mTjy8vYSRYZiIWyYXpuHFUlr31+wF3cBmwCI1
+4qHoRI6MWj4JBnwQq2bAzglgY7GvXXn6TYEFju3gCs6hlvlE8/1z7+Ku/LVsyiCh
+3T8tVAxBVeEandnJJgmOP7/dbLBq22/WI7tNi4UOmnqx9n2e2HpBSKk82a2+Z2Mi
+9yI6StgTn1osKWTXxyauVJkNKnsoOm/pfH0aR2BbK4K+XtW8B55diGmgKn7o5dN+
+2A+tHqPeioTRgTnzywoSniQ2qOkODKjpNr8UVPVOUFHcO4upT6CQa2hijp3f57ns
+GAJs9m/JJDSd8l98nbQZP7G4nZY6RK/NIEkWhECInAQQAQIABgUCTuj0XAAKCRDA
+KcpAFvTM6fG9A/9Z9GL5OlfyBYP7XKzFadtg7MReYdcA67DiYpkmiIKnJPSN0X4v
+H6Qr/mIjisAGm16UIMQTAIUPJCOm2et+55AA5INWiWrU4TKuCfOUJABMbdyvh5vI
+HmBmXdmVartyZj99fCDWOwai1cpm+KQMWvO6FDopPAN+3xJiumIQ6KfO0YkBHAQQ
+AQIABgUCTuj0fwAKCRA5pMd9qXiEsL51B/0QR4xgoCCaTzTYKTDYwNanLBa+J+Gm
+wO7qU6jK6nnLT1TNyMoElCziVh+rGLELD3Nfw64p0ZG8F4bIJhVLTCpipmXsXnGj
+86FrPXV2l/jglNIRv7CD12dBKuYN9AkGJz1Wt6NnaENu9GBciUyIkpVCpSEYTgD2
+jRhkyCqqOSGVj93ze39VPzw6xAGUEQl7+uVUm09lkONDHq4TDr3QcdpyfwntYKib
+DfbwmamVwYias6cMxjxT9GPH2Fu0LF9564CGxW3/AUbr9s/Ze85cysAo9JrIHzAL
+M9akedEg9Y/VVKH3d634OOXqRuddPjajDcohRZSg9PSrXRquvONR7LjIiJwEEAEC
+AAYFAk7pOe0ACgkQzx61AyIyegG9DgQAs6RL4lY2LGaSWrMIHMmsHXEkUT4SNP9n
+J8YFAqzhR88dEMC7s6OeCVGniAPnou07pHAez+hNqOvvqJ0HSsJAMaH7IaQKGvCM
+6+/VDTBnOJz56r2yVlWqbeTwGKuwwK+nIn4Pdm1DogsN3YMsdfbP4gCcK86mCMef
+aEbs75MGJOKIRgQQEQIABgUCTuo+sQAKCRAY9QOAJMJ4Ap/6AJ0W+lZpo0/ttlwI
+CCfzyaABwLCRggCg3lKOKjbw52dM/fGQkuVv6VX/OrGInAQQAQIABgUCTuo+uwAK
+CRB8S2dtoA4VYwPBA/9A7rXUPQep6yGORpF6KbIGUMNeotPkZp0FES5XbnGFAPJl
+P6qUDbM9sPyupk3b+askqHanusmMXQsyKcbTsFzLgoRPU8gjkquEhrwnpWAOz85N
+vvHNCNSo7U6Qnyo8B42wXOtumaOTWpko2PC/SkGh4dYA6J2LEftmkVRqZgA6xIic
+BBABAgAGBQJO6j7CAAoJENbgof5PvirdnkQD/i8GBLaY97zgOXuoilxq3mQK0cn6
+TWIorrG2J9f1JZGZX6K3mv2G3KsjGs4cXzaFkp2hgD9yqTO/+BBQg0+OiCNxvs+l
+zrkP7yIXk7uiUxMMHkXaKwxDUuQbf4V72LJqr5eLZiWNwuWJ2VdsVYoS9/gT4enw
+YkZr2hdH/07k4TpDiEYEEBECAAYFAk7qPsgACgkQIfnFvPdqm/XkBQCgjDEuvinF
+5lcGIWrERV4wqrgF+JMAoNbS0PaMoXJrVZYHIHhKxHABLP1ZiQEcBBABAgAGBQJO
+6j7NAAoJEI5a6fvO7vQ7g8QIAI9j2FkhUN7J6Wk42i/z9vSXCcbXwOnntq8awUz+
+se7Bw1eSLmJs3oxWlL2vhHJVEbvNejh1lReRKDHb6vXZ+YkN/f8TXsj/q+mbCHe9
+NisN5a3BTawAgzVE/E3XvGneQVY1cgC8As8ZoYfRRTdtsEHdicYoCjHWMw1LXfo3
++hBMsQNvsU1tuPQXjU/qsalfP9qRJe9OVNLo3fkxFSAcalNibB5PS86tyAes+T0k
+/5LT30nbeX6ZfY98qDIoRGj7dBWpu73oi4aS713iy0AIyy/Kip5AERtGv+B0llTC
+Y21AY0K2JXJGAS7IfVw2BrvbBZevzXe0AursqiLGMZ9Nokm5AQ0ETujz1AEIAM++
+iXuJkoVVvgEb7gxUbJurVDaedOjKVM2pHLuOorQBYI+gQYOZh+r7ZX3PpIGyoLWZ
+dlpwEhrEsd/2+TY3nMPzkcfW1D+wkP6MIuD+Y8y1efNeBC7IzNnS5gG3+IItgzEX
+Fuql/MMkwQ2xOybYvjzFB5I5cWEkGv1S2xp6uQvIhlD5bWT9R8/1A+9ZZYcP2Ozq
+IWQKeBljDEolz7rTd04UgfQK6ROMNYQghTwWZxmBjsdBa7jtWlfjssqngLiuxP5N
+XQVwN/vUEbryMfNNS4Stz7/ZrbCwtu9bHfx7sLn7fpcgJso14e42+PAXfnuoXtGm
+32o4yUdJPMqwFIMnLS8AEQEAAYkBHwQYAQIACQUCTujz1AIbDAAKCRBinvjuDIuD
+MxdPB/91RSXgG8IQDsOroKYNiZbeEHC75vxP3Rl0XOxU3IsN0mzz4ZjS7khLC1Pa
+ATCIkx3GwNTjvJkiePpc4knc3ZlKx9fKJz0a+pt0ideMmzYwdcX3enG+Z6z0hEL3
+GJzNC6v7WnV0DsSp7hcT8l9hnqY6HkV497jJG8ztGK3KH943/6YL90RlXqaoRTgq
++bSXhbxHueImhjyYUrmJFTZ0ElSAcuVtJpCHnAEouTQAtshzyUnDXwgoQk9extth
+Sn/xUlHB9VGWBAXlq6qJcx2jqWGrmRfz8gMBAwfLTUyNNeixt3TReTtos/HaZK3X
+G09zJuZGoDdC9KhhogEVj4Ow+ydV
+=qF87
+-----END PGP PUBLIC KEY BLOCK-----
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
 pub  1024 0xA0F8AA0C 2006-03-17 ---------- DSA             Sign & Encrypt
 f20    Fingerprint20 = 770E 4AC8 8A97 B69E 6E75  0605 1043 2518 A0F8 AA0C
 sub  2048 0x6E613854 2006-03-17 ---------- Diffie-Hellman
-uid  Sendmail, Inc. Security Officer <security-officer@sendmail.com>
+uid  Sendmail, Inc. Security Officer <security-officer@sendmail.com> [REVOKED]
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.4 (Darwin)
+Version: GnuPG v1.4.11 (Darwin)
 
 mQGiBEQbQzgRBAC7QmIW2r0oJ9Ixk1ewPxfwN1CU15k2ORBzRVIcO1UcLm6I5t3Z
 Gorbj22J8xNyY67yQ3pi5O+pffl5LujEKTco3D3sHhHnpz8vIaBiLyVUG3dCHZwU
@@ -1469,42 +1677,50 @@ LuhwZsvHbzie42JoroT/WI713JU3z1LrcwBYPxQG
 kqbog8zz7lZKD7PwRIduicPlXVft063DbABwTIi7YGv8xFnLt9vIix2gSco766KY
 rjPOA/9dlGIXq2HP6BGqYtZE6A6RwL2ujAXfene8hYLaMg8t52XyHvJDeay3siKy
 EhXt2tn+CyheTzKHXE7WdYGVIZq8OUBoJy/6eaL/paVbzw0SlhCuXNEP6J8SQClA
-rXDAwbl2SODl9T9eVUUbm7bQxdD942qCv+jhvBzAJrrHmZ0KPbQ/U2VuZG1haWws
-IEluYy4gU2VjdXJpdHkgT2ZmaWNlciA8c2VjdXJpdHktb2ZmaWNlckBzZW5kbWFp
-bC5jb20+iGEEExECACEFAkQbQzgCGwMHCwkIBwMCAQQVAggDBBYCAwECHgECF4AA
-CgkQEEMlGKD4qgwt0QCdHD2sFnc1cKILKClUR2Ad3x+OyysAoMTKNOPxq/burquo
-qt0rN8QnPkctiEYEEBECAAYFAkQbS9wACgkQGPUDgCTCeAKDiwCfae3NkBOnjSBa
-6E6ftmrDbzQYC9YAoN2Z8jaq1kM2pXmC0s/QTIIsPc3iiJwEEAECAAYFAkQbS+sA
-CgkQfEtnbaAOFWNKEQQAgIKzIX/EvAj4BaG13i3EYdvcSG0mfYsV4NVIdrDPnV3U
-mgbGBskgjkUyWHlUTJZ/AExcYyuTQNuivkH8pQKsXNUpm020PXvJg7t0/ZKTTv0t
-Xyz2OT3OLKhw1O+qUOOrkxgSpfg7UgQLTbZ0Ol1faP8iSTM5649rAOpqbPi8tneI
-nAQQAQIABgUCRBtL9QAKCRDAKcpAFvTM6cCsA/45MgCAYIr08/GKnFlBTZhAXQ6p
-ZvV4OCdtgMIwcJXJtB2E+HSjOsn9Ismyy9n19Z5j961oGwyfZ/uYoRp1Q5rMEs/s
-DmFyq0TAl3vRoblwuOKtOp2bvGah/TzdkMztMrftErM9MhddQDEIoS3PQ0QkSODR
-Ci/m8eMtGLPX/m+Fu4icBBABAgAGBQJEG0wEAAoJENbgof5PvirdmR0EAJNHIszZ
-ZnGx7jqUB2+tRLCsLctrm8Hpeltc2XkMeT0nx3K8XSDs/cigdQqTHq5oD2P/6Vp9
-e8X2UE/RfEhCDre9ADnSWzqASRtXktDVnFZZHuYnXl1d74bqS5RlWpbQUJ5VjAFu
-ZaB1nhFRcRWuhl8UIqN9OKygtUAgzlR/FfiziEYEEBECAAYFAkQbTBwACgkQIfnF
-vPdqm/XFxgCg8x357MlaxcLbnsbKZFN26nLDBqQAnAxqbkNoRKqF+IRV9aMBz0vS
-t+baiJwEEAECAAYFAkQbTCgACgkQHnuzyK+VliXMAAP+NGQ+3rPnGHUyT02C5K9k
-suqWt+7q0ZWHR3NP66H1XQCqrEUXqmcWtZpd0xTY8XWcyEzYntXje3epQMnA6/52
-ohFNehiGQG4FENsusTzu7+GNdpSqYTPcdUrUp6zOc3o5C30q+Y1tvBtyYlfeQSvH
-3x47Ai8PrnVmHjJCltkGtgiIRgQTEQIABgUCRBtU7QAKCRAxGYBRzxpNLE6WAKCA
-CCj678P/8pn+vG9JpgQWQgV7zgCfQ5409UHS5itySiyQ/atuUOAG0Qi5Ag0ERBtD
-ThAIALL0nX9pRt5NDqi0wk1RIXAGPJCahPJ8h52CgAJUm/FAsmXdCIVHavpDKkHg
-vcF7dixtm+8Jo4vhakQol7XZZgU5BETcSgBjNcwBJhFxAuB+Km/TtiXMK5U+36NG
-SUS5EqR89vBiChth33KMvQZgQ/OfpmWk05lMhI0//o1sX+0QAGTbO9q7RGMf77V4
-CHJxLTU5ZYguSa+ILV9Gg4+KSLGHqk03LROn13K0cTEeWHWKRcoFtLrokmYqDd+F
-qYaATa+SVCeS8PYDQ45R1ZaXJ7N15fRg0XM4pKsY4KAEUH5Y1ZfadPFd0LyDf1vh
-yseogJQpJczvstUARjOQx7yD8J8AAwUH/19Tgj/HYEyBXKX9Awnb3nZWYGap3m25
-iA/bW//uUWKjYrc5oIT/qJ5QMcSBmyOAuclrf/VGSYQIRAOlpXmZQcjdnUuVDliS
-wP77T4duMkfNiNgq8RAnM7cVUEJplbtGI5EapHFO8q88yq2ol8/urZIz5Qc3Va6H
-LelvW1zhFAcp7lJRfuLAWq8Qa6f3Pm2uzScdaQIYrS+vmXXwbOqlygucnI8bBh0L
-YTAjQqsG8YHklvXlrjfEjSas3l5UO45a48DWiSTXGyr5TsevSgfR6yabSHa8nUKO
-gbGF4UU1f1Nn2xaasMRMiZER2uIo2Gs1zPwLleRwwVAjaUOWwRupx/6ISQQYEQIA
-CQUCRBtDTgIbDAAKCRAQQyUYoPiqDP5SAJ4i92Z+F9bPVoX27UZS8xcmFOaxwQCg
-3plWjAkK4jGDVnkcVv2eMGfTP20=
-=Ylc5
+rXDAwbl2SODl9T9eVUUbm7bQxdD942qCv+jhvBzAJrrHmZ0KPYhJBCARAgAJBQJE
+G1GyAh0DAAoJEBBDJRig+KoM86gAmgNUdUqrkiyji3OrzgzJOvvvGgPJAJ9mbH/M
+PYHevtf0D4/YGAWDKIEkNrQ/U2VuZG1haWwsIEluYy4gU2VjdXJpdHkgT2ZmaWNl
+ciA8c2VjdXJpdHktb2ZmaWNlckBzZW5kbWFpbC5jb20+iGEEExECACEFAkQbQzgC
+GwMHCwkIBwMCAQQVAggDBBYCAwECHgECF4AACgkQEEMlGKD4qgwt0QCdHD2sFnc1
+cKILKClUR2Ad3x+OyysAoMTKNOPxq/burquoqt0rN8QnPkctiEYEEBECAAYFAkQb
+S9wACgkQGPUDgCTCeAKDiwCfae3NkBOnjSBa6E6ftmrDbzQYC9YAoN2Z8jaq1kM2
+pXmC0s/QTIIsPc3iiJwEEAECAAYFAkQbS+sACgkQfEtnbaAOFWNKEQQAgIKzIX/E
+vAj4BaG13i3EYdvcSG0mfYsV4NVIdrDPnV3UmgbGBskgjkUyWHlUTJZ/AExcYyuT
+QNuivkH8pQKsXNUpm020PXvJg7t0/ZKTTv0tXyz2OT3OLKhw1O+qUOOrkxgSpfg7
+UgQLTbZ0Ol1faP8iSTM5649rAOpqbPi8tneInAQQAQIABgUCRBtL9QAKCRDAKcpA
+FvTM6cCsA/45MgCAYIr08/GKnFlBTZhAXQ6pZvV4OCdtgMIwcJXJtB2E+HSjOsn9
+Ismyy9n19Z5j961oGwyfZ/uYoRp1Q5rMEs/sDmFyq0TAl3vRoblwuOKtOp2bvGah
+/TzdkMztMrftErM9MhddQDEIoS3PQ0QkSODRCi/m8eMtGLPX/m+Fu4icBBABAgAG
+BQJEG0wEAAoJENbgof5PvirdmR0EAJNHIszZZnGx7jqUB2+tRLCsLctrm8Hpeltc
+2XkMeT0nx3K8XSDs/cigdQqTHq5oD2P/6Vp9e8X2UE/RfEhCDre9ADnSWzqASRtX
+ktDVnFZZHuYnXl1d74bqS5RlWpbQUJ5VjAFuZaB1nhFRcRWuhl8UIqN9OKygtUAg
+zlR/FfiziEYEEBECAAYFAkQbTBwACgkQIfnFvPdqm/XFxgCg8x357MlaxcLbnsbK
+ZFN26nLDBqQAnAxqbkNoRKqF+IRV9aMBz0vSt+baiJwEEAECAAYFAkQbTCgACgkQ
+HnuzyK+VliXMAAP+NGQ+3rPnGHUyT02C5K9ksuqWt+7q0ZWHR3NP66H1XQCqrEUX
+qmcWtZpd0xTY8XWcyEzYntXje3epQMnA6/52ohFNehiGQG4FENsusTzu7+GNdpSq
+YTPcdUrUp6zOc3o5C30q+Y1tvBtyYlfeQSvH3x47Ai8PrnVmHjJCltkGtgiIRgQT
+EQIABgUCRBtU7QAKCRAxGYBRzxpNLE6WAKCACCj678P/8pn+vG9JpgQWQgV7zgCf
+Q5409UHS5itySiyQ/atuUOAG0QiJASIEEAECAAwFAko7qxAFAwASdQAACgkQlxC4
+m8pXrXxfsAf+LBylo0S6W+hExP3s9jso7TJTM4hJGrVjRKZpVF/zj5Qk0Nocxo4D
+YitmT08e+iBZerO7OcYvy16uiaTBQ2PCSYoLhen2AMjkKp7EPG+TF1VBrp7jj5aZ
+GYROu8NZTKr28rCL8a2Ge+KrohjEeIJ80IZo7gSZRprQnO5LzDtBMp2T4HV6Gj4d
+g2aa4tDhTj2EiU3ZOQ/A9AbOYBKAqipxXdBR20HdeJU8looTv5p7jZloawgblXqv
+bvvSBXYGT7uJjx7tOl6yxPrjuu82PyauHI6bUUbrJcvuk9zd3mrvyS9OL9pTeR2A
+VDK3PfX3g9z0OzR7owHZT627T36Jogult7kCDQREG0NOEAgAsvSdf2lG3k0OqLTC
+TVEhcAY8kJqE8nyHnYKAAlSb8UCyZd0IhUdq+kMqQeC9wXt2LG2b7wmji+FqRCiX
+tdlmBTkERNxKAGM1zAEmEXEC4H4qb9O2JcwrlT7fo0ZJRLkSpHz28GIKG2Hfcoy9
+BmBD85+mZaTTmUyEjT/+jWxf7RAAZNs72rtEYx/vtXgIcnEtNTlliC5Jr4gtX0aD
+j4pIsYeqTTctE6fXcrRxMR5YdYpFygW0uuiSZioN34WphoBNr5JUJ5Lw9gNDjlHV
+lpcns3Xl9GDRczikqxjgoARQfljVl9p08V3QvIN/W+HKx6iAlCklzO+y1QBGM5DH
+vIPwnwADBQf/X1OCP8dgTIFcpf0DCdvedlZgZqnebbmID9tb/+5RYqNitzmghP+o
+nlAxxIGbI4C5yWt/9UZJhAhEA6WleZlByN2dS5UOWJLA/vtPh24yR82I2CrxECcz
+txVQQmmVu0YjkRqkcU7yrzzKraiXz+6tkjPlBzdVroct6W9bXOEUBynuUlF+4sBa
+rxBrp/c+ba7NJx1pAhitL6+ZdfBs6qXKC5ycjxsGHQthMCNCqwbxgeSW9eWuN8SN
+JqzeXlQ7jlrjwNaJJNcbKvlOx69KB9HrJptIdrydQo6BsYXhRTV/U2fbFpqwxEyJ
+kRHa4ijYazXM/AuV5HDBUCNpQ5bBG6nH/ohJBBgRAgAJBQJEG0NOAhsMAAoJEBBD
+JRig+KoM/lIAniL3Zn4X1s9WhfbtRlLzFyYU5rHBAKDemVaMCQriMYNWeRxW/Z4w
+Z9M/bQ==
+=nJIt
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
@@ -2082,4 +2298,4 @@ DnF3FZZEzV7oqPwC2jzv/1dD6GFhtgy0cnyoPGUJ
 =nES8
 -----END PGP PUBLIC KEY BLOCK-----
 
-$Revision: 8.36 $, Last updated $Date: 2011/01/28 21:17:54 $
+$Revision: 8.40 $, Last updated $Date: 2012/01/09 04:44:59 $

Modified: head/contrib/sendmail/RELEASE_NOTES
==============================================================================
--- head/contrib/sendmail/RELEASE_NOTES	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/RELEASE_NOTES	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,11 +1,60 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.1991 2011/05/15 04:28:16 ca Exp $
+      $Id: RELEASE_NOTES,v 8.2011 2012/12/21 18:42:16 ca Exp $
 
 
 This listing shows the version of the sendmail binary, the version
 of the sendmail configuration files, the date of release, and a
 summary of the changes in that release.
 
+8.14.6/8.14.6	2012/12/23
+	Fix a regression introduced in 8.14.5: if a server offers
+		two AUTH lines, the MTA would not read them after
+		STARTTLS has been used and hence SMTP AUTH for
+		the client side would fail.  Problem noted by Lena.
+	Do not cache hostnames internally in a non case sensitive way
+		as that may cause addresses to change from lower case
+		to upper case or vice versa. These header modifications
+		can cause problems with milters that rely on receiving
+		headers in the same way as they are being sent out such
+		as a DKIM signing milter.
+	If MaxQueueChildren is set then it was possible that new queue
+		runners could not be started anymore because an
+		internal counter was subject to a race condition.
+	If a milter decreases the timeout it waits for a communication
+		with the MTA, the MTA might experience a write() timeout.
+		In some situations, the resulting error might have been
+		ignored.  Problem noted by Werner Wiethege.
+		Note: decreasing the communication timeout in a milter
+		should not be done without considering the potential
+		problems.
+	smfi_setsymlist() now properly sets the list of macros for
+		the milter which invoked it, instead of a global
+		list for all milters.  Problem reported by
+		David Shrimpton of the University of Queensland.
+	If Timeout.resolver.retrans is set to a value larger than 20,
+		then resolver.retry was temporarily set to 0 for
+		gethostbyaddr() lookups. Now it is set to 1 instead.
+		Patch from Peter.
+	If sendmail could not lock the statistics file due to a system
+		error, and sendmail later sends a DSN for a mail that
+		triggered such an error, then sendmail tried to access
+		memory that was freed before (causing a crash on some
+		systems).  Problem reported by Ryan Stone.
+	Do not log negative values for size= nor pri= to avoid confusing
+		log parsers, instead limit the values to LONG_MAX.
+	Account for an API change in newer versions of Cyrus-SASL.
+		Patch from Hajimu UMEMOTO from FreeBSD.
+	Do not try to resolve link-local addresses for IPv4 (just as it
+		is done for IPv6).  Patch from John Beck of Oracle.
+	Improve logging of client and server STARTTLS connection failures
+		that may be due to incompatible cipher lists by including
+		the reason for the failure in a single log line.  Suggested
+		by James Carey of Boeing.
+	Portability:
+		Add support for Darwin 11.x and 12.x (Mac OS X 10.7 and 10.8).
+		Add support for SunOS 5.12 (aka Solaris 12). Patch from
+		John Beck of Oracle.
+
 8.14.5/8.14.5	2011/05/17
 	Do not cache SMTP extensions across connections as the cache
 		is based on hostname which may not be a unique identifier

Modified: head/contrib/sendmail/cf/README
==============================================================================
--- head/contrib/sendmail/cf/README	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/cf/README	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1144,7 +1144,7 @@ relay_hosts_only
 		For example, if you specify ``foo.com'', then mail to or
 		from foo.com, abc.foo.com, or a.very.deep.domain.foo.com
 		will all be accepted for relaying.  This feature changes
-		the behaviour to lookup individual host names only.
+		the behaviour to look up individual host names only.
 
 relay_based_on_MX
 		Turns on the ability to allow relaying based on the MX
@@ -2230,9 +2230,9 @@ command:
  FEATURE(`ldap_routing', <mailHost>, <mailRoutingAddress>, <bounce>,
 		 <detail>, <nodomain>, <tempfail>)
 
-where <mailHost> is a map definition describing how to lookup an alternative
+where <mailHost> is a map definition describing how to look up an alternative
 mail host for a particular address; <mailRoutingAddress> is a map definition
-describing how to lookup an alternative address for a particular address;
+describing how to look up an alternative address for a particular address;
 the <bounce> argument, if present and not the word "passthru", dictates
 that mail should be bounced if neither a mailHost nor mailRoutingAddress
 is found, if set to "sendertoo", the sender will be rejected if not
@@ -4701,4 +4701,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.727 $, Last updated $Date: 2009/05/07 23:46:17 $
+$Revision: 8.728 $, Last updated $Date: 2012/09/07 16:29:13 $

Modified: head/contrib/sendmail/cf/cf/submit.cf
==============================================================================
--- head/contrib/sendmail/cf/cf/submit.cf	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/cf/cf/submit.cf	Sat Dec 29 20:30:46 2012	(r244833)
@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@wiz.smi.sendmail.com on Sat May 14 21:31:14 PDT 2011
-##### in /extra/home/ca/sm-8.14.5/OpenSource/sendmail-8.14.5/cf/cf
+##### built by ca@wiz.smi.sendmail.com on Fri Dec 21 10:45:15 PST 2012
+##### in /extra/home/ca/sm-8.14.6/OpenSource/sendmail-8.14.6/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -35,7 +35,7 @@
 #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.744 2010/11/23 20:29:47 guenther Exp $  #####
+#####  $Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.14.5/Submit
+DZ8.14.6/Submit
 
 
 ###############
@@ -926,6 +926,8 @@ SParseLocal=98
 
 
 
+
+
 ######################################################################
 ###  CanonAddr --	Convert an address into a standard form for
 ###			relay checking.  Route address syntax is

Modified: head/contrib/sendmail/cf/feature/ldap_routing.m4
==============================================================================
--- head/contrib/sendmail/cf/feature/ldap_routing.m4	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/cf/feature/ldap_routing.m4	Sat Dec 29 20:30:46 2012	(r244833)
@@ -10,7 +10,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Id: ldap_routing.m4,v 8.18 2010/01/05 00:57:27 ca Exp $')
+VERSIONID(`$Id: ldap_routing.m4,v 8.20 2012/01/18 22:27:06 ca Exp $')
 divert(-1)
 
 # Check first two arguments.  If they aren't set, may need to warn in proto.m4

Modified: head/contrib/sendmail/cf/m4/proto.m4
==============================================================================
--- head/contrib/sendmail/cf/m4/proto.m4	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/cf/m4/proto.m4	Sat Dec 29 20:30:46 2012	(r244833)
@@ -13,7 +13,7 @@ divert(-1)
 #
 divert(0)
 
-VERSIONID(`$Id: proto.m4,v 8.744 2010/11/23 20:29:47 guenther Exp $')
+VERSIONID(`$Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL`'ifdef(`NO_VENDOR',`', `/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')')
@@ -1532,8 +1532,9 @@ R<?> <e s> <$+>			$#error $@ nouser $: "
 R<?> <$*> <$+>			$@ $2',
 `dnl
 # return the original address
-R<> <> <$+> <@ $+> <$*>		$@ $1')',
-`dnl')
+R<> <> <$+> <@ $+> <$*>		$@ $1')
+')
+
 
 ifelse(substr(confDELIVERY_MODE,0,1), `d', `errprint(`WARNING: Antispam rules not available in deferred delivery mode.
 ')')

Modified: head/contrib/sendmail/cf/m4/version.m4
==============================================================================
--- head/contrib/sendmail/cf/m4/version.m4	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/cf/m4/version.m4	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2011 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2012 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.214 2011/04/26 23:02:36 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.222 2012/12/19 05:11:43 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.14.5`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.14.6`'ifdef(`confCF_VERSION', `/confCF_VERSION')

Modified: head/contrib/sendmail/doc/op/op.me
==============================================================================
--- head/contrib/sendmail/doc/op/op.me	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/doc/op/op.me	Sat Dec 29 20:30:46 2012	(r244833)
@@ -9,7 +9,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: op.me,v 8.747 2010/05/08 04:18:27 ca Exp $
+.\"	$Id: op.me,v 8.749 2012/03/02 22:37:11 ca Exp $
 .\"
 .\" eqn op.me | pic | troff -me
 .\"
@@ -90,7 +90,7 @@ Sendmail, Inc.
 .de Ve
 Version \\$2
 ..
-.Ve $Revision: 8.747 $
+.Ve $Revision: 8.749 $
 .rm Ve
 .sp
 For Sendmail Version 8.14
@@ -5999,7 +5999,7 @@ mailer.
 .ip @
 Look up addresses in the user database.
 .ip %
-Do not attempt delivery on initial recipient of a message
+Do not attempt delivery on initial receipt of a message
 or on queue runs
 unless the queued message is selected
 using one of the -qI/-qR/-qS queue run modifiers
@@ -7540,6 +7540,10 @@ This is intended to allow you to get res
 by processing the queue fairly frequently
 without thrashing your system by trying jobs too often.
 The default units are minutes.
+Note:
+This option is ignored for queue runs that select a subset
+of the queue, i.e.,
+.q \-q[!][I|R|S|Q][string]
 .ip MustQuoteChars=\fIs\fP
 [no short name]
 Sets the list of characters that must be quoted if used in a full name
@@ -11467,7 +11471,7 @@ replace it with a blank sheet for double
 .\".sz 10
 .\"Eric Allman
 .\".sp
-.\"Version $Revision: 8.747 $
+.\"Version $Revision: 8.749 $
 .\".ce 0
 .bp 3
 .ce

Modified: head/contrib/sendmail/include/libmilter/mfapi.h
==============================================================================
--- head/contrib/sendmail/include/libmilter/mfapi.h	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/include/libmilter/mfapi.h	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2004, 2006, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2006, 2008, 2012 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: mfapi.h,v 8.80 2009/11/06 00:57:08 ca Exp $
+ *	$Id: mfapi.h,v 8.82 2012/11/16 20:25:04 ca Exp $
  */
 
 /*
@@ -206,6 +206,7 @@ LIBMILTER_API int smfi_version __P((unsi
 **	(hence the list is not sorted by the SMT protocol steps).
 */
 
+#define SMFIM_NOMACROS	(-1)	/* Do NOT use, internal only */
 #define SMFIM_FIRST	0	/* Do NOT use, internal marker only */
 #define SMFIM_CONNECT	0	/* connect */
 #define SMFIM_HELO	1	/* HELO/EHLO */

Modified: head/contrib/sendmail/include/sm/clock.h
==============================================================================
--- head/contrib/sendmail/include/sm/clock.h	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/include/sm/clock.h	Sat Dec 29 20:30:46 2012	(r244833)
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: clock.h,v 1.12 2004/08/03 19:57:21 ca Exp $
+ *	$Id: clock.h,v 1.13 2011/11/03 03:13:24 ca Exp $
  */
 
 /*
@@ -59,7 +59,7 @@ extern SIGFUNC_DECL	sm_tick __P((int));
 /*
 **  SM_SETEVENT -- set an event to happen at a specific time in seconds.
 **
-**	Translates the seconds into millseconds and calls sm_seteventm()
+**	Translates the seconds into milliseconds and calls sm_seteventm()
 **	to get a specific event to happen in the future at a specific time.
 **
 **	Parameters:

Modified: head/contrib/sendmail/include/sm/tailq.h
==============================================================================
--- head/contrib/sendmail/include/sm/tailq.h	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/include/sm/tailq.h	Sat Dec 29 20:30:46 2012	(r244833)
@@ -36,7 +36,7 @@
 #define	SM_TAILQ_H_
 
 /*
- * $Id: tailq.h,v 1.2 2007/06/29 23:09:57 ca Exp $
+ * $Id: tailq.h,v 1.3 2012/01/21 00:12:14 ashish Exp $
  *
  * This file is a modified copy of queue.h from a BSD system:
  * we only need tail queues here.
@@ -69,8 +69,8 @@ struct {								\
 	struct type **tqe_prev;	/* address of previous next element */	\
 }
 
-/* 
- * tail queue access methods 
+/*
+ * tail queue access methods
  */
 #define	SM_TAILQ_FIRST(head)		((head)->tqh_first)
 #define	SM_TAILQ_END(head)		NULL

Modified: head/contrib/sendmail/libmilter/Makefile.m4
==============================================================================
--- head/contrib/sendmail/libmilter/Makefile.m4	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/libmilter/Makefile.m4	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 8.85 2009/11/24 21:59:33 ca Exp $
+dnl $Id: Makefile.m4,v 8.88 2012/09/25 17:40:32 ca Exp $
 include(confBUILDTOOLSDIR`/M4/switch.m4')
 
 dnl only required for compilation of EXTRAS

Modified: head/contrib/sendmail/libmilter/docs/api.html
==============================================================================
--- head/contrib/sendmail/libmilter/docs/api.html	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/libmilter/docs/api.html	Sat Dec 29 20:30:46 2012	(r244833)
@@ -2,7 +2,7 @@
 <HEAD><TITLE>Milter API</TITLE></HEAD>
 <BODY>
 <!--
-$Id: api.html,v 1.37 2009/05/19 00:40:52 ca Exp $
+$Id: api.html,v 1.38 2012/03/29 03:18:37 ca Exp $
 -->
 <H1>Milter API</H1>
 
@@ -214,7 +214,6 @@ other callbacks are message-oriented.
      <TD>SMFIS_REJECT</TD>
      <TD>For a connection-oriented routine, reject this connection; call <A HREF="xxfi_close.html">xxfi_close</A>.<BR>
         For a message-oriented routine (except 
-	<A HREF="xxfi_eom.html">xxfi_eom</A> or
         <A HREF="xxfi_abort.html">xxfi_abort</A>), reject this message.<BR>
 	For a recipient-oriented routine, reject the current recipient (but continue processing the current message).
      </TD>

Modified: head/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
==============================================================================
--- head/contrib/sendmail/libmilter/docs/smfi_setsymlist.html	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/libmilter/docs/smfi_setsymlist.html	Sat Dec 29 20:30:46 2012	(r244833)
@@ -2,7 +2,7 @@
 <HEAD><TITLE>smfi_setsymlist</TITLE></HEAD>
 <BODY>
 <!--
-$Id: smfi_setsymlist.html,v 1.5 2006/12/21 18:30:35 ca Exp $
+$Id: smfi_setsymlist.html,v 1.6 2012/05/11 17:34:23 ca Exp $
 -->
 <H1>smfi_setsymlist</H1>
 
@@ -86,8 +86,10 @@ Otherwise MI_SUCCESS is returned.
 <!----------- Notes ---------->
 <TR align="left" valign=top>
 <TH>NOTES</TH> 
-<TD>There is an internal limit on the number of macros that can be
-set (currently 5),
+<TD>There is an internal limit on the number of macros
+that can be set
+<!-- XREF: MAXFILTERMACROS -->
+(currently 50),
 however, this limit is not enforced by libmilter, only by the MTA,
 but a possible violation of this restriction is not communicated back to
 the milter.</TD>
@@ -97,7 +99,7 @@ the milter.</TD>
 
 <HR size="1">
 <FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006, 2012 Sendmail, Inc. and its suppliers.
 All rights reserved.
 <BR>
 By using this file, you agree to the terms and conditions set

Modified: head/contrib/sendmail/libmilter/docs/smfi_settimeout.html
==============================================================================
--- head/contrib/sendmail/libmilter/docs/smfi_settimeout.html	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/libmilter/docs/smfi_settimeout.html	Sat Dec 29 20:30:46 2012	(r244833)
@@ -2,7 +2,7 @@
 <HEAD><TITLE>smfi_settimeout</TITLE></HEAD>
 <BODY>
 <!--
-$Id: smfi_settimeout.html,v 1.14 2006/12/21 18:30:35 ca Exp $
+$Id: smfi_settimeout.html,v 1.15 2011/10/03 16:21:33 ca Exp $
 -->
 <H1>smfi_settimeout</H1>
 
@@ -52,11 +52,24 @@ If smfi_settimeout is not called, a defa
 <TD>smfi_settimeout always returns MI_SUCCESS.</TD>
 </TR>
 
+<!----------- Notes ---------->
+<TR>
+<TH valign="top" align=left>NOTES</TH> 
+<TD>
+Decreasing the timeout is strongly discouraged
+and may break the communication with the MTA.
+Do <EM>not</EM> decrease this value without making sure that
+the MTA also uses lower timeouts for communication
+(with the milter and with the SMTP client).
+</TR>
+</TABLE>
+
+
 </TABLE>
 
 <HR size="1">
 <FONT size="-1">
-Copyright (c) 2000, 2002-2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2002-2003, 2006, 2011 Sendmail, Inc. and its suppliers.
 All rights reserved.
 <BR>
 By using this file, you agree to the terms and conditions set

Modified: head/contrib/sendmail/libmilter/worker.c
==============================================================================
--- head/contrib/sendmail/libmilter/worker.c	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/libmilter/worker.c	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2003-2004, 2007, 2009-2011 Sendmail, Inc. and its suppliers.
+ *  Copyright (c) 2003-2004, 2007, 2009-2012 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
  */
 
 #include <sm/gen.h>
-SM_RCSID("@(#)$Id: worker.c,v 8.19 2011/02/14 23:33:48 ca Exp $")
+SM_RCSID("@(#)$Id: worker.c,v 8.24 2012/03/13 15:37:46 ca Exp $")
 
 #include "libmilter.h"
 
@@ -141,7 +141,8 @@ static int mi_list_del_ctx __P((SMFICTX_
 
 #if POOL_DEBUG
 # define POOL_LEV_DPRINTF(lev, x)					\
-	do {								\
+	do								\
+	{								\
 		if ((lev) < ctx->ctx_dbg)				\
 			sm_dprintf x;					\
 	} while (0)
@@ -377,7 +378,7 @@ mi_pool_controller(arg)
 	for (;;)
 	{
 		SMFICTX_PTR ctx;
-		int nfd, rfd, i;
+		int nfd, r, i;
 		time_t now;
 
 		POOL_LEV_DPRINTF(4, ("Let's %s again...", WAITFN));
@@ -498,19 +499,19 @@ mi_pool_controller(arg)
 		TASKMGR_UNLOCK();
 
 		/* Everything is ready, let's wait for an event */
-		rfd = poll(pfd, nfd, POLL_TIMEOUT);
+		r = poll(pfd, nfd, POLL_TIMEOUT);
 
 		POOL_LEV_DPRINTF(4, ("%s returned: at epoch %d value %d",
 			WAITFN, now, nfd));
 
 		/* timeout */
-		if (rfd == 0)
+		if (r == 0)
 			continue;
 
 		rebuild_set = true;
 
 		/* error */
-		if (rfd < 0)
+		if (r < 0)
 		{
 			if (errno == EINTR)
 				continue;
@@ -522,6 +523,7 @@ mi_pool_controller(arg)
 
 			if (pcnt >= MAX_FAILS_S)
 				goto err;
+			continue;
 		}
 		pcnt = 0;
 
@@ -535,7 +537,7 @@ mi_pool_controller(arg)
 				WAITFN, i, nfd,
 			WAIT_FD(i)));
 
-			/* has a worker signaled an end of task ? */
+			/* has a worker signaled an end of task? */
 			if (WAIT_FD(i) == RD_PIPE)
 			{
 				char evts[256];
@@ -563,7 +565,12 @@ mi_pool_controller(arg)
 				continue;
 			}
 
-			/* no ! sendmail wants to send a command */
+			/*
+			**  Not the pipe for workers waking us,
+			**  so must be something on an MTA connection.
+			*/
+
+			TASKMGR_LOCK();
 			SM_TAILQ_FOREACH(ctx, &WRK_CTX_HEAD, ctx_link)
 			{
 				if (ctx->ctx_wstate != WKST_WAITING)
@@ -575,7 +582,6 @@ mi_pool_controller(arg)
 
 				if (ctx->ctx_sd == pfd[i].fd)
 				{
-					TASKMGR_LOCK();
 
 					POOL_LEV_DPRINTF(4,
 						("TASK: found %d for fd[%d]=%d",
@@ -591,10 +597,10 @@ mi_pool_controller(arg)
 						ctx->ctx_wstate = WKST_RUNNING;
 						LAUNCH_WORKER(ctx);
 					}
-					TASKMGR_UNLOCK();
 					break;
 				}
 			}
+			TASKMGR_UNLOCK();
 
 			POOL_LEV_DPRINTF(4,
 				("TASK %s FOUND - Checking PIPE for fd[%d]",
@@ -607,6 +613,14 @@ mi_pool_controller(arg)
 		free(pfd);
 
 	Tskmgr.tm_signature = 0;
+#if 0
+	/*
+	**  Do not clean up ctx -- it can cause double-free()s.
+	**  The program is shutting down anyway, so it's not worth the trouble.
+	**  There is a more complex solution that prevents race conditions
+	**  while accessing ctx, but that's maybe for a later version.
+	*/
+
 	for (;;)
 	{
 		SMFICTX_PTR ctx;
@@ -616,6 +630,7 @@ mi_pool_controller(arg)
 			break;
 		mi_close_session(ctx);
 	}
+#endif
 
 	(void) smutex_destroy(&Tskmgr.tm_w_mutex);
 	(void) scond_destroy(&Tskmgr.tm_w_cond);

Modified: head/contrib/sendmail/src/Makefile.m4
==============================================================================
--- head/contrib/sendmail/src/Makefile.m4	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/src/Makefile.m4	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 8.126 2010/11/24 19:59:54 gshapiro Exp $
+dnl $Id: Makefile.m4,v 8.132 2012/09/11 20:02:44 ca Exp $
 include(confBUILDTOOLSDIR`/M4/switch.m4')
 
 define(`confREQUIRE_LIBSM', `true')

Modified: head/contrib/sendmail/src/TRACEFLAGS
==============================================================================
--- head/contrib/sendmail/src/TRACEFLAGS	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/src/TRACEFLAGS	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,4 +1,4 @@
-#	$Id: TRACEFLAGS,v 8.48 2008/11/03 21:09:26 gshapiro Exp $
+#	$Id: TRACEFLAGS,v 8.52 2012/03/03 00:10:42 ca Exp $
 0, 4	main.c		main	canonical name, UUCP node name, a.k.a.s
 0, 15	main.c		main	print configuration
 0, 44	util.c		printav	print address of each string
@@ -77,12 +77,12 @@
 63	queue.c		runqueue process watching
 64	multiple	Milter
 65	main.c		permission checks
-#if _FFR_ADAPTIVE_EOL 
-66	srvrsmtp.c	conformance checks 
-#endif /* _FFR_ADAPTIVE_EOL */ 
-#if _FFR_QUEUE_SCHED_DBG 
-69	queue.c		scheduling 
-#endif /* _FFR_QUEUE_SCHED_DBG */ 
+#if _FFR_ADAPTIVE_EOL
+66	srvrsmtp.c	conformance checks
+#endif /* _FFR_ADAPTIVE_EOL */
+#if _FFR_QUEUE_SCHED_DBG
+69	queue.c		scheduling
+#endif /* _FFR_QUEUE_SCHED_DBG */
 70	queue.c		quarantining
 71,>99	milter.c	quarantine on errors
 73	queue.c		shared memory updates
@@ -92,6 +92,7 @@
 83	collect.c	timeout
 84	deliver.c	timeout
 85	map.c		dprintf map
+89	conf.c		>=8 use sm_dprintf() instead of syslog()
 91	mci.c		syslogging of MCI cache information
 93,>99	*		Prevent daemon connection fork for profiling/debugging
 94,>99	srvrsmtp.c	cause commands to fail (for protocol testing)

Modified: head/contrib/sendmail/src/collect.c
==============================================================================
--- head/contrib/sendmail/src/collect.c	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/src/collect.c	Sat Dec 29 20:30:46 2012	(r244833)
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: collect.c,v 8.284 2008/08/06 05:26:24 ca Exp $")
+SM_RCSID("@(#)$Id: collect.c,v 8.285 2012/06/14 23:54:02 ca Exp $")
 
 static void	eatfrom __P((char *volatile, ENVELOPE *));
 static void	collect_doheader __P((ENVELOPE *));
@@ -869,7 +869,8 @@ readerr:
 			if (LogLevel > 6)
 				sm_syslog(LOG_NOTICE, e->e_id,
 					"message size (%ld) exceeds maximum (%ld)",
-					e->e_msgsize, MaxMessageSize);
+					PRT_NONNEGL(e->e_msgsize),
+					MaxMessageSize);
 		}
 	}
 

Modified: head/contrib/sendmail/src/conf.c
==============================================================================
--- head/contrib/sendmail/src/conf.c	Sat Dec 29 20:15:07 2012	(r244832)
+++ head/contrib/sendmail/src/conf.c	Sat Dec 29 20:30:46 2012	(r244833)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2012 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
 
 #include <sendmail.h>
 
-SM_RCSID("@(#)$Id: conf.c,v 8.1168 2011/01/25 18:31:30 ca Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.1176 2012/12/07 03:59:54 ca Exp $")
 
 #include <sm/sendmail.h>
 #include <sendmail/pathnames.h>
@@ -53,7 +53,7 @@ static int	add_hostnames __P((SOCKADDR *
 static struct hostent *sm_getipnodebyname __P((const char *, int, int, int *));
 static struct hostent *sm_getipnodebyaddr __P((const void *, size_t, int, int *));
 #else /* NETINET6 && NEEDSGETIPNODE */
-#define sm_getipnodebyname getipnodebyname 
+#define sm_getipnodebyname getipnodebyname
 #define sm_getipnodebyaddr getipnodebyaddr
 #endif /* NETINET6 && NEEDSGETIPNODE */
 
@@ -4602,6 +4602,10 @@ add_hostnames(sa)
 		int save_errno = errno;
 
 		if (LogLevel > 3 &&
+#if NETINET && defined(IN_LINKLOCAL)
+		    !(sa->sa.sa_family == AF_INET &&
+		      IN_LINKLOCAL(ntohl(sa->sin.sin_addr.s_addr))) &&
+#endif /* NETINET && defined(IN_LINKLOCAL) */
 #if NETINET6
 		    !(sa->sa.sa_family == AF_INET6 &&
 		      IN6_IS_ADDR_LINKLOCAL(&sa->sin6.sin6_addr)) &&
@@ -5374,14 +5378,30 @@ sm_syslog(level, id, fmt, va_alist)
 #if LOG
 		if (*id == '\0')
 		{
-			if (tTd(89, 8))
+			if (tTd(89, 10))
+			{
+				struct timeval tv;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 20:38:58 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 17C64DB6;
 Sat, 29 Dec 2012 20:38:58 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D45228FC13;
 Sat, 29 Dec 2012 20:38:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTKcvJA045500;
 Sat, 29 Dec 2012 20:38:57 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTKcvCV045499;
 Sat, 29 Dec 2012 20:38:57 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Message-Id: <201212292038.qBTKcvCV045499@svn.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 29 Dec 2012 20:38:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244834 - head/contrib/sendmail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 20:38:58 -0000

Author: gshapiro
Date: Sat Dec 29 20:38:57 2012
New Revision: 244834
URL: http://svnweb.freebsd.org/changeset/base/244834

Log:
  Update import info based on recent experiences and sendmail 8.14.6 import.
  
  MFC after:	4 days

Modified:
  head/contrib/sendmail/FREEBSD-upgrade

Modified: head/contrib/sendmail/FREEBSD-upgrade
==============================================================================
--- head/contrib/sendmail/FREEBSD-upgrade	Sat Dec 29 20:30:46 2012	(r244833)
+++ head/contrib/sendmail/FREEBSD-upgrade	Sat Dec 29 20:38:57 2012	(r244834)
@@ -1,24 +1,12 @@
 $FreeBSD$
 
-sendmail 8.14.5
+sendmail 8.14.6
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following directories were renamed:
 
 	sendmail -> src
 
-For the merge of sendmail, the following files were removed:
-
-	Build
-	cf/cf/Build
-	cf/cf/generic-*.cf
-	devtools/*
-	doc/op/op.ps
-	*/Build
-	[e-v]*/*.0
-	sendmail/makesendmail
-	sendmail/sysexits.h
-
 Imported using the instructions at:
 
 http://wiki.freebsd.org/SubversionPrimer/VendorImports
@@ -39,9 +27,8 @@ Then merged using:
 % svn commit
 
 After importing, bump the version of src/etc/sendmail/freebsd*mc
-so mergemaster will merge /etc/mail/freebsd*cf:
-
-	(svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc
+so mergemaster will merge /etc/mail/freebsd*cf by making a minor
+change and committing.
 
 To make local changes to sendmail, simply patch and commit to the head.
 Never make local changes in the vendor area (/vendor/sendmail/).
@@ -57,7 +44,7 @@ infrastructure in FreeBSD:
 	bin/rmail/Makefile
 	contrib/sendmail/
 	etc/Makefile
-	etc/defaults/make.conf (RELENG_4)
+	etc/defaults/make.conf (obsolete)
 	etc/defaults/periodic.conf
 	etc/defaults/rc.conf
 	etc/mail/Makefile
@@ -90,7 +77,7 @@ infrastructure in FreeBSD:
 	share/Makefile
 	share/doc/smm/Makefile
 	share/doc/smm/08.sendmailop/Makefile
-	share/examples/etc/make.conf (HEAD)
+	share/examples/etc/make.conf
 	share/man/man5/make.conf.5
 	share/man/man5/periodic.conf.5
 	share/man/man5/rc.conf.5
@@ -110,4 +97,4 @@ infrastructure in FreeBSD:
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro@FreeBSD.org
-13-June-2011
+29-December-2012

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 20:42:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A040BF64;
 Sat, 29 Dec 2012 20:42:29 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 697DC8FC0A;
 Sat, 29 Dec 2012 20:42:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTKgTL6046090;
 Sat, 29 Dec 2012 20:42:29 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTKgTYP046088;
 Sat, 29 Dec 2012 20:42:29 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Message-Id: <201212292042.qBTKgTYP046088@svn.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 29 Dec 2012 20:42:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244835 - head/etc/sendmail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 20:42:29 -0000

Author: gshapiro
Date: Sat Dec 29 20:42:28 2012
New Revision: 244835
URL: http://svnweb.freebsd.org/changeset/base/244835

Log:
  Minor changes to force commit these files so new freebsd*.cf files are
  built to use the new sendmail-8.14.6/cf tree.
  
  While here, update DNSBL link once again.
  
  MFC after:	4 days

Modified:
  head/etc/sendmail/freebsd.mc
  head/etc/sendmail/freebsd.submit.mc

Modified: head/etc/sendmail/freebsd.mc
==============================================================================
--- head/etc/sendmail/freebsd.mc	Sat Dec 29 20:38:57 2012	(r244834)
+++ head/etc/sendmail/freebsd.mc	Sat Dec 29 20:42:28 2012	(r244835)
@@ -63,8 +63,8 @@ dnl DNS based black hole lists
 dnl --------------------------------
 dnl DNS based black hole lists come and go on a regular basis
 dnl so this file will not serve as a database of the available servers.
-dnl For that, visit
-dnl http://www.google.com/Top/Computers/Internet/E-mail/Spam/Blacklists/
+dnl For more information, visit
+dnl http://en.wikipedia.org/wiki/DNSBL
 
 dnl Uncomment to activate your chosen DNS based blacklist
 dnl FEATURE(dnsbl, `dnsbl.example.com')

Modified: head/etc/sendmail/freebsd.submit.mc
==============================================================================
--- head/etc/sendmail/freebsd.submit.mc	Sat Dec 29 20:38:57 2012	(r244834)
+++ head/etc/sendmail/freebsd.submit.mc	Sat Dec 29 20:42:28 2012	(r244835)
@@ -9,6 +9,7 @@ divert(-1)
 #
 #
 
+
 #
 #  This is the FreeBSD configuration for a set-group-ID sm-msp sendmail
 #  that acts as a initial mail submission program.

From owner-svn-src-head@FreeBSD.ORG  Sat Dec 29 21:22:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2CA78A20;
 Sat, 29 Dec 2012 21:22:39 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 11DAE8FC0A;
 Sat, 29 Dec 2012 21:22:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTLMcMg052399;
 Sat, 29 Dec 2012 21:22:38 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTLMcrx052397;
 Sat, 29 Dec 2012 21:22:38 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201212292122.qBTLMcrx052397@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 29 Dec 2012 21:22:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244837 - in head/sys/dev/usb: . serial
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Dec 2012 21:22:39 -0000

Author: hselasky
Date: Sat Dec 29 21:22:38 2012
New Revision: 244837
URL: http://svnweb.freebsd.org/changeset/base/244837

Log:
  Add new USB ID.
  
  PR:		usb/174814
  Submitted by:	Andy Balholm
  MFC after:	1 week

Modified:
  head/sys/dev/usb/serial/u3g.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c	Sat Dec 29 21:01:41 2012	(r244836)
+++ head/sys/dev/usb/serial/u3g.c	Sat Dec 29 21:22:38 2012	(r244837)
@@ -342,6 +342,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(NOVATEL, MC760, 0),
 	U3G_DEV(NOVATEL, MC547, 0),
 	U3G_DEV(NOVATEL, MC950D, 0),
+	U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT),
 	U3G_DEV(NOVATEL, U720, 0),
 	U3G_DEV(NOVATEL, U727, 0),
 	U3G_DEV(NOVATEL, U727_2, 0),

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Sat Dec 29 21:01:41 2012	(r244836)
+++ head/sys/dev/usb/usbdevs	Sat Dec 29 21:22:38 2012	(r244837)
@@ -3058,6 +3058,7 @@ product NOVATEL U727		0x4100	Merlin U727
 product NOVATEL MC950D		0x4400	Novatel MC950D HSUPA
 product NOVATEL ZEROCD		0x5010	Novatel ZeroCD
 product NOVATEL ZEROCD2		0x5030	Novatel ZeroCD
+product NOVATEL MIFI2200	0x5041	Novatel MiFi 2200 CDMA
 product NOVATEL U727_2		0x5100	Merlin U727 CDMA
 product NOVATEL U760		0x6000	Novatel U760
 product NOVATEL MC760		0x6002	Novatel MC760