From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 02:02:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF0E1804; Sun, 1 Feb 2015 02:02:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFCD18B0; Sun, 1 Feb 2015 02:02:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1122pXX044016; Sun, 1 Feb 2015 02:02:51 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1122pwk044009; Sun, 1 Feb 2015 02:02:51 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201502010202.t1122pwk044009@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sun, 1 Feb 2015 02:02:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278020 - head/sys/boot/powerpc/kboot 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 02:02:52 -0000 Author: nwhitehorn Date: Sun Feb 1 02:02:50 2015 New Revision: 278020 URL: https://svnweb.freebsd.org/changeset/base/278020 Log: Allow this to work with disks greater than 4 GB and with names not beginning with "s". Modified: head/sys/boot/powerpc/kboot/host_syscall.S head/sys/boot/powerpc/kboot/host_syscall.h head/sys/boot/powerpc/kboot/hostdisk.c Modified: head/sys/boot/powerpc/kboot/host_syscall.S ============================================================================== --- head/sys/boot/powerpc/kboot/host_syscall.S Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/host_syscall.S Sun Feb 1 02:02:50 2015 (r278020) @@ -1,3 +1,8 @@ +/* + * + * $FreeBSD$ + */ + #include ENTRY(host_read) @@ -16,7 +21,10 @@ ENTRY(host_write) blr ENTRY(host_seek) - li %r0, 19 # SYS_lseek + mr %r4,%r5 + mr %r5,%r6 + mr %r6,%r7 + li %r0, 140 # SYS_llseek sc blr Modified: head/sys/boot/powerpc/kboot/host_syscall.h ============================================================================== --- head/sys/boot/powerpc/kboot/host_syscall.h Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/host_syscall.h Sun Feb 1 02:02:50 2015 (r278020) @@ -32,7 +32,7 @@ ssize_t host_read(int fd, void *buf, size_t nbyte); ssize_t host_write(int fd, const void *buf, size_t nbyte); -ssize_t host_seek(int fd, int offset, int whence); +ssize_t host_seek(int fd, int64_t offset, int whence); int host_open(char *path, int flags, int mode); int host_close(int fd); void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, int); Modified: head/sys/boot/powerpc/kboot/hostdisk.c ============================================================================== --- head/sys/boot/powerpc/kboot/hostdisk.c Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/hostdisk.c Sun Feb 1 02:02:50 2015 (r278020) @@ -40,7 +40,7 @@ static int hostdisk_ioctl(struct open_fi static void hostdisk_print(int verbose); struct devsw hostdisk = { - "s", + "/dev", DEVT_DISK, hostdisk_init, hostdisk_strategy, @@ -67,8 +67,10 @@ hostdisk_strategy(void *devdata, int fla pos = dblk * 512; - if (host_seek(desc->d_unit, pos, 0) < 0) + if (host_seek(desc->d_unit, pos, 0) < 0) { + printf("Seek error\n"); return (EIO); + } n = host_read(desc->d_unit, buf, size); if (n < 0) @@ -82,22 +84,19 @@ static int hostdisk_open(struct open_file *f, ...) { struct devdesc *desc; - char *path; va_list vl; va_start(vl, f); desc = va_arg(vl, struct devdesc *); va_end(vl); - path = malloc(strlen((char *)(desc->d_opendata)) + 6); - strcpy(path, "/dev/"); - strcat(path, (char *)(desc->d_opendata)); + desc->d_unit = host_open(desc->d_opendata, O_RDONLY, 0); - desc->d_unit = host_open(path, O_RDONLY, 0); - free(path); - - if (desc->d_unit <= 0) + if (desc->d_unit <= 0) { + printf("hostdisk_open: couldn't open %s: %d\n", + desc->d_opendata, desc->d_unit); return (ENOENT); + } return (0); } From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 05:00:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3C913D4; Sun, 1 Feb 2015 05:00:38 +0000 (UTC) Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au [211.29.132.249]) by mx1.freebsd.org (Postfix) with ESMTP id 2F9CF9AA; Sun, 1 Feb 2015 05:00:37 +0000 (UTC) Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133]) by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id 5791E1045F7B; Sun, 1 Feb 2015 16:00:35 +1100 (AEDT) Date: Sun, 1 Feb 2015 16:00:34 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dimitry Andric Subject: Re: svn commit: r278004 - head/sys/dev/drm2/radeon In-Reply-To: <201501312218.t0VMIr7m035695@svn.freebsd.org> Message-ID: <20150201153237.Q867@besplex.bde.org> References: <201501312218.t0VMIr7m035695@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=Za4kaKlA c=1 sm=1 tr=0 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=pCuNxOU4Z9ZC8-tW4SQA:9 a=CjuIK1q_8ugA:10 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 05:00:39 -0000 On Sat, 31 Jan 2015, Dimitry Andric wrote: > Log: > Constify a number of accesses in drm2's radeon drivers to avoid > -Wcast-qual warnings. No functional change. This is much better than using __DECONST(), but still has bogus casts. > > Modified: head/sys/dev/drm2/radeon/ni.c > ============================================================================== > --- head/sys/dev/drm2/radeon/ni.c Sat Jan 31 22:07:38 2015 (r278003) > +++ head/sys/dev/drm2/radeon/ni.c Sat Jan 31 22:18:52 2015 (r278004) > @@ -182,7 +182,7 @@ int ni_mc_load_microcode(struct radeon_d > { > const __be32 *fw_data; > u32 mem_type, running, blackout = 0; > - u32 *io_mc_regs; > + const u32 *io_mc_regs; > int i, ucode_size, regs_size; > > if (!rdev->mc_fw) Part of the correct change. > @@ -190,23 +190,23 @@ int ni_mc_load_microcode(struct radeon_d > > switch (rdev->family) { > case CHIP_BARTS: > - io_mc_regs = (u32 *)&barts_io_mc_regs; Old bogus cast. The array has const elements, but the pointer was not even to non-const elements (it was to an array type). A case was used to break the warning about at least the non-const part of this. But -Wcast-qual restored the warning. > + io_mc_regs = (const u32 *)&barts_io_mc_regs; New bogus cast. Now that the pointer type actually matches the data element type, no cast is needed. However &barts_io_mc_regs isn't actually a pointer to a data element. It is a pointer to the array, which has a different type. The array type might actually be important here, since the array is multi-dimensional and only a pointer to an array could keep track of (most of) the dimensions. However the code want a pointer to an element, since it wants to treat the array as variable-size although its data is fixed-size, and C's array indexing is no good except for fixed dimentsions. > ucode_size = BTC_MC_UCODE_SIZE; > regs_size = BTC_IO_MC_REGS_SIZE; It keeps track of one of the dimensions here. The other one is presumably fixed at 2. I forget whether it is the first or last dimension that is not needed for array indexing. > break; So the bogus cast was also explicitly converting from an array type to its element type. That conversion is normally done implicitly by assignment because the types are compatible enough for this not to break type safety. However, perhaps it is not actually safe for multi-dimensional arrays or arrays with const elements. Really strict type warnings would warn about implicitly and and explicitly converting pointers to arrays. Anyway, it is clearer to point to the first element: io_mc_regs = &barts_io_mc_regs[0][0]; > case CHIP_TURKS: > - io_mc_regs = (u32 *)&turks_io_mc_regs; > + io_mc_regs = (const u32 *)&turks_io_mc_regs; > ucode_size = BTC_MC_UCODE_SIZE; > regs_size = BTC_IO_MC_REGS_SIZE; > break; Similarly for the other bogus casts. Bruce From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 09:50:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D905845E; Sun, 1 Feb 2015 09:50:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C40DCE76; Sun, 1 Feb 2015 09:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t119oYGA060084; Sun, 1 Feb 2015 09:50:34 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t119oY6X060080; Sun, 1 Feb 2015 09:50:34 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201502010950.t119oY6X060080@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 1 Feb 2015 09:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278023 - head/contrib/gcc/config/arm 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 09:50:35 -0000 Author: andrew Date: Sun Feb 1 09:50:33 2015 New Revision: 278023 URL: https://svnweb.freebsd.org/changeset/base/278023 Log: FreeBSD expects _Unwind_GetGR, _Unwind_SetGR, and _Unwind_SetIP to be symbols and not macros. Make this so. This fixes a few ports that try to link against these functions but fail as they previously didn't exist. Modified: head/contrib/gcc/config/arm/unwind-arm.c head/contrib/gcc/config/arm/unwind-arm.h Modified: head/contrib/gcc/config/arm/unwind-arm.c ============================================================================== --- head/contrib/gcc/config/arm/unwind-arm.c Sun Feb 1 06:45:31 2015 (r278022) +++ head/contrib/gcc/config/arm/unwind-arm.c Sun Feb 1 09:50:33 2015 (r278023) @@ -25,6 +25,7 @@ along with this program; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#define __ARM_STATIC_INLINE #include "unwind.h" /* We add a prototype for abort here to avoid creating a dependency on @@ -1089,4 +1090,11 @@ _Unwind_GetIPInfo (struct _Unwind_Contex *ip_before_insn = 0; return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; } + +void +_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val) +{ + _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)); +} + #endif Modified: head/contrib/gcc/config/arm/unwind-arm.h ============================================================================== --- head/contrib/gcc/config/arm/unwind-arm.h Sun Feb 1 06:45:31 2015 (r278022) +++ head/contrib/gcc/config/arm/unwind-arm.h Sun Feb 1 09:50:33 2015 (r278023) @@ -34,6 +34,10 @@ #define __ARM_EABI_UNWINDER__ 1 +#ifndef __ARM_STATIC_INLINE +#define __ARM_STATIC_INLINE static inline +#endif + #ifdef __cplusplus extern "C" { #endif @@ -245,7 +249,7 @@ extern "C" { return tmp; } - static inline _Unwind_Word + __ARM_STATIC_INLINE _Unwind_Word _Unwind_GetGR (_Unwind_Context *context, int regno) { _uw val; @@ -253,6 +257,12 @@ extern "C" { return val; } + __ARM_STATIC_INLINE void + _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) + { + _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); + } + #ifndef __FreeBSD__ /* Return the address of the instruction, not the actual IP value. */ #define _Unwind_GetIP(context) \ @@ -260,21 +270,16 @@ extern "C" { #define _Unwind_GetIPInfo(context, ip_before_insn) \ (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) -#else - _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); - _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); -#endif - - static inline void - _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) - { - _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); - } /* The dwarf unwinder doesn't understand arm/thumb state. We assume the landing pad uses the same instruction set as the call site. */ #define _Unwind_SetIP(context, val) \ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)) +#else + _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); + _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); + void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr); +#endif #ifdef __cplusplus } /* extern "C" */ From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 15:28:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0061A1C5; Sun, 1 Feb 2015 15:28:22 +0000 (UTC) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB223BE; Sun, 1 Feb 2015 15:28:22 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::2844:fbf7:162f:3ca] (unknown [IPv6:2001:7b8:3a7:0:2844:fbf7:162f:3ca]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 9669A5C2E; Sun, 1 Feb 2015 16:28:17 +0100 (CET) Subject: Re: svn commit: r278004 - head/sys/dev/drm2/radeon Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 (755500a+) From: Dimitry Andric In-Reply-To: <20150201153237.Q867@besplex.bde.org> Date: Sun, 1 Feb 2015 16:28:16 +0100 Message-Id: References: <201501312218.t0VMIr7m035695@svn.freebsd.org> <20150201153237.Q867@besplex.bde.org> To: Bruce Evans X-Mailer: Apple Mail (2.2070.6) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 15:28:23 -0000 --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 01 Feb 2015, at 06:00, Bruce Evans wrote: > > On Sat, 31 Jan 2015, Dimitry Andric wrote: > >> Log: >> Constify a number of accesses in drm2's radeon drivers to avoid >> -Wcast-qual warnings. No functional change. > > This is much better than using __DECONST(), but still has bogus casts. ... > > Anyway, it is clearer to point to the > first element: > > io_mc_regs = &barts_io_mc_regs[0][0]; Thanks, I've put that up for review, here: https://reviews.freebsd.org/D1748 -Dimitry --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTORhMACgkQsF6jCi4glqM3NwCeLTSFKvX2gnHwWJ3vZM5vpAYy NDYAn1eNWGEI6GipkgV4KkGhF1vSkqXE =lkrW -----END PGP SIGNATURE----- --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F-- From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 17:19:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB6AF348; Sun, 1 Feb 2015 17:19:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7F18C6C; Sun, 1 Feb 2015 17:19:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11HJwSu091385; Sun, 1 Feb 2015 17:19:58 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11HJwtc091383; Sun, 1 Feb 2015 17:19:58 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502011719.t11HJwtc091383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 1 Feb 2015 17:19:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278031 - head/sys/arm/arm 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 17:19:59 -0000 Author: ian Date: Sun Feb 1 17:19:57 2015 New Revision: 278031 URL: https://svnweb.freebsd.org/changeset/base/278031 Log: Remove a stale comment. The logic that deleted the map before other resources was removed long ago, but the comment stuck somehow. Modified: head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- head/sys/arm/arm/busdma_machdep-v6.c Sun Feb 1 14:45:41 2015 (r278030) +++ head/sys/arm/arm/busdma_machdep-v6.c Sun Feb 1 17:19:57 2015 (r278031) @@ -858,8 +858,6 @@ bus_dmamem_free(bus_dma_tag_t dmat, void else ba = standard_allocator; - /* Be careful not to access map from here on. */ - bufzone = busdma_bufalloc_findzone(ba, dmat->maxsize); if (bufzone != NULL && dmat->alignment <= bufzone->size && From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 18:21:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61971D30; Sun, 1 Feb 2015 18:21:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5E825C; Sun, 1 Feb 2015 18:21:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11ILHI4023284; Sun, 1 Feb 2015 18:21:17 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11ILHCo023283; Sun, 1 Feb 2015 18:21:17 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502011821.t11ILHCo023283@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 1 Feb 2015 18:21:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278032 - head/sys/boot/fdt 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 18:21:17 -0000 Author: ian Date: Sun Feb 1 18:21:16 2015 New Revision: 278032 URL: https://svnweb.freebsd.org/changeset/base/278032 Log: Do not skip setting the memory 'reg' property if the fdt data already contains one. Published dts source often includes a minimal default memory definition and expects it to be overridden by the bootloader after determining the actual physical memory in the system. Modified: head/sys/boot/fdt/fdt_loader_cmd.c Modified: head/sys/boot/fdt/fdt_loader_cmd.c ============================================================================== --- head/sys/boot/fdt/fdt_loader_cmd.c Sun Feb 1 17:19:57 2015 (r278031) +++ head/sys/boot/fdt/fdt_loader_cmd.c Sun Feb 1 18:21:16 2015 (r278032) @@ -566,17 +566,6 @@ fdt_fixup_memory(struct fdt_mem_region * return; } - if ((reg = (uint32_t *)fdt_getprop(fdtp, memory, "reg", - &len)) != NULL) { - - if (fdt_reg_valid(reg, len, addr_cells, size_cells) == 0) - /* - * Do not apply fixup if existing 'reg' property - * seems to be valid. - */ - return; - } - len = (addr_cells + size_cells) * realmrno * sizeof(uint32_t); sb = buf = (uint8_t *)malloc(len); if (!buf) From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 19:56:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1189FE3D; Sun, 1 Feb 2015 19:56:21 +0000 (UTC) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB50AC52; Sun, 1 Feb 2015 19:56:20 +0000 (UTC) Received: by mail-pa0-f54.google.com with SMTP id eu11so73502019pac.13; Sun, 01 Feb 2015 11:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=YvwL6LiIkbOSJvPhWrfOOUX0BimMkM23P4i7NxGn3N0=; b=0Vt0Bw+ZEJu2anWpzyTLe7OHbOPcmwV2QEFo2siBgwHnZmkcEjStPM6w8gC/7cSPFD 0a8aJyF8jM+ly5E5KqDhnzugzyYGEVMibi6yOawDdb7+YORS+nd14uoi7wsCw4pQm68q Wda77fiLNCQ72EOpDbchiFi5bBWrSxB/JwjhHTrWEtbag4o0m964q/dcfgr4dtaJvj+V hP1SlJvNsIFK20QOhgOVEk5xXB7ipC/xEosxhv7gA7FWxNhNUpbVpn/hgEgwdaLUOb7v Mrt3mHHTPbN8NnFwkURe1l853K3bSHhghEIZecDyYA182FbEhDiWPouLFQQynxz+9nXT DKoQ== X-Received: by 10.70.88.231 with SMTP id bj7mr24033013pdb.168.1422820579849; Sun, 01 Feb 2015 11:56:19 -0800 (PST) Received: from localhost (c-76-21-76-83.hsd1.ca.comcast.net. [76.21.76.83]) by mx.google.com with ESMTPSA id xw1sm16891257pac.47.2015.02.01.11.56.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 11:56:19 -0800 (PST) Sender: Gleb Kurtsou Date: Sun, 1 Feb 2015 11:57:29 -0800 From: Gleb Kurtsou To: Ivan Klymenko Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms Message-ID: <20150201195729.GA1990@reks> Mail-Followup-To: Ivan Klymenko , "Max N. Boyarov" , Konstantin Belousov , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150122121551.77a7a9fb@nonamehost.local> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Konstantin Belousov , "Max N. Boyarov" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 19:56:21 -0000 On (22/01/2015 12:15), Ivan Klymenko wrote: > В Thu, 22 Jan 2015 11:18:37 +0300 > "Max N. Boyarov" пишет: > > > On Wed, Jan 21, 2015 at 7:10 PM, Konstantin Belousov > > wrote: > > > Author: kib > > > Date: Wed Jan 21 16:10:37 2015 > > > New Revision: 277487 > > > URL: https://svnweb.freebsd.org/changeset/base/277487 > > > > > > Log: > > > An update for the i915 GPU driver, which brings the code up to > > > Linux commit 4d93914ae3db4a897ead4b. Some related drm > > > infrastructure changes are imported as needed. > > > > > > Biggest update is the rewrite of the i915 gem io to more closely > > > follow Linux model, althought the mechanism used by FreeBSD port > > > is different. > > > > > > Sponsored by: The FreeBSD Foundation > > > MFC after: 2 month > > > > Hi, after this commit i have many error messages like: > > > > error: [drm:pid1121:gen6_sanitize_pm] *ERROR* Power management > > discrepancy: GEN6_RP_INTERRUPT_LIMITS expected 18070000, was 18000000 I'm seeing the same errors. I've also noticed that my laptop started to overheat (up to 96 C). It was mostly idle, cpu usage at few percent, freq lowered by powerd, nothing cpu intensive running, web browser, terminals, etc. My initial suspect was recent TSC changes regarding C2/C3 sleep states. But reverting this commit seems to get situation back to normal. Did anybody else experience similar issues? From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 20:00:09 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B97F293; Sun, 1 Feb 2015 20:00:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A580AC95; Sun, 1 Feb 2015 20:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11K092i069533; Sun, 1 Feb 2015 20:00:09 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11K09AD069530; Sun, 1 Feb 2015 20:00:09 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201502012000.t11K09AD069530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Sun, 1 Feb 2015 20:00:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278034 - head/sys/dev/ahci 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:00:09 -0000 Author: smh Date: Sun Feb 1 20:00:08 2015 New Revision: 278034 URL: https://svnweb.freebsd.org/changeset/base/278034 Log: Add a quirk to limit AHCI MSI vectors to one In 10.1-RELEASE the default number of MSI vectors used was changed from one to as many vectors as the HW supports. This change resulted in an ahci timeouts regression when running on AMD SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using this new quirk. MFC after: 2 weeks Sponsored by: Multiplay Modified: head/sys/dev/ahci/ahci.h head/sys/dev/ahci/ahci_pci.c Modified: head/sys/dev/ahci/ahci.h ============================================================================== --- head/sys/dev/ahci/ahci.h Sun Feb 1 19:07:42 2015 (r278033) +++ head/sys/dev/ahci/ahci.h Sun Feb 1 20:00:08 2015 (r278034) @@ -556,26 +556,27 @@ enum ahci_err_type { bus_write_multi_stream_4((res), (offset), (addr), (count)) -#define AHCI_Q_NOFORCE 1 -#define AHCI_Q_NOPMP 2 -#define AHCI_Q_NONCQ 4 -#define AHCI_Q_1CH 8 -#define AHCI_Q_2CH 0x10 -#define AHCI_Q_4CH 0x20 -#define AHCI_Q_EDGEIS 0x40 -#define AHCI_Q_SATA2 0x80 -#define AHCI_Q_NOBSYRES 0x100 -#define AHCI_Q_NOAA 0x200 -#define AHCI_Q_NOCOUNT 0x400 -#define AHCI_Q_ALTSIG 0x800 -#define AHCI_Q_NOMSI 0x1000 -#define AHCI_Q_ATI_PMP_BUG 0x2000 -#define AHCI_Q_MAXIO_64K 0x4000 -#define AHCI_Q_SATA1_UNIT0 0x8000 /* need better method for this */ -#define AHCI_Q_ABAR0 0x10000 +#define AHCI_Q_NOFORCE 0x00000001 +#define AHCI_Q_NOPMP 0x00000002 +#define AHCI_Q_NONCQ 0x00000004 +#define AHCI_Q_1CH 0x00000008 +#define AHCI_Q_2CH 0x00000010 +#define AHCI_Q_4CH 0x00000020 +#define AHCI_Q_EDGEIS 0x00000040 +#define AHCI_Q_SATA2 0x00000080 +#define AHCI_Q_NOBSYRES 0x00000100 +#define AHCI_Q_NOAA 0x00000200 +#define AHCI_Q_NOCOUNT 0x00000400 +#define AHCI_Q_ALTSIG 0x00000800 +#define AHCI_Q_NOMSI 0x00001000 +#define AHCI_Q_ATI_PMP_BUG 0x00002000 +#define AHCI_Q_MAXIO_64K 0x00004000 +#define AHCI_Q_SATA1_UNIT0 0x00008000 /* need better method for this */ +#define AHCI_Q_ABAR0 0x00010000 +#define AHCI_Q_1MSI 0x00020000 #define AHCI_Q_BIT_STRING \ - "\020" \ + "\021" \ "\001NOFORCE" \ "\002NOPMP" \ "\003NONCQ" \ @@ -592,7 +593,8 @@ enum ahci_err_type { "\016ATI_PMP_BUG" \ "\017MAXIO_64K" \ "\020SATA1_UNIT0" \ - "\021ABAR0" + "\021ABAR0" \ + "\0221MSI" int ahci_attach(device_t dev); int ahci_detach(device_t dev); Modified: head/sys/dev/ahci/ahci_pci.c ============================================================================== --- head/sys/dev/ahci/ahci_pci.c Sun Feb 1 19:07:42 2015 (r278033) +++ head/sys/dev/ahci/ahci_pci.c Sun Feb 1 20:00:08 2015 (r278034) @@ -55,12 +55,17 @@ static const struct { int quirks; } ahci_ids[] = { {0x43801002, 0x00, "AMD SB600", - AHCI_Q_NOMSI | AHCI_Q_ATI_PMP_BUG | AHCI_Q_MAXIO_64K}, - {0x43901002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43911002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43921002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43931002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43941002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, + AHCI_Q_NOMSI | AHCI_Q_ATI_PMP_BUG | AHCI_Q_MAXIO_64K}, + {0x43901002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43911002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43921002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43931002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43941002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, /* Not sure SB8x0/SB9x0 needs this quirk. Be conservative though */ {0x43951002, 0x00, "AMD SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, {0x78001022, 0x00, "AMD Hudson-2", 0}, @@ -137,7 +142,7 @@ static const struct { {0x1f378086, 0x00, "Intel Avoton (RAID)", 0}, {0x1f3e8086, 0x00, "Intel Avoton (RAID)", 0}, {0x1f3f8086, 0x00, "Intel Avoton (RAID)", 0}, - {0x23a38086, 0x00, "Intel Coleto Creek", 0}, + {0x23a38086, 0x00, "Intel Coleto Creek", 0}, {0x28238086, 0x00, "Intel Wellsburg (RAID)", 0}, {0x28278086, 0x00, "Intel Wellsburg (RAID)", 0}, {0x8c028086, 0x00, "Intel Lynx Point", 0}, @@ -410,10 +415,13 @@ ahci_pci_attach(device_t dev) /* Setup interrupts. */ /* Setup MSI register parameters */ - ctlr->msi = 2; /* Process hints. */ if (ctlr->quirks & AHCI_Q_NOMSI) ctlr->msi = 0; + else if (ctlr->quirks & AHCI_Q_1MSI) + ctlr->msi = 1; + else + ctlr->msi = 2; resource_int_value(device_get_name(dev), device_get_unit(dev), "msi", &ctlr->msi); ctlr->numirqs = 1; From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 20:31:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3334EDBB; Sun, 1 Feb 2015 20:31:37 +0000 (UTC) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [IPv6:2a00:1450:400c:c00::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B4933FCA; Sun, 1 Feb 2015 20:31:36 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id x13so35514921wgg.1; Sun, 01 Feb 2015 12:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=wqLfV78u8m31PRXvLTUedccm2WAmaXc0+kfjNOOBPg4=; b=lmOc6giW1SryagowNnMxBVV55hQ0UxpbVp/pa7JYvAgLs24Trua83pvbMGdPCCHOv2 U0CfAGksu4E8xN69sASyQU4dn5YCHOdvzcjaP+fU5JNSzeVQtblGSR8N1WnfOCjj4ajD aFRk6yB26gK4/wEbVEitWbPxVeN5zjrc2uvMMXN8mlZgF+J2L5K7nBywlXiI4tP4r4AW /8n9is0MrFNqS8NIHCF+ST+N+vSOI8FPCzcs1UejAI3qNC6ADpnoGytQ6sN17bbVUah5 UYjgD2QxvJXIdprnSpU0Mlm3BnrdHN1/w//gyMXFg9maXREjLUGrtLz7pKvipzrUKZ5Z nnhQ== X-Received: by 10.180.83.129 with SMTP id q1mr17188786wiy.8.1422822695122; Sun, 01 Feb 2015 12:31:35 -0800 (PST) Received: from brick.home (aeds165.neoplus.adsl.tpnet.pl. [79.186.96.165]) by mx.google.com with ESMTPSA id li7sm16703328wic.4.2015.02.01.12.31.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 12:31:34 -0800 (PST) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Date: Sun, 1 Feb 2015 21:31:32 +0100 From: Edward Tomasz =?utf-8?Q?Napiera=C5=82a?= To: Steven Hartland Subject: Re: svn commit: r278034 - head/sys/dev/ahci Message-ID: <20150201203132.GA30253@brick.home> Mail-Followup-To: Steven Hartland , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201502012000.t11K09AD069530@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201502012000.t11K09AD069530@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:31:37 -0000 On 0201T2000, Steven Hartland wrote: > Author: smh > Date: Sun Feb 1 20:00:08 2015 > New Revision: 278034 > URL: https://svnweb.freebsd.org/changeset/base/278034 > > Log: > Add a quirk to limit AHCI MSI vectors to one > > In 10.1-RELEASE the default number of MSI vectors used was changed from one > to as many vectors as the HW supports. > > This change resulted in an ahci timeouts regression when running on AMD > SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using > this new quirk. Could it fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195349? From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 21:27:16 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E80285F; Sun, 1 Feb 2015 21:27:16 +0000 (UTC) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D2970807; Sun, 1 Feb 2015 21:27:15 +0000 (UTC) Received: by mail-ig0-f176.google.com with SMTP id hl2so14186965igb.3; Sun, 01 Feb 2015 13:27:15 -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 :content-type; bh=XcKPFxCohcFuM8PwEeO9vXHDsFg87n0DuFdalFznT3k=; b=mizeroasBUTa97WVl8YrVROhmNcHSVeNNEssWbRNYBdQY4QNYh7WBQPTuW4s0Cq3Dh /K3jPrGDeTaygIpl/C1BAKXDTiVj7e8cCQk4jQCcl74VRA6COKofUgmTzaaEjoaNwjzm hOpdtXFypJXWQno29hvexoqS10rnRAGgS20SFk/Fv8aLDQHlEJ7MsOPjYsRfr1sVAtHF lCgMtwr1bzDzsSO/hZBmjkxR/8h2TUGmgk/vdsU/vbX+OtswnVDTC0gMVoy54W9ueZwh XMNJKujr35zfhDWBKViwZHmrN3kxJASr+IQiRHDpdaqh2AFEOpFMM1Lg+snzfUYnBOQC LNfQ== MIME-Version: 1.0 X-Received: by 10.50.107.7 with SMTP id gy7mr8378914igb.49.1422826035258; Sun, 01 Feb 2015 13:27:15 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 13:27:15 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 13:27:15 -0800 (PST) In-Reply-To: <20150201195729.GA1990@reks> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> Date: Sun, 1 Feb 2015 13:27:15 -0800 Message-ID: Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms From: Adrian Chadd To: svn-src-head@freebsd.org, Konstantin Belousov , svn-src-all@freebsd.org, src-committers@freebsd.org, Ivan Klymenko , "Max N. Boyarov" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 21:27:16 -0000 Try enabling rc6 sleep state in i915 and see what happens. I found that the package wasn't going to sleep without it. Bapt also found the same thing. I haven't chased up to see if enabling rc6 restored thing. Which hardware is this on? Adrian On Feb 1, 2015 11:56 AM, "Gleb Kurtsou" wrote: > On (22/01/2015 12:15), Ivan Klymenko wrote: > > =D0=92 Thu, 22 Jan 2015 11:18:37 +0300 > > "Max N. Boyarov" =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > > > > On Wed, Jan 21, 2015 at 7:10 PM, Konstantin Belousov > > > wrote: > > > > Author: kib > > > > Date: Wed Jan 21 16:10:37 2015 > > > > New Revision: 277487 > > > > URL: https://svnweb.freebsd.org/changeset/base/277487 > > > > > > > > Log: > > > > An update for the i915 GPU driver, which brings the code up to > > > > Linux commit 4d93914ae3db4a897ead4b. Some related drm > > > > infrastructure changes are imported as needed. > > > > > > > > Biggest update is the rewrite of the i915 gem io to more closely > > > > follow Linux model, althought the mechanism used by FreeBSD port > > > > is different. > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > MFC after: 2 month > > > > > > Hi, after this commit i have many error messages like: > > > > > > error: [drm:pid1121:gen6_sanitize_pm] *ERROR* Power management > > > discrepancy: GEN6_RP_INTERRUPT_LIMITS expected 18070000, was 18000000 > > I'm seeing the same errors. I've also noticed that my laptop started to > overheat (up to 96 C). It was mostly idle, cpu usage at few percent, > freq lowered by powerd, nothing cpu intensive running, web browser, > terminals, etc. > > My initial suspect was recent TSC changes regarding C2/C3 sleep states. > But reverting this commit seems to get situation back to normal. > Did anybody else experience similar issues? > > From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 21:50:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1449AFB8; Sun, 1 Feb 2015 21:50:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F33B59F3; Sun, 1 Feb 2015 21:50:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11LoVHC024601; Sun, 1 Feb 2015 21:50:31 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11LoSfT024581; Sun, 1 Feb 2015 21:50:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502012150.t11LoSfT024581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 1 Feb 2015 21:50:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278037 - in head: sys/cam/ctl usr.sbin/ctladm usr.sbin/ctld 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 21:50:32 -0000 Author: mav Date: Sun Feb 1 21:50:28 2015 New Revision: 278037 URL: https://svnweb.freebsd.org/changeset/base/278037 Log: CTL LUN mapping rewrite. Replace iSCSI-specific LUN mapping mechanism with new one, working for any ports. By default all ports are created without LUN mapping, exposing all CTL LUNs as before. But, if needed, LUN mapping can be manually set on per-port basis via ctladm. For its iSCSI ports ctld does it via ioctl(2). The next step will be to teach ctld to work with FibreChannel ports also. Respecting additional flexibility of the new mechanism, ctl.conf now allows alternative syntax for LUN definition. LUNs can now be defined in global context, and then referenced from targets by unique name, as needed. It allows same LUN to be exposed several times via multiple targets. While there, increase limit for LUNs per target in ctld from 256 to 1024. Some initiators do not support LUNs above 255, but that is not our problem. Discussed with: trasz MFC after: 2 weeks Relnotes: yes Sponsored by: iXsystems, Inc. Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_frontend.c head/sys/cam/ctl/ctl_frontend.h head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_frontend_iscsi.h head/sys/cam/ctl/ctl_ioctl.h head/sys/cam/ctl/ctl_private.h head/sys/cam/ctl/ctl_tpc_local.c head/usr.sbin/ctladm/ctladm.8 head/usr.sbin/ctladm/ctladm.c head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/kernel.c head/usr.sbin/ctld/parse.y Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl.c Sun Feb 1 21:50:28 2015 (r278037) @@ -398,12 +398,11 @@ static int ctl_ioctl_fill_ooa(struct ctl struct ctl_ooa_entry *kern_entries); static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); -static uint32_t ctl_map_lun(struct ctl_softc *softc, int port_num, uint32_t lun); -static uint32_t ctl_map_lun_back(struct ctl_softc *softc, int port_num, uint32_t lun); static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun, struct ctl_be_lun *be_lun, struct ctl_id target_id); static int ctl_free_lun(struct ctl_lun *lun); static void ctl_create_lun(struct ctl_be_lun *be_lun); +static struct ctl_port * ctl_io_port(struct ctl_io_hdr *io_hdr); /** static void ctl_failover_change_pages(struct ctl_softc *softc, struct ctl_scsiio *ctsio, int master); @@ -3411,6 +3410,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, struct ctl_lun_list *list; struct ctl_option *opt; int j; + uint32_t plun; list = (struct ctl_lun_list *)addr; @@ -3491,6 +3491,18 @@ ctl_ioctl(struct cdev *dev, u_long cmd, break; } + if (port->lun_map != NULL) { + sbuf_printf(sb, "\ton\n"); + for (j = 0; j < CTL_MAX_LUNS; j++) { + plun = ctl_lun_map_from_port(port, j); + if (plun >= CTL_MAX_LUNS) + continue; + sbuf_printf(sb, + "\t%u\n", + j, plun); + } + } + for (j = 0; j < CTL_MAX_INIT_PER_PORT; j++) { if (port->wwpn_iid[j].in_use == 0 || (port->wwpn_iid[j].wwpn == 0 && @@ -3538,6 +3550,38 @@ ctl_ioctl(struct cdev *dev, u_long cmd, sbuf_delete(sb); break; } + case CTL_LUN_MAP: { + struct ctl_lun_map *lm = (struct ctl_lun_map *)addr; + struct ctl_port *port; + + mtx_lock(&softc->ctl_lock); + if (lm->port >= CTL_MAX_PORTS || + (port = softc->ctl_ports[lm->port]) == NULL) { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + if (lm->plun < CTL_MAX_LUNS) { + if (lm->lun == UINT32_MAX) + retval = ctl_lun_map_unset(port, lm->plun); + else if (lm->lun < CTL_MAX_LUNS && + softc->ctl_luns[lm->lun] != NULL) + retval = ctl_lun_map_set(port, lm->plun, lm->lun); + else { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + } else if (lm->plun == UINT32_MAX) { + if (lm->lun == UINT32_MAX) + retval = ctl_lun_map_deinit(port); + else + retval = ctl_lun_map_init(port); + } else { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + mtx_unlock(&softc->ctl_lock); + break; + } default: { /* XXX KDM should we fix this? */ #if 0 @@ -3602,35 +3646,106 @@ ctl_port_idx(int port_num) return(port_num - CTL_MAX_PORTS); } -static uint32_t -ctl_map_lun(struct ctl_softc *softc, int port_num, uint32_t lun_id) +int +ctl_lun_map_init(struct ctl_port *port) +{ + uint32_t i; + + if (port->lun_map == NULL) + port->lun_map = malloc(sizeof(uint32_t) * CTL_MAX_LUNS, + M_CTL, M_NOWAIT); + if (port->lun_map == NULL) + return (ENOMEM); + for (i = 0; i < CTL_MAX_LUNS; i++) + port->lun_map[i] = UINT32_MAX; + return (0); +} + +int +ctl_lun_map_deinit(struct ctl_port *port) +{ + + if (port->lun_map == NULL) + return (0); + free(port->lun_map, M_CTL); + port->lun_map = NULL; + return (0); +} + +int +ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun) +{ + int status; + + if (port->lun_map == NULL) { + status = ctl_lun_map_init(port); + if (status != 0) + return (status); + } + port->lun_map[plun] = glun; + return (0); +} + +int +ctl_lun_map_unset(struct ctl_port *port, uint32_t plun) +{ + + if (port->lun_map == NULL) + return (0); + port->lun_map[plun] = UINT32_MAX; + return (0); +} + +int +ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun) +{ + int i; + + if (port->lun_map == NULL) + return (0); + for (i = 0; i < CTL_MAX_LUNS; i++) { + if (port->lun_map[i] == glun) + port->lun_map[i] = UINT32_MAX; + } + return (0); +} + +uint32_t +ctl_lun_map_from_port(struct ctl_port *port, uint32_t lun_id) { - struct ctl_port *port; - port = softc->ctl_ports[ctl_port_idx(port_num)]; if (port == NULL) return (UINT32_MAX); - if (port->lun_map == NULL) + if (port->lun_map == NULL || lun_id >= CTL_MAX_LUNS) return (lun_id); - return (port->lun_map(port->targ_lun_arg, lun_id)); + return (port->lun_map[lun_id]); } -static uint32_t -ctl_map_lun_back(struct ctl_softc *softc, int port_num, uint32_t lun_id) +uint32_t +ctl_lun_map_to_port(struct ctl_port *port, uint32_t lun_id) { - struct ctl_port *port; uint32_t i; - port = softc->ctl_ports[ctl_port_idx(port_num)]; + if (port == NULL) + return (UINT32_MAX); if (port->lun_map == NULL) return (lun_id); for (i = 0; i < CTL_MAX_LUNS; i++) { - if (port->lun_map(port->targ_lun_arg, i) == lun_id) + if (port->lun_map[i] == lun_id) return (i); } return (UINT32_MAX); } +static struct ctl_port * +ctl_io_port(struct ctl_io_hdr *io_hdr) +{ + int port_num; + + port_num = io_hdr->nexus.targ_port; + return (control_softc->ctl_ports[ctl_port_idx(port_num)]); +} + /* * Note: This only works for bitmask sizes that are at least 32 bits, and * that are a power of 2. @@ -4676,9 +4791,7 @@ static int ctl_free_lun(struct ctl_lun *lun) { struct ctl_softc *softc; -#if 0 struct ctl_port *port; -#endif struct ctl_lun *nlun; int i; @@ -4686,6 +4799,9 @@ ctl_free_lun(struct ctl_lun *lun) mtx_assert(&softc->ctl_lock, MA_OWNED); + STAILQ_FOREACH(port, &softc->port_list, links) + ctl_lun_map_unsetg(port, lun->lun); + STAILQ_REMOVE(&softc->lun_list, lun, ctl_lun, links); ctl_clear_mask(softc->ctl_lun_mask, lun->lun); @@ -7343,8 +7459,7 @@ ctl_report_tagret_port_groups(struct ctl STAILQ_FOREACH(port, &softc->port_list, links) { if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; - if (ctl_map_lun_back(softc, port->targ_port, lun->lun) >= - CTL_MAX_LUNS) + if (ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; num_target_ports++; } @@ -7417,8 +7532,7 @@ ctl_report_tagret_port_groups(struct ctl STAILQ_FOREACH(port, &softc->port_list, links) { if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; - if (ctl_map_lun_back(softc, port->targ_port, lun->lun) - >= CTL_MAX_LUNS) + if (ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS; scsi_ulto2b(p, tpg_desc->descriptors[pc]. @@ -9260,6 +9374,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio struct scsi_report_luns *cdb; struct scsi_report_luns_data *lun_data; struct ctl_lun *lun, *request_lun; + struct ctl_port *port; int num_luns, retval; uint32_t alloc_len, lun_datalen; int num_filled, well_known; @@ -9316,6 +9431,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio request_lun = (struct ctl_lun *) ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr; + port = ctl_io_port(&ctsio->io_hdr); lun_datalen = sizeof(*lun_data) + (num_luns * sizeof(struct scsi_report_luns_lundata)); @@ -9328,8 +9444,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio mtx_lock(&softc->ctl_lock); for (targ_lun_id = 0, num_filled = 0; targ_lun_id < CTL_MAX_LUNS && num_filled < num_luns; targ_lun_id++) { - lun_id = ctl_map_lun(softc, ctsio->io_hdr.nexus.targ_port, - targ_lun_id); + lun_id = ctl_lun_map_from_port(port, targ_lun_id); if (lun_id >= CTL_MAX_LUNS) continue; lun = softc->ctl_luns[lun_id]; @@ -10014,8 +10129,7 @@ ctl_inquiry_evpd_scsi_ports(struct ctl_s if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; if (lun != NULL && - ctl_map_lun_back(softc, port->targ_port, lun->lun) >= - CTL_MAX_LUNS) + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; num_target_ports++; if (port->init_devid) @@ -10068,8 +10182,7 @@ ctl_inquiry_evpd_scsi_ports(struct ctl_s if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; if (lun != NULL && - ctl_map_lun_back(softc, port->targ_port, lun->lun) - >= CTL_MAX_LUNS) + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS; scsi_ulto2b(p, pd->relative_port_id); @@ -13745,6 +13858,7 @@ int ctl_queue_sense(union ctl_io *io) { struct ctl_lun *lun; + struct ctl_port *port; struct ctl_softc *softc; uint32_t initidx, targ_lun; @@ -13765,8 +13879,8 @@ ctl_queue_sense(union ctl_io *io) * If we don't have a LUN for this, just toss the sense * information. */ - targ_lun = io->io_hdr.nexus.targ_lun; - targ_lun = ctl_map_lun(softc, io->io_hdr.nexus.targ_port, targ_lun); + port = ctl_io_port(&ctsio->io_hdr); + targ_lun = ctl_lun_map_from_port(port, io->io_hdr.nexus.targ_lun); if ((targ_lun < CTL_MAX_LUNS) && (softc->ctl_luns[targ_lun] != NULL)) lun = softc->ctl_luns[targ_lun]; @@ -13806,6 +13920,7 @@ bailout: int ctl_queue(union ctl_io *io) { + struct ctl_port *port; CTL_DEBUG_PRINT(("ctl_queue cdb[0]=%02X\n", io->scsiio.cdb[0])); @@ -13815,9 +13930,9 @@ ctl_queue(union ctl_io *io) #endif /* CTL_TIME_IO */ /* Map FE-specific LUN ID into global one. */ + port = ctl_io_port(&io->io_hdr); io->io_hdr.nexus.targ_mapped_lun = - ctl_map_lun(control_softc, io->io_hdr.nexus.targ_port, - io->io_hdr.nexus.targ_lun); + ctl_lun_map_from_port(port, io->io_hdr.nexus.targ_lun); switch (io->io_hdr.io_type) { case CTL_IO_SCSI: Modified: head/sys/cam/ctl/ctl_frontend.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend.c Sun Feb 1 21:50:28 2015 (r278037) @@ -234,6 +234,7 @@ ctl_port_deregister(struct ctl_port *por ctl_pool_free(pool); ctl_free_opts(&port->options); + ctl_lun_map_deinit(port); free(port->port_devid, M_CTL); port->port_devid = NULL; free(port->target_devid, M_CTL); Modified: head/sys/cam/ctl/ctl_frontend.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend.h Sun Feb 1 21:50:28 2015 (r278037) @@ -51,7 +51,6 @@ typedef void (*fe_shutdown_t)(void); typedef void (*port_func_t)(void *onoff_arg); typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb); typedef int (*lun_func_t)(void *arg, struct ctl_id targ_id, int lun_id); -typedef uint32_t (*lun_map_func_t)(void *arg, uint32_t lun_id); typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); @@ -226,7 +225,7 @@ struct ctl_port { void *onoff_arg; /* passed to CTL */ lun_func_t lun_enable; /* passed to CTL */ lun_func_t lun_disable; /* passed to CTL */ - lun_map_func_t lun_map; /* passed to CTL */ + uint32_t *lun_map; /* passed to CTL */ void *targ_lun_arg; /* passed to CTL */ void (*fe_datamove)(union ctl_io *io); /* passed to CTL */ void (*fe_done)(union ctl_io *io); /* passed to CTL */ Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Feb 1 21:50:28 2015 (r278037) @@ -151,7 +151,6 @@ static int cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id); -static uint32_t cfiscsi_lun_map(void *arg, uint32_t lun); static int cfiscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); static void cfiscsi_datamove(union ctl_io *io); @@ -2031,7 +2030,6 @@ cfiscsi_ioctl_port_create(struct ctl_req port->onoff_arg = ct; port->lun_enable = cfiscsi_lun_enable; port->lun_disable = cfiscsi_lun_disable; - port->lun_map = cfiscsi_lun_map; port->targ_lun_arg = ct; port->fe_datamove = cfiscsi_datamove; port->fe_done = cfiscsi_done; @@ -2081,7 +2079,7 @@ cfiscsi_ioctl_port_create(struct ctl_req free(port->target_devid, M_CFISCSI); req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "ctl_frontend_register() failed with error %d", retval); + "ctl_port_register() failed with error %d", retval); return; } done: @@ -2259,7 +2257,6 @@ cfiscsi_target_find_or_create(struct cfi const char *alias) { struct cfiscsi_target *ct, *newct; - int i; if (name[0] == '\0' || strlen(name) >= CTL_ISCSI_NAME_LEN) return (NULL); @@ -2277,9 +2274,6 @@ cfiscsi_target_find_or_create(struct cfi return (ct); } - for (i = 0; i < CTL_MAX_LUNS; i++) - newct->ct_luns[i] = UINT32_MAX; - strlcpy(newct->ct_name, name, sizeof(newct->ct_name)); if (alias != NULL) strlcpy(newct->ct_alias, alias, sizeof(newct->ct_alias)); @@ -2294,108 +2288,17 @@ cfiscsi_target_find_or_create(struct cfi return (newct); } -/* - * Takes LUN from the target space and returns LUN from the CTL space. - */ -static uint32_t -cfiscsi_lun_map(void *arg, uint32_t lun) -{ - struct cfiscsi_target *ct = arg; - - if (lun >= CTL_MAX_LUNS) { - CFISCSI_DEBUG("requested lun number %d is higher " - "than maximum %d", lun, CTL_MAX_LUNS - 1); - return (UINT32_MAX); - } - return (ct->ct_luns[lun]); -} - -static int -cfiscsi_target_set_lun(struct cfiscsi_target *ct, - unsigned long lun_id, unsigned long ctl_lun_id) -{ - - if (lun_id >= CTL_MAX_LUNS) { - CFISCSI_WARN("requested lun number %ld is higher " - "than maximum %d", lun_id, CTL_MAX_LUNS - 1); - return (-1); - } - - if (ct->ct_luns[lun_id] < CTL_MAX_LUNS) { - /* - * CTL calls cfiscsi_lun_enable() twice for each LUN - once - * when the LUN is created, and a second time just before - * the port is brought online; don't emit warnings - * for that case. - */ - if (ct->ct_luns[lun_id] == ctl_lun_id) - return (0); - CFISCSI_WARN("lun %ld already allocated", lun_id); - return (-1); - } - -#if 0 - CFISCSI_DEBUG("adding mapping for lun %ld, target %s " - "to ctl lun %ld", lun_id, ct->ct_name, ctl_lun_id); -#endif - - ct->ct_luns[lun_id] = ctl_lun_id; - - return (0); -} - static int cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) { - struct cfiscsi_softc *softc; - struct cfiscsi_target *ct; - const char *target = NULL; - const char *lun = NULL; - unsigned long tmp; - - ct = (struct cfiscsi_target *)arg; - softc = ct->ct_softc; - - target = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options, - "cfiscsi_target"); - lun = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options, - "cfiscsi_lun"); - - if (target == NULL && lun == NULL) - return (0); - - if (target == NULL || lun == NULL) { - CFISCSI_WARN("lun added with cfiscsi_target, but without " - "cfiscsi_lun, or the other way around; ignoring"); - return (0); - } - - if (strcmp(target, ct->ct_name) != 0) - return (0); - tmp = strtoul(lun, NULL, 10); - cfiscsi_target_set_lun(ct, tmp, lun_id); return (0); } static int cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) { - struct cfiscsi_softc *softc; - struct cfiscsi_target *ct; - int i; - - ct = (struct cfiscsi_target *)arg; - softc = ct->ct_softc; - mtx_lock(&softc->lock); - for (i = 0; i < CTL_MAX_LUNS; i++) { - if (ct->ct_luns[i] != lun_id) - continue; - ct->ct_luns[i] = UINT32_MAX; - break; - } - mtx_unlock(&softc->lock); return (0); } Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend_iscsi.h Sun Feb 1 21:50:28 2015 (r278037) @@ -38,7 +38,6 @@ struct cfiscsi_target { TAILQ_ENTRY(cfiscsi_target) ct_next; - uint32_t ct_luns[CTL_MAX_LUNS]; struct cfiscsi_softc *ct_softc; volatile u_int ct_refcount; char ct_name[CTL_ISCSI_NAME_LEN]; Modified: head/sys/cam/ctl/ctl_ioctl.h ============================================================================== --- head/sys/cam/ctl/ctl_ioctl.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_ioctl.h Sun Feb 1 21:50:28 2015 (r278037) @@ -805,6 +805,12 @@ struct ctl_iscsi { /* passed to userland */ }; +struct ctl_lun_map { + uint32_t port; + uint32_t plun; + uint32_t lun; +}; + #define CTL_IO _IOWR(CTL_MINOR, 0x00, union ctl_io) #define CTL_ENABLE_PORT _IOW(CTL_MINOR, 0x04, struct ctl_port_entry) #define CTL_DISABLE_PORT _IOW(CTL_MINOR, 0x05, struct ctl_port_entry) @@ -832,6 +838,7 @@ struct ctl_iscsi { #define CTL_ISCSI _IOWR(CTL_MINOR, 0x25, struct ctl_iscsi) #define CTL_PORT_REQ _IOWR(CTL_MINOR, 0x26, struct ctl_req) #define CTL_PORT_LIST _IOWR(CTL_MINOR, 0x27, struct ctl_lun_list) +#define CTL_LUN_MAP _IOW(CTL_MINOR, 0x28, struct ctl_lun_map) #endif /* _CTL_IOCTL_H_ */ Modified: head/sys/cam/ctl/ctl_private.h ============================================================================== --- head/sys/cam/ctl/ctl_private.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_private.h Sun Feb 1 21:50:28 2015 (r278037) @@ -492,6 +492,13 @@ extern const struct ctl_cmd_entry ctl_cm uint32_t ctl_get_initindex(struct ctl_nexus *nexus); uint32_t ctl_get_resindex(struct ctl_nexus *nexus); uint32_t ctl_port_idx(int port_num); +int ctl_lun_map_init(struct ctl_port *port); +int ctl_lun_map_deinit(struct ctl_port *port); +int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun); +int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun); +int ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun); +uint32_t ctl_lun_map_from_port(struct ctl_port *port, uint32_t plun); +uint32_t ctl_lun_map_to_port(struct ctl_port *port, uint32_t glun); int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, uint32_t total_ctl_io, void **npool); void ctl_pool_free(struct ctl_io_pool *pool); Modified: head/sys/cam/ctl/ctl_tpc_local.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc_local.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_tpc_local.c Sun Feb 1 21:50:28 2015 (r278037) @@ -314,48 +314,30 @@ tpcl_resolve(struct ctl_softc *softc, in struct scsi_ec_cscd_id *cscdid; struct ctl_port *port; struct ctl_lun *lun; - uint64_t lunid = UINT64_MAX, l; - int i; + uint64_t lunid = UINT64_MAX; if (cscd->type_code != EC_CSCD_ID) return (lunid); cscdid = (struct scsi_ec_cscd_id *)cscd; mtx_lock(&softc->ctl_lock); - if (init_port >= 0) { + if (init_port >= 0) port = softc->ctl_ports[ctl_port_idx(init_port)]; - if (port == NULL || port->lun_map == NULL) - init_port = -1; - } - if (init_port < 0) { - STAILQ_FOREACH(lun, &softc->lun_list, links) { - if (lun->lun_devid == NULL) - continue; - if (scsi_devid_match(lun->lun_devid->data, - lun->lun_devid->len, &cscdid->codeset, - cscdid->length + 4) == 0) { - lunid = lun->lun; - if (ss && lun->be_lun) - *ss = lun->be_lun->blocksize; - break; - } - } - } else { - for (i = 0; i < CTL_MAX_LUNS; i++) { - l = port->lun_map(port->targ_lun_arg, i); - if (l >= CTL_MAX_LUNS) - continue; - lun = softc->ctl_luns[l]; - if (lun == NULL || lun->lun_devid == NULL) - continue; - if (scsi_devid_match(lun->lun_devid->data, - lun->lun_devid->len, &cscdid->codeset, - cscdid->length + 4) == 0) { - lunid = lun->lun; - if (ss && lun->be_lun) - *ss = lun->be_lun->blocksize; - break; - } + else + port = NULL; + STAILQ_FOREACH(lun, &softc->lun_list, links) { + if (port != NULL && + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) + continue; + if (lun->lun_devid == NULL) + continue; + if (scsi_devid_match(lun->lun_devid->data, + lun->lun_devid->len, &cscdid->codeset, + cscdid->length + 4) == 0) { + lunid = lun->lun; + if (ss && lun->be_lun) + *ss = lun->be_lun->blocksize; + break; } } mtx_unlock(&softc->ctl_lock); Modified: head/usr.sbin/ctladm/ctladm.8 ============================================================================== --- head/usr.sbin/ctladm/ctladm.8 Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctladm/ctladm.8 Sun Feb 1 21:50:28 2015 (r278037) @@ -34,7 +34,7 @@ .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" $FreeBSD$ .\" -.Dd December 17, 2014 +.Dd February 1, 2015 .Dt CTLADM 8 .Os .Sh NAME @@ -196,11 +196,17 @@ .Ic portlist .Op Fl f Ar frontend .Op Fl i +.Op Fl l .Op Fl p Ar targ_port .Op Fl q .Op Fl v .Op Fl x .Nm +.Ic lunmap +.Aq Fl p Ar targ_port +.Op Fl l Ar pLUN +.Op Fl L Ar cLUN +.Nm .Ic dumpooa .Nm .Ic dumpstructs @@ -782,7 +788,9 @@ List CTL frontend ports. .It Fl f Ar frontend Specify the frontend type. .It Fl i -Report target and connected initiators addresses +Report target and connected initiators addresses. +.It Fl l +Report LUN mapping. .It Fl p Ar targ_port Specify the frontend port number. .It Fl q @@ -792,6 +800,31 @@ Enable verbose output (report all port o .It Fl x Output the port list in XML format. .El +.It Ic lunmap +Change LUN mapping for specified port. +If both +.Ar pLUN +and +.Ar cLUN +are specified -- LUN will be mapped. +If +.Ar pLUN +is specified, but +.Ar cLUN +is not -- LUN will be unmapped. +If neither +.Ar pLUN +nor +.Ar cLUN +are specified -- LUN mapping will be disabled, exposing all CTL LUNs. +.Bl -tag -width 12n +.It Fl p Ar targ_port +Specify the frontend port number. +.It Fl l Ar pLUN +LUN number visible by specified port. +.It Fl L Ar cLUN +CTL LUN number. +.El .It Ic dumpooa Dump the OOA (Order Of Arrival) queue for each LUN registered with CTL. .It Ic dumpstructs Modified: head/usr.sbin/ctladm/ctladm.c ============================================================================== --- head/usr.sbin/ctladm/ctladm.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctladm/ctladm.c Sun Feb 1 21:50:28 2015 (r278037) @@ -121,7 +121,8 @@ typedef enum { CTLADM_CMD_MODIFY, CTLADM_CMD_ISLIST, CTLADM_CMD_ISLOGOUT, - CTLADM_CMD_ISTERMINATE + CTLADM_CMD_ISTERMINATE, + CTLADM_CMD_LUNMAP } ctladm_cmdfunction; typedef enum { @@ -188,10 +189,11 @@ static struct ctladm_opts option_table[] {"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ac:i:p:"}, {"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ac:i:p:"}, {"lunlist", CTLADM_CMD_LUNLIST, CTLADM_ARG_NONE, NULL}, + {"lunmap", CTLADM_CMD_LUNMAP, CTLADM_ARG_NONE, "p:l:L:"}, {"modesense", CTLADM_CMD_MODESENSE, CTLADM_ARG_NEED_TL, "P:S:dlm:c:"}, {"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:s:"}, {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "lo:p:qt:w:W:x"}, - {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ip:qvx"}, + {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ilp:qvx"}, {"prin", CTLADM_CMD_PRES_IN, CTLADM_ARG_NEED_TL, "a:"}, {"prout", CTLADM_CMD_PRES_OUT, CTLADM_ARG_NEED_TL, "a:k:r:s:"}, {"read", CTLADM_CMD_READ, CTLADM_ARG_NEED_TL, rw_opts}, @@ -4106,8 +4108,9 @@ struct cctl_port { char *frontend_type; char *name; int pp, vp; - char *target, *port; + char *target, *port, *lun_map; STAILQ_HEAD(,cctl_lun_nv) init_list; + STAILQ_HEAD(,cctl_lun_nv) lun_list; STAILQ_HEAD(,cctl_lun_nv) attr_list; STAILQ_ENTRY(cctl_port) links; }; @@ -4161,6 +4164,7 @@ cctl_start_pelement(void *user_data, con portlist->cur_port = cur_port; STAILQ_INIT(&cur_port->init_list); + STAILQ_INIT(&cur_port->lun_list); STAILQ_INIT(&cur_port->attr_list); cur_port->port_id = portlist->cur_id; STAILQ_INSERT_TAIL(&portlist->port_list, cur_port, links); @@ -4220,6 +4224,9 @@ cctl_end_pelement(void *user_data, const } else if (strcmp(name, "port") == 0) { cur_port->port = str; str = NULL; + } else if (strcmp(name, "lun_map") == 0) { + cur_port->lun_map = str; + str = NULL; } else if (strcmp(name, "targ_port") == 0) { portlist->cur_port = NULL; } else if (strcmp(name, "ctlportlist") == 0) { @@ -4232,7 +4239,8 @@ cctl_end_pelement(void *user_data, const err(1, "%s: can't allocate %zd bytes for nv pair", __func__, sizeof(*nv)); - if (strcmp(name, "initiator") == 0) + if (strcmp(name, "initiator") == 0 || + strcmp(name, "lun") == 0) asprintf(&nv->name, "%ju", portlist->cur_id); else nv->name = strdup(name); @@ -4244,6 +4252,8 @@ cctl_end_pelement(void *user_data, const str = NULL; if (strcmp(name, "initiator") == 0) STAILQ_INSERT_TAIL(&cur_port->init_list, nv, links); + else if (strcmp(name, "lun") == 0) + STAILQ_INSERT_TAIL(&cur_port->lun_list, nv, links); else STAILQ_INSERT_TAIL(&cur_port->attr_list, nv, links); } @@ -4274,7 +4284,7 @@ cctl_portlist(int fd, int argc, char **a int retval, c; char *frontend = NULL; uint64_t portarg = UINT64_MAX; - int verbose = 0, init = 0, quiet = 0; + int verbose = 0, init = 0, lun = 0, quiet = 0; retval = 0; port_len = 4096; @@ -4290,6 +4300,9 @@ cctl_portlist(int fd, int argc, char **a case 'i': init++; break; + case 'l': + lun++; + break; case 'p': portarg = strtoll(optarg, NULL, 0); break; @@ -4381,6 +4394,17 @@ retry: } } + if (lun || verbose) { + if (port->lun_map) { + STAILQ_FOREACH(nv, &port->lun_list, links) + printf(" LUN %s: %s\n", + nv->name, nv->value); + if (STAILQ_EMPTY(&port->lun_list)) + printf(" No LUNs mapped\n"); + } else + printf(" All LUNs mapped\n"); + } + if (verbose) { STAILQ_FOREACH(nv, &port->attr_list, links) { printf(" %s=%s\n", nv->name, nv->value); @@ -4393,6 +4417,41 @@ bailout: return (retval); } +static int +cctl_lunmap(int fd, int argc, char **argv, char *combinedopt) +{ + struct ctl_lun_map lm; + int retval = 0, c; + + retval = 0; + lm.port = UINT32_MAX; + lm.plun = UINT32_MAX; + lm.lun = UINT32_MAX; + + while ((c = getopt(argc, argv, combinedopt)) != -1) { + switch (c) { + case 'p': + lm.port = strtoll(optarg, NULL, 0); + break; + case 'l': + lm.plun = strtoll(optarg, NULL, 0); + break; + case 'L': + lm.lun = strtoll(optarg, NULL, 0); + break; + default: + break; + } + } + + if (ioctl(fd, CTL_LUN_MAP, &lm) == -1) { + warn("%s: error issuing CTL_LUN_MAP ioctl", __func__); + retval = 1; + } + + return (retval); +} + void usage(int error) { @@ -4430,6 +4489,7 @@ usage(int error) " ctladm hardstop\n" " ctladm hardstart\n" " ctladm lunlist\n" +" ctladm lunmap -p targ_port [-l pLUN] [-L cLUN]\n" " ctladm bbrread [dev_id] <-l lba> <-d datalen>\n" " ctladm delay [dev_id] <-l datamove|done> [-T oneshot|cont]\n" " [-t secs]\n" @@ -4529,10 +4589,15 @@ usage(int error) "portlist options:\n" "-f fronetnd : specify frontend type\n" "-i : report target and initiators addresses\n" +"-l : report LUN mapping\n" "-p targ_port : specify target port number\n" "-q : omit header in list output\n" "-v : verbose output (report all port options)\n" "-x : output port list in XML format\n" +"lunmap options:\n" +"-p targ_port : specify target port number\n" +"-L pLUN : specify port-visible LUN\n" +"-L cLUN : specify CTL LUN\n" "bbrread options:\n" "-l lba : starting LBA\n" "-d datalen : length, in bytes, to read\n", @@ -4760,6 +4825,9 @@ main(int argc, char **argv) case CTLADM_CMD_PORTLIST: retval = cctl_portlist(fd, argc, argv, combinedopt); break; + case CTLADM_CMD_LUNMAP: + retval = cctl_lunmap(fd, argc, argv, combinedopt); + break; case CTLADM_CMD_READCAPACITY: retval = cctl_read_capacity(fd, target, lun, initid, retries, argc, argv, combinedopt); Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctld/ctl.conf.5 Sun Feb 1 21:50:28 2015 (r278037) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 24, 2014 +.Dd February 1, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -60,9 +60,14 @@ file is: .Dl ... } +.No lun Ar name No { +.Dl path Ar path +} + .No target Ar name { .Dl auth-group Ar name .Dl portal-group Ar name +.Dl lun Ar number Ar name .Dl lun Ar number No { .Dl path Ar path .Dl } @@ -95,6 +100,10 @@ Create a configuration context, defining a new portal-group, which can then be assigned to any number of targets. +.It Ic lun Ar name +Create a +.Sy lun +configuration context, defining a LUN to be exported by some target(s). .It Ic target Ar name Create a .Sy target @@ -312,6 +321,10 @@ IPv4 or IPv6 address to redirect initiat When configured, all initiators attempting to connect to this target will get redirected using "Target moved temporarily" login response. Redirection happens after successful authentication. +.It Ic lun Ar number Ar name +Export previously defined +.Sy lun +by the parent target. .It Ic lun Ar number Create a .Sy lun @@ -387,21 +400,21 @@ target iqn.2012-06.com.example:target0 { } } +lun example_1 { + path /dev/zvol/tank/example_1 +} + target iqn.2012-06.com.example:target1 { chap chapuser chapsecret - lun 0 { - path /dev/zvol/tank/example_1 - } + lun 0 example_1 } target iqn.2012-06.com.example:target2 { auth-group ag0 portal-group pg0 - lun 0 { - path /dev/zvol/tank/example2_0 - } + lun 0 example_1 lun 1 { - path /dev/zvol/tank/example2_1 + path /dev/zvol/tank/example_2 option foo bar } } Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctld/ctld.c Sun Feb 1 21:50:28 2015 (r278037) @@ -87,6 +87,7 @@ conf_new(void) conf = calloc(1, sizeof(*conf)); if (conf == NULL) log_err(1, "calloc"); + TAILQ_INIT(&conf->conf_luns); TAILQ_INIT(&conf->conf_targets); TAILQ_INIT(&conf->conf_auth_groups); TAILQ_INIT(&conf->conf_portal_groups); @@ -104,6 +105,7 @@ conf_new(void) void conf_delete(struct conf *conf) { + struct lun *lun, *ltmp; struct target *targ, *tmp; struct auth_group *ag, *cagtmp; struct portal_group *pg, *cpgtmp; @@ -111,6 +113,8 @@ conf_delete(struct conf *conf) assert(conf->conf_pidfh == NULL); + TAILQ_FOREACH_SAFE(lun, &conf->conf_luns, l_next, ltmp) + lun_delete(lun); TAILQ_FOREACH_SAFE(targ, &conf->conf_targets, t_next, tmp) target_delete(targ); TAILQ_FOREACH_SAFE(ag, &conf->conf_auth_groups, ag_next, cagtmp) @@ -1146,7 +1150,6 @@ target_new(struct conf *conf, const char for (i = 0; i < len; i++) targ->t_name[i] = tolower(targ->t_name[i]); - TAILQ_INIT(&targ->t_luns); targ->t_conf = conf; TAILQ_INSERT_TAIL(&conf->conf_targets, targ, t_next); @@ -1156,12 +1159,9 @@ target_new(struct conf *conf, const char void target_delete(struct target *targ) { - struct lun *lun, *tmp; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 22:50:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBE64A16; Sun, 1 Feb 2015 22:50:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6AC6F2A; Sun, 1 Feb 2015 22:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11MoY7Z054982; Sun, 1 Feb 2015 22:50:34 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11MoYMh054980; Sun, 1 Feb 2015 22:50:34 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201502012250.t11MoYMh054980@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sun, 1 Feb 2015 22:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278038 - in head: contrib/netbsd-tests/lib/libc/gen lib/libc/gen 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 22:50:34 -0000 Author: jilles Date: Sun Feb 1 22:50:33 2015 New Revision: 278038 URL: https://svnweb.freebsd.org/changeset/base/278038 Log: ttyname_r(): Return actual error, not always [ENOTTY]. Adjust the test that used to fail because of this bug. PR: 191936 MFC after: 1 week Modified: head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c head/lib/libc/gen/ttyname.c Modified: head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Sun Feb 1 21:50:28 2015 (r278037) +++ head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Sun Feb 1 22:50:33 2015 (r278038) @@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc) ATF_REQUIRE(rv == ERANGE); } -#ifdef __FreeBSD__ - atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936"); -#endif rv = ttyname_r(-1, buf, ttymax); ATF_REQUIRE(rv == EBADF); Modified: head/lib/libc/gen/ttyname.c ============================================================================== --- head/lib/libc/gen/ttyname.c Sun Feb 1 21:50:28 2015 (r278037) +++ head/lib/libc/gen/ttyname.c Sun Feb 1 22:50:33 2015 (r278038) @@ -65,7 +65,7 @@ ttyname_r(int fd, char *buf, size_t len) /* Must be a terminal. */ if (!isatty(fd)) - return (ENOTTY); + return (errno); /* Must have enough room */ if (len <= sizeof(_PATH_DEV)) return (ERANGE); @@ -73,7 +73,7 @@ ttyname_r(int fd, char *buf, size_t len) strcpy(buf, _PATH_DEV); used = strlen(buf); if (fdevname_r(fd, buf + used, len - used) == NULL) - return (ENOTTY); + return (errno == EINVAL ? ERANGE : errno); return (0); } From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:02:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42606C4B; Sun, 1 Feb 2015 23:02:43 +0000 (UTC) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [IPv6:2a00:1450:400c:c05::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFAE3120; Sun, 1 Feb 2015 23:02:42 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id h11so13123295wiw.5; Sun, 01 Feb 2015 15:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Ka2kCyCrZTXVhbKMlUS8cehOUr7B2C+rrAVE71Alkpo=; b=QAYtaz7Neo/7V4hEQ7bOSL1cCCd7Sr9keqOfmOSpCyAqqC0hJwLhEZWovCCcpQDTgd GIuxPtzQKUwM+T+NldeRcgzhJ8meqOUpdeouKzz3mI2dsGz5Z/yIWGbt1+szNc3+shnr kIwI9DPR26Uoh1vrfzC1ICnX0Y/A3s/cVpF00gwxCWkm+/D5O1SX0v0yJET+jjCohFX6 YqZz5gQwPKAVX9FCYgFTK5j+cRDLXTGEaubTM4TE6us4wfr/L8yGiw3ZS4a09iZlCSbP 9JGA06/7kQbovqP+x8CXho7vMbS8Q2CADB67L3/od878wt9JbY3ZQTiydT0RqvG+bQeL RTdw== X-Received: by 10.194.120.40 with SMTP id kz8mr37130458wjb.21.1422831761225; Sun, 01 Feb 2015 15:02:41 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id hl1sm25166792wjc.18.2015.02.01.15.02.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 15:02:40 -0800 (PST) Sender: Baptiste Daroussin Date: Mon, 2 Feb 2015 00:02:38 +0100 From: Baptiste Daroussin To: Adrian Chadd Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms Message-ID: <20150201230238.GG11558@ivaldir.etoilebsd.net> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/i8j2F0k9BYX4qLc" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Ivan Klymenko , src-committers@freebsd.org, "Max N. Boyarov" , svn-src-all@freebsd.org, Konstantin Belousov , svn-src-head@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:02:43 -0000 --/i8j2F0k9BYX4qLc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 01, 2015 at 01:27:15PM -0800, Adrian Chadd wrote: > Try enabling rc6 sleep state in i915 and see what happens. >=20 > I found that the package wasn't going to sleep without it. >=20 > Bapt also found the same thing. I haven't chased up to see if enabling rc6 > restored thing. >=20 Yes this restored thing, the laptop is now usable again. Chatting about this is Lars (lme@) at FOSDEM he sees the same results. Bapt --/i8j2F0k9BYX4qLc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlTOsI4ACgkQ8kTtMUmk6Ez0mgCdEtnXXSQoG8+lBf13rZCoimvz vi4AoJ3YLn0Df/7KwedeVok5ZRIZRDdM =VlRA -----END PGP SIGNATURE----- --/i8j2F0k9BYX4qLc-- From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:08:20 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB715D9A for ; Sun, 1 Feb 2015 23:08:20 +0000 (UTC) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51E171C2 for ; Sun, 1 Feb 2015 23:08:19 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id fb4so13163268wid.2 for ; Sun, 01 Feb 2015 15:08:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=/n77tIki6Edragq76cTT0MWcZ3HGt6rDYkG5p/pyv9s=; b=c5mrlQSp1GRQtXzpIcC+15e12+sq1QFqZjOXF9DL0/n5woc1vNJjWg1oyXb9V9tHhW Qsmqy4g9r27hJ5GewmOhm8dcAamQEQMo3anqlwMEo9V/XIrufDR//iN/AZFcm0u4w5wd Sx2AAOS94yMQdP45HnBhAGLAn4aUQDyJhsk3It97qVkGLNC9oYA/kbuzDLf58I8IEbDX dWptcAA2sgMVOd1v1aoX8wlq1T5pQFyBA7/lQr8PlnbwdqfcPcICkrRqTWMwZnN1/iwl RnFCAPRAtAOAxzeSrO1fQS27Qzks6c/q0zQNPLCGvhx3mF3y7MaTOV2LLFfTRJQJUlFf UJAw== X-Gm-Message-State: ALoCoQmS28OK6kqQ+ZXRHi3PnVdsBVc6QyaxxWRQuibKwdbfYEuAEDP8/GGatx/MsQq7jv5i1LRR X-Received: by 10.194.239.72 with SMTP id vq8mr27067461wjc.110.1422832092255; Sun, 01 Feb 2015 15:08:12 -0800 (PST) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id x6sm25183244wjf.24.2015.02.01.15.08.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 15:08:11 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <54CEB1DE.8070300@freebsd.org> Date: Sun, 01 Feb 2015 23:08:14 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r278034 - head/sys/dev/ahci References: <201502012000.t11K09AD069530@svn.freebsd.org> <20150201203132.GA30253@brick.home> In-Reply-To: <20150201203132.GA30253@brick.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:08:20 -0000 On 01/02/2015 20:31, Edward Tomasz Napierała wrote: > On 0201T2000, Steven Hartland wrote: >> Author: smh >> Date: Sun Feb 1 20:00:08 2015 >> New Revision: 278034 >> URL: https://svnweb.freebsd.org/changeset/base/278034 >> >> Log: >> Add a quirk to limit AHCI MSI vectors to one >> >> In 10.1-RELEASE the default number of MSI vectors used was changed from one >> to as many vectors as the HW supports. >> >> This change resulted in an ahci timeouts regression when running on AMD >> SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using >> this new quirk. > Could it fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195349? > Yes it could well fix that as the dmesg lists the effected hardware From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:19:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8793AA4; Sun, 1 Feb 2015 23:19:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73E892EE; Sun, 1 Feb 2015 23:19:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11NJ7Dp066323; Sun, 1 Feb 2015 23:19:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11NJ7Vo066322; Sun, 1 Feb 2015 23:19:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502012319.t11NJ7Vo066322@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 1 Feb 2015 23:19:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278039 - head/lib/libc/rpc 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:19:07 -0000 Author: pfg Date: Sun Feb 1 23:19:06 2015 New Revision: 278039 URL: https://svnweb.freebsd.org/changeset/base/278039 Log: Resource leak CID: 1016703 Reviewed by: alfred Modified: head/lib/libc/rpc/crypt_client.c Modified: head/lib/libc/rpc/crypt_client.c ============================================================================== --- head/lib/libc/rpc/crypt_client.c Sun Feb 1 22:50:33 2015 (r278038) +++ head/lib/libc/rpc/crypt_client.c Sun Feb 1 23:19:06 2015 (r278039) @@ -64,6 +64,7 @@ _des_crypt_call(buf, len, dparms) } if (nconf == NULL) { warnx("getnetconfig: %s", nc_sperror()); + endnetconfig(localhandle); return(DESERR_HWERROR); } clnt = clnt_tp_create(NULL, CRYPT_PROG, CRYPT_VERS, nconf); From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:17:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A16FC8BE; Mon, 2 Feb 2015 00:17:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D21CA4B; Mon, 2 Feb 2015 00:17:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t120HbT5095089; Mon, 2 Feb 2015 00:17:37 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t120Hb2g095087; Mon, 2 Feb 2015 00:17:37 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201502020017.t120Hb2g095087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Mon, 2 Feb 2015 00:17:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278040 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:17:37 -0000 Author: smh Date: Mon Feb 2 00:17:36 2015 New Revision: 278040 URL: https://svnweb.freebsd.org/changeset/base/278040 Log: Prevent inlining txg_quiesce This allows dtrace to monitor the calls to txg_quiesce which can be really helpful. Also standardise __noinline order for arc_kmem_reap_now. Sponsored by: Multiplay Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Feb 2 00:17:36 2015 (r278040) @@ -2677,7 +2677,7 @@ extern kmem_cache_t *zio_buf_cache[]; extern kmem_cache_t *zio_data_buf_cache[]; extern kmem_cache_t *range_seg_cache; -static void __noinline +static __noinline void arc_kmem_reap_now(arc_reclaim_strategy_t strat) { size_t i; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Mon Feb 2 00:17:36 2015 (r278040) @@ -353,7 +353,7 @@ txg_rele_to_sync(txg_handle_t *th) * On return, the transaction group has reached a stable state in which it can * then be passed off to the syncing context. */ -static void +static __noinline void txg_quiesce(dsl_pool_t *dp, uint64_t txg) { tx_state_t *tx = &dp->dp_tx; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:19:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6767A7C; Mon, 2 Feb 2015 00:19:38 +0000 (UTC) Received: from mail-ie0-x22e.google.com (mail-ie0-x22e.google.com [IPv6:2607:f8b0:4001:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6C76A62; Mon, 2 Feb 2015 00:19:38 +0000 (UTC) Received: by mail-ie0-f174.google.com with SMTP id vy18so14334847iec.5; Sun, 01 Feb 2015 16:19:38 -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=j2K/fst7K9vc8dD0olhx/GqVal3GdwWp6d9RJIKWOgM=; b=BNXoxQyvHqNWX0WQmAkY25Hxv9dZD007Rl068B4fx3aavltlsddghqS9MCwfcktx+Q 31jZyMo2/R84Lt9GnbuVyG1wf1j4OvA3ancv1nutdjLYigRKUeLCh7VjN63XstLmoOey B7hwXVRWrPMYhLDr8dwDhupiey6/lOCJxrlNI7vK3kWfzbz9W+KTFOz06b9nucH2Etj4 rjg1s9WmAqXJSSXUsjVNhT9U06pUfCytHoIMY+m33IDSYz5yuDh+XI5PA2KM1n+DlXIS pZH6MXogwfxZjH0PuWd2fXRLhnFHPlK0v8e4RQ++q6XUFZUxeWPJmEY6RWCYtAoVdUMP pILQ== MIME-Version: 1.0 X-Received: by 10.42.62.71 with SMTP id x7mr16104763ich.61.1422836378139; Sun, 01 Feb 2015 16:19:38 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 16:19:38 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 16:19:38 -0800 (PST) In-Reply-To: <20150201230238.GG11558@ivaldir.etoilebsd.net> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> <20150201230238.GG11558@ivaldir.etoilebsd.net> Date: Sun, 1 Feb 2015 16:19:38 -0800 Message-ID: Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms From: Adrian Chadd To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: Ivan Klymenko , src-committers@freebsd.org, "Max N. Boyarov" , svn-src-all@freebsd.org, Konstantin Belousov , svn-src-head@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:19:39 -0000 It sounds like the driver is doing something new unless you're in rc6. Maybe its not clocking the GPU core down? How can we check the state of the GPU bits? Adrian On Feb 1, 2015 3:02 PM, "Baptiste Daroussin" wrote: > On Sun, Feb 01, 2015 at 01:27:15PM -0800, Adrian Chadd wrote: > > Try enabling rc6 sleep state in i915 and see what happens. > > > > I found that the package wasn't going to sleep without it. > > > > Bapt also found the same thing. I haven't chased up to see if enabling > rc6 > > restored thing. > > > Yes this restored thing, the laptop is now usable again. > > Chatting about this is Lars (lme@) at FOSDEM he sees the same results. > > Bapt > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:21:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CAD03C52; Mon, 2 Feb 2015 00:21:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B702DA8A; Mon, 2 Feb 2015 00:21:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t120LZ6k098118; Mon, 2 Feb 2015 00:21:35 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t120LZhX098117; Mon, 2 Feb 2015 00:21:35 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502020021.t120LZhX098117@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 2 Feb 2015 00:21:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278041 - head/lib/libc/rpc 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:21:35 -0000 Author: pfg Date: Mon Feb 2 00:21:34 2015 New Revision: 278041 URL: https://svnweb.freebsd.org/changeset/base/278041 Log: rpc: Uninitialized pointer read Initialize *xprt to avoid exposing a random value in cleanup_svc_vc_create. CID: 1018723 Phabric: D1749 Reviewed by: alfred Modified: head/lib/libc/rpc/svc_vc.c Modified: head/lib/libc/rpc/svc_vc.c ============================================================================== --- head/lib/libc/rpc/svc_vc.c Mon Feb 2 00:17:36 2015 (r278040) +++ head/lib/libc/rpc/svc_vc.c Mon Feb 2 00:21:34 2015 (r278041) @@ -128,7 +128,7 @@ svc_vc_create(fd, sendsize, recvsize) u_int sendsize; u_int recvsize; { - SVCXPRT *xprt; + SVCXPRT *xprt = NULL; struct cf_rendezvous *r = NULL; struct __rpc_sockinfo si; struct sockaddr_storage sslocal; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:28:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84E22DFE; Mon, 2 Feb 2015 00:28:27 +0000 (UTC) Received: from mail-yk0-x234.google.com (mail-yk0-x234.google.com [IPv6:2607:f8b0:4002:c07::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40154B5B; Mon, 2 Feb 2015 00:28:27 +0000 (UTC) Received: by mail-yk0-f180.google.com with SMTP id 131so20723446ykp.11; Sun, 01 Feb 2015 16:28:26 -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:message-id:subject :from:to:cc:content-type; bh=1Z7FteLj26Ne5DLSAZXGzyTrPNP2W9qS1BRCdHkR1XY=; b=O2W2XKp6cuYkhf72z5vpHMUIZvREwbebRfeyVFMWVM7sp2n5LkT1uSp5RQ91pcccik 6CqYAkbAnT989548po2Orn98Prv/GDYLkgealz8jjJ2otG37YxH7+XRI0HKZT6LBqm4x +IA4iXkrSOhGLPeb2sW9ak7MH+LBeBlN7ye1lKz7hD3/Wuxourv4Vnlc41Vz/vE0ZT8Q 2n0sz57ctrCQYAbS2LkQBSN9ZF5O7aB/L7gz0CF0RfdfUBUJgb9BnwMK4bzMN1jK4FCq Hsy0lsKhi7XbNuM72i63i6RBpv7jdq32puUF+tNf0873K19Ur9jJ1KiiX5G0axEyGbcJ gvDQ== MIME-Version: 1.0 X-Received: by 10.170.56.5 with SMTP id 5mr8094939yky.103.1422836906290; Sun, 01 Feb 2015 16:28:26 -0800 (PST) Sender: davide.italiano@gmail.com Received: by 10.170.157.85 with HTTP; Sun, 1 Feb 2015 16:28:26 -0800 (PST) In-Reply-To: <201502020017.t120Hb2g095087@svn.freebsd.org> References: <201502020017.t120Hb2g095087@svn.freebsd.org> Date: Mon, 2 Feb 2015 01:28:26 +0100 X-Google-Sender-Auth: L4s-roTUaC0qxHe3iMBkd_4rWlY Message-ID: Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs From: Davide Italiano To: Steven Hartland 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:28:27 -0000 On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland wrote: > Author: smh > Date: Mon Feb 2 00:17:36 2015 > New Revision: 278040 > URL: https://svnweb.freebsd.org/changeset/base/278040 > > Log: > Prevent inlining txg_quiesce > > This allows dtrace to monitor the calls to txg_quiesce which can be really > helpful. > > Also standardise __noinline order for arc_kmem_reap_now. > > Sponsored by: Multiplay > > I found this while I was at iXsystems, trying to port Richard Elling's arc statistics utility to FreeBSD. I do not disagree with the change in theory, but I never committed this because I was worried of performance penalty. Last time I checked Solaris/Illumos actually do not inline this function without any particular directive (I guess this is mostly due to difference in toolchain, in particular in the compiler), so it shouldn't be a big deal, but if you have time, do you mind to check the penalty introduced, if any, is negligible? Thanks, -- Davide "There are no solved problems; there are only problems that are more or less solved" -- Henri Poincare From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:52:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58EC7293 for ; Mon, 2 Feb 2015 00:52:12 +0000 (UTC) Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com [209.85.216.176]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1445CD6E for ; Mon, 2 Feb 2015 00:52:11 +0000 (UTC) Received: by mail-qc0-f176.google.com with SMTP id c9so28164764qcz.7 for ; Sun, 01 Feb 2015 16:52:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=e8Wqg9T5Awgrg+K+jUW7+9nLUpKndxVis+H/+Zx4zG4=; b=S12XaRDU1I8zVhsFZaHp7npsMpgeaXQuGT4HManlXx2Qs5GP+2LXx5chFoSQFEYCJh pWQts6v1mv8sIE4/vlfpxoxvNHpsulMqf0cmw+apbv9EHjqjgwMzkH/ufePii8sxfU// BS/QBrxhIve8JTV7ieJQxtP+ldIZNu0evifK7DqehDiztz+yFdjR1GC6tsZOlwkzOfeP j8grPbJ6z39MFvptdWjg7Sc6rmtTYk/6QmMqju9ioyCSG4BcVcYEdk97rbfCiBy/gQK5 gIDmX8NZ5XbRzcTWFCGWTLbSkBe+YYwUnOvZueG3jNFXteXbiont1Pk+WPpdILnjPfmX RfaQ== X-Gm-Message-State: ALoCoQkkdfiDhVpr0wjSU4CvOCjllkcqGHOGPdRuuGoEHy2TM1jJ20+/+JltIJHTr3FvC8K+gp6s MIME-Version: 1.0 X-Received: by 10.229.68.202 with SMTP id w10mr36682528qci.13.1422837923425; Sun, 01 Feb 2015 16:45:23 -0800 (PST) Received: by 10.140.88.103 with HTTP; Sun, 1 Feb 2015 16:45:23 -0800 (PST) In-Reply-To: References: <201502020017.t120Hb2g095087@svn.freebsd.org> Date: Sun, 1 Feb 2015 17:45:23 -0700 Message-ID: Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs From: Will Andrews To: Davide Italiano Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "svn-src-head@freebsd.org" , Steven Hartland , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:52:12 -0000 On Sunday, February 1, 2015, Davide Italiano wrote: > On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland > wrote: > > Author: smh > > Date: Mon Feb 2 00:17:36 2015 > > New Revision: 278040 > > URL: https://svnweb.freebsd.org/changeset/base/278040 > > > > Log: > > Prevent inlining txg_quiesce > > > > This allows dtrace to monitor the calls to txg_quiesce which can be > really > > helpful. > > > > Also standardise __noinline order for arc_kmem_reap_now. > > > > Sponsored by: Multiplay > > > > > > I found this while I was at iXsystems, trying to port Richard Elling's > arc statistics utility to FreeBSD. > I do not disagree with the change in theory, but I never committed > this because I was worried of performance penalty. > Last time I checked Solaris/Illumos actually do not inline this > function without any particular directive (I guess this is mostly due > to difference in toolchain, in particular in the compiler), so it > shouldn't be a big deal, but if you have time, do you mind to check > the penalty introduced, if any, is negligible? > It should be negligible. The function is only called once per txg, which generally is only supposed to happen about 1-0.2Hz. --Will. From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:54:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D20D2C1 for ; Mon, 2 Feb 2015 00:54:04 +0000 (UTC) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4E00D79 for ; Mon, 2 Feb 2015 00:54:03 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id q59so36263606wes.10 for ; Sun, 01 Feb 2015 16:53:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=gDff3yowCPqdd5FzpNQ0C8o+Fr0u8lzeG/I8Sh3WHow=; b=C4WWjYjWFCd7ZYtO1h6BiGklkoBmK//LhvhnSrVKN79gvsygtidDFfGR5r76BueSCd E3o2tBLz77H8JrwbFOWqSxcK+DdwwrVi6FeMKGCqZh4hZorrH1HggRndbHOH9SuISKpm uH6bXLybTYrJs8RuSdG7Qm3292lfhwN79VD6zvMvm/wG4J3TI4WZ/CoLNMEtJNbtc+Io AD1GEtCSfTp5fjO1mxCdqb2WF+GZd7g6hsdVUxOFZp8gnpNR/JQf4L2/y4dPEHEMZUzg tarSwlFSdJvYLBUM0//6N3SU0jOSagt8KYhf1JXD3ARH3Nr84wGapDuWqZ4ADpopa7IL JOsQ== X-Gm-Message-State: ALoCoQkFMZ7MkyPJGG2YfNgGSm9QtQMpUlh+zE0iZFnFzFHf2rrvCckzjx8mF49c95UB0M8nfrUq X-Received: by 10.194.170.161 with SMTP id an1mr36500237wjc.126.1422838435803; Sun, 01 Feb 2015 16:53:55 -0800 (PST) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id u9sm25443419wjy.37.2015.02.01.16.53.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 16:53:55 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <54CECAA5.9090406@freebsd.org> Date: Mon, 02 Feb 2015 00:53:57 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Davide Italiano Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201502020017.t120Hb2g095087@svn.freebsd.org> In-Reply-To: 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:54:04 -0000 On 02/02/2015 00:28, Davide Italiano wrote: > On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland wrote: >> Author: smh >> Date: Mon Feb 2 00:17:36 2015 >> New Revision: 278040 >> URL: https://svnweb.freebsd.org/changeset/base/278040 >> >> Log: >> Prevent inlining txg_quiesce >> >> This allows dtrace to monitor the calls to txg_quiesce which can be really >> helpful. >> >> Also standardise __noinline order for arc_kmem_reap_now. >> >> Sponsored by: Multiplay >> >> > I found this while I was at iXsystems, trying to port Richard Elling's > arc statistics utility to FreeBSD. > I do not disagree with the change in theory, but I never committed > this because I was worried of performance penalty. > Last time I checked Solaris/Illumos actually do not inline this > function without any particular directive (I guess this is mostly due > to difference in toolchain, in particular in the compiler), so it > shouldn't be a big deal, but if you have time, do you mind to check > the penalty introduced, if any, is negligible? Performance difference should be negligible if not unmeasurable, but I'll run some tests to check call frequency to be sure. From what I can tell its inlined because there is only a single caller (txg_quiesce_thread). Regards Steve From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:44:28 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20B41123; Mon, 2 Feb 2015 02:44:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6B879A4; Mon, 2 Feb 2015 02:44:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122iRUQ065198; Mon, 2 Feb 2015 02:44:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122iRIK065197; Mon, 2 Feb 2015 02:44:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020244.t122iRIK065197@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:44:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278043 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:44:28 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:44:27 2015 New Revision: 278043 URL: https://svnweb.freebsd.org/changeset/base/278043 Log: - Remove more files when MK_BINUTILS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 01:02:49 2015 (r278042) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:44:27 2015 (r278043) @@ -181,6 +181,34 @@ OLD_FILES+=usr/share/man/man8/bhyveload. OLD_DIRS+=usr/share/examples/bhyve .endif +.if ${MK_BINUTILS} == no +OLD_FILES+=usr/bin/as +OLD_FILES+=usr/bin/ld +OLD_FILES+=usr/bin/objcopy +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/bin/readelf +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw +OLD_FILES+=usr/share/doc/binutils/as.txt +OLD_FILES+=usr/share/doc/binutils/ld.txt +OLD_FILES+=usr/share/man/man1/as.1.gz +OLD_FILES+=usr/share/man/man1/ld.1.gz +OLD_FILES+=usr/share/man/man1/objcopy.1.gz +OLD_FILES+=usr/share/man/man1/objdump.1.gz +OLD_FILES+=usr/share/man/man1/readelf.1.gz +.endif + .if ${MK_BLUETOOTH} == no OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:47:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C578313; Mon, 2 Feb 2015 02:47:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0EB8B9CD; Mon, 2 Feb 2015 02:47:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122lblS065590; Mon, 2 Feb 2015 02:47:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122lbAn065589; Mon, 2 Feb 2015 02:47:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020247.t122lbAn065589@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:47:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278044 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:47:38 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:47:37 2015 New Revision: 278044 URL: https://svnweb.freebsd.org/changeset/base/278044 Log: - Remove more files when MK_BLUETOOTH == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:44:27 2015 (r278043) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:47:37 2015 (r278044) @@ -215,6 +215,10 @@ OLD_FILES+=etc/bluetooth/hosts OLD_FILES+=etc/bluetooth/protocols OLD_FILES+=etc/defaults/bluetooth.device.conf OLD_DIRS+=etc/bluetooth +OLD_FILES+=etc/rc.d/bluetooth +OLD_FILES+=etc/rc.d/bthidd +OLD_FILES+=etc/rc.d/hcsecd +OLD_FILES+=etc/rc.d/ubthidhci OLD_FILES+=usr/bin/bthost OLD_FILES+=usr/bin/btsockstat OLD_FILES+=usr/bin/rfcomm_sppd @@ -251,6 +255,7 @@ OLD_FILES+=usr/lib32/libsdp.so OLD_LIBS+=usr/lib32/libsdp.so.4 OLD_FILES+=usr/lib32/libsdp_p.a .endif +OLD_FILES+=usr/sbin/ath3kfw OLD_FILES+=usr/sbin/bcmfw OLD_FILES+=usr/sbin/bt3cfw OLD_FILES+=usr/sbin/bthidcontrol @@ -264,6 +269,7 @@ OLD_FILES+=usr/sbin/l2ping OLD_FILES+=usr/sbin/rfcomm_pppd OLD_FILES+=usr/sbin/sdpcontrol OLD_FILES+=usr/sbin/sdpd +OLD_FILES+=usr/share/examples/etc/defaults/bluetooth.device.conf OLD_FILES+=usr/share/man/man1/bthost.1.gz OLD_FILES+=usr/share/man/man1/btsockstat.1.gz OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz @@ -321,6 +327,7 @@ OLD_FILES+=usr/share/man/man3/sdp_search OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz +OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz OLD_FILES+=usr/share/man/man8/bcmfw.8.gz OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:49:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 465C5460; Mon, 2 Feb 2015 02:49:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 181D09DD; Mon, 2 Feb 2015 02:49:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122n1Di065788; Mon, 2 Feb 2015 02:49:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122n1jc065787; Mon, 2 Feb 2015 02:49:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020249.t122n1jc065787@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:49:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278045 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:49:02 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:49:01 2015 New Revision: 278045 URL: https://svnweb.freebsd.org/changeset/base/278045 Log: - Remove more files when MK_BOOT == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:47:37 2015 (r278044) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:01 2015 (r278045) @@ -343,9 +343,63 @@ OLD_FILES+=usr/share/man/man8/sdpcontrol OLD_FILES+=usr/share/man/man8/sdpd.8.gz .endif -#.if ${MK_BOOT} == no -# to be filled in -#.endif +.if ${MK_BOOT} == no +OLD_FILES+=boot/beastie.4th +OLD_FILES+=boot/boot +OLD_FILES+=boot/boot0 +OLD_FILES+=boot/boot0sio +OLD_FILES+=boot/boot1 +OLD_FILES+=boot/boot1.efi +OLD_FILES+=boot/boot1.efifat +OLD_FILES+=boot/boot2 +OLD_FILES+=boot/brand.4th +OLD_FILES+=boot/cdboot +OLD_FILES+=boot/check-password.4th +OLD_FILES+=boot/color.4th +OLD_FILES+=boot/defaults/loader.conf +OLD_FILES+=boot/delay.4th +OLD_FILES+=boot/device.hints +OLD_FILES+=boot/frames.4th +OLD_FILES+=boot/gptboot +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/loader +OLD_FILES+=boot/loader.4th +OLD_FILES+=boot/loader.efi +OLD_FILES+=boot/loader.help +OLD_FILES+=boot/loader.rc +OLD_FILES+=boot/mbr +OLD_FILES+=boot/menu-commands.4th +OLD_FILES+=boot/menu.4th +OLD_FILES+=boot/menu.rc +OLD_FILES+=boot/menusets.4th +OLD_FILES+=boot/pcibios.4th +OLD_FILES+=boot/pmbr +OLD_FILES+=boot/pxeboot +OLD_FILES+=boot/screen.4th +OLD_FILES+=boot/shortcuts.4th +OLD_FILES+=boot/support.4th +OLD_FILES+=boot/userboot.so +OLD_FILES+=boot/version.4th +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_FILES+=usr/lib/kgzldr.o +OLD_FILES+=usr/share/man/man5/loader.conf.5.gz +OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz +OLD_FILES+=usr/share/man/man8/brand.4th.8.gz +OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz +OLD_FILES+=usr/share/man/man8/color.4th.8.gz +OLD_FILES+=usr/share/man/man8/delay.4th.8.gz +OLD_FILES+=usr/share/man/man8/gptboot.8.gz +OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz +OLD_FILES+=usr/share/man/man8/loader.4th.8.gz +OLD_FILES+=usr/share/man/man8/loader.8.gz +OLD_FILES+=usr/share/man/man8/menu.4th.8.gz +OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz +OLD_FILES+=usr/share/man/man8/pxeboot.8.gz +OLD_FILES+=usr/share/man/man8/version.4th.8.gz +OLD_FILES+=usr/share/man/man8/zfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zfsloader.8.gz +.endif .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:49:55 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47CAF5A2; Mon, 2 Feb 2015 02:49:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 33E549E6; Mon, 2 Feb 2015 02:49:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122ntSO065906; Mon, 2 Feb 2015 02:49:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122nthl065905; Mon, 2 Feb 2015 02:49:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020249.t122nthl065905@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:49:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278046 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:49:55 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:49:54 2015 New Revision: 278046 URL: https://svnweb.freebsd.org/changeset/base/278046 Log: - Remove more files when MK_BSD_CPIO == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:01 2015 (r278045) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:54 2015 (r278046) @@ -401,6 +401,13 @@ OLD_FILES+=usr/share/man/man8/zfsboot.8. OLD_FILES+=usr/share/man/man8/zfsloader.8.gz .endif +.if ${MK_BSD_CPIO} == no +OLD_FILES+=usr/bin/bsdcpio +OLD_FILES+=usr/bin/cpio +OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz +OLD_FILES+=usr/share/man/man1/cpio.1.gz +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:51:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A12E6EB; Mon, 2 Feb 2015 02:51:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BF6BA85; Mon, 2 Feb 2015 02:51:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122pNGw069160; Mon, 2 Feb 2015 02:51:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122pNao069159; Mon, 2 Feb 2015 02:51:23 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020251.t122pNao069159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278047 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:51:23 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:51:22 2015 New Revision: 278047 URL: https://svnweb.freebsd.org/changeset/base/278047 Log: - Remove more files when MK_BSNMP == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:54 2015 (r278046) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:51:22 2015 (r278047) @@ -457,25 +457,44 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a +OLD_FILES+=usr/lib/libbsnmp.so OLD_LIBS+=usr/lib/libbsnmp.so.6 OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a +OLD_FILES+=usr/lib/libbsnmptools.so OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a +OLD_FILES+=usr/lib/snmp_atm.so OLD_LIBS+=usr/lib/snmp_atm.so.6 +OLD_FILES+=usr/lib/snmp_bridge.so OLD_LIBS+=usr/lib/snmp_bridge.so.6 +OLD_FILES+=usr/lib/snmp_hast.so OLD_LIBS+=usr/lib/snmp_hast.so.6 +OLD_FILES+=usr/lib/snmp_hostres.so OLD_LIBS+=usr/lib/snmp_hostres.so.6 +OLD_FILES+=usr/lib/snmp_lm75.so OLD_LIBS+=usr/lib/snmp_lm75.so.6 +OLD_FILES+=usr/lib/snmp_mibII.so OLD_LIBS+=usr/lib/snmp_mibII.so.6 +OLD_FILES+=usr/lib/snmp_netgraph.so OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_pf.so OLD_LIBS+=usr/lib/snmp_pf.so.6 +OLD_FILES+=usr/lib/snmp_target.so OLD_LIBS+=usr/lib/snmp_target.so.6 +OLD_FILES+=usr/lib/snmp_usm.so OLD_LIBS+=usr/lib/snmp_usm.so.6 +OLD_FILES+=usr/lib/snmp_vacm.so OLD_LIBS+=usr/lib/snmp_vacm.so.6 +OLD_FILES+=usr/lib/snmp_wlan.so OLD_LIBS+=usr/lib/snmp_wlan.so.6 +OLD_FILES+=usr/lib32/libbsnmp.a +OLD_FILES+=usr/lib32/libbsnmp.so +OLD_LIBS+=usr/lib32/libbsnmp.so.6 +OLD_FILES+=usr/lib32/libbsnmp_p.a OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree +OLD_FILES+=usr/share/examples/etc/snmpd.config OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:53:53 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6EE3B9D7; Mon, 2 Feb 2015 02:53:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B1EAAB1; Mon, 2 Feb 2015 02:53:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122rrfA070117; Mon, 2 Feb 2015 02:53:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122rr4a070116; Mon, 2 Feb 2015 02:53:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020253.t122rr4a070116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278048 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:53:53 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:53:52 2015 New Revision: 278048 URL: https://svnweb.freebsd.org/changeset/base/278048 Log: - Remove more files when MK_DMAGENT == no and move the chunk into its alphabetical place MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:51:22 2015 (r278047) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:53:52 2015 (r278048) @@ -1552,6 +1552,14 @@ OLD_FILES+=usr/share/dict/words OLD_DIRS+=usr/share/dict .endif +.if ${MK_DMAGENT} == no +OLD_FILES+=etc/dma/dma.conf +OLD_FILES+=usr/libexec/dma +OLD_FILES+=usr/libexec/dma-mbox-create +OLD_FILES+=usr/share/man/man8/dma.8.gz +OLD_FILES+=usr/share/examples/dma/mailer.conf +.endif + .if ${MK_EE} == no OLD_FILES+=usr/bin/edit OLD_FILES+=usr/bin/ee @@ -5157,13 +5165,6 @@ OLD_FILES+=usr/bin/svnsync OLD_FILES+=usr/bin/svnversion .endif -.if ${MK_DMAGENT} == no -OLD_FILES+=usr/libexec/dma -OLD_FILES+=usr/libexec/dma-mbox-create -OLD_FILES+=usr/share/man/man8/dma.8.gz -OLD_FILES+=usr/share/examples/dma/mailer.conf -.endif - .if ${MK_HYPERV} == no OLD_FILES+=etc/devd/hyperv.conf OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:56:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA9F9B30; Mon, 2 Feb 2015 02:56:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9764FAC8; Mon, 2 Feb 2015 02:56:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122uUa5070531; Mon, 2 Feb 2015 02:56:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122uUmK070530; Mon, 2 Feb 2015 02:56:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020256.t122uUmK070530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:56:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278049 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:56:30 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:56:29 2015 New Revision: 278049 URL: https://svnweb.freebsd.org/changeset/base/278049 Log: - Remove more files when MK_GPIO == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:53:52 2015 (r278048) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:56:29 2015 (r278049) @@ -1713,8 +1713,13 @@ OLD_FILES+=usr/share/man/man1/kgdb.1.gz .if ${MK_GPIO} == no OLD_FILES+=usr/include/libgpio.h OLD_FILES+=usr/lib/libgpio.a +OLD_FILES+=usr/lib/libgpio.so OLD_LIBS+=usr/lib/libgpio.so.0 OLD_FILES+=usr/lib/libgpio_p.a +OLD_FILES+=usr/lib32/libgpio.a +OLD_FILES+=usr/lib32/libgpio.so +OLD_LIBS+=usr/lib32/libgpio.so.0 +OLD_FILES+=usr/lib32/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man3/gpio.3.gz OLD_FILES+=usr/share/man/man3/gpio_close.3.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 05:41:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A526AB1; Mon, 2 Feb 2015 05:41:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 922BBDA9; Mon, 2 Feb 2015 05:41:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t125fIBY050071; Mon, 2 Feb 2015 05:41:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t125fIAS050070; Mon, 2 Feb 2015 05:41:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502020541.t125fIAS050070@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 05:41:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278053 - head/etc/rc.d 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 05:41:18 -0000 Author: ngie Date: Mon Feb 2 05:41:17 2015 New Revision: 278053 URL: https://svnweb.freebsd.org/changeset/base/278053 Log: Remove hostapd and wpa_supplicant from FILES so they're installed conditionally if MK_WIRELESS != no MFC after: 3 days X-MFC with: r277740 Modified: head/etc/rc.d/Makefile Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Mon Feb 2 05:17:26 2015 (r278052) +++ head/etc/rc.d/Makefile Mon Feb 2 05:41:17 2015 (r278053) @@ -43,7 +43,6 @@ FILES= DAEMON \ growfs \ gssd \ ${_hcsecd} \ - hostapd \ hostid \ hostid_save \ hostname \ @@ -137,7 +136,6 @@ FILES= DAEMON \ var \ virecover \ watchdogd \ - wpa_supplicant \ ypbind \ yppasswdd \ ypserv \ From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 08:01:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8305CE58; Mon, 2 Feb 2015 08:01:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55346C89; Mon, 2 Feb 2015 08:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1281BZG015114; Mon, 2 Feb 2015 08:01:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1281BCL015113; Mon, 2 Feb 2015 08:01:11 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502020801.t1281BCL015113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Mon, 2 Feb 2015 08:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278061 - head/sys/arm/ti/am335x 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 08:01:11 -0000 Author: rpaulo Date: Mon Feb 2 08:01:10 2015 New Revision: 278061 URL: https://svnweb.freebsd.org/changeset/base/278061 Log: am335x_clk_pruss_activate(): use the L3F clock. The DISP DPLL clock is slower and was making the PRU programs slower on FreeBSD than on Linux. Submitted by: Manuel Stuehn MFC after: 1 week Modified: head/sys/arm/ti/am335x/am335x_prcm.c Modified: head/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- head/sys/arm/ti/am335x/am335x_prcm.c Mon Feb 2 07:42:03 2015 (r278060) +++ head/sys/arm/ti/am335x/am335x_prcm.c Mon Feb 2 08:01:10 2015 (r278061) @@ -502,7 +502,7 @@ am335x_clk_gpio_activate(struct ti_clock /* set *_CLKCTRL register MODULEMODE[1:0] to enable(2) */ /* set *_CLKCTRL register OPTFCLKEN_GPIO_1_G DBCLK[18] to FCLK_EN(1) */ prcm_write_4(clk_details->clkctrl_reg, 2 | (1 << 18)); - while ((prcm_read_4(clk_details->clkctrl_reg) & + while ((prcm_read_4(clk_details->clkctrl_reg) & (3 | (1 << 18) )) != (2 | (1 << 18))) DELAY(10); @@ -724,11 +724,11 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x4); /* Make sure it's in bypass mode */ - while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 8))) DELAY(10); - /* + /* * For now set frequency to 99*SYSFREQ/8 which is twice as * HDMI 1080p pixel clock (minimum LCDC freq divisor is 2) */ @@ -738,7 +738,7 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x7); int timeout = 10000; - while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 0))) && timeout--) DELAY(10); @@ -786,9 +786,9 @@ am335x_clk_pruss_activate(struct ti_cloc while ((prcm_read_4(CM_PER_PRUSS_CLKSTCTRL) & (1<<6)) == 0) DELAY(10); - /* Select DISP DPLL as OCP clock */ - prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 1); - while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 1) + /* Select L3F as OCP clock */ + prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 0); + while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 0) DELAY(10); /* Clear the RESET bit */ From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 10:31:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AF42E88; Mon, 2 Feb 2015 10:31:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8582CE31; Mon, 2 Feb 2015 10:31:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12AVaps087337; Mon, 2 Feb 2015 10:31:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12AVaCk087336; Mon, 2 Feb 2015 10:31:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502021031.t12AVaCk087336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 10:31:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278070 - head/sbin 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 10:31:36 -0000 Author: ngie Date: Mon Feb 2 10:31:35 2015 New Revision: 278070 URL: https://svnweb.freebsd.org/changeset/base/278070 Log: Remove duplicate MK_ISCSI block and sort the conditional blocks so this error won't crop up again in the future Reported by: gjb MFC after: 1 week Modified: head/sbin/Makefile Modified: head/sbin/Makefile ============================================================================== --- head/sbin/Makefile Mon Feb 2 10:00:45 2015 (r278069) +++ head/sbin/Makefile Mon Feb 2 10:31:35 2015 (r278070) @@ -91,6 +91,11 @@ SUBDIR+= hastctl SUBDIR+= hastd .endif +.if ${MK_INET6} != "no" +SUBDIR+= ping6 +SUBDIR+= rtsol +.endif + .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif @@ -114,15 +119,6 @@ SUBDIR+= pfctl SUBDIR+= pflogd .endif -.if ${MK_INET6} != "no" -SUBDIR+= ping6 -SUBDIR+= rtsol -.endif - -.if ${MK_ISCSI} != "no" -SUBDIR+= iscontrol -.endif - .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck .endif From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 11:06:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC235546; Mon, 2 Feb 2015 11:06:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7AE11EB; Mon, 2 Feb 2015 11:06:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12B6g2w002811; Mon, 2 Feb 2015 11:06:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12B6gvc002807; Mon, 2 Feb 2015 11:06:42 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021106.t12B6gvc002807@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 11:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278071 - in head/sys/dev/usb: . controller 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 11:06:43 -0000 Author: hselasky Date: Mon Feb 2 11:06:41 2015 New Revision: 278071 URL: https://svnweb.freebsd.org/changeset/base/278071 Log: Section 3.2.9 in the XHCI specification about control transfers says that we should use a normal-TRB if there are more TRBs extending the data-stage TRB. Add a dedicated state bit to the internal USB transfer flags to handle this case. Reported by: Kohji Okuno MFC after: 1 week Modified: head/sys/dev/usb/controller/xhci.c head/sys/dev/usb/usb_core.h head/sys/dev/usb/usb_transfer.c Modified: head/sys/dev/usb/controller/xhci.c ============================================================================== --- head/sys/dev/usb/controller/xhci.c Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/controller/xhci.c Mon Feb 2 11:06:41 2015 (r278071) @@ -1866,6 +1866,15 @@ restart: XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE); if (temp->direction == UE_DIR_IN) dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT; + /* + * Section 3.2.9 in the XHCI + * specification about control + * transfers says that we should use a + * normal-TRB if there are more TRBs + * extending the data-stage + * TRB. Update the "trb_type". + */ + temp->trb_type = XHCI_TRB_TYPE_NORMAL; break; case XHCI_TRB_TYPE_STATUS_STAGE: dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT | @@ -2106,7 +2115,8 @@ xhci_setup_generic_chain(struct usb_xfer mult = 1; temp.isoc_delta = 0; temp.isoc_frame = 0; - temp.trb_type = XHCI_TRB_TYPE_DATA_STAGE; + temp.trb_type = xfer->flags_int.control_did_data ? + XHCI_TRB_TYPE_NORMAL : XHCI_TRB_TYPE_DATA_STAGE; } else { x = 0; mult = 1; Modified: head/sys/dev/usb/usb_core.h ============================================================================== --- head/sys/dev/usb/usb_core.h Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/usb_core.h Mon Feb 2 11:06:41 2015 (r278071) @@ -101,6 +101,7 @@ struct usb_xfer_flags_int { * sent */ uint8_t control_act:1; /* set if control transfer is active */ uint8_t control_stall:1; /* set if control transfer should be stalled */ + uint8_t control_did_data:1; /* set if control DATA has been transferred */ uint8_t short_frames_ok:1; /* filtered version */ uint8_t short_xfer_ok:1; /* filtered version */ Modified: head/sys/dev/usb/usb_transfer.c ============================================================================== --- head/sys/dev/usb/usb_transfer.c Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:06:41 2015 (r278071) @@ -1409,6 +1409,29 @@ usbd_control_transfer_init(struct usb_xf } /*------------------------------------------------------------------------* + * usbd_control_transfer_did_data + * + * This function returns non-zero if a control endpoint has + * transferred the first DATA packet after the SETUP packet. + * Else it returns zero. + *------------------------------------------------------------------------*/ +static uint8_t +usbd_control_transfer_did_data(struct usb_xfer *xfer) +{ + struct usb_device_request req; + + /* SETUP packet is not yet sent */ + if (xfer->flags_int.control_hdr != 0) + return (0); + + /* copy out the USB request header */ + usbd_copy_out(xfer->frbuffers, 0, &req, sizeof(req)); + + /* compare remainder to the initial value */ + return (xfer->flags_int.control_rem != UGETW(req.wLength)); +} + +/*------------------------------------------------------------------------* * usbd_setup_ctrl_transfer * * This function handles initialisation of control transfers. Control @@ -1513,6 +1536,11 @@ usbd_setup_ctrl_transfer(struct usb_xfer len = (xfer->sumlen - sizeof(struct usb_device_request)); } + /* update did data flag */ + + xfer->flags_int.control_did_data = + usbd_control_transfer_did_data(xfer); + /* check if there is a length mismatch */ if (len > xfer->flags_int.control_rem) { From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 11:32:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 132E3269; Mon, 2 Feb 2015 11:32:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E811D79C; Mon, 2 Feb 2015 11:32:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12BWGP1016755; Mon, 2 Feb 2015 11:32:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12BWGae016753; Mon, 2 Feb 2015 11:32:16 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021132.t12BWGae016753@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 11:32:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278074 - in head/sys: conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 11:32:17 -0000 Author: hselasky Date: Mon Feb 2 11:32:15 2015 New Revision: 278074 URL: https://svnweb.freebsd.org/changeset/base/278074 Log: Optimise allocation of USB DMA structures. By default don't double map allocations if only one element should be allocated per page cache. Make one allocation per element compile time configurable. Fix a comment while at it. Suggested by: ian @ MFC after: 1 week Modified: head/sys/conf/options head/sys/dev/usb/usb_transfer.c Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Mon Feb 2 11:26:52 2015 (r278073) +++ head/sys/conf/options Mon Feb 2 11:32:15 2015 (r278074) @@ -651,6 +651,7 @@ USB_HOST_ALIGN opt_usb.h USB_REQ_DEBUG opt_usb.h USB_TEMPLATE opt_usb.h USB_VERBOSE opt_usb.h +USB_DMA_SINGLE_ALLOC opt_usb.h USB_EHCI_BIG_ENDIAN_DESC opt_usb.h U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h Modified: head/sys/dev/usb/usb_transfer.c ============================================================================== --- head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:26:52 2015 (r278073) +++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:32:15 2015 (r278074) @@ -237,7 +237,11 @@ usbd_transfer_setup_sub_malloc(struct us n_obj = 1; } else { /* compute number of objects per page */ +#ifdef USB_DMA_SINGLE_ALLOC + n_obj = 1; +#else n_obj = (USB_PAGE_SIZE / size); +#endif /* * Compute number of DMA chunks, rounded up * to nearest one: @@ -273,15 +277,33 @@ usbd_transfer_setup_sub_malloc(struct us &parm->curr_xfer->xroot->dma_parent_tag; } - if (ppc) { - *ppc = parm->xfer_page_cache_ptr; + if (ppc != NULL) { + if (n_obj != 1) + *ppc = parm->xfer_page_cache_ptr; + else + *ppc = parm->dma_page_cache_ptr; } r = count; /* set remainder count */ z = n_obj * size; /* set allocation size */ pc = parm->xfer_page_cache_ptr; pg = parm->dma_page_ptr; - for (x = 0; x != n_dma_pc; x++) { + if (n_obj == 1) { + /* + * Avoid mapping memory twice if only a single object + * should be allocated per page cache: + */ + for (x = 0; x != n_dma_pc; x++) { + if (usb_pc_alloc_mem(parm->dma_page_cache_ptr, + pg, z, align)) { + return (1); /* failure */ + } + /* Make room for one DMA page cache and "n_dma_pg" pages */ + parm->dma_page_cache_ptr++; + pg += n_dma_pg; + } + } else { + for (x = 0; x != n_dma_pc; x++) { if (r < n_obj) { /* compute last remainder */ @@ -294,7 +316,7 @@ usbd_transfer_setup_sub_malloc(struct us } /* Set beginning of current buffer */ buf = parm->dma_page_cache_ptr->buffer; - /* Make room for one DMA page cache and one page */ + /* Make room for one DMA page cache and "n_dma_pg" pages */ parm->dma_page_cache_ptr++; pg += n_dma_pg; @@ -314,6 +336,7 @@ usbd_transfer_setup_sub_malloc(struct us } mtx_unlock(pc->tag_parent->mtx); } + } } parm->xfer_page_cache_ptr = pc; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 13:03:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CF7E9DA; Mon, 2 Feb 2015 13:03:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 780C0BD; Mon, 2 Feb 2015 13:03:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12D355u059545; Mon, 2 Feb 2015 13:03:05 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12D35Nf059543; Mon, 2 Feb 2015 13:03:05 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201502021303.t12D35Nf059543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Mon, 2 Feb 2015 13:03:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278080 - head/sbin/ifconfig 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 13:03:05 -0000 Author: vsevolod (ports committer) Date: Mon Feb 2 13:03:04 2015 New Revision: 278080 URL: https://svnweb.freebsd.org/changeset/base/278080 Log: Reorganize the list of addresses associated with an interface and group them based on the address family. This should help to recognize interfaces with multiple AF (e.g. ipv4 and ipv6) with many aliases or additional addresses. The order of addresses inside a single group is strictly preserved. Improve the scope_id output for AF_INET6 families, as the current approach uses hexadecimal string that is basically the ID of an interface, whilst this information is already depicted by getnameinfo(3) call. Therefore, now ifconfig just prints the scope of address as it is defined in 2.4 of RFC 2373. PR: 197270 Approved by: bapt MFC after: 2 weeks Modified: head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/af_inet6.c ============================================================================== --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 12:48:13 2015 (r278079) +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015 (r278080) @@ -167,6 +167,33 @@ setip6eui64(const char *cmd, int dummy _ } static void +in6_print_scope(uint8_t *a) +{ + const char *sname = NULL; + uint16_t val; + + val = (a[0] << 4) + ((a[1] & 0xc0) >> 4); + + if ((val & 0xff0) == 0xff0) + sname = "Multicast"; + else { + switch(val) { + case 0xfe8: + sname = "Link"; + break; + case 0xfec: + sname = "Site"; + break; + default: + sname = "Global"; + break; + } + } + + printf("scope: %s ", sname); +} + +static void in6_status(int s __unused, const struct ifaddrs *ifa) { struct sockaddr_in6 *sin, null_sin; @@ -257,9 +284,7 @@ in6_status(int s __unused, const struct if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) printf("prefer_source "); - if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id) - printf("scopeid 0x%x ", - ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id); + in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_addr); if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { printf("pltime "); Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 12:48:13 2015 (r278079) +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015 (r278080) @@ -47,6 +47,7 @@ static const char rcsid[] = #include #include #include +#include #include #include @@ -110,6 +111,15 @@ static void af_other_status(int); static struct option *opts = NULL; +struct ifa_order_elt { + int if_order; + int af_orders[255]; + struct ifaddrs *ifa; + TAILQ_ENTRY(ifa_order_elt) link; +}; + +TAILQ_HEAD(ifa_queue, ifa_order_elt); + void opt_register(struct option *p) { @@ -141,16 +151,162 @@ usage(void) exit(1); } +static int +calcorders(struct ifaddrs *ifa, struct ifa_queue *q) +{ + unsigned int ord, af, ifa_ord; + struct ifaddrs *prev; + struct ifa_order_elt *cur; + + prev = NULL; + cur = NULL; + ord = 0; + ifa_ord = 0; + + while (ifa != NULL) { + if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0) { + cur = calloc(1, sizeof(*cur)); + + if (cur == NULL) + return (-1); + + TAILQ_INSERT_TAIL(q, cur, link); + cur->if_order = ifa_ord ++; + cur->ifa = ifa; + ord = 0; + } + + if (ifa->ifa_addr) { + af = ifa->ifa_addr->sa_family; + + if (af < sizeof(cur->af_orders) / sizeof(cur->af_orders[0]) && + cur->af_orders[af] == 0) + cur->af_orders[af] = ++ord; + } + prev = ifa; + ifa = ifa->ifa_next; + } + + return (0); +} + +static int +cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q) +{ + int ret; + unsigned int af1, af2; + struct ifa_order_elt *cur, *e1, *e2; + + e1 = e2 = NULL; + + ret = strcmp(a->ifa_name, b->ifa_name); + if (ret != 0) { + /* We need to find elements corresponding to these different names */ + TAILQ_FOREACH(cur, q, link) { + if (e1 && e2) + break; + + if (strcmp(cur->ifa->ifa_name, a->ifa_name) == 0) + e1 = cur; + else if (strcmp(cur->ifa->ifa_name, b->ifa_name) == 0) + e2 = cur; + } + + if (!e1 || !e2) + return (0); + else + return (e1->if_order - e2->if_order); + + } else if (a->ifa_addr != NULL && b->ifa_addr != NULL) { + TAILQ_FOREACH(cur, q, link) { + if (strcmp(cur->ifa->ifa_name, a->ifa_name) == 0) { + e1 = cur; + break; + } + } + + if (!e1) + return (0); + + af1 = a->ifa_addr->sa_family; + af2 = b->ifa_addr->sa_family; + + if (af1 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0]) && + af2 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0])) + return (e1->af_orders[af2] - e1->af_orders[af1]); + } + + return (0); +} + +static struct ifaddrs * +sortifaddrs(struct ifaddrs *list, + int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), + struct ifa_queue *q) +{ + + struct ifaddrs *right, *temp, *last, *result, *next, *tail; + + right = list; + temp = list; + last = list; + result = NULL; + next = NULL; + tail = NULL; + + if (!list || !list->ifa_next) + return (list); + + while (temp && temp->ifa_next) { + last = right; + right = right->ifa_next; + temp = temp->ifa_next->ifa_next; + } + + last->ifa_next = NULL; + + list = sortifaddrs(list, compare, q); + right = sortifaddrs(right, compare, q); + + while (list || right) { + + if (!right) { + next = list; + list = list->ifa_next; + } else if (!list) { + next = right; + right = right->ifa_next; + } else if (compare(list, right, q) <= 0) { + next = list; + list = list->ifa_next; + } else { + next = right; + right = right->ifa_next; + } + + if (!result) + result = next; + else + tail->ifa_next = next; + + tail = next; + } + + return (result); +} + int main(int argc, char *argv[]) { int c, all, namesonly, downonly, uponly; const struct afswtch *afp = NULL; int ifindex; - struct ifaddrs *ifap, *ifa; + struct ifaddrs *ifap, *sifap, *ifa; struct ifreq paifr; const struct sockaddr_dl *sdl; char options[1024], *cp, *namecp = NULL; + struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); + struct ifa_order_elt *cur, *tmp; const char *ifname; struct option *p; size_t iflen; @@ -285,9 +441,19 @@ main(int argc, char *argv[]) if (getifaddrs(&ifap) != 0) err(EXIT_FAILURE, "getifaddrs"); + cp = NULL; + + if (calcorders(ifap, &q) != 0) + err(EXIT_FAILURE, "calcorders"); + + sifap = sortifaddrs(ifap, cmpifaddrs, &q); + + TAILQ_FOREACH_SAFE(cur, &q, link, tmp) + free(cur); + ifindex = 0; - for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + for (ifa = sifap; ifa; ifa = ifa->ifa_next) { memset(&paifr, 0, sizeof(paifr)); strncpy(paifr.ifr_name, ifa->ifa_name, sizeof(paifr.ifr_name)); if (sizeof(paifr.ifr_addr) >= ifa->ifa_addr->sa_len) { From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:37:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E8CDA93; Mon, 2 Feb 2015 14:37:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A161C95; Mon, 2 Feb 2015 14:37:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EbkgA002350; Mon, 2 Feb 2015 14:37:46 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Ebk7M002347; Mon, 2 Feb 2015 14:37:46 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201502021437.t12Ebk7M002347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Mon, 2 Feb 2015 14:37:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278081 - head/sbin/ifconfig 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:37:46 -0000 Author: vsevolod (ports committer) Date: Mon Feb 2 14:37:45 2015 New Revision: 278081 URL: https://svnweb.freebsd.org/changeset/base/278081 Log: Style(9) fixes. Approved by: bapt, ae X-MFC-With: r278080 Modified: head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/af_inet6.c ============================================================================== --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015 (r278080) +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 14:37:45 2015 (r278081) @@ -58,8 +58,8 @@ static const char rcsid[] = #include "ifconfig.h" static struct in6_ifreq in6_ridreq; -static struct in6_aliasreq in6_addreq = - { .ifra_flags = 0, +static struct in6_aliasreq in6_addreq = + { .ifra_flags = 0, .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; static int ip6lifetime; @@ -284,20 +284,23 @@ in6_status(int s __unused, const struct if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) printf("prefer_source "); - in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_addr); + in6_print_scope((uint8_t *)&((struct sockaddr_in6 *) + (ifa->ifa_addr))->sin6_addr); if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { printf("pltime "); if (lifetime.ia6t_preferred) { printf("%s ", lifetime.ia6t_preferred < now.tv_sec - ? "0" : sec2str(lifetime.ia6t_preferred - now.tv_sec)); + ? "0" : + sec2str(lifetime.ia6t_preferred - now.tv_sec)); } else printf("infty "); printf("vltime "); if (lifetime.ia6t_expire) { printf("%s ", lifetime.ia6t_expire < now.tv_sec - ? "0" : sec2str(lifetime.ia6t_expire - now.tv_sec)); + ? "0" : + sec2str(lifetime.ia6t_expire - now.tv_sec)); } else printf("infty "); } @@ -372,25 +375,25 @@ in6_getaddr(const char *s, int which) static int prefix(void *val, int size) { - u_char *name = (u_char *)val; - int byte, bit, plen = 0; + u_char *name = (u_char *)val; + int byte, bit, plen = 0; - for (byte = 0; byte < size; byte++, plen += 8) - if (name[byte] != 0xff) - break; + for (byte = 0; byte < size; byte++, plen += 8) + if (name[byte] != 0xff) + break; if (byte == size) return (plen); for (bit = 7; bit != 0; bit--, plen++) - if (!(name[byte] & (1 << bit))) - break; - for (; bit != 0; bit--) - if (name[byte] & (1 << bit)) - return(0); - byte++; - for (; byte < size; byte++) - if (name[byte]) - return(0); - return (plen); + if (!(name[byte] & (1 << bit))) + break; + for (; bit != 0; bit--) + if (name[byte] & (1 << bit)) + return(0); + byte++; + for (; byte < size; byte++) + if (name[byte]) + return(0); + return (plen); } static char * @@ -534,7 +537,11 @@ in6_Lopt_cb(const char *optarg __unused) { ip6lifetime++; /* print IPv6 address lifetime */ } -static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb }; +static struct option in6_Lopt = { + .opt = "L", + .opt_usage = "[-L]", + .cb = in6_Lopt_cb +}; static __constructor void inet6_ctor(void) Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015 (r278080) +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 14:37:45 2015 (r278081) @@ -151,12 +151,14 @@ usage(void) exit(1); } +#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0]) + static int calcorders(struct ifaddrs *ifa, struct ifa_queue *q) { - unsigned int ord, af, ifa_ord; struct ifaddrs *prev; struct ifa_order_elt *cur; + unsigned int ord, af, ifa_ord; prev = NULL; cur = NULL; @@ -164,7 +166,8 @@ calcorders(struct ifaddrs *ifa, struct i ifa_ord = 0; while (ifa != NULL) { - if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0) { + if (prev == NULL || + strcmp(ifa->ifa_name, prev->ifa_name) != 0) { cur = calloc(1, sizeof(*cur)); if (cur == NULL) @@ -179,12 +182,12 @@ calcorders(struct ifaddrs *ifa, struct i if (ifa->ifa_addr) { af = ifa->ifa_addr->sa_family; - if (af < sizeof(cur->af_orders) / sizeof(cur->af_orders[0]) && - cur->af_orders[af] == 0) + if (af < ORDERS_SIZE(cur->af_orders) && + cur->af_orders[af] == 0) cur->af_orders[af] = ++ord; } prev = ifa; - ifa = ifa->ifa_next; + ifa = ifa->ifa_next; } return (0); @@ -193,15 +196,14 @@ calcorders(struct ifaddrs *ifa, struct i static int cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q) { - int ret; - unsigned int af1, af2; struct ifa_order_elt *cur, *e1, *e2; + unsigned int af1, af2; + int ret; e1 = e2 = NULL; ret = strcmp(a->ifa_name, b->ifa_name); if (ret != 0) { - /* We need to find elements corresponding to these different names */ TAILQ_FOREACH(cur, q, link) { if (e1 && e2) break; @@ -231,20 +233,21 @@ cmpifaddrs(struct ifaddrs *a, struct ifa af1 = a->ifa_addr->sa_family; af2 = b->ifa_addr->sa_family; - if (af1 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0]) && - af2 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0])) + if (af1 < ORDERS_SIZE(e1->af_orders) && + af2 < ORDERS_SIZE(e1->af_orders)) return (e1->af_orders[af2] - e1->af_orders[af1]); } return (0); } +#undef ORDERS_SIZE + static struct ifaddrs * sortifaddrs(struct ifaddrs *list, - int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), - struct ifa_queue *q) + int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), + struct ifa_queue *q) { - struct ifaddrs *right, *temp, *last, *result, *next, *tail; right = list; @@ -499,7 +502,8 @@ main(int argc, char *argv[]) sdl->sdl_alen != ETHER_ADDR_LEN) continue; } else { - if (ifa->ifa_addr->sa_family != afp->af_af) + if (ifa->ifa_addr->sa_family + != afp->af_af) continue; } } @@ -835,7 +839,7 @@ settunnel(const char *src, const char *d errx(1, "error in parsing address string: %s", gai_strerror(ecode)); - if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) + if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) errx(1, "error in parsing address string: %s", gai_strerror(ecode)); From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:38:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6EEBBDD; Mon, 2 Feb 2015 14:38:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2A1FCA2; Mon, 2 Feb 2015 14:38:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EcmQY002520; Mon, 2 Feb 2015 14:38:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EcmPx002519; Mon, 2 Feb 2015 14:38:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021438.t12EcmPx002519@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:38:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278082 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:38:49 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:38:47 2015 New Revision: 278082 URL: https://svnweb.freebsd.org/changeset/base/278082 Log: - Remove more files when MK_GROFF == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:37:45 2015 (r278081) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47 2015 (r278082) @@ -1777,6 +1777,76 @@ OLD_FILES+=usr/bin/tfmtodit OLD_FILES+=usr/bin/troff OLD_FILES+=usr/bin/vgrind OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/dict/eign +OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz +OLD_FILES+=usr/share/doc/papers/bio.ascii.gz +OLD_FILES+=usr/share/doc/papers/contents.ascii.gz +OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz +OLD_FILES+=usr/share/doc/papers/jail.ascii.gz +OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz +OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz +OLD_FILES+=usr/share/doc/papers/releng.ascii.gz +OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz +OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz +OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/Title.ascii.gz +OLD_FILES+=usr/share/doc/psd/contents.ascii.gz +OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/Title.ascii.gz +OLD_FILES+=usr/share/doc/smm/contents.ascii.gz +OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/Title.ascii.gz +OLD_FILES+=usr/share/doc/usd/contents.ascii.gz OLD_FILES+=usr/share/groff_font/devX100-12/CB OLD_FILES+=usr/share/groff_font/devX100-12/CBI OLD_FILES+=usr/share/groff_font/devX100-12/CI From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:40:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E7F9D48; Mon, 2 Feb 2015 14:40:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A169CC0; Mon, 2 Feb 2015 14:40:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EehMT004708; Mon, 2 Feb 2015 14:40:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Eeh9P004707; Mon, 2 Feb 2015 14:40:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021440.t12Eeh9P004707@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:40:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278083 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:40:43 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:40:42 2015 New Revision: 278083 URL: https://svnweb.freebsd.org/changeset/base/278083 Log: - Remove more files when MK_HTML == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47 2015 (r278082) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42 2015 (r278083) @@ -2402,9 +2402,76 @@ OLD_FILES+=usr/share/man/man3/hesiod.3.g OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz .endif -#.if ${MK_HTML} == no -# to be filled in -#.endif +.if ${MK_HTML} == no +OLD_FILES+=usr/share/doc/ncurses/hackguide.html +OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html +OLD_FILES+=usr/share/doc/ntp/accopt.html +OLD_FILES+=usr/share/doc/ntp/assoc.html +OLD_FILES+=usr/share/doc/ntp/audio.html +OLD_FILES+=usr/share/doc/ntp/authopt.html +OLD_FILES+=usr/share/doc/ntp/build.html +OLD_FILES+=usr/share/doc/ntp/clockopt.html +OLD_FILES+=usr/share/doc/ntp/config.html +OLD_FILES+=usr/share/doc/ntp/confopt.html +OLD_FILES+=usr/share/doc/ntp/copyright.html +OLD_FILES+=usr/share/doc/ntp/debug.html +OLD_FILES+=usr/share/doc/ntp/driver1.html +OLD_FILES+=usr/share/doc/ntp/driver10.html +OLD_FILES+=usr/share/doc/ntp/driver11.html +OLD_FILES+=usr/share/doc/ntp/driver12.html +OLD_FILES+=usr/share/doc/ntp/driver16.html +OLD_FILES+=usr/share/doc/ntp/driver18.html +OLD_FILES+=usr/share/doc/ntp/driver19.html +OLD_FILES+=usr/share/doc/ntp/driver2.html +OLD_FILES+=usr/share/doc/ntp/driver20.html +OLD_FILES+=usr/share/doc/ntp/driver22.html +OLD_FILES+=usr/share/doc/ntp/driver26.html +OLD_FILES+=usr/share/doc/ntp/driver27.html +OLD_FILES+=usr/share/doc/ntp/driver28.html +OLD_FILES+=usr/share/doc/ntp/driver29.html +OLD_FILES+=usr/share/doc/ntp/driver3.html +OLD_FILES+=usr/share/doc/ntp/driver30.html +OLD_FILES+=usr/share/doc/ntp/driver32.html +OLD_FILES+=usr/share/doc/ntp/driver33.html +OLD_FILES+=usr/share/doc/ntp/driver34.html +OLD_FILES+=usr/share/doc/ntp/driver35.html +OLD_FILES+=usr/share/doc/ntp/driver36.html +OLD_FILES+=usr/share/doc/ntp/driver37.html +OLD_FILES+=usr/share/doc/ntp/driver4.html +OLD_FILES+=usr/share/doc/ntp/driver5.html +OLD_FILES+=usr/share/doc/ntp/driver6.html +OLD_FILES+=usr/share/doc/ntp/driver7.html +OLD_FILES+=usr/share/doc/ntp/driver8.html +OLD_FILES+=usr/share/doc/ntp/driver9.html +OLD_FILES+=usr/share/doc/ntp/extern.html +OLD_FILES+=usr/share/doc/ntp/hints.html +OLD_FILES+=usr/share/doc/ntp/howto.html +OLD_FILES+=usr/share/doc/ntp/index.html +OLD_FILES+=usr/share/doc/ntp/kern.html +OLD_FILES+=usr/share/doc/ntp/ldisc.html +OLD_FILES+=usr/share/doc/ntp/measure.html +OLD_FILES+=usr/share/doc/ntp/miscopt.html +OLD_FILES+=usr/share/doc/ntp/monopt.html +OLD_FILES+=usr/share/doc/ntp/mx4200data.html +OLD_FILES+=usr/share/doc/ntp/notes.html +OLD_FILES+=usr/share/doc/ntp/ntpd.html +OLD_FILES+=usr/share/doc/ntp/ntpdate.html +OLD_FILES+=usr/share/doc/ntp/ntpdc.html +OLD_FILES+=usr/share/doc/ntp/ntpq.html +OLD_FILES+=usr/share/doc/ntp/ntptime.html +OLD_FILES+=usr/share/doc/ntp/ntptrace.html +OLD_FILES+=usr/share/doc/ntp/parsedata.html +OLD_FILES+=usr/share/doc/ntp/parsenew.html +OLD_FILES+=usr/share/doc/ntp/patches.html +OLD_FILES+=usr/share/doc/ntp/porting.html +OLD_FILES+=usr/share/doc/ntp/pps.html +OLD_FILES+=usr/share/doc/ntp/prefer.html +OLD_FILES+=usr/share/doc/ntp/quick.html +OLD_FILES+=usr/share/doc/ntp/rdebug.html +OLD_FILES+=usr/share/doc/ntp/refclock.html +OLD_FILES+=usr/share/doc/ntp/release.html +OLD_FILES+=usr/share/doc/ntp/tickadj.html +.endif .if ${MK_ICONV} == no OLD_FILES+=usr/bin/iconv From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:43:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B564EA7; Mon, 2 Feb 2015 14:43:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 573CDD6D; Mon, 2 Feb 2015 14:43:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Eh8G6006581; Mon, 2 Feb 2015 14:43:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Eh8XO006580; Mon, 2 Feb 2015 14:43:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021443.t12Eh8XO006580@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278084 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:43:08 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:43:07 2015 New Revision: 278084 URL: https://svnweb.freebsd.org/changeset/base/278084 Log: - Remove more files when MK_LIBCPLUSPLUS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42 2015 (r278083) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07 2015 (r278084) @@ -3661,6 +3661,7 @@ OLD_FILES+=usr/include/c++/v1/__function OLD_FILES+=usr/include/c++/v1/__hash_table OLD_FILES+=usr/include/c++/v1/__locale OLD_FILES+=usr/include/c++/v1/__mutex_base +OLD_FILES+=usr/include/c++/v1/__refstring OLD_FILES+=usr/include/c++/v1/__split_buffer OLD_FILES+=usr/include/c++/v1/__sso_allocator OLD_FILES+=usr/include/c++/v1/__std_stream @@ -3704,8 +3705,12 @@ OLD_FILES+=usr/include/c++/v1/cwctype OLD_FILES+=usr/include/c++/v1/cxxabi.h OLD_FILES+=usr/include/c++/v1/deque OLD_FILES+=usr/include/c++/v1/exception +OLD_FILES+=usr/include/c++/v1/experimental/__config OLD_FILES+=usr/include/c++/v1/experimental/dynarray OLD_FILES+=usr/include/c++/v1/experimental/optional +OLD_FILES+=usr/include/c++/v1/experimental/string_view +OLD_FILES+=usr/include/c++/v1/experimental/type_traits +OLD_FILES+=usr/include/c++/v1/experimental/utility OLD_FILES+=usr/include/c++/v1/ext/__hash OLD_FILES+=usr/include/c++/v1/ext/hash_map OLD_FILES+=usr/include/c++/v1/ext/hash_set @@ -3735,6 +3740,7 @@ OLD_FILES+=usr/include/c++/v1/ratio OLD_FILES+=usr/include/c++/v1/regex OLD_FILES+=usr/include/c++/v1/scoped_allocator OLD_FILES+=usr/include/c++/v1/set +OLD_FILES+=usr/include/c++/v1/shared_mutex OLD_FILES+=usr/include/c++/v1/sstream OLD_FILES+=usr/include/c++/v1/stack OLD_FILES+=usr/include/c++/v1/stdexcept @@ -3744,6 +3750,103 @@ OLD_FILES+=usr/include/c++/v1/strstream OLD_FILES+=usr/include/c++/v1/system_error OLD_FILES+=usr/include/c++/v1/tgmath.h OLD_FILES+=usr/include/c++/v1/thread +OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference +OLD_FILES+=usr/include/c++/v1/tr1/__config +OLD_FILES+=usr/include/c++/v1/tr1/__debug +OLD_FILES+=usr/include/c++/v1/tr1/__functional_03 +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03 +OLD_FILES+=usr/include/c++/v1/tr1/__hash_table +OLD_FILES+=usr/include/c++/v1/tr1/__locale +OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base +OLD_FILES+=usr/include/c++/v1/tr1/__refstring +OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer +OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator +OLD_FILES+=usr/include/c++/v1/tr1/__std_stream +OLD_FILES+=usr/include/c++/v1/tr1/__tree +OLD_FILES+=usr/include/c++/v1/tr1/__tuple +OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03 +OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max +OLD_FILES+=usr/include/c++/v1/tr1/algorithm +OLD_FILES+=usr/include/c++/v1/tr1/array +OLD_FILES+=usr/include/c++/v1/tr1/atomic +OLD_FILES+=usr/include/c++/v1/tr1/bitset +OLD_FILES+=usr/include/c++/v1/tr1/cassert +OLD_FILES+=usr/include/c++/v1/tr1/ccomplex +OLD_FILES+=usr/include/c++/v1/tr1/cctype +OLD_FILES+=usr/include/c++/v1/tr1/cerrno +OLD_FILES+=usr/include/c++/v1/tr1/cfenv +OLD_FILES+=usr/include/c++/v1/tr1/cfloat +OLD_FILES+=usr/include/c++/v1/tr1/chrono +OLD_FILES+=usr/include/c++/v1/tr1/cinttypes +OLD_FILES+=usr/include/c++/v1/tr1/ciso646 +OLD_FILES+=usr/include/c++/v1/tr1/climits +OLD_FILES+=usr/include/c++/v1/tr1/clocale +OLD_FILES+=usr/include/c++/v1/tr1/cmath +OLD_FILES+=usr/include/c++/v1/tr1/codecvt +OLD_FILES+=usr/include/c++/v1/tr1/complex +OLD_FILES+=usr/include/c++/v1/tr1/complex.h +OLD_FILES+=usr/include/c++/v1/tr1/condition_variable +OLD_FILES+=usr/include/c++/v1/tr1/csetjmp +OLD_FILES+=usr/include/c++/v1/tr1/csignal +OLD_FILES+=usr/include/c++/v1/tr1/cstdarg +OLD_FILES+=usr/include/c++/v1/tr1/cstdbool +OLD_FILES+=usr/include/c++/v1/tr1/cstddef +OLD_FILES+=usr/include/c++/v1/tr1/cstdint +OLD_FILES+=usr/include/c++/v1/tr1/cstdio +OLD_FILES+=usr/include/c++/v1/tr1/cstdlib +OLD_FILES+=usr/include/c++/v1/tr1/cstring +OLD_FILES+=usr/include/c++/v1/tr1/ctgmath +OLD_FILES+=usr/include/c++/v1/tr1/ctime +OLD_FILES+=usr/include/c++/v1/tr1/cwchar +OLD_FILES+=usr/include/c++/v1/tr1/cwctype +OLD_FILES+=usr/include/c++/v1/tr1/deque +OLD_FILES+=usr/include/c++/v1/tr1/exception +OLD_FILES+=usr/include/c++/v1/tr1/forward_list +OLD_FILES+=usr/include/c++/v1/tr1/fstream +OLD_FILES+=usr/include/c++/v1/tr1/functional +OLD_FILES+=usr/include/c++/v1/tr1/future +OLD_FILES+=usr/include/c++/v1/tr1/initializer_list +OLD_FILES+=usr/include/c++/v1/tr1/iomanip +OLD_FILES+=usr/include/c++/v1/tr1/ios +OLD_FILES+=usr/include/c++/v1/tr1/iosfwd +OLD_FILES+=usr/include/c++/v1/tr1/iostream +OLD_FILES+=usr/include/c++/v1/tr1/istream +OLD_FILES+=usr/include/c++/v1/tr1/iterator +OLD_FILES+=usr/include/c++/v1/tr1/limits +OLD_FILES+=usr/include/c++/v1/tr1/list +OLD_FILES+=usr/include/c++/v1/tr1/locale +OLD_FILES+=usr/include/c++/v1/tr1/map +OLD_FILES+=usr/include/c++/v1/tr1/memory +OLD_FILES+=usr/include/c++/v1/tr1/mutex +OLD_FILES+=usr/include/c++/v1/tr1/new +OLD_FILES+=usr/include/c++/v1/tr1/numeric +OLD_FILES+=usr/include/c++/v1/tr1/ostream +OLD_FILES+=usr/include/c++/v1/tr1/queue +OLD_FILES+=usr/include/c++/v1/tr1/random +OLD_FILES+=usr/include/c++/v1/tr1/ratio +OLD_FILES+=usr/include/c++/v1/tr1/regex +OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator +OLD_FILES+=usr/include/c++/v1/tr1/set +OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex +OLD_FILES+=usr/include/c++/v1/tr1/sstream +OLD_FILES+=usr/include/c++/v1/tr1/stack +OLD_FILES+=usr/include/c++/v1/tr1/stdexcept +OLD_FILES+=usr/include/c++/v1/tr1/streambuf +OLD_FILES+=usr/include/c++/v1/tr1/string +OLD_FILES+=usr/include/c++/v1/tr1/strstream +OLD_FILES+=usr/include/c++/v1/tr1/system_error +OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h +OLD_FILES+=usr/include/c++/v1/tr1/thread +OLD_FILES+=usr/include/c++/v1/tr1/tuple +OLD_FILES+=usr/include/c++/v1/tr1/type_traits +OLD_FILES+=usr/include/c++/v1/tr1/typeindex +OLD_FILES+=usr/include/c++/v1/tr1/typeinfo +OLD_FILES+=usr/include/c++/v1/tr1/unordered_map +OLD_FILES+=usr/include/c++/v1/tr1/unordered_set +OLD_FILES+=usr/include/c++/v1/tr1/utility +OLD_FILES+=usr/include/c++/v1/tr1/valarray +OLD_FILES+=usr/include/c++/v1/tr1/vector OLD_FILES+=usr/include/c++/v1/tuple OLD_FILES+=usr/include/c++/v1/type_traits OLD_FILES+=usr/include/c++/v1/typeindex @@ -3756,6 +3859,14 @@ OLD_FILES+=usr/include/c++/v1/unwind.h OLD_FILES+=usr/include/c++/v1/utility OLD_FILES+=usr/include/c++/v1/valarray OLD_FILES+=usr/include/c++/v1/vector +OLD_FILES+=usr/lib32/libc++.a +OLD_FILES+=usr/lib32/libc++.so +OLD_LIBS+=usr/lib32/libc++.so.1 +OLD_FILES+=usr/lib32/libc++_p.a +OLD_FILES+=usr/lib32/libcxxrt.a +OLD_FILES+=usr/lib32/libcxxrt.so +OLD_LIBS+=usr/lib32/libcxxrt.so.1 +OLD_FILES+=usr/lib32/libcxxrt_p.a OLD_DIRS+=usr/include/c++/v1/experimental OLD_DIRS+=usr/include/c++/v1/ext OLD_DIRS+=usr/include/c++/v1 From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:45:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBB1CC2; Mon, 2 Feb 2015 14:45:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B51AFD83; Mon, 2 Feb 2015 14:45:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EjIle006957; Mon, 2 Feb 2015 14:45:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EjIex006956; Mon, 2 Feb 2015 14:45:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021445.t12EjIex006956@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:45:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278085 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:45:18 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:45:17 2015 New Revision: 278085 URL: https://svnweb.freebsd.org/changeset/base/278085 Log: - Remove more files when MK_LOCALES == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07 2015 (r278084) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:45:17 2015 (r278085) @@ -3876,9 +3876,1039 @@ OLD_DIRS+=usr/include/c++/v1 # to be filled in #.endif -#.if ${MK_LOCALES} == no -# to be filled in -#.endif +.if ${MK_LOCALES} == no +OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MONETARY +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_TIME +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MONETARY +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_NUMERIC +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_TIME +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_TIME +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MONETARY +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_NUMERIC +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_TIME +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_COLLATE +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_CTYPE +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MONETARY +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_NUMERIC +OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_TIME +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_COLLATE +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_CTYPE +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MESSAGES +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MONETARY +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_NUMERIC +OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_TIME +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_TIME +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_TIME +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_TIME +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_TIME *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:48:06 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7268263; Mon, 2 Feb 2015 14:48:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B381FDAD; Mon, 2 Feb 2015 14:48:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Em6dU007354; Mon, 2 Feb 2015 14:48:06 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Em6hi007353; Mon, 2 Feb 2015 14:48:06 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021448.t12Em6hi007353@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:48:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278086 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:48:06 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:48:05 2015 New Revision: 278086 URL: https://svnweb.freebsd.org/changeset/base/278086 Log: - Remove more files when MK_MAIL == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:45:17 2015 (r278085) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:48:05 2015 (r278086) @@ -4960,6 +4960,10 @@ OLD_FILES+=usr/share/man/man8/pac.8.gz .endif .if ${MK_MAIL} == no +OLD_FILES+=etc/aliases +OLD_FILES+=etc/mail.rc +OLD_FILES+=etc/mail/aliases +OLD_FILES+=etc/mail/mailer.conf OLD_FILES+=etc/periodic/daily/130.clean-msgs OLD_FILES+=usr/bin/Mail OLD_FILES+=usr/bin/biff From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:50:15 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 129803FB; Mon, 2 Feb 2015 14:50:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0B57DC6; Mon, 2 Feb 2015 14:50:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EoEnB007720; Mon, 2 Feb 2015 14:50:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EoE8c007719; Mon, 2 Feb 2015 14:50:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021450.t12EoE8c007719@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:50:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278087 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:50:15 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:50:14 2015 New Revision: 278087 URL: https://svnweb.freebsd.org/changeset/base/278087 Log: - Remove more files when MK_MAKE == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:48:05 2015 (r278086) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:50:14 2015 (r278087) @@ -4992,6 +4992,371 @@ OLD_FILES+=usr/sbin/mailwrapper OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz .endif +.if ${MK_MAKE} == no +OLD_FILES+=usr/bin/make +OLD_FILES+=usr/share/man/man1/make.1.gz +OLD_FILES+=usr/share/mk/atf.test.mk +OLD_FILES+=usr/share/mk/bsd.README +OLD_FILES+=usr/share/mk/bsd.arch.inc.mk +OLD_FILES+=usr/share/mk/bsd.compiler.mk +OLD_FILES+=usr/share/mk/bsd.cpu.mk +OLD_FILES+=usr/share/mk/bsd.crunchgen.mk +OLD_FILES+=usr/share/mk/bsd.dep.mk +OLD_FILES+=usr/share/mk/bsd.doc.mk +OLD_FILES+=usr/share/mk/bsd.dtb.mk +OLD_FILES+=usr/share/mk/bsd.endian.mk +OLD_FILES+=usr/share/mk/bsd.files.mk +OLD_FILES+=usr/share/mk/bsd.incs.mk +OLD_FILES+=usr/share/mk/bsd.info.mk +OLD_FILES+=usr/share/mk/bsd.init.mk +OLD_FILES+=usr/share/mk/bsd.kmod.mk +OLD_FILES+=usr/share/mk/bsd.lib.mk +OLD_FILES+=usr/share/mk/bsd.libnames.mk +OLD_FILES+=usr/share/mk/bsd.links.mk +OLD_FILES+=usr/share/mk/bsd.man.mk +OLD_FILES+=usr/share/mk/bsd.mkopt.mk +OLD_FILES+=usr/share/mk/bsd.nls.mk +OLD_FILES+=usr/share/mk/bsd.obj.mk +OLD_FILES+=usr/share/mk/bsd.opts.mk +OLD_FILES+=usr/share/mk/bsd.own.mk +OLD_FILES+=usr/share/mk/bsd.port.mk +OLD_FILES+=usr/share/mk/bsd.port.options.mk +OLD_FILES+=usr/share/mk/bsd.port.post.mk +OLD_FILES+=usr/share/mk/bsd.port.pre.mk +OLD_FILES+=usr/share/mk/bsd.port.subdir.mk +OLD_FILES+=usr/share/mk/bsd.prog.mk +OLD_FILES+=usr/share/mk/bsd.progs.mk +OLD_FILES+=usr/share/mk/bsd.snmpmod.mk +OLD_FILES+=usr/share/mk/bsd.subdir.mk +OLD_FILES+=usr/share/mk/bsd.symver.mk +OLD_FILES+=usr/share/mk/bsd.sys.mk +OLD_FILES+=usr/share/mk/bsd.test.mk +OLD_FILES+=usr/share/mk/plain.test.mk +OLD_FILES+=usr/share/mk/suite.test.mk +OLD_FILES+=usr/share/mk/sys.mk +OLD_FILES+=usr/share/mk/tap.test.mk +OLD_FILES+=usr/share/mk/version_gen.awk +OLD_FILES+=usr/tests/usr.bin/bmake/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/archives/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/libtest.a +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/libtest.a +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.3 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.4 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.5 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.6 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.7 +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/libtest.a +OLD_FILES+=usr/tests/usr.bin/bmake/basic/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/common.sh +OLD_FILES+=usr/tests/usr.bin/bmake/execution/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/sh +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/sh +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/sh +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/shell +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/shell +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/TEST1.a +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST1.a +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST2.a +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST1.a +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST2.a +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.3 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.4 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.5 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.3 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.4 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.5 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.3 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.4 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.5 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/sys.mk +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/cleanup +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/sys.mk +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/cleanup +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/sys.mk +OLD_FILES+=usr/tests/usr.bin/bmake/test-new.mk +OLD_FILES+=usr/tests/usr.bin/bmake/variables/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.3 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.3 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.3 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.2 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/legacy_test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Kyuafile +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Makefile.test +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.status.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stderr.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stdout.1 +OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test +.endif + #.if ${MK_MAN} == no # This should add a dependency to a special target which removes all man pages. # Listing all of them here is overkill. From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:51:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC15C54B; Mon, 2 Feb 2015 14:51:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B80B7E63; Mon, 2 Feb 2015 14:51:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EpROj010701; Mon, 2 Feb 2015 14:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EpRXD010700; Mon, 2 Feb 2015 14:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021451.t12EpRXD010700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:51:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278088 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:51:27 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:51:26 2015 New Revision: 278088 URL: https://svnweb.freebsd.org/changeset/base/278088 Log: - Remove more files when MK_MAN == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:50:14 2015 (r278087) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:51:26 2015 (r278088) @@ -5357,10 +5357,10 @@ OLD_FILES+=usr/tests/usr.bin/bmake/varia OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test .endif -#.if ${MK_MAN} == no -# This should add a dependency to a special target which removes all man pages. -# Listing all of them here is overkill. -#.endif +.if ${MK_MAN} == no +MAN_FILES!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type f | sed -e 's,^${DESTDIR}/,,'; echo +OLD_FILES+=${MAN_FILES} +.endif .if ${MK_NDIS} == no OLD_FILES+=usr/sbin/ndiscvt From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:52:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81002699; Mon, 2 Feb 2015 14:52:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D117E76; Mon, 2 Feb 2015 14:52:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EqdHG011506; Mon, 2 Feb 2015 14:52:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Eqd2t011505; Mon, 2 Feb 2015 14:52:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021452.t12Eqd2t011505@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:52:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278089 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:52:39 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:52:38 2015 New Revision: 278089 URL: https://svnweb.freebsd.org/changeset/base/278089 Log: - Remove more files when MK_MAN_UTILS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:51:26 2015 (r278088) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:52:38 2015 (r278089) @@ -5362,6 +5362,32 @@ MAN_FILES!=find ${DESTDIR}/usr/share/man OLD_FILES+=${MAN_FILES} .endif +.if ${MK_MAN_UTILS} == no +OLD_FILES+=etc/periodic/weekly/320.whatis +OLD_FILES+=etc/periodic/weekly/330.catman +OLD_FILES+=usr/bin/apropos +OLD_FILES+=usr/bin/catman +OLD_FILES+=usr/bin/makewhatis +OLD_FILES+=usr/bin/man +OLD_FILES+=usr/bin/manpath +OLD_FILES+=usr/bin/whatis +OLD_FILES+=usr/libexec/catman.local +OLD_FILES+=usr/libexec/makewhatis.local +OLD_FILES+=usr/sbin/manctl +OLD_FILES+=usr/share/man/man1/apropos.1.gz +OLD_FILES+=usr/share/man/man1/catman.1.gz +OLD_FILES+=usr/share/man/man1/makewhatis.1.gz +OLD_FILES+=usr/share/man/man1/man.1.gz +OLD_FILES+=usr/share/man/man1/manpath.1.gz +OLD_FILES+=usr/share/man/man1/whatis.1.gz +OLD_FILES+=usr/share/man/man5/man.conf.5.gz +OLD_FILES+=usr/share/man/man8/catman.local.8.gz +OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz +OLD_FILES+=usr/share/man/man8/manctl.8.gz +OLD_FILES+=usr/share/man/whatis +OLD_FILES+=usr/share/openssl/man/whatis +.endif + .if ${MK_NDIS} == no OLD_FILES+=usr/sbin/ndiscvt OLD_FILES+=usr/sbin/ndisgen From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:54:29 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C70C8F5; Mon, 2 Feb 2015 14:54:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FD13E8F; Mon, 2 Feb 2015 14:54:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EsTUA011874; Mon, 2 Feb 2015 14:54:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EsTSb011873; Mon, 2 Feb 2015 14:54:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021454.t12EsTSb011873@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:54:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278090 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:54:29 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:54:28 2015 New Revision: 278090 URL: https://svnweb.freebsd.org/changeset/base/278090 Log: - Remove more files when MK_NETGRAPH == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:52:38 2015 (r278089) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:54:28 2015 (r278090) @@ -5401,6 +5401,43 @@ OLD_FILES+=usr/bin/nc OLD_FILES+=usr/share/man/man1/nc.1.gz .endif +.if ${MK_NETGRAPH} == no +OLD_FILES+=usr/include/netgraph.h +OLD_FILES+=usr/lib/libnetgraph.a +OLD_FILES+=usr/lib/libnetgraph.so +OLD_LIBS+=usr/lib/libnetgraph.so.4 +OLD_FILES+=usr/lib/libnetgraph_p.a +OLD_FILES+=usr/lib32/libnetgraph.a +OLD_FILES+=usr/lib32/libnetgraph.so +OLD_LIBS+=usr/lib32/libnetgraph.so.4 +OLD_FILES+=usr/lib32/libnetgraph_p.a +OLD_FILES+=usr/libexec/pppoed +OLD_FILES+=usr/sbin/flowctl +OLD_FILES+=usr/sbin/lmcconfig +OLD_FILES+=usr/sbin/ngctl +OLD_FILES+=usr/sbin/nghook +OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz +OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz +OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendData.3.gz +OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz +OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz +OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz +OLD_FILES+=usr/share/man/man3/netgraph.3.gz +OLD_FILES+=usr/share/man/man8/flowctl.8.gz +OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz +OLD_FILES+=usr/share/man/man8/ngctl.8.gz +OLD_FILES+=usr/share/man/man8/nghook.8.gz +OLD_FILES+=usr/share/man/man8/pppoed.8.gz +.endif + .if ${MK_NIS} == no OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:55:25 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4C24A36; Mon, 2 Feb 2015 14:55:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0D7AE99; Mon, 2 Feb 2015 14:55:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EtPhk012091; Mon, 2 Feb 2015 14:55:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EtP0u012090; Mon, 2 Feb 2015 14:55:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021455.t12EtP0u012090@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278091 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:55:25 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:55:24 2015 New Revision: 278091 URL: https://svnweb.freebsd.org/changeset/base/278091 Log: - Remove more files when MK_NETGRAPH_SUPPORT == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:54:28 2015 (r278090) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:55:24 2015 (r278091) @@ -5438,6 +5438,15 @@ OLD_FILES+=usr/share/man/man8/nghook.8.g OLD_FILES+=usr/share/man/man8/pppoed.8.gz .endif +.if ${MK_NETGRAPH_SUPPORT} == no +OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h +OLD_FILES+=usr/lib/snmp_netgraph.so +OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz +OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt +.endif + .if ${MK_NIS} == no OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:56:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C6D8B9C; Mon, 2 Feb 2015 14:56:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47780EB3; Mon, 2 Feb 2015 14:56:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Eue3i012284; Mon, 2 Feb 2015 14:56:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EuexA012283; Mon, 2 Feb 2015 14:56:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021456.t12EuexA012283@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:56:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278092 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:56:40 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:56:39 2015 New Revision: 278092 URL: https://svnweb.freebsd.org/changeset/base/278092 Log: - Remove more files when MK_NLS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:55:24 2015 (r278091) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:56:39 2015 (r278092) @@ -5503,8 +5503,115 @@ OLD_FILES+=var/yp/Makefile.dist .endif .if ${MK_NLS} == no +OLD_FILES+=usr/share/nls/C/ee.cat +OLD_FILES+=usr/share/nls/be_BY.UTF-8/libc.cat +OLD_FILES+=usr/share/nls/ca_ES.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/libc.cat +OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat +OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/en_US.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat +OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/ee.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat +OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat +OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat +OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/libc.cat +OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat +OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat +OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat +OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat +OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat +OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat +OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat +OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat +OLD_FILES+=usr/share/nls/ko_KR.UTF-8/libc.cat +OLD_FILES+=usr/share/nls/ko_KR.eucKR/libc.cat +OLD_FILES+=usr/share/nls/mn_MN.UTF-8/libc.cat +OLD_FILES+=usr/share/nls/nl_NL.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/no_NO.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/libc.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/pt_PT.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/libc.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/sk_SK.ISO8859-2/libc.cat +OLD_FILES+=usr/share/nls/sv_SE.ISO8859-1/libc.cat +OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat +OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat +OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat +OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat +OLD_FILES+=usr/share/nls/uk_UA.UTF-8/libc.cat +OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/zh_CN.GB18030/libc.cat +OLD_FILES+=usr/share/nls/zh_CN.GB2312/libc.cat +OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat +OLD_FILES+=usr/share/nls/zh_CN.UTF-8/libc.cat OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0 -# to be filled in .endif .if ${MK_NTP} == no From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:57:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70160CE7; Mon, 2 Feb 2015 14:57:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C083EC4; Mon, 2 Feb 2015 14:57:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Evk1I012463; Mon, 2 Feb 2015 14:57:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Evkx9012462; Mon, 2 Feb 2015 14:57:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021457.t12Evkx9012462@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:57:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278093 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:57:46 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:57:45 2015 New Revision: 278093 URL: https://svnweb.freebsd.org/changeset/base/278093 Log: - Remove more files when MK_NLS_CATALOGS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:56:39 2015 (r278092) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:57:45 2015 (r278093) @@ -5614,6 +5614,30 @@ OLD_FILES+=usr/share/nls/zh_CN.UTF-8/lib OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0 .endif +.if ${MK_NLS_CATALOGS} == no +OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat +OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat +OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat +OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat +OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat +.endif + .if ${MK_NTP} == no OLD_FILES+=etc/ntp.conf OLD_FILES+=etc/periodic/daily/480.status-ntpd From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:58:42 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE929E2F; Mon, 2 Feb 2015 14:58:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AB7BECF; Mon, 2 Feb 2015 14:58:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EwgbT012624; Mon, 2 Feb 2015 14:58:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EwgsS012623; Mon, 2 Feb 2015 14:58:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021458.t12EwgsS012623@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278094 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:58:42 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:58:41 2015 New Revision: 278094 URL: https://svnweb.freebsd.org/changeset/base/278094 Log: - Remove more files when MK_NS_CACHING == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:57:45 2015 (r278093) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:58:41 2015 (r278094) @@ -5638,6 +5638,15 @@ OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat .endif +.if ${MK_NS_CACHING} == no +OLD_FILES+=etc/nscd.conf +OLD_FILES+=etc/rc.d/nscd +OLD_FILES+=usr/sbin/nscd +OLD_FILES+=usr/share/examples/etc/nscd.conf +OLD_FILES+=usr/share/man/man5/nscd.conf.5.gz +OLD_FILES+=usr/share/man/man8/nscd.8.gz +.endif + .if ${MK_NTP} == no OLD_FILES+=etc/ntp.conf OLD_FILES+=etc/periodic/daily/480.status-ntpd From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:59:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DC8DF87; Mon, 2 Feb 2015 14:59:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A2B7EDE; Mon, 2 Feb 2015 14:59:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Exuxa012813; Mon, 2 Feb 2015 14:59:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12ExulM012812; Mon, 2 Feb 2015 14:59:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021459.t12ExulM012812@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:59:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278095 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:59:56 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:59:55 2015 New Revision: 278095 URL: https://svnweb.freebsd.org/changeset/base/278095 Log: - Remove more files when MK_NTP == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:58:41 2015 (r278094) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:59:55 2015 (r278095) @@ -5725,6 +5725,7 @@ OLD_FILES+=usr/share/doc/ntp/release.htm OLD_FILES+=usr/share/doc/ntp/tickadj.html OLD_DIRS+=usr/share/doc/ntp OLD_FILES+=usr/share/examples/etc/ntp.conf +OLD_FILES+=usr/share/man/man1/sntp.1.gz OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 15:59:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09FC21DA; Mon, 2 Feb 2015 15:59:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA57B89B; Mon, 2 Feb 2015 15:59:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12FxHls041256; Mon, 2 Feb 2015 15:59:17 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12FxH8v041255; Mon, 2 Feb 2015 15:59:17 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502021559.t12FxH8v041255@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 2 Feb 2015 15:59:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278098 - head/sys/dev/iscsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 15:59:18 -0000 Author: mav Date: Mon Feb 2 15:59:17 2015 New Revision: 278098 URL: https://svnweb.freebsd.org/changeset/base/278098 Log: Add some fields and constants from RFC7144. MFC after: 1 week Modified: head/sys/dev/iscsi/iscsi_proto.h Modified: head/sys/dev/iscsi/iscsi_proto.h ============================================================================== --- head/sys/dev/iscsi/iscsi_proto.h Mon Feb 2 15:53:01 2015 (r278097) +++ head/sys/dev/iscsi/iscsi_proto.h Mon Feb 2 15:59:17 2015 (r278098) @@ -115,7 +115,9 @@ struct iscsi_bhs_scsi_response { uint8_t bhssr_status; uint8_t bhssr_total_ahs_len; uint8_t bhssr_data_segment_len[3]; - uint64_t bhssr_reserved; + uint16_t bhssr_status_qualifier; + uint16_t bhssr_reserved; + uint32_t bhssr_reserved2; uint32_t bhssr_initiator_task_tag; uint32_t bhssr_snack_tag; uint32_t bhssr_statsn; @@ -135,6 +137,10 @@ CTASSERT(sizeof(struct iscsi_bhs_scsi_re #define BHSTMR_FUNCTION_TARGET_WARM_RESET 6 #define BHSTMR_FUNCTION_TARGET_COLD_RESET 7 #define BHSTMR_FUNCTION_TASK_REASSIGN 8 +#define BHSTMR_FUNCTION_QUERY_TASK 9 +#define BHSTMR_FUNCTION_QUERY_TASK_SET 10 +#define BHSTMR_FUNCTION_I_T_NEXUS_RESET 11 +#define BHSTMR_FUNCTION_QUERY_ASYNC_EVENT 12 struct iscsi_bhs_task_management_request { uint8_t bhstmr_opcode; @@ -154,7 +160,14 @@ struct iscsi_bhs_task_management_request CTASSERT(sizeof(struct iscsi_bhs_task_management_request) == ISCSI_BHS_SIZE); #define BHSTMR_RESPONSE_FUNCTION_COMPLETE 0 +#define BHSTMR_RESPONSE_TASK_DOES_NOT_EXIST 1 +#define BHSTMR_RESPONSE_LUN_DOES_NOT_EXIST 2 +#define BHSTMR_RESPONSE_TASK_STILL_ALLEGIANT 3 +#define BHSTMR_RESPONSE_TASK_ALL_REASS_NOT_SUPP 4 #define BHSTMR_RESPONSE_FUNCTION_NOT_SUPPORTED 5 +#define BHSTMR_RESPONSE_FUNCTION_AUTH_FAIL 6 +#define BHSTMR_RESPONSE_FUNCTION_SUCCEEDED 7 +#define BHSTMR_RESPONSE_FUNCTION_REJECTED 255 struct iscsi_bhs_task_management_response { uint8_t bhstmr_opcode; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 16:06:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C18B554; Mon, 2 Feb 2015 16:06:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7881E98A; Mon, 2 Feb 2015 16:06:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12G6OsT045727; Mon, 2 Feb 2015 16:06:24 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12G6OtC045726; Mon, 2 Feb 2015 16:06:24 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502021606.t12G6OtC045726@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 2 Feb 2015 16:06:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278099 - head/sys/dev/iscsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 16:06:24 -0000 Author: mav Date: Mon Feb 2 16:06:23 2015 New Revision: 278099 URL: https://svnweb.freebsd.org/changeset/base/278099 Log: Missed addition to r278098. MFC after: 1 week Modified: head/sys/dev/iscsi/iscsi_proto.h Modified: head/sys/dev/iscsi/iscsi_proto.h ============================================================================== --- head/sys/dev/iscsi/iscsi_proto.h Mon Feb 2 15:59:17 2015 (r278098) +++ head/sys/dev/iscsi/iscsi_proto.h Mon Feb 2 16:06:23 2015 (r278099) @@ -176,7 +176,8 @@ struct iscsi_bhs_task_management_respons uint8_t bhstmr_reserved; uint8_t bhstmr_total_ahs_len; uint8_t bhstmr_data_segment_len[3]; - uint64_t bhstmr_reserved2; + uint8_t bhstmr_additional_reponse_information[3]; + uint8_t bhstmr_reserved2[5]; uint32_t bhstmr_initiator_task_tag; uint32_t bhstmr_reserved3; uint32_t bhstmr_statsn; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 16:07:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92AA56A7; Mon, 2 Feb 2015 16:07:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F61D9A1; Mon, 2 Feb 2015 16:07:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12G78IV045858; Mon, 2 Feb 2015 16:07:08 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12G78Iv045857; Mon, 2 Feb 2015 16:07:08 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502021607.t12G78Iv045857@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 2 Feb 2015 16:07:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278100 - head/sys/rpc 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 16:07:08 -0000 Author: pfg Date: Mon Feb 2 16:07:07 2015 New Revision: 278100 URL: https://svnweb.freebsd.org/changeset/base/278100 Log: rpc: Uninitialized pointer read Initialize *xprt to avoid exposing a random value in cleanup_svc_vc_create. This is the kernel counterpart of r278041. CID: 1007340 Modified: head/sys/rpc/svc_vc.c Modified: head/sys/rpc/svc_vc.c ============================================================================== --- head/sys/rpc/svc_vc.c Mon Feb 2 16:06:23 2015 (r278099) +++ head/sys/rpc/svc_vc.c Mon Feb 2 16:07:07 2015 (r278100) @@ -143,7 +143,7 @@ SVCXPRT * svc_vc_create(SVCPOOL *pool, struct socket *so, size_t sendsize, size_t recvsize) { - SVCXPRT *xprt; + SVCXPRT *xprt = NULL; struct sockaddr* sa; int error; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 16:10:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CC67917; Mon, 2 Feb 2015 16:10:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28F3FA16; Mon, 2 Feb 2015 16:10:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12GA4jZ046313; Mon, 2 Feb 2015 16:10:04 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12GA4fa046312; Mon, 2 Feb 2015 16:10:04 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201502021610.t12GA4fa046312@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 2 Feb 2015 16:10:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278101 - head/release/doc/share/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 16:10:04 -0000 Author: hrs Date: Mon Feb 2 16:10:03 2015 New Revision: 278101 URL: https://svnweb.freebsd.org/changeset/base/278101 Log: Add a toc.section.depth=3 parameter to use the same ToC depth as DocBook DSSSL stylesheet. Reported by: gjb Modified: head/release/doc/share/mk/doc.relnotes.mk Modified: head/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- head/release/doc/share/mk/doc.relnotes.mk Mon Feb 2 16:07:07 2015 (r278100) +++ head/release/doc/share/mk/doc.relnotes.mk Mon Feb 2 16:10:03 2015 (r278101) @@ -17,6 +17,7 @@ PROFILING+= --param profile.attribute "' XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'" +XSLTPROCFLAGS+= --param toc.section.depth "'3'" # Find the RELNOTESng document catalogs EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \ From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 16:11:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF587A9C; Mon, 2 Feb 2015 16:11:35 +0000 (UTC) Date: Mon, 2 Feb 2015 16:11:31 +0000 From: Glen Barber To: Hiroki Sato Subject: Re: svn commit: r278101 - head/release/doc/share/mk Message-ID: <20150202161131.GJ29056@hub.FreeBSD.org> References: <201502021610.t12GA4fa046312@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="aznLbwQ42o7LEaqN" Content-Disposition: inline In-Reply-To: <201502021610.t12GA4fa046312@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 16:11:36 -0000 --aznLbwQ42o7LEaqN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 02, 2015 at 04:10:04PM +0000, Hiroki Sato wrote: > Author: hrs > Date: Mon Feb 2 16:10:03 2015 > New Revision: 278101 > URL: https://svnweb.freebsd.org/changeset/base/278101 >=20 > Log: > Add a toc.section.depth=3D3 parameter to use the same ToC depth as DocB= ook > DSSSL stylesheet. > =20 Thank you. Glen --aznLbwQ42o7LEaqN Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUz6GzAAoJEAMUWKVHj+KTnpgP/in7uc7NZzMBbO3d55KFOheb HT2ZpXhpZJp7qgHP16Dvx/+p0ES1PxOJtjrQgAXSTA0Pvfhlb7S4bBwbY7Qq9Cqz IPhdFY81U75EB+6j441r4Fvf+S26fB/OFEycnFcded1aS5Og+BDaLlzVQdi7FTO+ 7WHbPtQUOksAgttJOQhtpyO48cyRUMAGzD5oatG5VTAD8qlF+ZUMJ134MmoPfOGG LGWwByWPbzEmeGR97VJfD5jdJvV0rnnSSjBc5BFD2x9Oq/w+QsY8J3YeAQ5+CAm2 02p/rO7J4cTwW8Jo4muPXVjYhRnTxabmNWcfRuG7nufYBZ3pALS+43Hz0i60NuCG iZP9jTZVk9htmSOXLOSFoVmAZdfqOBx9Tu2ZkUUNQDXyqILDZKE4KDqGHXzgiYQm qh+vG3bIcbcgAVbL3bkrrbNY8WUpNoWritddRYz8xaqSQNS1yAwH2HhTetcBU5Cf m6NiNXfATtiehDCeRVlcpOKxLok9bZwEx5/Rj277k/7mQ5XY1YIuN0bfLJeYOeP6 4GLBcMCgdsuJAkcLqzkhtcu0ZuheKL5eMYUHEHegPRoyiPUmB5dVXKydnpBLMx5a p92jgor5U4/vYck0m91O+sp7J8r20LQTL9BwwefiCm00L7NAOt3Rnjvqocdr/wX1 KScfKf1E/halmTcryJAm =mV+j -----END PGP SIGNATURE----- --aznLbwQ42o7LEaqN-- From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 17:32:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B56E479; Mon, 2 Feb 2015 17:32:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67096793; Mon, 2 Feb 2015 17:32:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12HWpMn087642; Mon, 2 Feb 2015 17:32:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12HWpEA087641; Mon, 2 Feb 2015 17:32:51 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021732.t12HWpEA087641@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 17:32:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278103 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 17:32:51 -0000 Author: hselasky Date: Mon Feb 2 17:32:50 2015 New Revision: 278103 URL: https://svnweb.freebsd.org/changeset/base/278103 Log: The flowid and hashtype should be copied from the originating packet when fragmenting IP packets to preserve the order of the packets in a stream. Else the resulting fragments can be sent out of order when the hardware supports multiple transmit rings. Reviewed by: glebius @ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/netinet/ip_output.c Modified: head/sys/netinet/ip_output.c ============================================================================== --- head/sys/netinet/ip_output.c Mon Feb 2 16:19:11 2015 (r278102) +++ head/sys/netinet/ip_output.c Mon Feb 2 17:32:50 2015 (r278103) @@ -789,6 +789,10 @@ smart_frag_failure: IPSTAT_INC(ips_odropped); goto done; } + /* make sure the flowid is the same for the fragmented mbufs */ + M_HASHTYPE_SET(m, M_HASHTYPE_GET(m0)); + m->m_pkthdr.flowid = m0->m_pkthdr.flowid; + /* copy multicast flag, if any */ m->m_flags |= (m0->m_flags & M_MCAST); /* * In the first mbuf, leave room for the link header, then From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 17:33:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C03D35B0; Mon, 2 Feb 2015 17:33:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACF91796; Mon, 2 Feb 2015 17:33:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12HX1k5087743; Mon, 2 Feb 2015 17:33:01 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12HX1uG087742; Mon, 2 Feb 2015 17:33:01 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201502021733.t12HX1uG087742@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 2 Feb 2015 17:33:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278104 - head/sys/mips/atheros 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 17:33:01 -0000 Author: sbruno Date: Mon Feb 2 17:33:00 2015 New Revision: 278104 URL: https://svnweb.freebsd.org/changeset/base/278104 Log: The linux driver code for the MDIO bus does a read-after-write which seems to be required on MIPS74k platforms for correct behaviour. Reviewed by: adrian Modified: head/sys/mips/atheros/if_argevar.h Modified: head/sys/mips/atheros/if_argevar.h ============================================================================== --- head/sys/mips/atheros/if_argevar.h Mon Feb 2 17:32:50 2015 (r278103) +++ head/sys/mips/atheros/if_argevar.h Mon Feb 2 17:33:00 2015 (r278104) @@ -74,8 +74,20 @@ #define ARGE_CLEAR_BITS(sc, reg, bits) \ ARGE_WRITE(sc, reg, ARGE_READ(sc, (reg)) & ~(bits)) -#define ARGE_MDIO_WRITE(_sc, _reg, _val) \ - ARGE_WRITE((_sc), (_reg), (_val)) +/* + * The linux driver code for the MDIO bus does a read-after-write + * which seems to be required on MIPS74k platforms for correct + * behaviour. + * + * So, ARGE_WRITE() does the write + barrier, and the following + * ARGE_READ() seems to flush the thing all the way through the device + * FIFO(s) before we continue issuing MDIO bus updates. + */ +#define ARGE_MDIO_WRITE(_sc, _reg, _val) \ + do { \ + ARGE_WRITE((_sc), (_reg), (_val)); \ + ARGE_READ((_sc), (_reg)); \ + } while (0) #define ARGE_MDIO_READ(_sc, _reg) \ ARGE_READ((_sc), (_reg)) #define ARGE_MDIO_BARRIER_READ(_sc) ARGE_BARRIER_READ(_sc) From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 18:20:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E77D4A5; Mon, 2 Feb 2015 18:20:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20D79CEC; Mon, 2 Feb 2015 18:20:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12IKAKk007668; Mon, 2 Feb 2015 18:20:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12IKAjc007667; Mon, 2 Feb 2015 18:20:10 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021820.t12IKAjc007667@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 18:20:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278105 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 18:20:11 -0000 Author: hselasky Date: Mon Feb 2 18:20:10 2015 New Revision: 278105 URL: https://svnweb.freebsd.org/changeset/base/278105 Log: Separate out detection of prevent and allow medium removal quirk. PR: 185747 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 Mon Feb 2 17:33:00 2015 (r278104) +++ head/sys/dev/usb/usb_msctest.c Mon Feb 2 18:20:10 2015 (r278105) @@ -113,6 +113,8 @@ static uint8_t scsi_request_sense[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static uint8_t scsi_read_capacity[] = { 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t scsi_prevent_removal[] = { 0x1e, 0, 0, 0, 1, 0 }; +static uint8_t scsi_allow_removal[] = { 0x1e, 0, 0, 0, 0, 0 }; #ifndef USB_MSCTEST_BULK_SIZE #define USB_MSCTEST_BULK_SIZE 64 /* dummy */ @@ -702,10 +704,28 @@ usb_msc_auto_quirk(struct usb_device *ud USB_MS_HZ); if (err != 0) { + if (err != ERR_CSW_FAILED) + goto error; + DPRINTF("Test unit ready failed\n"); + } + err = bbb_command_start(sc, DIR_OUT, 0, NULL, 0, + &scsi_prevent_removal, sizeof(scsi_prevent_removal), + USB_MS_HZ); + + if (err == 0) { + err = bbb_command_start(sc, DIR_OUT, 0, NULL, 0, + &scsi_allow_removal, sizeof(scsi_allow_removal), + USB_MS_HZ); + } + + if (err != 0) { if (err != ERR_CSW_FAILED) goto error; + DPRINTF("Device doesn't handle prevent and allow removal\n"); + usbd_add_dynamic_quirk(udev, UQ_MSC_NO_PREVENT_ALLOW); } + timeout = 1; retry_sync_cache: @@ -718,11 +738,9 @@ retry_sync_cache: if (err != ERR_CSW_FAILED) goto error; - DPRINTF("Device doesn't handle synchronize cache " - "and prevent allow medium removal\n"); + DPRINTF("Device doesn't handle synchronize cache\n"); usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); - usbd_add_dynamic_quirk(udev, UQ_MSC_NO_PREVENT_ALLOW); } else { /* @@ -749,13 +767,10 @@ retry_sync_cache: goto retry_sync_cache; DPRINTF("Device most likely doesn't " - "handle synchronize cache nor" - "prevent allow medium removal\n"); + "handle synchronize cache\n"); usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); - usbd_add_dynamic_quirk(udev, - UQ_MSC_NO_PREVENT_ALLOW); } else { if (err != ERR_CSW_FAILED) goto error; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 19:00:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD6359F3; Mon, 2 Feb 2015 19:00:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9FEE622D; Mon, 2 Feb 2015 19:00:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12J0Jor027733; Mon, 2 Feb 2015 19:00:19 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12J0JHU027730; Mon, 2 Feb 2015 19:00:19 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201502021900.t12J0JHU027730@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Mon, 2 Feb 2015 19:00:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278107 - head/sbin/ifconfig 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 19:00:19 -0000 Author: vsevolod (ports committer) Date: Mon Feb 2 19:00:18 2015 New Revision: 278107 URL: https://svnweb.freebsd.org/changeset/base/278107 Log: Revert the change of flowid output format. [1] Reverse the sorting order of the interfaces addresses familise so it should be the same as getifaddrs(3) order. [2] Suggested by: hrs [1], bz [2] Approved by: hrs, bapt Modified: head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/af_inet6.c ============================================================================== --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 18:48:49 2015 (r278106) +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 19:00:18 2015 (r278107) @@ -167,33 +167,6 @@ setip6eui64(const char *cmd, int dummy _ } static void -in6_print_scope(uint8_t *a) -{ - const char *sname = NULL; - uint16_t val; - - val = (a[0] << 4) + ((a[1] & 0xc0) >> 4); - - if ((val & 0xff0) == 0xff0) - sname = "Multicast"; - else { - switch(val) { - case 0xfe8: - sname = "Link"; - break; - case 0xfec: - sname = "Site"; - break; - default: - sname = "Global"; - break; - } - } - - printf("scope: %s ", sname); -} - -static void in6_status(int s __unused, const struct ifaddrs *ifa) { struct sockaddr_in6 *sin, null_sin; @@ -284,8 +257,9 @@ in6_status(int s __unused, const struct if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) printf("prefer_source "); - in6_print_scope((uint8_t *)&((struct sockaddr_in6 *) - (ifa->ifa_addr))->sin6_addr); + if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id) + printf("scopeid 0x%x ", + ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id); if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { printf("pltime "); Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 18:48:49 2015 (r278106) +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 19:00:18 2015 (r278107) @@ -235,7 +235,7 @@ cmpifaddrs(struct ifaddrs *a, struct ifa if (af1 < ORDERS_SIZE(e1->af_orders) && af2 < ORDERS_SIZE(e1->af_orders)) - return (e1->af_orders[af2] - e1->af_orders[af1]); + return (e1->af_orders[af1] - e1->af_orders[af2]); } return (0); From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 19:22:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 275C7347; Mon, 2 Feb 2015 19:22:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E944476F; Mon, 2 Feb 2015 19:22:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12JMZDG040718; Mon, 2 Feb 2015 19:22:35 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12JMZDE040713; Mon, 2 Feb 2015 19:22:35 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502021922.t12JMZDE040713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Mon, 2 Feb 2015 19:22:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278108 - head/sys/dev/gpio 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 19:22:36 -0000 Author: loos Date: Mon Feb 2 19:22:34 2015 New Revision: 278108 URL: https://svnweb.freebsd.org/changeset/base/278108 Log: Register the GPIO controller device reference on xref table for FDT systems. Modified: head/sys/dev/gpio/gpiobus.c head/sys/dev/gpio/gpiobusvar.h head/sys/dev/gpio/ofw_gpiobus.c Modified: head/sys/dev/gpio/gpiobus.c ============================================================================== --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) device_delete_child(dev, busdev); return (NULL); } +#ifdef FDT + ofw_gpiobus_register_provider(dev); +#endif bus_generic_attach(dev); return (busdev); @@ -152,6 +155,10 @@ int gpiobus_detach_bus(device_t dev) { +#ifdef FDT + ofw_gpiobus_unregister_provider(dev); +#endif + return (bus_generic_detach(dev)); } Modified: head/sys/dev/gpio/gpiobusvar.h ============================================================================== --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 (r278107) +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 (r278108) @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d } device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); +void ofw_gpiobus_register_provider(device_t); +void ofw_gpiobus_unregister_provider(device_t); #endif int gpio_check_flags(uint32_t, uint32_t); device_t gpiobus_attach_bus(device_t); Modified: head/sys/dev/gpio/ofw_gpiobus.c ============================================================================== --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s return (0); } +void +ofw_gpiobus_register_provider(device_t provider) +{ + phandle_t node; + + node = ofw_bus_get_node(provider); + OF_device_register_xref(OF_xref_from_node(node), provider); +} + +void +ofw_gpiobus_unregister_provider(device_t provider) +{ + phandle_t node; + + node = ofw_bus_get_node(provider); + OF_device_register_xref(OF_xref_from_node(node), NULL); +} + static struct ofw_gpiobus_devinfo * ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) { From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 19:55:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E6C3EB2; Mon, 2 Feb 2015 19:55:48 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (anacreon.Physics.Berkeley.EDU [128.32.117.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anacreon.physics.wisc.edu", Issuer "anacreon.physics.wisc.edu" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F1F28ABF; Mon, 2 Feb 2015 19:55:47 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (localhost [127.0.0.1]) by anacreon.physics.berkeley.edu (8.14.9/8.14.9) with ESMTP id t12JObZi087245; Mon, 2 Feb 2015 11:24:37 -0800 (PST) (envelope-from nwhitehorn@freebsd.org) Message-ID: <54CFCEF5.70200@freebsd.org> Date: Mon, 02 Feb 2015 11:24:37 -0800 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD powerpc; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Luiz Otavio O Souza , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r278108 - head/sys/dev/gpio References: <201502021922.t12JMZDE040713@svn.freebsd.org> In-Reply-To: <201502021922.t12JMZDE040713@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 19:55:48 -0000 Please don't condition things like this on FDT. They are useful on Open Firmware systems too. -Nathan On 02/02/15 11:22, Luiz Otavio O Souza wrote: > Author: loos > Date: Mon Feb 2 19:22:34 2015 > New Revision: 278108 > URL: https://svnweb.freebsd.org/changeset/base/278108 > > Log: > Register the GPIO controller device reference on xref table for FDT systems. > > Modified: > head/sys/dev/gpio/gpiobus.c > head/sys/dev/gpio/gpiobusvar.h > head/sys/dev/gpio/ofw_gpiobus.c > > Modified: head/sys/dev/gpio/gpiobus.c > ============================================================================== > --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) > device_delete_child(dev, busdev); > return (NULL); > } > +#ifdef FDT > + ofw_gpiobus_register_provider(dev); > +#endif > bus_generic_attach(dev); > > return (busdev); > @@ -152,6 +155,10 @@ int > gpiobus_detach_bus(device_t dev) > { > > +#ifdef FDT > + ofw_gpiobus_unregister_provider(dev); > +#endif > + > return (bus_generic_detach(dev)); > } > > > Modified: head/sys/dev/gpio/gpiobusvar.h > ============================================================================== > --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 (r278107) > +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 (r278108) > @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d > } > > device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); > +void ofw_gpiobus_register_provider(device_t); > +void ofw_gpiobus_unregister_provider(device_t); > #endif > int gpio_check_flags(uint32_t, uint32_t); > device_t gpiobus_attach_bus(device_t); > > Modified: head/sys/dev/gpio/ofw_gpiobus.c > ============================================================================== > --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s > return (0); > } > > +void > +ofw_gpiobus_register_provider(device_t provider) > +{ > + phandle_t node; > + > + node = ofw_bus_get_node(provider); > + OF_device_register_xref(OF_xref_from_node(node), provider); > +} > + > +void > +ofw_gpiobus_unregister_provider(device_t provider) > +{ > + phandle_t node; > + > + node = ofw_bus_get_node(provider); > + OF_device_register_xref(OF_xref_from_node(node), NULL); > +} > + > static struct ofw_gpiobus_devinfo * > ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) > { > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:05:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59A771C7; Mon, 2 Feb 2015 20:05:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44C57BC3; Mon, 2 Feb 2015 20:05:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12K5s9l060432; Mon, 2 Feb 2015 20:05:54 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12K5reJ060429; Mon, 2 Feb 2015 20:05:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502022005.t12K5reJ060429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 2 Feb 2015 20:05:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278109 - head/contrib/llvm/patches 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:05:54 -0000 Author: dim Date: Mon Feb 2 20:05:52 2015 New Revision: 278109 URL: https://svnweb.freebsd.org/changeset/base/278109 Log: Belatedly add the clang patch corresponding to r277423. Added: head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff - copied unchanged from r278063, head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff - copied unchanged from r278063, head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff Deleted: head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff Added: head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff Mon Feb 2 20:05:52 2015 (r278109) @@ -0,0 +1,33 @@ +Allow clang to be built for mips/mips64 backend types by adding our mips +triple ids + +This only allows testing and does not change the defaults for mips/mips64. +They still build/use gcc by default. + +Differential Revision: https://reviews.freebsd.org/D1190 +Reviewed by: dim + +Introduced here: http://svnweb.freebsd.org/changeset/base/277423 + +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -6592,6 +6592,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c + CmdArgs.push_back("elf32ppc_fbsd"); + } + ++ if (Arg *A = Args.getLastArg(options::OPT_G)) { ++ if (ToolChain.getArch() == llvm::Triple::mips || ++ ToolChain.getArch() == llvm::Triple::mipsel || ++ ToolChain.getArch() == llvm::Triple::mips64 || ++ ToolChain.getArch() == llvm::Triple::mips64el) { ++ StringRef v = A->getValue(); ++ CmdArgs.push_back(Args.MakeArgString("-G" + v)); ++ A->claim(); ++ } ++ } ++ + if (Output.isFilename()) { + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); Copied: head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff (from r278063, head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff Mon Feb 2 20:05:52 2015 (r278109, copy of r278063, head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff) @@ -0,0 +1,83 @@ +Pull in r226664 from upstream llvm trunk (by Tim Northover): + + AArch64: add backend option to reserve x18 (platform register) + + AAPCS64 says that it's up to the platform to specify whether x18 is + reserved, and a first step on that way is to add a flag controlling + it. + + From: Andrew Turner + +Introduced here: http://svnweb.freebsd.org/changeset/base/277774 + +Index: lib/Target/AArch64/AArch64RegisterInfo.cpp +=================================================================== +--- lib/Target/AArch64/AArch64RegisterInfo.cpp ++++ lib/Target/AArch64/AArch64RegisterInfo.cpp +@@ -33,6 +33,10 @@ using namespace llvm; + #define GET_REGINFO_TARGET_DESC + #include "AArch64GenRegisterInfo.inc" + ++static cl::opt ++ReserveX18("aarch64-reserve-x18", cl::Hidden, ++ cl::desc("Reserve X18, making it unavailable as GPR")); ++ + AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii, + const AArch64Subtarget *sti) + : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {} +@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine + Reserved.set(AArch64::W29); + } + +- if (STI->isTargetDarwin()) { ++ if (STI->isTargetDarwin() || ReserveX18) { + Reserved.set(AArch64::X18); // Platform register + Reserved.set(AArch64::W18); + } +@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach + return true; + case AArch64::X18: + case AArch64::W18: +- return STI->isTargetDarwin(); ++ return STI->isTargetDarwin() || ReserveX18; + case AArch64::FP: + case AArch64::W29: + return TFI->hasFP(MF) || STI->isTargetDarwin(); +@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit( + case AArch64::GPR64commonRegClassID: + return 32 - 1 // XZR/SP + - (TFI->hasFP(MF) || STI->isTargetDarwin()) // FP +- - STI->isTargetDarwin() // X18 reserved as platform register ++ - (STI->isTargetDarwin() || ReserveX18) // X18 reserved as platform register + - hasBasePointer(MF); // X19 + case AArch64::FPR8RegClassID: + case AArch64::FPR16RegClassID: +Index: test/CodeGen/AArch64/arm64-platform-reg.ll +=================================================================== +--- test/CodeGen/AArch64/arm64-platform-reg.ll ++++ test/CodeGen/AArch64/arm64-platform-reg.ll +@@ -1,4 +1,5 @@ +-; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-DARWIN ++; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18 ++; RUN: llc -mtriple=arm64-freebsd-gnu -aarch64-reserve-x18 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18 + ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s + + ; x18 is reserved as a platform register on Darwin but not on other +@@ -16,11 +17,11 @@ define void @keep_live() { + ; CHECK: ldr x18 + ; CHECK: str x18 + +-; CHECK-DARWIN-NOT: ldr fp +-; CHECK-DARWIN-NOT: ldr x18 +-; CHECK-DARWIN: Spill +-; CHECK-DARWIN-NOT: ldr fp +-; CHECK-DARWIN-NOT: ldr x18 +-; CHECK-DARWIN: ret ++; CHECK-RESERVE-X18-NOT: ldr fp ++; CHECK-RESERVE-X18-NOT: ldr x18 ++; CHECK-RESERVE-X18: Spill ++; CHECK-RESERVE-X18-NOT: ldr fp ++; CHECK-RESERVE-X18-NOT: ldr x18 ++; CHECK-RESERVE-X18: ret + ret void + } Copied: head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff (from r278063, head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff Mon Feb 2 20:05:52 2015 (r278109, copy of r278063, head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff) @@ -0,0 +1,54 @@ +Pull in r227062 from upstream clang trunk (by Renato Golin): + + Allows Clang to use LLVM's fixes-x18 option + + This patch allows clang to have llvm reserve the x18 + platform register on AArch64. FreeBSD will use this in the kernel for + per-cpu data but has no need to reserve this register in userland so + will need this flag to reserve it. + + This uses llvm r226664 to allow this register to be reserved. + + Patch by Andrew Turner. + +Introduced here: http://svnweb.freebsd.org/changeset/base/277775 + +Index: tools/clang/include/clang/Driver/Options.td +=================================================================== +--- tools/clang/include/clang/Driver/Options.td ++++ tools/clang/include/clang/Driver/Options.td +@@ -1141,6 +1141,9 @@ def mno_long_calls : Flag<["-"], "mno-long-calls"> + def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group, + HelpText<"Generate code which only uses the general purpose registers (AArch64 only)">; + ++def ffixed_x18 : Flag<["-"], "ffixed-x18">, Group, ++ HelpText<"Reserve the x18 register (AArch64 only)">; ++ + def mvsx : Flag<["-"], "mvsx">, Group; + def mno_vsx : Flag<["-"], "mno-vsx">, Group; + def mfprnd : Flag<["-"], "mfprnd">, Group; +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -887,6 +887,11 @@ void Clang::AddAArch64TargetArgs(const ArgList &Ar + if (A->getOption().matches(options::OPT_mno_global_merge)) + CmdArgs.push_back("-mno-global-merge"); + } ++ ++ if (Args.hasArg(options::OPT_ffixed_x18)) { ++ CmdArgs.push_back("-backend-option"); ++ CmdArgs.push_back("-aarch64-reserve-x18"); ++ } + } + + // Get CPU and ABI names. They are not independent +Index: tools/clang/test/Driver/aarch64-fixed-x18.c +=================================================================== +--- tools/clang/test/Driver/aarch64-fixed-x18.c ++++ tools/clang/test/Driver/aarch64-fixed-x18.c +@@ -0,0 +1,4 @@ ++// RUN: %clang -target aarch64-none-gnu -ffixed-x18 -### %s 2> %t ++// RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s ++ ++// CHECK-FIXED-X18: "-backend-option" "-aarch64-reserve-x18" From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:09:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EC3E33B; Mon, 2 Feb 2015 20:09:01 +0000 (UTC) Received: from smtp7.ore.mailhop.org (smtp7.ore.mailhop.org [54.149.250.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E460BF0; Mon, 2 Feb 2015 20:09:00 +0000 (UTC) Received: from [73.34.117.227] (helo=ilsoft.org) by smtp7.ore.mailhop.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1YINIq-0005mu-5t; Mon, 02 Feb 2015 20:09:00 +0000 Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t12K8vcE088595; Mon, 2 Feb 2015 13:08:57 -0700 (MST) (envelope-from ian@freebsd.org) X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX18FEhP3Z4pE0l6Po2ZqsseH Message-ID: <1422907737.15718.291.camel@freebsd.org> Subject: Re: svn commit: r278108 - head/sys/dev/gpio From: Ian Lepore To: Nathan Whitehorn Date: Mon, 02 Feb 2015 13:08:57 -0700 In-Reply-To: <54CFCEF5.70200@freebsd.org> References: <201502021922.t12JMZDE040713@svn.freebsd.org> <54CFCEF5.70200@freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.8 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: Luiz Otavio O Souza , 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:09:01 -0000 On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote: > Please don't condition things like this on FDT. They are useful on Open > Firmware systems too. > -Nathan > Is there something defined for OFW? The gpio code needs to work on hint-based (not-FDT and not-OFW) mips systems too. -- Ian > On 02/02/15 11:22, Luiz Otavio O Souza wrote: > > Author: loos > > Date: Mon Feb 2 19:22:34 2015 > > New Revision: 278108 > > URL: https://svnweb.freebsd.org/changeset/base/278108 > > > > Log: > > Register the GPIO controller device reference on xref table for FDT systems. > > > > Modified: > > head/sys/dev/gpio/gpiobus.c > > head/sys/dev/gpio/gpiobusvar.h > > head/sys/dev/gpio/ofw_gpiobus.c > > > > Modified: head/sys/dev/gpio/gpiobus.c > > ============================================================================== > > --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > > @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) > > device_delete_child(dev, busdev); > > return (NULL); > > } > > +#ifdef FDT > > + ofw_gpiobus_register_provider(dev); > > +#endif > > bus_generic_attach(dev); > > > > return (busdev); > > @@ -152,6 +155,10 @@ int > > gpiobus_detach_bus(device_t dev) > > { > > > > +#ifdef FDT > > + ofw_gpiobus_unregister_provider(dev); > > +#endif > > + > > return (bus_generic_detach(dev)); > > } > > > > > > Modified: head/sys/dev/gpio/gpiobusvar.h > > ============================================================================== > > --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 (r278108) > > @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d > > } > > > > device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); > > +void ofw_gpiobus_register_provider(device_t); > > +void ofw_gpiobus_unregister_provider(device_t); > > #endif > > int gpio_check_flags(uint32_t, uint32_t); > > device_t gpiobus_attach_bus(device_t); > > > > Modified: head/sys/dev/gpio/ofw_gpiobus.c > > ============================================================================== > > --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > > @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s > > return (0); > > } > > > > +void > > +ofw_gpiobus_register_provider(device_t provider) > > +{ > > + phandle_t node; > > + > > + node = ofw_bus_get_node(provider); > > + OF_device_register_xref(OF_xref_from_node(node), provider); > > +} > > + > > +void > > +ofw_gpiobus_unregister_provider(device_t provider) > > +{ > > + phandle_t node; > > + > > + node = ofw_bus_get_node(provider); > > + OF_device_register_xref(OF_xref_from_node(node), NULL); > > +} > > + > > static struct ofw_gpiobus_devinfo * > > ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) > > { > > > > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:20:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D0FC90C; Mon, 2 Feb 2015 20:20:50 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (anacreon.Physics.Berkeley.EDU [128.32.117.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anacreon.physics.wisc.edu", Issuer "anacreon.physics.wisc.edu" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E7658DAC; Mon, 2 Feb 2015 20:20:49 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (localhost [127.0.0.1]) by anacreon.physics.berkeley.edu (8.14.9/8.14.9) with ESMTP id t12KItkl089588; Mon, 2 Feb 2015 12:18:55 -0800 (PST) (envelope-from nwhitehorn@freebsd.org) Message-ID: <54CFDBAF.2010003@freebsd.org> Date: Mon, 02 Feb 2015 12:18:55 -0800 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD powerpc; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Ian Lepore Subject: Re: svn commit: r278108 - head/sys/dev/gpio References: <201502021922.t12JMZDE040713@svn.freebsd.org> <54CFCEF5.70200@freebsd.org> <1422907737.15718.291.camel@freebsd.org> In-Reply-To: <1422907737.15718.291.camel@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: Luiz Otavio O Souza , 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:20:50 -0000 On 02/02/15 12:08, Ian Lepore wrote: > On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote: >> Please don't condition things like this on FDT. They are useful on Open >> Firmware systems too. >> -Nathan >> > > Is there something defined for OFW? The gpio code needs to work on > hint-based (not-FDT and not-OFW) mips systems too. There isn't right now, so far as I'm aware, but there should be. -Nathan > -- Ian > > >> On 02/02/15 11:22, Luiz Otavio O Souza wrote: >>> Author: loos >>> Date: Mon Feb 2 19:22:34 2015 >>> New Revision: 278108 >>> URL: https://svnweb.freebsd.org/changeset/base/278108 >>> >>> Log: >>> Register the GPIO controller device reference on xref table for FDT systems. >>> >>> Modified: >>> head/sys/dev/gpio/gpiobus.c >>> head/sys/dev/gpio/gpiobusvar.h >>> head/sys/dev/gpio/ofw_gpiobus.c >>> >>> Modified: head/sys/dev/gpio/gpiobus.c >>> ============================================================================== >>> --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) >>> +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) >>> @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) >>> device_delete_child(dev, busdev); >>> return (NULL); >>> } >>> +#ifdef FDT >>> + ofw_gpiobus_register_provider(dev); >>> +#endif >>> bus_generic_attach(dev); >>> >>> return (busdev); >>> @@ -152,6 +155,10 @@ int >>> gpiobus_detach_bus(device_t dev) >>> { >>> >>> +#ifdef FDT >>> + ofw_gpiobus_unregister_provider(dev); >>> +#endif >>> + >>> return (bus_generic_detach(dev)); >>> } >>> >>> >>> Modified: head/sys/dev/gpio/gpiobusvar.h >>> ============================================================================== >>> --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 (r278107) >>> +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 (r278108) >>> @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d >>> } >>> >>> device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); >>> +void ofw_gpiobus_register_provider(device_t); >>> +void ofw_gpiobus_unregister_provider(device_t); >>> #endif >>> int gpio_check_flags(uint32_t, uint32_t); >>> device_t gpiobus_attach_bus(device_t); >>> >>> Modified: head/sys/dev/gpio/ofw_gpiobus.c >>> ============================================================================== >>> --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) >>> +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) >>> @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s >>> return (0); >>> } >>> >>> +void >>> +ofw_gpiobus_register_provider(device_t provider) >>> +{ >>> + phandle_t node; >>> + >>> + node = ofw_bus_get_node(provider); >>> + OF_device_register_xref(OF_xref_from_node(node), provider); >>> +} >>> + >>> +void >>> +ofw_gpiobus_unregister_provider(device_t provider) >>> +{ >>> + phandle_t node; >>> + >>> + node = ofw_bus_get_node(provider); >>> + OF_device_register_xref(OF_xref_from_node(node), NULL); >>> +} >>> + >>> static struct ofw_gpiobus_devinfo * >>> ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) >>> { >>> >> >> > > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:23:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2F49A8C; Mon, 2 Feb 2015 20:23:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEC9EDD5; Mon, 2 Feb 2015 20:23:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12KN7Rg069703; Mon, 2 Feb 2015 20:23:07 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12KN6ir069698; Mon, 2 Feb 2015 20:23:06 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502022023.t12KN6ir069698@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 2 Feb 2015 20:23:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278111 - in head/sys/cam: . scsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:23:07 -0000 Author: mav Date: Mon Feb 2 20:23:05 2015 New Revision: 278111 URL: https://svnweb.freebsd.org/changeset/base/278111 Log: Retry indefinitely on SCSI BUSY status from VMware disks and CDs. VMware returns BUSY status when storage has transient connectivity issues. It is often better to wait and let VM admin fix the problem then crash. Discussed with: ken MFC after: 1 week Modified: head/sys/cam/cam.h head/sys/cam/cam_periph.c head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/cam.h ============================================================================== --- head/sys/cam/cam.h Mon Feb 2 20:18:47 2015 (r278110) +++ head/sys/cam/cam.h Mon Feb 2 20:23:05 2015 (r278111) @@ -121,7 +121,8 @@ enum { SF_QUIET_IR = 0x04, /* Be quiet about Illegal Request reponses */ SF_PRINT_ALWAYS = 0x08, /* Always print error status. */ SF_NO_RECOVERY = 0x10, /* Don't do active error recovery. */ - SF_NO_RETRY = 0x20 /* Don't do any retries. */ + SF_NO_RETRY = 0x20, /* Don't do any retries. */ + SF_RETRY_BUSY = 0x40 /* Retry BUSY status. */ }; /* CAM Status field values */ Modified: head/sys/cam/cam_periph.c ============================================================================== --- head/sys/cam/cam_periph.c Mon Feb 2 20:18:47 2015 (r278110) +++ head/sys/cam/cam_periph.c Mon Feb 2 20:23:05 2015 (r278111) @@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb, * Restart the queue after either another * command completes or a 1 second timeout. */ - if (ccb->ccb_h.retry_count > 0) { - ccb->ccb_h.retry_count--; + if ((sense_flags & SF_RETRY_BUSY) != 0 || + (ccb->ccb_h.retry_count--) > 0) { error = ERESTART; *relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT | RELSIM_RELEASE_AFTER_CMDCMPLT; Modified: head/sys/cam/scsi/scsi_cd.c ============================================================================== --- head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:18:47 2015 (r278110) +++ head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:23:05 2015 (r278111) @@ -87,14 +87,16 @@ typedef enum { CD_Q_NONE = 0x00, CD_Q_NO_TOUCH = 0x01, CD_Q_BCD_TRACKS = 0x02, - CD_Q_10_BYTE_ONLY = 0x10 + CD_Q_10_BYTE_ONLY = 0x10, + CD_Q_RETRY_BUSY = 0x40 } cd_quirks; #define CD_Q_BIT_STRING \ "\020" \ "\001NO_TOUCH" \ "\002BCD_TRACKS" \ - "\00510_BYTE_ONLY" + "\00510_BYTE_ONLY" \ + "\007RETRY_BUSY" typedef enum { CD_FLAG_INVALID = 0x0001, @@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta { { T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM CDS-535","*"}, /* quirks */ CD_Q_BCD_TRACKS + }, + { + /* + * VMware returns BUSY status when storage has transient + * connectivity problems, so better wait. + */ + {T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE CDR10", "*"}, + /*quirks*/ CD_Q_RETRY_BUSY } }; @@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl * don't treat UAs as errors. */ sense_flags |= SF_RETRY_UA; + + if (softc->quirks & CD_Q_RETRY_BUSY) + sense_flags |= SF_RETRY_BUSY; return (cam_periph_error(ccb, cam_flags, sense_flags, &softc->saved_ccb)); } Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:18:47 2015 (r278110) +++ head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:23:05 2015 (r278111) @@ -101,7 +101,8 @@ typedef enum { DA_Q_NO_PREVENT = 0x04, DA_Q_4K = 0x08, DA_Q_NO_RC16 = 0x10, - DA_Q_NO_UNMAP = 0x20 + DA_Q_NO_UNMAP = 0x20, + DA_Q_RETRY_BUSY = 0x40 } da_quirks; #define DA_Q_BIT_STRING \ @@ -110,7 +111,9 @@ typedef enum { "\002NO_6_BYTE" \ "\003NO_PREVENT" \ "\0044K" \ - "\005NO_RC16" + "\005NO_RC16" \ + "\006NO_UNMAP" \ + "\007RETRY_BUSY" typedef enum { DA_CCB_PROBE_RC = 0x01, @@ -359,6 +362,14 @@ static struct da_quirk_entry da_quirk_ta {T_DIRECT, SIP_MEDIA_FIXED, "STEC", "*", "*"}, /*quirks*/ DA_Q_NO_UNMAP }, + { + /* + * VMware returns BUSY status when storage has transient + * connectivity problems, so better wait. + */ + {T_DIRECT, SIP_MEDIA_FIXED, "VMware", "Virtual disk", "*"}, + /*quirks*/ DA_Q_RETRY_BUSY + }, /* USB mass storage devices supported by umass(4) */ { /* @@ -3630,6 +3641,9 @@ daerror(union ccb *ccb, u_int32_t cam_fl * don't treat UAs as errors. */ sense_flags |= SF_RETRY_UA; + + if (softc->quirks & DA_Q_RETRY_BUSY) + sense_flags |= SF_RETRY_BUSY; return(cam_periph_error(ccb, cam_flags, sense_flags, &softc->saved_ccb)); } From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:30:42 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D68CFE40; Mon, 2 Feb 2015 20:30:42 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (anacreon.Physics.Berkeley.EDU [128.32.117.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anacreon.physics.wisc.edu", Issuer "anacreon.physics.wisc.edu" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 5648FE2C; Mon, 2 Feb 2015 20:30:42 +0000 (UTC) Received: from anacreon.physics.berkeley.edu (localhost [127.0.0.1]) by anacreon.physics.berkeley.edu (8.14.9/8.14.9) with ESMTP id t12KSlJO089609; Mon, 2 Feb 2015 12:28:47 -0800 (PST) (envelope-from nwhitehorn@freebsd.org) Message-ID: <54CFDDFF.7060708@freebsd.org> Date: Mon, 02 Feb 2015 12:28:47 -0800 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD powerpc; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Alexander Motin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r278111 - in head/sys/cam: . scsi References: <201502022023.t12KN6ir069698@svn.freebsd.org> In-Reply-To: <201502022023.t12KN6ir069698@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:30:43 -0000 You may want to look at PR 195479 on this topic. Does this also turn off the infinite console spam? -Nathan On 02/02/15 12:23, Alexander Motin wrote: > Author: mav > Date: Mon Feb 2 20:23:05 2015 > New Revision: 278111 > URL: https://svnweb.freebsd.org/changeset/base/278111 > > Log: > Retry indefinitely on SCSI BUSY status from VMware disks and CDs. > > VMware returns BUSY status when storage has transient connectivity issues. > It is often better to wait and let VM admin fix the problem then crash. > > Discussed with: ken > MFC after: 1 week > > Modified: > head/sys/cam/cam.h > head/sys/cam/cam_periph.c > head/sys/cam/scsi/scsi_cd.c > head/sys/cam/scsi/scsi_da.c > > Modified: head/sys/cam/cam.h > ============================================================================== > --- head/sys/cam/cam.h Mon Feb 2 20:18:47 2015 (r278110) > +++ head/sys/cam/cam.h Mon Feb 2 20:23:05 2015 (r278111) > @@ -121,7 +121,8 @@ enum { > SF_QUIET_IR = 0x04, /* Be quiet about Illegal Request reponses */ > SF_PRINT_ALWAYS = 0x08, /* Always print error status. */ > SF_NO_RECOVERY = 0x10, /* Don't do active error recovery. */ > - SF_NO_RETRY = 0x20 /* Don't do any retries. */ > + SF_NO_RETRY = 0x20, /* Don't do any retries. */ > + SF_RETRY_BUSY = 0x40 /* Retry BUSY status. */ > }; > > /* CAM Status field values */ > > Modified: head/sys/cam/cam_periph.c > ============================================================================== > --- head/sys/cam/cam_periph.c Mon Feb 2 20:18:47 2015 (r278110) > +++ head/sys/cam/cam_periph.c Mon Feb 2 20:23:05 2015 (r278111) > @@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb, > * Restart the queue after either another > * command completes or a 1 second timeout. > */ > - if (ccb->ccb_h.retry_count > 0) { > - ccb->ccb_h.retry_count--; > + if ((sense_flags & SF_RETRY_BUSY) != 0 || > + (ccb->ccb_h.retry_count--) > 0) { > error = ERESTART; > *relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT > | RELSIM_RELEASE_AFTER_CMDCMPLT; > > Modified: head/sys/cam/scsi/scsi_cd.c > ============================================================================== > --- head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:18:47 2015 (r278110) > +++ head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:23:05 2015 (r278111) > @@ -87,14 +87,16 @@ typedef enum { > CD_Q_NONE = 0x00, > CD_Q_NO_TOUCH = 0x01, > CD_Q_BCD_TRACKS = 0x02, > - CD_Q_10_BYTE_ONLY = 0x10 > + CD_Q_10_BYTE_ONLY = 0x10, > + CD_Q_RETRY_BUSY = 0x40 > } cd_quirks; > > #define CD_Q_BIT_STRING \ > "\020" \ > "\001NO_TOUCH" \ > "\002BCD_TRACKS" \ > - "\00510_BYTE_ONLY" > + "\00510_BYTE_ONLY" \ > + "\007RETRY_BUSY" > > typedef enum { > CD_FLAG_INVALID = 0x0001, > @@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta > { > { T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM CDS-535","*"}, > /* quirks */ CD_Q_BCD_TRACKS > + }, > + { > + /* > + * VMware returns BUSY status when storage has transient > + * connectivity problems, so better wait. > + */ > + {T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE CDR10", "*"}, > + /*quirks*/ CD_Q_RETRY_BUSY > } > }; > > @@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl > * don't treat UAs as errors. > */ > sense_flags |= SF_RETRY_UA; > + > + if (softc->quirks & CD_Q_RETRY_BUSY) > + sense_flags |= SF_RETRY_BUSY; > return (cam_periph_error(ccb, cam_flags, sense_flags, > &softc->saved_ccb)); > } > > Modified: head/sys/cam/scsi/scsi_da.c > ============================================================================== > --- head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:18:47 2015 (r278110) > +++ head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:23:05 2015 (r278111) > @@ -101,7 +101,8 @@ typedef enum { > DA_Q_NO_PREVENT = 0x04, > DA_Q_4K = 0x08, > DA_Q_NO_RC16 = 0x10, > - DA_Q_NO_UNMAP = 0x20 > + DA_Q_NO_UNMAP = 0x20, > + DA_Q_RETRY_BUSY = 0x40 > } da_quirks; > > #define DA_Q_BIT_STRING \ > @@ -110,7 +111,9 @@ typedef enum { > "\002NO_6_BYTE" \ > "\003NO_PREVENT" \ > "\0044K" \ > - "\005NO_RC16" > + "\005NO_RC16" \ > + "\006NO_UNMAP" \ > + "\007RETRY_BUSY" > > typedef enum { > DA_CCB_PROBE_RC = 0x01, > @@ -359,6 +362,14 @@ static struct da_quirk_entry da_quirk_ta > {T_DIRECT, SIP_MEDIA_FIXED, "STEC", "*", "*"}, > /*quirks*/ DA_Q_NO_UNMAP > }, > + { > + /* > + * VMware returns BUSY status when storage has transient > + * connectivity problems, so better wait. > + */ > + {T_DIRECT, SIP_MEDIA_FIXED, "VMware", "Virtual disk", "*"}, > + /*quirks*/ DA_Q_RETRY_BUSY > + }, > /* USB mass storage devices supported by umass(4) */ > { > /* > @@ -3630,6 +3641,9 @@ daerror(union ccb *ccb, u_int32_t cam_fl > * don't treat UAs as errors. > */ > sense_flags |= SF_RETRY_UA; > + > + if (softc->quirks & DA_Q_RETRY_BUSY) > + sense_flags |= SF_RETRY_BUSY; > return(cam_periph_error(ccb, cam_flags, sense_flags, > &softc->saved_ccb)); > } > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:48:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65941551; Mon, 2 Feb 2015 20:48:04 +0000 (UTC) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com [IPv6:2a00:1450:4010:c03::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D6BF89B; Mon, 2 Feb 2015 20:48:03 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id gf13so44933791lab.8; Mon, 02 Feb 2015 12:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=K22RmGNiZBZgmvktYBf0wIQugxiG3tYp8gjZtNn6TmM=; b=l8HFrVD25IgTlyQPAmH9d369PrJxxgq1KZ+sejD5SR1DsjRjNZdSh+W0UPwxju0JAa 4+u8hF6FdSRbuPzSYtREWhwLemAyW0ozPuzUc3whSnqzu92dqqhfHJLcb5ls5/64LMij u66foaA0bGu1eLy6BHbpCh9oAilbgc6Ua/S0Al3Pi/tOhibqj3aQ2v01uboE3s9qrp5W 6QEU4rgEtKI6tbytrVkdwid+4nQng6VptNnqrP+OWp3J4V++WSQebmWbJzU37nI+ssI7 oH5wAIDzfXmwNw20qe+fB9NNd7RjY/ukLKgCXsriXUlmYD5h3TKx1uWqI9UQ+MReWI1p pDlg== X-Received: by 10.152.198.200 with SMTP id je8mr21079205lac.93.1422910081970; Mon, 02 Feb 2015 12:48:01 -0800 (PST) Received: from mavbook.mavhome.dp.ua ([134.249.139.101]) by mx.google.com with ESMTPSA id c1sm4609350lah.45.2015.02.02.12.47.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2015 12:48:01 -0800 (PST) Sender: Alexander Motin Message-ID: <54CFE27E.8050602@FreeBSD.org> Date: Mon, 02 Feb 2015 22:47:58 +0200 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Nathan Whitehorn , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r278111 - in head/sys/cam: . scsi References: <201502022023.t12KN6ir069698@svn.freebsd.org> <54CFDDFF.7060708@freebsd.org> In-Reply-To: <54CFDDFF.7060708@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:48:04 -0000 On 02.02.2015 22:28, Nathan Whitehorn wrote: > You may want to look at PR 195479 on this topic. Does this also turn off > the infinite console spam? This patch was supposed to only workaround issues I see when storage has a problem. In that case hiding messages is a bad idea, because admin should see that something goes wrong. So I didn't hide them. I don't know why would VMware report BUSY status regularly for disks under load, as mentioned in that PR. My patch should partially help in that case by avoiding errors reported to applications. But still each error like that freezes the device operation for one second before retry, so real cause still must be fixed or performance will heavily suffer. > On 02/02/15 12:23, Alexander Motin wrote: >> Author: mav >> Date: Mon Feb 2 20:23:05 2015 >> New Revision: 278111 >> URL: https://svnweb.freebsd.org/changeset/base/278111 >> >> Log: >> Retry indefinitely on SCSI BUSY status from VMware disks and CDs. >> >> VMware returns BUSY status when storage has transient connectivity >> issues. >> It is often better to wait and let VM admin fix the problem then >> crash. >> >> Discussed with: ken >> MFC after: 1 week >> >> Modified: >> head/sys/cam/cam.h >> head/sys/cam/cam_periph.c >> head/sys/cam/scsi/scsi_cd.c >> head/sys/cam/scsi/scsi_da.c >> >> Modified: head/sys/cam/cam.h >> ============================================================================== >> >> --- head/sys/cam/cam.h Mon Feb 2 20:18:47 2015 (r278110) >> +++ head/sys/cam/cam.h Mon Feb 2 20:23:05 2015 (r278111) >> @@ -121,7 +121,8 @@ enum { >> SF_QUIET_IR = 0x04, /* Be quiet about Illegal Request >> reponses */ >> SF_PRINT_ALWAYS = 0x08, /* Always print error status. */ >> SF_NO_RECOVERY = 0x10, /* Don't do active error >> recovery. */ >> - SF_NO_RETRY = 0x20 /* Don't do any retries. */ >> + SF_NO_RETRY = 0x20, /* Don't do any retries. */ >> + SF_RETRY_BUSY = 0x40 /* Retry BUSY status. */ >> }; >> >> /* CAM Status field values */ >> >> Modified: head/sys/cam/cam_periph.c >> ============================================================================== >> >> --- head/sys/cam/cam_periph.c Mon Feb 2 20:18:47 2015 (r278110) >> +++ head/sys/cam/cam_periph.c Mon Feb 2 20:23:05 2015 (r278111) >> @@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb, >> * Restart the queue after either another >> * command completes or a 1 second timeout. >> */ >> - if (ccb->ccb_h.retry_count > 0) { >> - ccb->ccb_h.retry_count--; >> + if ((sense_flags & SF_RETRY_BUSY) != 0 || >> + (ccb->ccb_h.retry_count--) > 0) { >> error = ERESTART; >> *relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT >> | RELSIM_RELEASE_AFTER_CMDCMPLT; >> >> Modified: head/sys/cam/scsi/scsi_cd.c >> ============================================================================== >> >> --- head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:18:47 2015 (r278110) >> +++ head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:23:05 2015 (r278111) >> @@ -87,14 +87,16 @@ typedef enum { >> CD_Q_NONE = 0x00, >> CD_Q_NO_TOUCH = 0x01, >> CD_Q_BCD_TRACKS = 0x02, >> - CD_Q_10_BYTE_ONLY = 0x10 >> + CD_Q_10_BYTE_ONLY = 0x10, >> + CD_Q_RETRY_BUSY = 0x40 >> } cd_quirks; >> >> #define CD_Q_BIT_STRING \ >> "\020" \ >> "\001NO_TOUCH" \ >> "\002BCD_TRACKS" \ >> - "\00510_BYTE_ONLY" >> + "\00510_BYTE_ONLY" \ >> + "\007RETRY_BUSY" >> >> typedef enum { >> CD_FLAG_INVALID = 0x0001, >> @@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta >> { >> { T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM >> CDS-535","*"}, >> /* quirks */ CD_Q_BCD_TRACKS >> + }, >> + { >> + /* >> + * VMware returns BUSY status when storage has transient >> + * connectivity problems, so better wait. >> + */ >> + {T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE >> CDR10", "*"}, >> + /*quirks*/ CD_Q_RETRY_BUSY >> } >> }; >> >> @@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl >> * don't treat UAs as errors. >> */ >> sense_flags |= SF_RETRY_UA; >> + >> + if (softc->quirks & CD_Q_RETRY_BUSY) >> + sense_flags |= SF_RETRY_BUSY; >> return (cam_periph_error(ccb, cam_flags, sense_flags, >> &softc->saved_ccb)); >> } >> >> Modified: head/sys/cam/scsi/scsi_da.c >> ============================================================================== >> >> --- head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:18:47 2015 (r278110) >> +++ head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:23:05 2015 (r278111) >> @@ -101,7 +101,8 @@ typedef enum { >> DA_Q_NO_PREVENT = 0x04, >> DA_Q_4K = 0x08, >> DA_Q_NO_RC16 = 0x10, >> - DA_Q_NO_UNMAP = 0x20 >> + DA_Q_NO_UNMAP = 0x20, >> + DA_Q_RETRY_BUSY = 0x40 >> } da_quirks; >> >> #define DA_Q_BIT_STRING \ >> @@ -110,7 +111,9 @@ typedef enum { >> "\002NO_6_BYTE" \ >> "\003NO_PREVENT" \ >> "\0044K" \ >> - "\005NO_RC16" >> + "\005NO_RC16" \ >> + "\006NO_UNMAP" \ >> + "\007RETRY_BUSY" >> >> typedef enum { >> DA_CCB_PROBE_RC = 0x01, >> @@ -359,6 +362,14 @@ static struct da_quirk_entry da_quirk_ta >> {T_DIRECT, SIP_MEDIA_FIXED, "STEC", "*", "*"}, >> /*quirks*/ DA_Q_NO_UNMAP >> }, >> + { >> + /* >> + * VMware returns BUSY status when storage has transient >> + * connectivity problems, so better wait. >> + */ >> + {T_DIRECT, SIP_MEDIA_FIXED, "VMware", "Virtual disk", "*"}, >> + /*quirks*/ DA_Q_RETRY_BUSY >> + }, >> /* USB mass storage devices supported by umass(4) */ >> { >> /* >> @@ -3630,6 +3641,9 @@ daerror(union ccb *ccb, u_int32_t cam_fl >> * don't treat UAs as errors. >> */ >> sense_flags |= SF_RETRY_UA; >> + >> + if (softc->quirks & DA_Q_RETRY_BUSY) >> + sense_flags |= SF_RETRY_BUSY; >> return(cam_periph_error(ccb, cam_flags, sense_flags, >> &softc->saved_ccb)); >> } >> > -- Alexander Motin From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 20:48:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3195C68B; Mon, 2 Feb 2015 20:48:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D991A2; Mon, 2 Feb 2015 20:48:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12KmVUm080013; Mon, 2 Feb 2015 20:48:31 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12KmVYr080012; Mon, 2 Feb 2015 20:48:31 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201502022048.t12KmVYr080012@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 2 Feb 2015 20:48:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278114 - head/cddl/contrib/opensolaris/lib/libdtrace/common 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:48:32 -0000 Author: markj Date: Mon Feb 2 20:48:31 2015 New Revision: 278114 URL: https://svnweb.freebsd.org/changeset/base/278114 Log: Let the standard deviation of the empty set be 0. This is consistent with the behaviour for averages, and fixes a crash that can occur when attempting to print a stddev aggregation containing no elements: dtrace:::BEGIN { @ = stddev(0); clear(@); printa("%@d", @); } PR: 197260 MFC after: 2 week Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Mon Feb 2 20:36:16 2015 (r278113) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Mon Feb 2 20:48:31 2015 (r278114) @@ -382,6 +382,9 @@ dt_stddev(uint64_t *data, uint64_t norma int64_t norm_avg; uint64_t diff[2]; + if (data[0] == 0) + return (0); + /* * The standard approximation for standard deviation is * sqrt(average(x**2) - average(x)**2), i.e. the square root From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 21:09:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A14869A9; Mon, 2 Feb 2015 21:09:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 833AD311; Mon, 2 Feb 2015 21:09:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12L9OYu089492; Mon, 2 Feb 2015 21:09:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12L9O4L089491; Mon, 2 Feb 2015 21:09:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502022109.t12L9O4L089491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 2 Feb 2015 21:09:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278115 - head/release/doc/en_US.ISO8859-1/relnotes 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 21:09:24 -0000 Author: gjb Date: Mon Feb 2 21:09:23 2015 New Revision: 278115 URL: https://svnweb.freebsd.org/changeset/base/278115 Log: Move the 'Upgrading from Previous Releases of FreeBSD' section to the top of the file, following the introduction. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 20:48:31 2015 (r278114) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:23 2015 (r278115) @@ -92,6 +92,28 @@ &release.current; can be found on the &os; Web site. + + Upgrading from Previous Releases of &os; + + Binary upgrades between RELEASE versions + (and snapshots of the various security branches) are supported + using the &man.freebsd-update.8; utility. The binary upgrade + procedure will update unmodified userland utilities, as well as + unmodified GENERIC kernels distributed as a part of an official + &os; release. The &man.freebsd-update.8; utility requires that + the host being upgraded have Internet connectivity. + + Source-based upgrades (those based on recompiling the &os; + base system from source code) from previous versions are + supported, according to the instructions in + /usr/src/UPDATING. + + + Upgrading &os; should only be attempted after backing up + all data and configuration files. + + + What's New @@ -825,26 +847,4 @@   - - - Upgrading from Previous Releases of &os; - - Binary upgrades between RELEASE versions - (and snapshots of the various security branches) are supported - using the &man.freebsd-update.8; utility. The binary upgrade - procedure will update unmodified userland utilities, as well as - unmodified GENERIC kernels distributed as a part of an official - &os; release. The &man.freebsd-update.8; utility requires that - the host being upgraded have Internet connectivity. - - Source-based upgrades (those based on recompiling the &os; - base system from source code) from previous versions are - supported, according to the instructions in - /usr/src/UPDATING. - - - Upgrading &os; should only be attempted after backing up - all data and configuration files. - - From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 21:09:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4975AABF; Mon, 2 Feb 2015 21:09:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34B34312; Mon, 2 Feb 2015 21:09:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12L9RoD089539; Mon, 2 Feb 2015 21:09:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12L9Rpp089538; Mon, 2 Feb 2015 21:09:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502022109.t12L9Rpp089538@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 2 Feb 2015 21:09:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278116 - head/release/doc/en_US.ISO8859-1/relnotes 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 21:09:27 -0000 Author: gjb Date: Mon Feb 2 21:09:26 2015 New Revision: 278116 URL: https://svnweb.freebsd.org/changeset/base/278116 Log: Overhaul the relnotes page to reorganize the sections. With the previous layout, the majority of the release notes were categorized under one main "What's New" section, which in addition to making the page difficult to parse relevant bits, also had a few rendering issues, such as 'Note' blocks visually not appearing as if they pertain to a particular change. This change removes the "What's New" section, integrating it with the introduction. In addition, each section now provides a brief description of its contents, broken down further into a subsection for each "topic", making it much easier to find a specific topic in the page. MFC after: 3 days X-MFC-Note: direct commit, not a merge Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:23 2015 (r278115) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:26 2015 (r278116) @@ -90,6 +90,21 @@ information on known bugs, security advisories, and corrections to documentation. An up-to-date copy of the errata for &os; &release.current; can be found on the &os; Web site. + + This document describes the most user-visible new or changed + features in &os; since &release.prev;. In general, changes + described here are unique to the &release.branch; branch unless + specifically marked as &merged; features. + + Typical release note items document recent security + advisories issued after &release.prev;, new drivers or hardware + support, new commands or options, major bug fixes, or + contributed software upgrades. They may also list changes to + major ports/packages or release engineering practices. Clearly + the release notes cannot list every single change made to &os; + between releases; this document focuses primarily on security + advisories, user-visible changes, and major architectural + improvements. @@ -114,23 +129,11 @@ - - What's New - - This section describes the most user-visible new or changed - features in &os; since &release.prev;. In general, changes - described here are unique to the &release.branch; branch unless - specifically marked as &merged; features. + + Security and Errata - Typical release note items document recent security - advisories issued after &release.prev;, new drivers or hardware - support, new commands or options, major bug fixes, or - contributed software upgrades. They may also list changes to - major ports/packages or release engineering practices. Clearly - the release notes cannot list every single change made to &os; - between releases; this document focuses primarily on security - advisories, user-visible changes, and major architectural - improvements. + This section lists the various Security Advisories and + Errata Notices since &release.prev;. Security Advisories @@ -139,389 +142,41 @@ - - Kernel Changes - - Support for GPS ports has been added to - &man.uhso.4;. - - The if_nf10bmac(4) - device has been added, providing support for NetFPGA-10G - Embedded CPU Ethernet Core. - - - The if_nf10bmac(4) driver operates on - the FPGA, and is not suited for the PCI host - interface. - - - The &man.full.4; device has been added, - and the lindev(4) device has been removed. - Prior to this change, lindev(4) provided - only the /dev/full character device, - returning ENOSPC on write attempts. As - this device is not specific to &linux;, a native &os; version - has been added. - - The &man.mpr.4; - device has been added, providing support for LSI Fusion-MPT - 3 12Gb SCSI/SATA controllers. - - The &man.mrsas.4; driver has been added, - providing support for LSI MegaRAID SAS controllers. The - &man.mfi.4; driver will attach to the controller, by default. - To enable &man.mrsas.4; add - hw.mfi.mrsas_enable=1 to - /boot/loader.conf, which turns off - &man.mfi.4; device probing. - - - At this time, the &man.mfiutil.8; utility and the &os; - version of MegaCLI and - StorCli do not work with - &man.mrsas.4;. - - - A kernel bug that inhibited proper - functionality of the dev.cpu.0.freq - &man.sysctl.8; on &intel; processors with Turbo - Boost ™ enabled has been fixed. - - The IMAGACT_BINMISC - kernel configuration option has been enabled by default, - which enables application execution through emulators, such - as Qemu. - - Support for the &man.cxgbe.4; Terminator - 5 (T5) 10G/40G cards has been added to &man.netmap.4;. - - The VT kernel - configuration file has been removed, and the &man.vt.4; - driver is included in the GENERIC kernel. - To enable &man.vt.4;, enter set kern.vty=vt - at the &man.loader.8; prompt during boot, or add - kern.vty=vt to &man.loader.conf.5; and - reboot the system. - - Support for - &man.dtrace.1; stack tracing has been fixed for - &os;/&arch.powerpc;, using the trapexit() - and asttrapexit() functions instead of - checking within addressed kernel space. - - Hardware context support has been - added to the drm/i915 driver, adding - support for Mesa 9.2 and - later. - - The &man.vt.4; driver has been updated, - replacing the bitmapped kern.vt.spclkeys - &man.sysctl.8; with individual - kern.vt.kbd_* variants. + + Errata Notices - The &man.hpet.4; driver has been updated - to create a - /dev/hpetN - device, providing access to HPET from - userspace. + No errata notices. - The &man.vt.4; driver has been made the - default system console driver. The &man.syscons.4; driver is - still available, and can be enabled by adding - kern.vty=sc in &man.loader.conf.5;. - Alternatively, &man.syscons.4; can be enabled at boot time by - entering set kern.vty=sc at the - &man.loader.8; prompt. + + - An issue that could cause a system to - hang when entering ACPI - S3 state (suspend to - RAM) has been corrected in the &man.acpi.4; - and &man.pci.4; drivers. + + Userland - The power management unit - subsystem has been updated to support power button events on - certain &arch.powerpc; hardware, such as aluminum - PowerBook ®. + This section covers changes and additions to userland + applications, contributed software, and system utilities. - The &man.hwpmc.4; - driver has been updated to correct performance counter - sampling on G4 (MPC74xxx) and G5 class processors. + + Userland Configuration Changes - The - OpenCrypto framework has been - updated to include AES-ICM and - AES-GCM modes, both of which have also been - added to the &man.aesni.4; driver. + The default &man.newsyslog.conf.5; now + includes files in the + /etc/newsyslog.conf.d/ and + /usr/local/etc/newsyslog.conf.d/ + directories by default for &man.newsyslog.8;. - - Virtualization Support + The &man.mailwrapper.8; utility has been + updated to use &man.mailer.conf.5; from the + LOCALBASE environment variable, which + defaults to /usr/local + if unset. - Support for the Virtual - Interrupt Delivery feature of &intel; VT-x is - enabled if supported by the CPU. This feature can be - disabled by running sysctl - hw.vmm.vmx.use_apic_vid=0. Additionally, to - persist this setting across reboots, add - hw.vmm.vmx.use_apic_vid=0 to - /etc/sysctl.conf. - - Support for Posted Interrupt - Processing is enabled if supported by the CPU. - This feature can be disabled by running sysctl - hw.vmm.vmx.use_apic_pir=0. Additionally, to - persist this setting across reboots, add - hw.vmm.vmx.use_apic_pir=0 to - /etc/sysctl.conf. - - Unmapped IO support has been added to - &man.virtio_blk.4;. - - Unmapped IO support has been added to - &man.virtio_scsi.4;. - - The &man.virtio_random.4; driver has - been added to harvest entropy from the host system. - - Support for running - a &os;/&arch.amd64; Xen guest - instance as PVH guest has been added. - PVH mode, short for - Para-Virtualized Hardware, uses - para-virtualized drivers for boot and I/O, and uses hardware - virtualization extensions for all other tasks, without the - need for emulation. - - The &man.virtio.console.4; driver has - been added, which provides an interface to VirtIO console - devices through a &man.tty.4; device. - - - - ARM Support - - The &man.nand.4; device is enabled for - ARM devices by default. - - An issue that could cause - instability when detecting SD cards on - the Raspberry Pi SOC has been - fixed. - - The bcm2835_cpufreq - driver has been added, which supports CPU - frequency and voltage control on the Raspberry Pi - SOC. - - - - Boot Loader Changes - -   - - - - Hardware Support - - The &man.asmc.4; driver has been - updated to support the &apple; MacMini 3,1. - - Support for &os;/ia64 has been dropped - as of &os; 11. - - - Multimedia Support - -   - - - - Network Interface Support - - Support for Broadcom chipsets - BCM57764, BCM57767, BCM57782, BCM57786 and BCM57787 has - been added to &man.bge.4;. - - Support for the &intel; - Centrino™ Wireless-N 135 chipset has been - added. - - Firmware for &intel; Centrino™ - Wireless-N 105 devices has been added to the base - system. - - The deprecated nve(4) driver has - been removed. Users of NVIDIA nForce MCP network adapters - are advised to use the &man.nfe.4; driver instead, which - has been the default driver for this hardware since - &os; 7.0. - - The &man.ath.hal.4; driver has been - updated to support the Atheros AR1111 chipset. - - Support for the &intel; - Centrino™ Wireless-N 105 chipset has been - added. - - A bug in &man.ipfw.4; that could - potentially lead to a kernel panic when using - &man.dummynet.4; at layer 2 has been fixed. - - The &man.alc.4; driver has been - updated to support AR816x and AR817x ethernet - controllers. - - The &man.vxlan.4; driver has been - added, which creates a virtual Layer 2 (Ethernet) network - overlaid in a Layer 3 (IP/UDP) network. The &man.vxlan.4; - driver is analogous to &man.vlan.4;, but is designed to be - better suited for large, multiple-tenant datacenter - environments. - - The &man.gre.4; driver has been - significantly overhauled, and has been split into two - separate modules, &man.gre.4; and &man.me.4;. - - - - - Network Protocols - - Support for the IPX network transport - protocol has been removed, and will not be supported in - &os; 11 and later releases. - - Support for PLPMTUD - blackhole detection (RFC 4821) has been - added to the &man.tcp.4; stack, disabled by default. New - control tunables have been added: - - - - - - - - Tunable - Description - - - - - - net.inet.tcp.pmtud_blackhole_detection - Enables or disables PLPMTUD - blackhole detection - - - - net.inet.tcp.pmtud_blackhole_mss - MSS to try for IPv4 - - - - net.inet.tcp.v6pmtud_blackhole_mss - MSS to try for IPv6 - - - - - - New monitoring &man.sysctl.8;s haven been added: - - - - - - - - Tunable - Description - - - - - - net.inet.tcp.pmtud_blackhole_activated - Number of times the code was activated to - attempt downshifting the - MSS - - - - net.inet.tcp.pmtud_blackhole_min_activated - Number of times the blackhole - MSS was used in an attempt to - downshift - - - - net.inet.tcp.pmtud_blackhole_failed - Number of times that the blackhole failed to - connect after downshifting the - MSS - - - - - - - - Disks and Storage - - Support for the - disklabel64 partitioning scheme has been - added to &man.gpart.8;. - - The asr(4) driver - has been removed, and is no longer supported. - - The - &man.ctl.4; subsystem has been updated, increasing the ports - limit from 128 to 256, - and LUN limit from 256 - to 1024. - - - - File Systems - - The - new filesystem automount facility, &man.autofs.5;, has been - added. The new &man.autofs.5; facility is similar to that - found in other &unix;-like operating systems, such as - OS X™ and Solaris™. The &man.autofs.5; - facility uses a &sun;-compatible &man.auto.master.5; - configuration file, and is administered with the - &man.automount.8; userland utility, and the - &man.automountd.8; and &man.autounmountd.8; daemons. - - - ZFS - - The - arc_meta_limit statistics are now - visible through the kstat - &man.sysctl.8;. As a result of this change, the - vfs.zfs.arc_meta_used &man.sysctl.8; - has been removed, and replaced with the - kstat.zfs.misc.arcstats.arc_meta_used - &man.sysctl.8;. - - + The MK_ARM_EABI + &man.src.conf.5; option has been removed. - - Userland Changes + + Userland Application Changes The &man.casperd.8; daemon has been @@ -554,9 +209,6 @@ network packets using the Capsicum framework to drop privileges. - &os;/&arch.i386; guests can be run under - bhyve. - The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. @@ -577,23 +229,6 @@ ends event collection after the specified number of seconds. - The default &man.newsyslog.conf.5; now - includes files in the - /etc/newsyslog.conf.d/ and - /usr/local/etc/newsyslog.conf.d/ - directories by default for &man.newsyslog.8;. - - The &man.readline.3; library is now - statically linked in software within the base system, and the - shared library is no longer installed, allowing the Ports - Collection to use a modern version of the library. - - The &man.mailwrapper.8; utility has been - updated to use &man.mailer.conf.5; from the - LOCALBASE environment variable, which - defaults to /usr/local - if unset. - The &man.ps.1; utility has been updated to include a new keyword, tracer, which displays the PID of the tracing @@ -602,10 +237,6 @@ Support for adding empty partitions has been added to the &man.mkimg.1; utility. - The &man.bsdinstall.8; partition editor - and &man.sade.8; utility have been updated to include native - ZFS support. - The &man.primes.6; utility has been updated to correctly enumerate prime numbers between 4295098369 and @@ -650,65 +281,20 @@ - The &man.strptime.3; library has been - updated to add support for POSIX-2001 - features %U and - %W. - - The &os; installation utility, - &man.bsdinstall.8;, has been updated to set the - canmount &man.zfs.8; property to - off for the /var dataset, preventing the - contents of directories within /var from conflicting when - using multiple boot environments, such as that provided by - sysutils/beadm. - - The MK_ARM_EABI - &man.src.conf.5; option has been removed. - Userland &man.ctf.5; support in &man.dtrace.1; has been added. With this change, &man.dtrace.1; is able to resolve type info for function and USDT probe arguments, and function return values. - The &man.dl.iterate.phdr.3; library has been - changed to always return the path name of the - ELF object in the - dlpi_name structure member. - - A - userland library for Chelsio Terminator 5 based iWARP cards - has been added, allowing userland RDMA - applications to work over compatible - NICs. - - The &man.bsdconfig.8; utility has been - updated to skip the initial &man.tzsetup.8; - UTC versus wall-clock time prompt when run - in a virtual machine, determined when the - kern.vm_guest &man.sysctl.8; is set to - 1. - The &man.elfdump.1; utility has been updated to support capability mode provided by &man.capsicum.4;. - The &man.gpio.3; library has been added, - providing a wrapper around the &man.gpio.4; kernel - interface. - The &man.fstyp.8; utility has been added, which is used to determine the filesystem on a specified device. - The &man.bsdinstall.8; utility has been - updated to use the new &man.dpv.3; library to display progress - when extracting the &os; distributions. - The libedit library has been updated to support UTF-8, which additionally provides unicode support to &man.sh.1;. @@ -716,44 +302,9 @@ The &man.ptrace.2; system call has been updated include support for Altivec registers on &os;/&arch.powerpc;. - - - <acronym>ABI</acronym> Compatibility - - The &linux; compatibility version has - been updated to 2.6.18. The - compat.linux.osrelease &man.sysctl.8; is - evaluated when building the emulators/linux-c6 and related - ports. - - - - <filename>/etc/rc.d</filename> Scripts - - The &man.rc.8; subsystem has been - updated to allow configuring services in ${LOCALBASE}/etc/rc.conf.d/. - If LOCALBASE is unset, it defaults to - /usr/local. - - The mrouted - &man.rc.8; script has been removed from the base system. An - equivalent script is available from the net/mrouted port. - - - - <filename>/etc/periodic</filename> Scripts - - The daily &man.periodic.8; script - 110.clean-tmps has been updated to - avoid crossing filesystem mount boundaries when cleaning - files in /tmp. - - + Contributed Software - - Ports/Packages Collection Infrastructure + + Installation and Configuration Tools -   + The &man.bsdinstall.8; partition editor + and &man.sade.8; utility have been updated to include native + ZFS support. + + The &os; installation utility, + &man.bsdinstall.8;, has been updated to set the + canmount &man.zfs.8; property to + off for the /var dataset, preventing the + contents of directories within /var from conflicting when + using multiple boot environments, such as that provided by + sysutils/beadm. + + The &man.bsdconfig.8; utility has been + updated to skip the initial &man.tzsetup.8; + UTC versus wall-clock time prompt when run + in a virtual machine, determined when the + kern.vm_guest &man.sysctl.8; is set to + 1. + + The &man.bsdinstall.8; utility has been + updated to use the new &man.dpv.3; library to display progress + when extracting the &os; distributions. - - Release Engineering and Integration + + <filename class="directory">/etc/rc.d</filename> + Scripts + + The &man.rc.8; subsystem has been + updated to allow configuring services in ${LOCALBASE}/etc/rc.conf.d/. + If LOCALBASE is unset, it defaults to + /usr/local. + + The mrouted + &man.rc.8; script has been removed from the base system. An + equivalent script is available from the net/mrouted port. + - The - Release Engineering build tools have been updated to include - support for producing virtual machine disk images for various - cloud hosting providers. + + <filename class="directory">/etc/periodic</filename> + Scripts + + The daily &man.periodic.8; script + 110.clean-tmps has been updated to avoid + crossing filesystem mount boundaries when cleaning files in + /tmp. - - Documentation + + Runtime Libraries and API -   + The &man.readline.3; library is now + statically linked in software within the base system, and the + shared library is no longer installed, allowing the Ports + Collection to use a modern version of the library. + + The &man.strptime.3; library has been + updated to add support for POSIX-2001 + features %U and + %W. + + The &man.dl.iterate.phdr.3; library has been + changed to always return the path name of the + ELF object in the + dlpi_name structure member. + + A + userland library for Chelsio Terminator 5 based iWARP cards + has been added, allowing userland RDMA + applications to work over compatible + NICs. + + The &man.gpio.3; library has been added, + providing a wrapper around the &man.gpio.4; kernel + interface. + + + + ABI Compatibility + + The &linux; compatibility version has + been updated to 2.6.18. The + compat.linux.osrelease &man.sysctl.8; is + evaluated when building the emulators/linux-c6 and related + ports. + + + + + Kernel + + This section covers changes to kernel configurations, system + tuning, and system control parameters that are not otherwise + categorized. + + + Kernel Bug Fixes + + A kernel bug that inhibited proper + functionality of the dev.cpu.0.freq + &man.sysctl.8; on &intel; processors with Turbo + Boost ™ enabled has been fixed. + + Support for + &man.dtrace.1; stack tracing has been fixed for + &os;/&arch.powerpc;, using the trapexit() + and asttrapexit() functions instead of + checking within addressed kernel space. + + A bug in &man.ipfw.4; that could + potentially lead to a kernel panic when using &man.dummynet.4; + at layer 2 has been fixed. + + + + Kernel Configuration + + The IMAGACT_BINMISC + kernel configuration option has been enabled by default, + which enables application execution through emulators, such + as Qemu. + + The VT kernel + configuration file has been removed, and the &man.vt.4; + driver is included in the GENERIC kernel. + To enable &man.vt.4;, enter set kern.vty=vt + at the &man.loader.8; prompt during boot, or add + kern.vty=vt to &man.loader.conf.5; and + reboot the system. + + + + System Tuning and Controls + +   + + + + + Devices and Drivers + + This section covers changes and additions to devices and + device drivers since &release.prev;. + + + Device Drivers + + Support for GPS ports has been added to + &man.uhso.4;. + + The &man.full.4; device has been added, + and the lindev(4) device has been removed. + Prior to this change, lindev(4) provided + only the /dev/full character device, + returning ENOSPC on write attempts. As + this device is not specific to &linux;, a native &os; version + has been added. + + Hardware context support has been + added to the drm/i915 driver, adding + support for Mesa 9.2 and + later. + + The &man.vt.4; driver has been updated, + replacing the bitmapped kern.vt.spclkeys + &man.sysctl.8; with individual + kern.vt.kbd_* variants. + + The &man.hpet.4; driver has been updated + to create a + /dev/hpetN + device, providing access to HPET from + userspace. + + + + Storage Drivers + + The &man.mpr.4; + device has been added, providing support for LSI Fusion-MPT + 3 12Gb SCSI/SATA controllers. + + The &man.mrsas.4; driver has been added, + providing support for LSI MegaRAID SAS controllers. The + &man.mfi.4; driver will attach to the controller, by default. + To enable &man.mrsas.4; add + hw.mfi.mrsas_enable=1 to + /boot/loader.conf, which turns off + &man.mfi.4; device probing. + + + At this time, the &man.mfiutil.8; utility and the &os; + version of MegaCLI and + StorCli do not work with + &man.mrsas.4;. + + + The + &man.ctl.4; subsystem has been updated, increasing the ports + limit from 128 to 256, + and LUN limit from 256 + to 1024. + + The asr(4) driver has + been removed, and is no longer supported. + + + + Network Drivers + + Support for Broadcom chipsets BCM57764, + BCM57767, BCM57782, BCM57786 and BCM57787 has been added to + &man.bge.4;. + + Support for the &intel; Centrino™ + Wireless-N 135 chipset has been added. + + Firmware for &intel; Centrino™ + Wireless-N 105 devices has been added to the base + system. + + The deprecated nve(4) driver has been + removed. Users of NVIDIA nForce MCP network adapters are + advised to use the &man.nfe.4; driver instead, which has been + the default driver for this hardware since + &os; 7.0. + + The if_nf10bmac(4) + device has been added, providing support for NetFPGA-10G + Embedded CPU Ethernet Core. + + + The if_nf10bmac(4) driver operates on + the FPGA, and is not suited for the PCI host + interface. + + + The &man.ath.hal.4; driver has been + updated to support the Atheros AR1111 chipset. + + Support for the &intel; Centrino™ + Wireless-N 105 chipset has been added. + + Support for the &man.cxgbe.4; Terminator + 5 (T5) 10G/40G cards has been added to &man.netmap.4;. + + The &man.alc.4; driver has been updated + to support AR816x and AR817x ethernet controllers. + + The &man.vxlan.4; driver has been added, + which creates a virtual Layer 2 (Ethernet) network overlaid in + a Layer 3 (IP/UDP) network. The &man.vxlan.4; driver is + analogous to &man.vlan.4;, but is designed to be better suited + for large, multiple-tenant datacenter environments. + + The + &man.gre.4; driver has been significantly overhauled, and has + been split into two separate modules, &man.gre.4; and + &man.me.4;. + + + + + Hardware Support + + This section covers general hardware support for physical + machines, hypervisors, and virtualization environments, as well + as hardware changes and updates that do not otherwise fit in + other sections of this document. + + + Hardware Support + + The &man.asmc.4; driver has been + updated to support the &apple; MacMini 3,1. + + Support for &os;/ia64 has been dropped + as of &os; 11. + + An issue that could cause a system to + hang when entering ACPI + S3 state (suspend to + RAM) has been corrected in the &man.acpi.4; + and &man.pci.4; drivers. + + The power management unit + subsystem has been updated to support power button events on + certain &arch.powerpc; hardware, such as aluminum + PowerBook ®. + + The &man.hwpmc.4; + driver has been updated to correct performance counter + sampling on G4 (MPC74xxx) and G5 class processors. + + The + OpenCrypto framework has been + updated to include AES-ICM and + AES-GCM modes, both of which have also been + added to the &man.aesni.4; driver. + + + + Virtualization Support + + Support for the Virtual Interrupt + Delivery feature of &intel; VT-x is enabled if + supported by the CPU. This feature can be disabled by running + sysctl hw.vmm.vmx.use_apic_vid=0. + Additionally, to persist this setting across reboots, add + hw.vmm.vmx.use_apic_vid=0 to + /etc/sysctl.conf. + + Support for Posted Interrupt + Processing is enabled if supported by the CPU. This + feature can be disabled by running sysctl + hw.vmm.vmx.use_apic_pir=0. Additionally, to + persist this setting across reboots, add + hw.vmm.vmx.use_apic_pir=0 to + /etc/sysctl.conf. + + Unmapped IO support has been added to + &man.virtio_blk.4;. + + Unmapped IO support has been added to + &man.virtio_scsi.4;. + + The &man.virtio_random.4; driver has + been added to harvest entropy from the host system. + + &os;/&arch.i386; guests can be run under + bhyve. + + Support for running a &os;/&arch.amd64; + Xen guest instance as + PVH guest has been added. + PVH mode, short for Para-Virtualized + Hardware, uses para-virtualized drivers for boot and + I/O, and uses hardware virtualization extensions for all other + tasks, without the need for emulation. + + The &man.virtio.console.4; driver has + been added, which provides an interface to VirtIO console + devices through a &man.tty.4; device. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 23:41:44 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9D61990; Mon, 2 Feb 2015 23:41:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C62AB7C7; Mon, 2 Feb 2015 23:41:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Nfiv9063913; Mon, 2 Feb 2015 23:41:44 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12NfiBW063912; Mon, 2 Feb 2015 23:41:44 GMT (envelope-from np@FreeBSD.org) Message-Id: <201502022341.t12NfiBW063912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Mon, 2 Feb 2015 23:41:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278117 - head/sys/ofed/include/linux 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 23:41:45 -0000 Author: np Date: Mon Feb 2 23:41:43 2015 New Revision: 278117 URL: https://svnweb.freebsd.org/changeset/base/278117 Log: Fix bug in idr_pre_get where it doesn't handle 'need' correctly. Obtained from: Chelsio Communications' internal repository. Modified: head/sys/ofed/include/linux/linux_idr.c Modified: head/sys/ofed/include/linux/linux_idr.c ============================================================================== --- head/sys/ofed/include/linux/linux_idr.c Mon Feb 2 21:09:26 2015 (r278116) +++ head/sys/ofed/include/linux/linux_idr.c Mon Feb 2 23:41:43 2015 (r278117) @@ -223,7 +223,7 @@ idr_pre_get(struct idr *idr, gfp_t gfp_m for (il = idr->free; il != NULL; il = il->ary[0]) need--; mtx_unlock(&idr->lock); - if (need == 0) + if (need <= 0) break; for (head = NULL; need; need--) { iln = malloc(sizeof(*il), M_IDR, M_ZERO | gfp_mask); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 00:07:55 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7045FCC; Tue, 3 Feb 2015 00:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3AF8A87; Tue, 3 Feb 2015 00:07:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1307tE8075499; Tue, 3 Feb 2015 00:07:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1307tkC075498; Tue, 3 Feb 2015 00:07:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502030007.t1307tkC075498@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 3 Feb 2015 00:07:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278118 - head/release/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 00:07:55 -0000 Author: gjb Date: Tue Feb 3 00:07:54 2015 New Revision: 278118 URL: https://svnweb.freebsd.org/changeset/base/278118 Log: Move service_enable="YES" rc.conf(5) additions to VM_RC_LIST and deduplicate. Evaluate if firstboot_freebsd_update should be enabled based on UNAME_r, because it is not supported for the -CURRENT or -STABLE branches. MFC after: 2 weeks X-MFC-with: r277458, r277536, r277606, r277609, r277836 Sponsored by: The FreeBSD Foundation Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf ============================================================================== --- head/release/tools/gce.conf Mon Feb 2 23:41:43 2015 (r278117) +++ head/release/tools/gce.conf Tue Feb 3 00:07:54 2015 (r278118) @@ -9,7 +9,8 @@ export VM_EXTRA_PACKAGES="firstboot-free google-startup-scripts" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="google_accounts_manager ntpd" +export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \ + firstboot_pkgs google_startup" vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf @@ -22,17 +23,16 @@ vm_extra_pre_umount() { dumpdev="AUTO" ifconfig_vtnet0="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" -ntpd_enable="YES" -sshd_enable="YES" -google_accounts_manager_enable="YES" -#disabled until I can figure out why the reboot for updates is hanging -#firstboot_freebsd_update_enable="YES" -#firstboot_pkgs_enable="YES" +case \$(uname -r) in + *-BETA*|*-RC*|*-RELEASE*) + firstboot_freebsd_update_enable="YES" + ;; + *) + ;; +esac # need to fill in something here #firstboot_pkgs_list="" panicmail_autosubmit="YES" -firstboot_growfs_enable="YES" -google_startup_enable="YES" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 00:10:49 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E8941A4; Tue, 3 Feb 2015 00:10:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5AF7DAA1; Tue, 3 Feb 2015 00:10:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t130Anl3079346; Tue, 3 Feb 2015 00:10:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t130AnxI079345; Tue, 3 Feb 2015 00:10:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502030010.t130AnxI079345@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 3 Feb 2015 00:10:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278119 - head/release/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 00:10:49 -0000 Author: gjb Date: Tue Feb 3 00:10:48 2015 New Revision: 278119 URL: https://svnweb.freebsd.org/changeset/base/278119 Log: Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4) MFC after: 2 weeks X-MFC-with: r277458, r277536, r277606, r277609, r277836, r278118 Sponsored by: The FreeBSD Foundation Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf ============================================================================== --- head/release/tools/gce.conf Tue Feb 3 00:07:54 2015 (r278118) +++ head/release/tools/gce.conf Tue Feb 3 00:10:48 2015 (r278119) @@ -21,7 +21,7 @@ vm_extra_install_base() { vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" -ifconfig_vtnet0="SYNCDHCP mtu 1460" +ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" case \$(uname -r) in *-BETA*|*-RC*|*-RELEASE*) From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 00:17:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2BBE51D; Tue, 3 Feb 2015 00:17:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84D78B88; Tue, 3 Feb 2015 00:17:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t130HoIT080305; Tue, 3 Feb 2015 00:17:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t130Ho0r080302; Tue, 3 Feb 2015 00:17:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030017.t130Ho0r080302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 00:17:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278120 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 00:17:50 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 00:17:49 2015 New Revision: 278120 URL: https://svnweb.freebsd.org/changeset/base/278120 Log: - Remove more files when MK_OPENSSH == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:10:48 2015 (r278119) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:17:49 2015 (r278120) @@ -5741,18 +5741,28 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. #.endif .if ${MK_OPENSSH} == no +OLD_FILES+=etc/rc.d/sshd +OLD_FILES+=etc/ssh/moduli +OLD_FILES+=etc/ssh/ssh_config +OLD_FILES+=etc/ssh/sshd_config +OLD_FILES+=usr/bin/scp OLD_FILES+=usr/bin/sftp +OLD_FILES+=usr/bin/slogin OLD_FILES+=usr/bin/ssh OLD_FILES+=usr/bin/ssh-add OLD_FILES+=usr/bin/ssh-agent OLD_FILES+=usr/bin/ssh-copy-id OLD_FILES+=usr/bin/ssh-keygen OLD_FILES+=usr/bin/ssh-keyscan +OLD_FILES+=usr/lib/pam_ssh.so +OLD_LIBS+=usr/lib/pam_ssh.so.5 OLD_FILES+=usr/lib/private/libssh.a OLD_FILES+=usr/lib/private/libssh.so OLD_LIBS+=usr/lib/private/libssh.so.5 OLD_FILES+=usr/lib/private/libssh_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/pam_ssh.so +OLD_LIBS+=usr/lib32/pam_ssh.so.5 OLD_FILES+=usr/lib32/private/libssh.a OLD_FILES+=usr/lib32/private/libssh.so OLD_LIBS+=usr/lib32/private/libssh.so.5 @@ -5762,6 +5772,22 @@ OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign OLD_FILES+=usr/libexec/ssh-pkcs11-helper OLD_FILES+=usr/sbin/sshd +OLD_FILES+=usr/share/man/man1/scp.1.gz +OLD_FILES+=usr/share/man/man1/sftp.1.gz +OLD_FILES+=usr/share/man/man1/slogin.1.gz +OLD_FILES+=usr/share/man/man1/ssh-add.1.gz +OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz +OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz +OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz +OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz +OLD_FILES+=usr/share/man/man1/ssh.1.gz +OLD_FILES+=usr/share/man/man5/ssh_config.5.gz +OLD_FILES+=usr/share/man/man5/sshd_config.5.gz +OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz +OLD_FILES+=usr/share/man/man8/sftp-server.8.gz +OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz +OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz +OLD_FILES+=usr/share/man/man8/sshd.8.gz .endif .if ${MK_OPENSSL} == no From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 00:19:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC1866A5; Tue, 3 Feb 2015 00:19:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C79B0BA2; Tue, 3 Feb 2015 00:19:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t130JpF4080585; Tue, 3 Feb 2015 00:19:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t130Jppc080584; Tue, 3 Feb 2015 00:19:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030019.t130Jppc080584@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 00:19:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278121 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 00:19:52 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 00:19:50 2015 New Revision: 278121 URL: https://svnweb.freebsd.org/changeset/base/278121 Log: - Remove more files when MK_PF == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:17:49 2015 (r278120) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:19:50 2015 (r278121) @@ -5889,6 +5889,11 @@ OLD_FILES+=etc/pf.os OLD_FILES+=etc/rc.d/ftp-proxy OLD_FILES+=sbin/pfctl OLD_FILES+=sbin/pflogd +OLD_FILES+=usr/include/netpfil/pf/pf.h +OLD_FILES+=usr/include/netpfil/pf/pf_altq.h +OLD_FILES+=usr/include/netpfil/pf/pf_mtag.h +OLD_FILES+=usr/lib/snmp_pf.so +OLD_LIBS+=usr/lib/snmp_pf.so.6 OLD_FILES+=usr/libexec/tftp-proxy OLD_FILES+=usr/sbin/ftp-proxy OLD_FILES+=usr/share/examples/etc/pf.os @@ -5912,6 +5917,8 @@ OLD_FILES+=usr/share/man/man8/ftp-proxy. OLD_FILES+=usr/share/man/man8/pfctl.8.gz OLD_FILES+=usr/share/man/man8/pflogd.8.gz OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz +OLD_FILES+=usr/share/snmp/defs/pf_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt .endif .if ${MK_PKGBOOTSTRAP} == no From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 01:56:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BF3C706; Tue, 3 Feb 2015 01:56:34 +0000 (UTC) Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E7BA7752; Tue, 3 Feb 2015 01:56:33 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id rl12so22043044iec.11; Mon, 02 Feb 2015 17:56:33 -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=yaHn98ipkG7nS0xxBRZU2qpZOVemVsZpmIaE2FfQr54=; b=QN4F+pgOLRyfipv+tyuvFFYnwSgTUc7DdnSEnEkAs7JhXi2ZLmnXjTtGaM3WJ8gxaK gmqyXp6HTVQTSgSMFnsQhVTJNyZaPwKIgckD8s54nsBK5Ox/zmWuhc0/M3EDj8DvBlWG TfB64J0+MX63znRYGlj44uTf8kUjDvDwnpE51sr4d3S4P38WT1/QVrODHvtucGJtROIY ws8Lc+lbhXvVXRa3YUIw4EQ65ajGDTyFe195vkJCdz8DV2JwZgYV2x3y4Cf7Q1YoJHX+ f9FXu8kHrppU6+19COg1vw7p2eewyEtyal8KCHBlXFTu6LJoRduy7SBrIlOngY4uoR46 6qNw== MIME-Version: 1.0 X-Received: by 10.50.62.83 with SMTP id w19mr15190916igr.26.1422928593323; Mon, 02 Feb 2015 17:56:33 -0800 (PST) Received: by 10.50.182.233 with HTTP; Mon, 2 Feb 2015 17:56:33 -0800 (PST) In-Reply-To: <201502030010.t130AnxI079345@svn.freebsd.org> References: <201502030010.t130AnxI079345@svn.freebsd.org> Date: Mon, 2 Feb 2015 17:56:33 -0800 Message-ID: Subject: Re: svn commit: r278119 - head/release/tools From: NGie Cooper To: Glen Barber 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 01:56:34 -0000 On Mon, Feb 2, 2015 at 4:10 PM, Glen Barber wrote: > Author: gjb > Date: Tue Feb 3 00:10:48 2015 > New Revision: 278119 > URL: https://svnweb.freebsd.org/changeset/base/278119 ... ... > -ifconfig_vtnet0="SYNCDHCP mtu 1460" > +ifconfig_DEFAULT="SYNCDHCP mtu 1460" ... Why hardcode the MTU to 1460? From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 01:59:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BA2285F; Tue, 3 Feb 2015 01:59:53 +0000 (UTC) Date: Tue, 3 Feb 2015 01:59:50 +0000 From: Glen Barber To: NGie Cooper Subject: Re: svn commit: r278119 - head/release/tools Message-ID: <20150203015950.GD1666@hub.FreeBSD.org> References: <201502030010.t130AnxI079345@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4zI0WCX1RcnW9Hbu" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 01:59:55 -0000 --4zI0WCX1RcnW9Hbu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 02, 2015 at 05:56:33PM -0800, NGie Cooper wrote: > On Mon, Feb 2, 2015 at 4:10 PM, Glen Barber wrote: > > Author: gjb > > Date: Tue Feb 3 00:10:48 2015 > > New Revision: 278119 > > URL: https://svnweb.freebsd.org/changeset/base/278119 > ... > ... > > -ifconfig_vtnet0=3D"SYNCDHCP mtu 1460" > > +ifconfig_DEFAULT=3D"SYNCDHCP mtu 1460" >=20 > ... >=20 > Why hardcode the MTU to 1460? >=20 GCE specifications. Glen --4zI0WCX1RcnW9Hbu Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU0CuWAAoJEAMUWKVHj+KTRnkP/jeGkQzUbwHcQHBG1ps1Z3cu InTWSNd/ZHzaE9FPkCfhwNZji6naTnVmWPVh8epR9HjOz+gcv4nYyF4WQvRj/dwL R0Q5bm2cFrNoLgdIwu2zeuULvdh1OUzTrfZ/PToeX+Fki3yiCip7P1vGTq2T8LPO blJJuMZcSlo60pzxRXJnj2Ya/I2sNlyjzWGBUdbx3YcW/zRmukXy7cbXx1mVmkPT BEadarVJNzEq3Caw2HoNl8fE0l7YSYkCC9WcPnOVoQ33zsrUTGLpOeT1/krYxF6z rtmfOeX6CQcSRadb3wW7g6RwjyavyrhcmsI7LmaNhspq9CjEkrbhgs2sqTKSDi1Z 7l9AAfYAsXQVDtcVHhK85aZayP3A/O/IkacSLYOEJ5/7//KvJjsnMiGo8FsUvzux tOwwA79SuhUG6brDcqD/an457N8L1TSUFbuQa2tQEnAzEmEz6EaN8lOeUkoL9PM9 sD68wXgOr+hikV7LcHpi5HL/yJ2vz0VkEgtaXPb5o5belWnUtrfexR8P7MLMairU hIKremP2bJ+lyVtlBBQmsjeJwMAr82Fs+HdK2HOemMzWkxQz3ZVMmOnvh4WTWwzb gJXAmhWm+gdxBo22o3Higp4UoZM7WHPmOsMnQdbomc8g4/Wqa8raI1upRTsCjT07 AD788UJPqCtFMCoNLQLX =58vW -----END PGP SIGNATURE----- --4zI0WCX1RcnW9Hbu-- From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 02:54:55 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52BEC5A5; Tue, 3 Feb 2015 02:54:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C542EDE; Tue, 3 Feb 2015 02:54:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t132stDf054123; Tue, 3 Feb 2015 02:54:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t132sts6054122; Tue, 3 Feb 2015 02:54:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030254.t132sts6054122@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 02:54:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278126 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 02:54:55 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 02:54:54 2015 New Revision: 278126 URL: https://svnweb.freebsd.org/changeset/base/278126 Log: - Remove more files when MK_PMC == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:25:02 2015 (r278125) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:54:54 2015 (r278126) @@ -5926,6 +5926,92 @@ OLD_FILES+=usr/sbin/pkg OLD_FILES+=usr/share/man/man7/pkg.7.gz .endif +.if ${MK_PMC} == no +OLD_FILES+=usr/bin/pmcstudy +OLD_FILES+=usr/include/pmc.h +OLD_FILES+=usr/include/pmclog.h +OLD_FILES+=usr/lib/libpmc.a +OLD_FILES+=usr/lib/libpmc.so +OLD_LIBS+=usr/lib/libpmc.so.5 +OLD_FILES+=usr/lib/libpmc_p.a +OLD_FILES+=usr/lib32/libpmc.a +OLD_FILES+=usr/lib32/libpmc.so +OLD_LIBS+=usr/lib32/libpmc.so.5 +OLD_FILES+=usr/lib32/libpmc_p.a +OLD_FILES+=usr/sbin/pmcannotate +OLD_FILES+=usr/sbin/pmccontrol +OLD_FILES+=usr/sbin/pmcstat +OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz +OLD_FILES+=usr/share/man/man3/pmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz +OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz +OLD_FILES+=usr/share/man/man3/pmc.core.3.gz +OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz +OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz +OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz +OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz +OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz +OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz +OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.soft.3.gz +OLD_FILES+=usr/share/man/man3/pmc.tsc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ucf.3.gz +OLD_FILES+=usr/share/man/man3/pmc.westmere.3.gz +OLD_FILES+=usr/share/man/man3/pmc.westmereuc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz +OLD_FILES+=usr/share/man/man3/pmc_allocate.3.gz +OLD_FILES+=usr/share/man/man3/pmc_attach.3.gz +OLD_FILES+=usr/share/man/man3/pmc_capabilities.3.gz +OLD_FILES+=usr/share/man/man3/pmc_configure_logfile.3.gz +OLD_FILES+=usr/share/man/man3/pmc_cpuinfo.3.gz +OLD_FILES+=usr/share/man/man3/pmc_detach.3.gz +OLD_FILES+=usr/share/man/man3/pmc_disable.3.gz +OLD_FILES+=usr/share/man/man3/pmc_enable.3.gz +OLD_FILES+=usr/share/man/man3/pmc_event_names_of_class.3.gz +OLD_FILES+=usr/share/man/man3/pmc_flush_logfile.3.gz +OLD_FILES+=usr/share/man/man3/pmc_get_driver_stats.3.gz +OLD_FILES+=usr/share/man/man3/pmc_get_msr.3.gz +OLD_FILES+=usr/share/man/man3/pmc_init.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_capability.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_class.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_cputype.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_disposition.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_event.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_mode.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_state.3.gz +OLD_FILES+=usr/share/man/man3/pmc_ncpu.3.gz +OLD_FILES+=usr/share/man/man3/pmc_npmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc_pmcinfo.3.gz +OLD_FILES+=usr/share/man/man3/pmc_read.3.gz +OLD_FILES+=usr/share/man/man3/pmc_release.3.gz +OLD_FILES+=usr/share/man/man3/pmc_rw.3.gz +OLD_FILES+=usr/share/man/man3/pmc_set.3.gz +OLD_FILES+=usr/share/man/man3/pmc_start.3.gz +OLD_FILES+=usr/share/man/man3/pmc_stop.3.gz +OLD_FILES+=usr/share/man/man3/pmc_width.3.gz +OLD_FILES+=usr/share/man/man3/pmc_write.3.gz +OLD_FILES+=usr/share/man/man3/pmc_writelog.3.gz +OLD_FILES+=usr/share/man/man3/pmclog.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_close.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_feed.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_open.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_read.3.gz +OLD_FILES+=usr/share/man/man8/pmcannotate.8.gz +OLD_FILES+=usr/share/man/man8/pmccontrol.8.gz +OLD_FILES+=usr/share/man/man8/pmcstat.8.gz +.endif + .if ${MK_PORTSNAP} == no OLD_FILES+=etc/portsnap.conf OLD_FILES+=usr/libexec/make_index From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 02:56:26 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C65DB6E5; Tue, 3 Feb 2015 02:56:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2CD7EE9; Tue, 3 Feb 2015 02:56:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t132uQsq054411; Tue, 3 Feb 2015 02:56:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t132uQRe054410; Tue, 3 Feb 2015 02:56:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030256.t132uQRe054410@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 02:56:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278127 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 02:56:26 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 02:56:25 2015 New Revision: 278127 URL: https://svnweb.freebsd.org/changeset/base/278127 Log: - Remove more files when MK_PORTSNAP == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:54:54 2015 (r278126) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:56:25 2015 (r278127) @@ -6018,6 +6018,7 @@ OLD_FILES+=usr/libexec/make_index OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/sbin/portsnap OLD_FILES+=usr/share/examples/etc/portsnap.conf +OLD_FILES+=usr/share/man/man8/phttpget.8.gz OLD_FILES+=usr/share/man/man8/portsnap.8.gz .endif From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 02:57:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9384854; Tue, 3 Feb 2015 02:57:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5966EF9; Tue, 3 Feb 2015 02:57:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t132vp93054593; Tue, 3 Feb 2015 02:57:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t132vp8E054592; Tue, 3 Feb 2015 02:57:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030257.t132vp8E054592@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 02:57:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278128 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 02:57:51 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 02:57:50 2015 New Revision: 278128 URL: https://svnweb.freebsd.org/changeset/base/278128 Log: - Remove more files when MK_QUOTAS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:56:25 2015 (r278127) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:57:50 2015 (r278128) @@ -6138,6 +6138,21 @@ OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh_p.a .endif +.if ${MK_QUOTAS} == no +OLD_FILES+=sbin/quotacheck +OLD_FILES+=usr/bin/quota +OLD_FILES+=usr/sbin/edquota +OLD_FILES+=usr/sbin/quotaoff +OLD_FILES+=usr/sbin/quotaon +OLD_FILES+=usr/sbin/repquota +OLD_FILES+=usr/share/man/man1/quota.1.gz +OLD_FILES+=usr/share/man/man8/edquota.8.gz +OLD_FILES+=usr/share/man/man8/quotacheck.8.gz +OLD_FILES+=usr/share/man/man8/quotaoff.8.gz +OLD_FILES+=usr/share/man/man8/quotaon.8.gz +OLD_FILES+=usr/share/man/man8/repquota.8.gz +.endif + .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp OLD_FILES+=etc/rc.d/rwho From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 02:59:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2D4D9B3; Tue, 3 Feb 2015 02:59:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 756C4F04; Tue, 3 Feb 2015 02:59:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t132xmZo054856; Tue, 3 Feb 2015 02:59:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t132xmSU054855; Tue, 3 Feb 2015 02:59:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030259.t132xmSU054855@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 02:59:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278129 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 02:59:48 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 02:59:47 2015 New Revision: 278129 URL: https://svnweb.freebsd.org/changeset/base/278129 Log: - Remove more files when MK_SSP == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:57:50 2015 (r278128) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:59:47 2015 (r278129) @@ -6456,6 +6456,41 @@ OLD_FILES+=usr/share/doc/pjdfstest/READM OLD_DIRS+=usr/share/doc/pjdfstest .endif +.if ${MK_SSP} == no +OLD_LIBS+=lib/libssp.so.0 +OLD_FILES+=usr/include/ssp/ssp.h +OLD_FILES+=usr/include/ssp/stdio.h +OLD_FILES+=usr/include/ssp/string.h +OLD_FILES+=usr/include/ssp/unistd.h +OLD_FILES+=usr/lib/libssp.a +OLD_FILES+=usr/lib/libssp.so +OLD_FILES+=usr/lib/libssp_nonshared.a +OLD_FILES+=usr/lib32/libssp.a +OLD_FILES+=usr/lib32/libssp.so +OLD_LIBS+=usr/lib32/libssp.so.0 +OLD_FILES+=usr/lib32/libssp_nonshared.a +OLD_FILES+=usr/tests/lib/libc/ssp/Kyuafile +OLD_FILES+=usr/tests/lib/libc/ssp/h_fgets +OLD_FILES+=usr/tests/lib/libc/ssp/h_getcwd +OLD_FILES+=usr/tests/lib/libc/ssp/h_gets +OLD_FILES+=usr/tests/lib/libc/ssp/h_memcpy +OLD_FILES+=usr/tests/lib/libc/ssp/h_memmove +OLD_FILES+=usr/tests/lib/libc/ssp/h_memset +OLD_FILES+=usr/tests/lib/libc/ssp/h_read +OLD_FILES+=usr/tests/lib/libc/ssp/h_readlink +OLD_FILES+=usr/tests/lib/libc/ssp/h_snprintf +OLD_FILES+=usr/tests/lib/libc/ssp/h_sprintf +OLD_FILES+=usr/tests/lib/libc/ssp/h_stpcpy +OLD_FILES+=usr/tests/lib/libc/ssp/h_stpncpy +OLD_FILES+=usr/tests/lib/libc/ssp/h_strcat +OLD_FILES+=usr/tests/lib/libc/ssp/h_strcpy +OLD_FILES+=usr/tests/lib/libc/ssp/h_strncat +OLD_FILES+=usr/tests/lib/libc/ssp/h_strncpy +OLD_FILES+=usr/tests/lib/libc/ssp/h_vsnprintf +OLD_FILES+=usr/tests/lib/libc/ssp/h_vsprintf +OLD_FILES+=usr/tests/lib/libc/ssp/ssp_test +.endif + #.if ${MK_SYSCONS} == no # to be filled in #.endif From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:02:42 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE14AD2A; Tue, 3 Feb 2015 03:02:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9ECC214E; Tue, 3 Feb 2015 03:02:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1332gPh059798; Tue, 3 Feb 2015 03:02:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1332gI3059797; Tue, 3 Feb 2015 03:02:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030302.t1332gI3059797@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:02:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278130 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:02:42 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:02:41 2015 New Revision: 278130 URL: https://svnweb.freebsd.org/changeset/base/278130 Log: - Remove more files when MK_SYSCONS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:59:47 2015 (r278129) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:02:41 2015 (r278130) @@ -6491,9 +6491,190 @@ OLD_FILES+=usr/tests/lib/libc/ssp/h_vspr OLD_FILES+=usr/tests/lib/libc/ssp/ssp_test .endif -#.if ${MK_SYSCONS} == no -# to be filled in -#.endif +.if ${MK_SYSCONS} == no +OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt +OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps +OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd +OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd +OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd +OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd +OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd +OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd +OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm +OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm +.endif .if ${MK_TALK} == no OLD_FILES+=usr/bin/talk From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:05:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65019E8A; Tue, 3 Feb 2015 03:05:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 519AE165; Tue, 3 Feb 2015 03:05:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13357Vt060146; Tue, 3 Feb 2015 03:05:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13357ms060145; Tue, 3 Feb 2015 03:05:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030305.t13357ms060145@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:05:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278131 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:05:07 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:05:06 2015 New Revision: 278131 URL: https://svnweb.freebsd.org/changeset/base/278131 Log: - Remove more files when MK_TCSH == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:02:41 2015 (r278130) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:05:06 2015 (r278131) @@ -6684,10 +6684,19 @@ OLD_FILES+=usr/share/man/man8/talkd.8.gz .endif .if ${MK_TCSH} == no +OLD_FILES+=.cshrc +OLD_FILES+=etc/csh.cshrc +OLD_FILES+=etc/csh.login +OLD_FILES+=etc/csh.logout OLD_FILES+=bin/csh OLD_FILES+=bin/tcsh OLD_FILES+=rescue/csh OLD_FILES+=rescue/tcsh +OLD_FILES+=root/.cshrc +OLD_FILES+=root/.login +OLD_FILES+=usr/share/examples/etc/csh.cshrc +OLD_FILES+=usr/share/examples/etc/csh.login +OLD_FILES+=usr/share/examples/etc/csh.logout OLD_FILES+=usr/share/examples/tcsh/complete.tcsh OLD_FILES+=usr/share/examples/tcsh/csh-mode.el OLD_DIRS+=usr/share/examples/tcsh From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:10:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A7E0FE7; Tue, 3 Feb 2015 03:10:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CDFA1C7; Tue, 3 Feb 2015 03:10:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t133AOqn062654; Tue, 3 Feb 2015 03:10:24 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t133AOW2062653; Tue, 3 Feb 2015 03:10:24 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030310.t133AOW2062653@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:10:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278132 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:10:24 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:10:23 2015 New Revision: 278132 URL: https://svnweb.freebsd.org/changeset/base/278132 Log: - Remove more files when MK_TESTS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:05:06 2015 (r278131) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:10:23 2015 (r278132) @@ -7229,6 +7229,7 @@ OLD_FILES+=usr/tests/usr.bin/yacc/undefi .endif .else # ATF libraries. +OLD_FILES+=etc/mtree/BSD.tests.dist OLD_FILES+=usr/bin/atf-sh OLD_DIRS+=usr/include/atf-c OLD_FILES+=usr/include/atf-c/build.h @@ -7259,6 +7260,7 @@ OLD_FILES+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/libexec/atf-check +OLD_FILES+=usr/libexec/atf-sh OLD_DIRS+=usr/share/atf OLD_FILES+=usr/share/atf/libatf-sh.subr OLD_DIRS+=usr/share/doc/atf @@ -7266,14 +7268,20 @@ OLD_FILES+=usr/share/doc/atf/AUTHORS OLD_FILES+=usr/share/doc/atf/COPYING OLD_FILES+=usr/share/doc/atf/NEWS OLD_FILES+=usr/share/doc/atf/README +OLD_FILES+=usr/share/doc/pjdfstest/README OLD_FILES+=usr/share/man/man1/atf-check.1.gz OLD_FILES+=usr/share/man/man1/atf-sh.1.gz OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz +OLD_FILES+=usr/share/man/man3/atf-sh.3.gz OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/mk/atf.test.mk +OLD_FILES+=usr/share/mk/plain.test.mk +OLD_FILES+=usr/share/mk/suite.test.mk +OLD_FILES+=usr/share/mk/tap.test.mk # Test suite. . if exists(${DESTDIR}${TESTSBASE}) From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:11:25 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1531195; Tue, 3 Feb 2015 03:11:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB0D41D3; Tue, 3 Feb 2015 03:11:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t133BOFu063305; Tue, 3 Feb 2015 03:11:24 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t133BOVu063304; Tue, 3 Feb 2015 03:11:24 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030311.t133BOVu063304@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:11:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278133 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:11:25 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:11:24 2015 New Revision: 278133 URL: https://svnweb.freebsd.org/changeset/base/278133 Log: - Remove more files when MK_TEXTPROC == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:10:23 2015 (r278132) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:11:24 2015 (r278133) @@ -7292,6 +7292,15 @@ OLD_FILES+=${TESTS_FILES} . endif .endif # Test suite. +.if ${MK_TEXTPROC} == no +OLD_FILES+=usr/bin/checknr +OLD_FILES+=usr/bin/colcrt +OLD_FILES+=usr/bin/ul +OLD_FILES+=usr/share/man/man1/checknr.1.gz +OLD_FILES+=usr/share/man/man1/colcrt.1.gz +OLD_FILES+=usr/share/man/man1/ul.1.gz +.endif + #.if ${MK_TOOLCHAIN} == no # to be filled in #.endif From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:13:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF1FD2E4; Tue, 3 Feb 2015 03:13:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C0E8270; Tue, 3 Feb 2015 03:13:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t133DHJD064643; Tue, 3 Feb 2015 03:13:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t133DH4u064642; Tue, 3 Feb 2015 03:13:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030313.t133DH4u064642@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278134 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:13:17 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:13:16 2015 New Revision: 278134 URL: https://svnweb.freebsd.org/changeset/base/278134 Log: - Remove more files when MK_UNBOUND == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:11:24 2015 (r278133) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:13:16 2015 (r278134) @@ -7307,6 +7307,7 @@ OLD_FILES+=usr/share/man/man1/ul.1.gz .if ${MK_UNBOUND} == no OLD_FILES+=etc/rc.d/local_unbound +OLD_FILES+=etc/unbound OLD_FILES+=usr/lib/private/libunbound.a OLD_FILES+=usr/lib/private/libunbound.so OLD_LIBS+=usr/lib/private/libunbound.so.5 @@ -7323,6 +7324,11 @@ OLD_FILES+=usr/sbin/unbound-anchor OLD_FILES+=usr/sbin/unbound-checkconf OLD_FILES+=usr/sbin/unbound-control OLD_FILES+=usr/sbin/unbound-control-setup +OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz +OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz +OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/unbound-control.8.gz +OLD_FILES+=usr/share/man/man8/unbound.8.gz .endif .if ${MK_USB} == no From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 03:14:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 316CD424; Tue, 3 Feb 2015 03:14:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1170227A; Tue, 3 Feb 2015 03:14:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t133EHQJ064809; Tue, 3 Feb 2015 03:14:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t133EHpo064808; Tue, 3 Feb 2015 03:14:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502030314.t133EHpo064808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 03:14:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278135 - head/tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 03:14:18 -0000 Author: amdmi3 (ports committer) Date: Tue Feb 3 03:14:17 2015 New Revision: 278135 URL: https://svnweb.freebsd.org/changeset/base/278135 Log: - Remove more files when MK_USB == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:13:16 2015 (r278134) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:14:17 2015 (r278135) @@ -7332,8 +7332,245 @@ OLD_FILES+=usr/share/man/man8/unbound.8. .endif .if ${MK_USB} == no +OLD_FILES+=etc/devd/uath.conf OLD_FILES+=etc/devd/uauth.conf +OLD_FILES+=etc/devd/ulpt.conf OLD_FILES+=etc/devd/usb.conf +OLD_FILES+=usr/bin/usbhidaction +OLD_FILES+=usr/bin/usbhidctl +OLD_FILES+=usr/include/libusb.h +OLD_FILES+=usr/include/libusb20.h +OLD_FILES+=usr/include/libusb20_desc.h +OLD_FILES+=usr/include/usb.h +OLD_FILES+=usr/include/usbhid.h +OLD_FILES+=usr/lib/libusb.a +OLD_FILES+=usr/lib/libusb.so +OLD_LIBS+=usr/lib/libusb.so.3 +OLD_FILES+=usr/lib/libusb_p.a +OLD_FILES+=usr/lib/libusbhid.a +OLD_FILES+=usr/lib/libusbhid.so +OLD_LIBS+=usr/lib/libusbhid.so.4 +OLD_FILES+=usr/lib/libusbhid_p.a +OLD_FILES+=usr/lib32/libusb.a +OLD_FILES+=usr/lib32/libusb.so +OLD_LIBS+=usr/lib32/libusb.so.3 +OLD_FILES+=usr/lib32/libusb_p.a +OLD_FILES+=usr/lib32/libusbhid.a +OLD_FILES+=usr/lib32/libusbhid.so +OLD_LIBS+=usr/lib32/libusbhid.so.4 +OLD_FILES+=usr/lib32/libusbhid_p.a +OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc +OLD_FILES+=usr/sbin/uathload +OLD_FILES+=usr/sbin/uhsoctl +OLD_FILES+=usr/sbin/usbconfig +OLD_FILES+=usr/sbin/usbdump +OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz +OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz +OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz +OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_init.3.gz +OLD_FILES+=usr/share/man/man3/hid_locate.3.gz +OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz +OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz +OLD_FILES+=usr/share/man/man3/libusb.3.gz +OLD_FILES+=usr/share/man/man3/libusb20.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/libusb_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz +OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_init.3.gz +OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz +OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz +OLD_FILES+=usr/share/man/man3/libusbhid.3.gz +OLD_FILES+=usr/share/man/man3/usb.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/usb_close.3.gz +OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz +OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_device.3.gz +OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz +OLD_FILES+=usr/share/man/man3/usb_init.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_open.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_reset.3.gz +OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/usbhid.3.gz +OLD_FILES+=usr/share/man/man8/uathload.8.gz +OLD_FILES+=usr/share/man/man8/usbconfig.8.gz +OLD_FILES+=usr/share/man/man8/usbdump.8.gz .endif .if ${MK_UTMPX} == no From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 05:38:53 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C77D74F6; Tue, 3 Feb 2015 05:38:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2D2F165; Tue, 3 Feb 2015 05:38:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t135crGF029973; Tue, 3 Feb 2015 05:38:53 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t135crSX029972; Tue, 3 Feb 2015 05:38:53 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201502030538.t135crSX029972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 3 Feb 2015 05:38:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278136 - head/sys/cddl/contrib/opensolaris/uts/common/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 05:38:53 -0000 Author: markj Date: Tue Feb 3 05:38:52 2015 New Revision: 278136 URL: https://svnweb.freebsd.org/changeset/base/278136 Log: Diff reduction with illumos, in preparation for merging r266993 from the vendor branch. No functional change. MFC after: 1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 03:14:17 2015 (r278135) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 05:38:52 2015 (r278136) @@ -16841,23 +16841,20 @@ dtrace_dtr(void *data) mutex_enter(&cpu_lock); mutex_enter(&dtrace_lock); - if (state != NULL) { - if (state->dts_anon) { - /* - * There is anonymous state. Destroy that first. - */ - ASSERT(dtrace_anon.dta_state == NULL); - dtrace_state_destroy(state->dts_anon); - } - - dtrace_state_destroy(state); + if (state->dts_anon) { + /* + * There is anonymous state. Destroy that first. + */ + ASSERT(dtrace_anon.dta_state == NULL); + dtrace_state_destroy(state->dts_anon); + } + dtrace_state_destroy(state); #ifndef illumos - kmem_free(state, 0); + kmem_free(state, 0); #endif - } - ASSERT(dtrace_opens > 0); + #ifdef illumos /* * Only relinquish control of the kernel debugger interface when there From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 06:04:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C01F584A; Tue, 3 Feb 2015 06:04:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB8C1632; Tue, 3 Feb 2015 06:04:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1364HeY043398; Tue, 3 Feb 2015 06:04:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1364HtO043396; Tue, 3 Feb 2015 06:04:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201502030604.t1364HtO043396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 3 Feb 2015 06:04:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278137 - head/sys/cddl/contrib/opensolaris/uts/common/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 06:04:17 -0000 Author: markj Date: Tue Feb 3 06:04:16 2015 New Revision: 278137 URL: https://svnweb.freebsd.org/changeset/base/278137 Log: Continue to handle the case where state is NULL, though this currently cannot happen on FreeBSD. r278136 overlooked the fact that a destructor registered with devfs_set_cdevpriv(9) is invoked even in the case of an error. X-MFC-With: r278136 Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 05:38:52 2015 (r278136) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 06:04:16 2015 (r278137) @@ -14174,7 +14174,7 @@ dtrace_state_create(struct cdev *dev) if (dev != NULL) { cr = dev->si_cred; m = dev2unit(dev); - } + } /* Allocate memory for the state. */ state = kmem_zalloc(sizeof(dtrace_state_t), KM_SLEEP); @@ -16841,7 +16841,12 @@ dtrace_dtr(void *data) mutex_enter(&cpu_lock); mutex_enter(&dtrace_lock); - if (state->dts_anon) { +#ifdef illumos + if (state->dts_anon) +#else + if (state != NULL && state->dts_anon) +#endif + { /* * There is anonymous state. Destroy that first. */ @@ -16849,9 +16854,13 @@ dtrace_dtr(void *data) dtrace_state_destroy(state->dts_anon); } +#ifdef illumos dtrace_state_destroy(state); -#ifndef illumos - kmem_free(state, 0); +#else + if (state == NULL) { + dtrace_state_destroy(state); + kmem_free(state, 0); + } #endif ASSERT(dtrace_opens > 0); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 06:16:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34F45AFB; Tue, 3 Feb 2015 06:16:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07804789; Tue, 3 Feb 2015 06:16:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t136GIpR048403; Tue, 3 Feb 2015 06:16:18 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t136GIJ5048402; Tue, 3 Feb 2015 06:16:18 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201502030616.t136GIJ5048402@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 3 Feb 2015 06:16:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278138 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 06:16:19 -0000 Author: markj Date: Tue Feb 3 06:16:18 2015 New Revision: 278138 URL: https://svnweb.freebsd.org/changeset/base/278138 Log: Use a MIME type of text/plain for a couple of shell scripts with a file extension of ".exe". MFC after: 1 week Modified: Directory Properties: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (props changed) head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (props changed) From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 06:22:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06BA9D8D; Tue, 3 Feb 2015 06:22:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5013871; Tue, 3 Feb 2015 06:22:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t136Mn84052630; Tue, 3 Feb 2015 06:22:49 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t136MkOn052613; Tue, 3 Feb 2015 06:22:46 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201502030622.t136MkOn052613@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 3 Feb 2015 06:22:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278139 - in head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common: pid plockstat 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 06:22:50 -0000 Author: markj Date: Tue Feb 3 06:22:46 2015 New Revision: 278139 URL: https://svnweb.freebsd.org/changeset/base/278139 Log: Avoid hard-coding a path to ksh in scripts that are executed directly by the test harness. This is a problem in many of the *.ksh test scripts as well, but those scripts are executed using a shell whose path is specified in dtest.pl, so there's no need to modify them. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe Tue Feb 3 06:16:18 2015 (r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe Tue Feb 3 06:22:46 2015 (r278139) @@ -1,4 +1,4 @@ -#!/usr/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 10:29:41 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C02CA2F6; Tue, 3 Feb 2015 10:29:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC98A38C; Tue, 3 Feb 2015 10:29:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13ATfR8065368; Tue, 3 Feb 2015 10:29:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13ATfPp065367; Tue, 3 Feb 2015 10:29:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031029.t13ATfPp065367@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 10:29:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278145 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 10:29:41 -0000 Author: kib Date: Tue Feb 3 10:29:40 2015 New Revision: 278145 URL: https://svnweb.freebsd.org/changeset/base/278145 Log: Fix use after free in pipe_dtor(). PIPE_NAMED flag must be tested before pipeclose() is called, since for !PIPE_NAMED case, when peer is already closed, the pipe pair memory is freed. Submitted by: luke.tw@gmail.com PR: 197246 Tested by: pho MFC after: 3 days Modified: head/sys/kern/sys_pipe.c Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Tue Feb 3 08:59:42 2015 (r278144) +++ head/sys/kern/sys_pipe.c Tue Feb 3 10:29:40 2015 (r278145) @@ -377,15 +377,16 @@ pipe_named_ctor(struct pipe **ppipe, str void pipe_dtor(struct pipe *dpipe) { + struct pipe *peer; ino_t ino; ino = dpipe->pipe_ino; + peer = (dpipe->pipe_state & PIPE_NAMED) != 0 ? dpipe->pipe_peer : NULL; funsetown(&dpipe->pipe_sigio); pipeclose(dpipe); - if (dpipe->pipe_state & PIPE_NAMED) { - dpipe = dpipe->pipe_peer; - funsetown(&dpipe->pipe_sigio); - pipeclose(dpipe); + if (peer != NULL) { + funsetown(&peer->pipe_sigio); + pipeclose(peer); } if (ino != 0 && ino != (ino_t)-1) free_unr(pipeino_unr, ino); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 10:30:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F17CA490; Tue, 3 Feb 2015 10:30:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C48C4626; Tue, 3 Feb 2015 10:30:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13AUgFl066357; Tue, 3 Feb 2015 10:30:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13AUgSi066355; Tue, 3 Feb 2015 10:30:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031030.t13AUgSi066355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 10:30:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278146 - head/sys/dev/drm2/i915 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 10:30:43 -0000 Author: kib Date: Tue Feb 3 10:30:41 2015 New Revision: 278146 URL: https://svnweb.freebsd.org/changeset/base/278146 Log: Do not attach to the unsupported chipsets, unless magic tunable is frobbed. Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/i915/i915_drv.c head/sys/dev/drm2/i915/i915_drv.h Modified: head/sys/dev/drm2/i915/i915_drv.c ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.c Tue Feb 3 10:29:40 2015 (r278145) +++ head/sys/dev/drm2/i915/i915_drv.c Tue Feb 3 10:30:41 2015 (r278146) @@ -208,6 +208,7 @@ static const struct intel_device_info in .has_blt_ring = 1, .has_llc = 1, .has_pch_split = 1, + .not_supported = 1, }; static const struct intel_device_info intel_haswell_m_info = { @@ -217,6 +218,7 @@ static const struct intel_device_info in .has_blt_ring = 1, .has_llc = 1, .has_pch_split = 1, + .not_supported = 1, }; #define INTEL_VGA_DEVICE(id, info_) { \ @@ -282,6 +284,8 @@ static const struct intel_gfx_device_id {0, 0} }; +static int i915_enable_unsupported; + static int i915_drm_freeze(struct drm_device *dev) { struct drm_i915_private *dev_priv; @@ -413,8 +417,16 @@ i915_resume(device_t kdev) static int i915_probe(device_t kdev) { + const struct intel_device_info *info; + int error; - return drm_probe(kdev, i915_pciidlist); + error = drm_probe(kdev, i915_pciidlist); + if (error != 0) + return (error); + info = i915_get_device_id(pci_get_device(kdev)); + if (info == NULL) + return (ENXIO); + return (0); } int i915_modeset; @@ -458,6 +470,8 @@ i915_get_device_id(int device) for (did = &pciidlist[0]; did->device != 0; did++) { if (did->device != device) continue; + if (did->info->not_supported && !i915_enable_unsupported) + return (NULL); return (did->info); } return (NULL); @@ -527,6 +541,7 @@ int i915_enable_ppgtt = -1; TUNABLE_INT("drm.i915.enable_ppgtt", &i915_enable_ppgtt); int i915_enable_hangcheck = 1; TUNABLE_INT("drm.i915.enable_hangcheck", &i915_enable_hangcheck); +TUNABLE_INT("drm.i915.enable_unsupported", &i915_enable_unsupported); #define PCI_VENDOR_INTEL 0x8086 #define INTEL_PCH_DEVICE_ID_MASK 0xff00 Modified: head/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.h Tue Feb 3 10:29:40 2015 (r278145) +++ head/sys/dev/drm2/i915/i915_drv.h Tue Feb 3 10:30:41 2015 (r278146) @@ -166,6 +166,7 @@ struct drm_i915_display_funcs { struct intel_device_info { u8 gen; + u8 not_supported:1; u8 is_mobile:1; u8 is_i85x:1; u8 is_i915g:1; From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 10:46:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40E05830; Tue, 3 Feb 2015 10:46:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CCE27BC; Tue, 3 Feb 2015 10:46:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Ak8xQ074650; Tue, 3 Feb 2015 10:46:08 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Ak8QJ074649; Tue, 3 Feb 2015 10:46:08 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031046.t13Ak8QJ074649@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 10:46:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278147 - head/sys/dev/drm2/i915 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 10:46:08 -0000 Author: kib Date: Tue Feb 3 10:46:07 2015 New Revision: 278147 URL: https://svnweb.freebsd.org/changeset/base/278147 Log: Fix sign for the error code returned from the driver-specific code. Noted by: hps Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/i915/intel_dp.c Modified: head/sys/dev/drm2/i915/intel_dp.c ============================================================================== --- head/sys/dev/drm2/i915/intel_dp.c Tue Feb 3 10:30:41 2015 (r278146) +++ head/sys/dev/drm2/i915/intel_dp.c Tue Feb 3 10:46:07 2015 (r278147) @@ -620,14 +620,14 @@ intel_dp_i2c_aux_ch(device_t idev, int m break; case AUX_NATIVE_REPLY_NACK: DRM_DEBUG_KMS("aux_ch native nack\n"); - return (EREMOTEIO); + return (-EREMOTEIO); case AUX_NATIVE_REPLY_DEFER: DELAY(100); continue; default: DRM_ERROR("aux_ch invalid native reply 0x%02x\n", reply[0]); - return (EREMOTEIO); + return (-EREMOTEIO); } switch (reply[0] & AUX_I2C_REPLY_MASK) { @@ -638,14 +638,14 @@ intel_dp_i2c_aux_ch(device_t idev, int m return (0/*reply_bytes - 1*/); case AUX_I2C_REPLY_NACK: DRM_DEBUG_KMS("aux_i2c nack\n"); - return (EREMOTEIO); + return (-EREMOTEIO); case AUX_I2C_REPLY_DEFER: DRM_DEBUG_KMS("aux_i2c defer\n"); DELAY(100); break; default: DRM_ERROR("aux_i2c invalid reply 0x%02x\n", reply[0]); - return (EREMOTEIO); + return (-EREMOTEIO); } } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 11:30:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC0BB23B; Tue, 3 Feb 2015 11:30:06 +0000 (UTC) Received: from mail110.syd.optusnet.com.au (mail110.syd.optusnet.com.au [211.29.132.97]) by mx1.freebsd.org (Postfix) with ESMTP id 71E3BBFF; Tue, 3 Feb 2015 11:30:06 +0000 (UTC) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail110.syd.optusnet.com.au (Postfix) with ESMTPS id A07EB782201; Tue, 3 Feb 2015 22:29:58 +1100 (AEDT) Date: Tue, 3 Feb 2015 22:29:57 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Vsevolod Stakhov Subject: Re: svn commit: r278081 - head/sbin/ifconfig In-Reply-To: <201502021437.t12Ebk7M002347@svn.freebsd.org> Message-ID: <20150203213023.I1264@besplex.bde.org> References: <201502021437.t12Ebk7M002347@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=Za4kaKlA c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=Sob2yR2vYUooJkjFYQAA:9 a=IJY_3xg_LMlPUPqT:21 a=hvIknoyIQPV0I19m:21 a=CjuIK1q_8ugA:10 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 11:30:07 -0000 On Mon, 2 Feb 2015, Vsevolod Stakhov wrote: > Log: > Style(9) fixes. This is still a fair way from style(9) even on the changed lines. > Modified: head/sbin/ifconfig/af_inet6.c > ============================================================================== > --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015 (r278080) > +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 14:37:45 2015 (r278081) > @@ -58,8 +58,8 @@ static const char rcsid[] = > #include "ifconfig.h" > > static struct in6_ifreq in6_ridreq; > -static struct in6_aliasreq in6_addreq = > - { .ifra_flags = 0, > +static struct in6_aliasreq in6_addreq = > + { .ifra_flags = 0, > .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; In strict KNF, the type name is indented 1 tab after the storage class. That rule is followed here. In old strict KNF, the second work of long type declartor is indented 1 tab. That would be after 'struct'. FreeBSD removed this rule. It is not followed here. The formatting now follows the FreeBSD rule of just space separators in the type declarator. In not so strict KNF, the variable name is indented by 1 tab after the type declarator. FreeBSD broke this rule to allow any number of tabs so as to line up all the variable names, at least for struct members, even if this puts the names far to the right leaving not enough space for comments, provided there are more than just 10% of names that would not line up with minimal indentation. This rule (with less than maximal indentation) is more usefule than the others. It is not followed here. In KNF (or just 1TBS) the left brace goes on the previous line. Indentation in KNF is 1 tab, not 4 spaces as it was before the change and 2 spaces afer the change. In KNF (or just myNF), lists in initializaers should be terminated with a comma. In KNF (or just 1TBS), the last right brace goes on a line by itself, with indentation by a number of tabs (possibly 0). Indentation of the storage class but not anything else makes the (implicit) rules for indentation of the initializers unclear. For file-scope declarations, it is common to put the trailing brace in column 0 and indent relative to that. However, for prototypes, the following indentation is normal. From void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); Note that the function name is indented with strict KNF to a fault -- by 1 tab and 1 space (the space is to allow for a single star before the function name). Then if the prototype needs multiple lines, they are indented relative to the function name. The analogue of indenting relative to the variable name in the above gives after fixing all the style bugs except for the extra space before the variable name: static struct in6_aliasreq in6_addreq = { .ifra_flags = 0, .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME, }, }; but that is too verbose even when the variable name starts less than half way to the right, so we should indent the initializer relative to column 0 and cheat by omitting the optional commas: static struct in6_aliasreq in6_addreq = { .ifra_flags = 0, .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; Many other initializers need special formatting like this, that is hard to automatically generate or check. It is much easier to automaticallY format complicated statements than simple initializers since code has more structure. > static int ip6lifetime; > > @@ -284,20 +284,23 @@ in6_status(int s __unused, const struct > if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) > printf("prefer_source "); > > - in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_addr); > + in6_print_scope((uint8_t *)&((struct sockaddr_in6 *) > + (ifa->ifa_addr))->sin6_addr); The formatting is OK. Can the bogus casts be improved? > > if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { > printf("pltime "); > if (lifetime.ia6t_preferred) { > printf("%s ", lifetime.ia6t_preferred < now.tv_sec > - ? "0" : sec2str(lifetime.ia6t_preferred - now.tv_sec)); > + ? "0" : > + sec2str(lifetime.ia6t_preferred - now.tv_sec)); "?" at the start of a line is still gnu style. The KNF formatting is: printf("%s ", lifetime.ia6t_preferred < now.tv_sec ? "0" : sec2str(lifetime.ia6t_preferred - now.tv_sec)); > } else > printf("infty "); > > printf("vltime "); > if (lifetime.ia6t_expire) { > printf("%s ", lifetime.ia6t_expire < now.tv_sec > - ? "0" : sec2str(lifetime.ia6t_expire - now.tv_sec)); > + ? "0" : > + sec2str(lifetime.ia6t_expire - now.tv_sec)); Similarly. > } else > printf("infty "); > } > @@ -372,25 +375,25 @@ in6_getaddr(const char *s, int which) > static int > prefix(void *val, int size) > { > - u_char *name = (u_char *)val; > - int byte, bit, plen = 0; > + u_char *name = (u_char *)val; > + int byte, bit, plen = 0; The following style bugs were not changed: - the case to u_char * is bogus (has no effect). This is not C++. - initialization in declarations (2 instances) - unsorted declarations (1 instance). > > - for (byte = 0; byte < size; byte++, plen += 8) > - if (name[byte] != 0xff) > - break; > + for (byte = 0; byte < size; byte++, plen += 8) > + if (name[byte] != 0xff) > + break; > if (byte == size) > return (plen); > for (bit = 7; bit != 0; bit--, plen++) > - if (!(name[byte] & (1 << bit))) > - break; > - for (; bit != 0; bit--) > - if (name[byte] & (1 << bit)) > - return(0); > - byte++; > - for (; byte < size; byte++) > - if (name[byte]) > - return(0); > - return (plen); > + if (!(name[byte] & (1 << bit))) > + break; > + for (; bit != 0; bit--) > + if (name[byte] & (1 << bit)) > + return(0); > + byte++; > + for (; byte < size; byte++) > + if (name[byte]) > + return(0); > + return (plen); OK, except: - most but not all returns are still missing a space before the left parenthesis - 2 tests of name[byte] are boolean in non-boolean context. Strict KNF may even require testing (foo & MASK) as non-boolean. I don't like that. > } > > static char * > @@ -534,7 +537,11 @@ in6_Lopt_cb(const char *optarg __unused) > { > ip6lifetime++; /* print IPv6 address lifetime */ > } > -static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb }; > +static struct option in6_Lopt = { > + .opt = "L", > + .opt_usage = "[-L]", > + .cb = in6_Lopt_cb > +}; This is a more normal style for initializers. They are hard enough to format without tabs here and there. C99 initializers allow sorting the initializers in a less random order than the struct members. This doesn't seem to be taken advantage of here. > > static __constructor void > inet6_ctor(void) > > Modified: head/sbin/ifconfig/ifconfig.c > ============================================================================== > --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015 (r278080) > +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 14:37:45 2015 (r278081) > @@ -151,12 +151,14 @@ usage(void) > exit(1); > } > > +#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0]) > + Non-KNF indentation. Missing parentheses around one x. Non-use of the standard macro for this. FreeBSD has about 2 versions of it and is slowly standardizing one. Elsewhere the cleanups were to replace home made versions by the standard one. > static int > calcorders(struct ifaddrs *ifa, struct ifa_queue *q) > { > - unsigned int ord, af, ifa_ord; > struct ifaddrs *prev; > struct ifa_order_elt *cur; > + unsigned int ord, af, ifa_ord; Now the unsorting is only within the u_ints. 'unsigned int' is still not spelled u_int. > > prev = NULL; > cur = NULL; Example of the KNF rule of no initialization in declarations. > @@ -164,7 +166,8 @@ calcorders(struct ifaddrs *ifa, struct i > ifa_ord = 0; > > while (ifa != NULL) { > - if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0) { > + if (prev == NULL || > + strcmp(ifa->ifa_name, prev->ifa_name) != 0) { > cur = calloc(1, sizeof(*cur)); > > if (cur == NULL) OK. > @@ -179,12 +182,12 @@ calcorders(struct ifaddrs *ifa, struct i > if (ifa->ifa_addr) { > af = ifa->ifa_addr->sa_family; > > - if (af < sizeof(cur->af_orders) / sizeof(cur->af_orders[0]) && > - cur->af_orders[af] == 0) > + if (af < ORDERS_SIZE(cur->af_orders) && > + cur->af_orders[af] == 0) > cur->af_orders[af] = ++ord; OK except for non-use of the standard macro. The name of the special macro is also too specialized. It is not limited to variables named 'orders'. > } > prev = ifa; > - ifa = ifa->ifa_next; > + ifa = ifa->ifa_next; > } > > return (0); > @@ -193,15 +196,14 @@ calcorders(struct ifaddrs *ifa, struct i > static int > cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q) > { > - int ret; > - unsigned int af1, af2; > struct ifa_order_elt *cur, *e1, *e2; > + unsigned int af1, af2; > + int ret; OK except for missing conversion to u_int. > > e1 = e2 = NULL; > > ret = strcmp(a->ifa_name, b->ifa_name); > if (ret != 0) { > - /* We need to find elements corresponding to these different names */ Possibly not banal; just too long for 1 line, and missing punctuation. > TAILQ_FOREACH(cur, q, link) { > if (e1 && e2) > break; > @@ -231,20 +233,21 @@ cmpifaddrs(struct ifaddrs *a, struct ifa > af1 = a->ifa_addr->sa_family; > af2 = b->ifa_addr->sa_family; > > - if (af1 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0]) && > - af2 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0])) > + if (af1 < ORDERS_SIZE(e1->af_orders) && > + af2 < ORDERS_SIZE(e1->af_orders)) > return (e1->af_orders[af2] - e1->af_orders[af1]); OK, except as above. > } > > return (0); > } > > +#undef ORDERS_SIZE > + > static struct ifaddrs * > sortifaddrs(struct ifaddrs *list, > - int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), > - struct ifa_queue *q) > + int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), > + struct ifa_queue *q) Seems hard to avoid this ugliness. > { > - > struct ifaddrs *right, *temp, *last, *result, *next, *tail; > > right = list; > @@ -499,7 +502,8 @@ main(int argc, char *argv[]) > sdl->sdl_alen != ETHER_ADDR_LEN) > continue; > } else { > - if (ifa->ifa_addr->sa_family != afp->af_af) > + if (ifa->ifa_addr->sa_family > + != afp->af_af) Gnu-style placement of operator. > continue; > } > } > @@ -835,7 +839,7 @@ settunnel(const char *src, const char *d > errx(1, "error in parsing address string: %s", > gai_strerror(ecode)); > > - if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) > + if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) > errx(1, "error in parsing address string: %s", > gai_strerror(ecode)); OK (seems to be a null change?) Bruce From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 11:34:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AAA03E6; Tue, 3 Feb 2015 11:34:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46C9FCBB; Tue, 3 Feb 2015 11:34:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13BYJ35098049; Tue, 3 Feb 2015 11:34:19 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13BYJqX098048; Tue, 3 Feb 2015 11:34:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031134.t13BYJqX098048@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 11:34:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278148 - head/sys/dev/drm2/i915 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 11:34:19 -0000 Author: kib Date: Tue Feb 3 11:34:18 2015 New Revision: 278148 URL: https://svnweb.freebsd.org/changeset/base/278148 Log: Followup to r278147. Two more sign errors. Noted by: hps Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/i915/intel_dp.c Modified: head/sys/dev/drm2/i915/intel_dp.c ============================================================================== --- head/sys/dev/drm2/i915/intel_dp.c Tue Feb 3 10:46:07 2015 (r278147) +++ head/sys/dev/drm2/i915/intel_dp.c Tue Feb 3 11:34:18 2015 (r278148) @@ -609,7 +609,7 @@ intel_dp_i2c_aux_ch(device_t idev, int m reply, reply_bytes); if (ret < 0) { DRM_DEBUG_KMS("aux_ch failed %d\n", ret); - return (-ret); + return (ret); } switch (reply[0] & AUX_NATIVE_REPLY_MASK) { @@ -650,7 +650,7 @@ intel_dp_i2c_aux_ch(device_t idev, int m } DRM_ERROR("too many retries, giving up\n"); - return (EREMOTEIO); + return (-EREMOTEIO); } static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 12:09:49 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81E86AB; Tue, 3 Feb 2015 12:09:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E377FB; Tue, 3 Feb 2015 12:09:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13C9nJ1012940; Tue, 3 Feb 2015 12:09:49 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13C9nwX012939; Tue, 3 Feb 2015 12:09:49 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031209.t13C9nwX012939@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 12:09:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278151 - head/sys/fs/tmpfs 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 12:09:49 -0000 Author: kib Date: Tue Feb 3 12:09:48 2015 New Revision: 278151 URL: https://svnweb.freebsd.org/changeset/base/278151 Log: Remove duplicated assignment. CID: 1267988 Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/fs/tmpfs/tmpfs_subr.c Modified: head/sys/fs/tmpfs/tmpfs_subr.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_subr.c Tue Feb 3 11:54:33 2015 (r278150) +++ head/sys/fs/tmpfs/tmpfs_subr.c Tue Feb 3 12:09:48 2015 (r278151) @@ -1426,7 +1426,6 @@ tmpfs_check_mtime(struct vnode *vp) ASSERT_VOP_ELOCKED(vp, "check_mtime"); if (vp->v_type != VREG) return; - node = VP_TO_TMPFS_NODE(vp); obj = vp->v_object; KASSERT((obj->flags & (OBJ_TMPFS_NODE | OBJ_TMPFS)) == (OBJ_TMPFS_NODE | OBJ_TMPFS), ("non-tmpfs obj")); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 13:43:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 134A71FE; Tue, 3 Feb 2015 13:43:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3C98DCD; Tue, 3 Feb 2015 13:43:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Dh3LW059896; Tue, 3 Feb 2015 13:43:03 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Dh3wW059895; Tue, 3 Feb 2015 13:43:03 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031343.t13Dh3wW059895@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 13:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278152 - head/sys/dev/drm2/i915 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 13:43:04 -0000 Author: kib Date: Tue Feb 3 13:43:03 2015 New Revision: 278152 URL: https://svnweb.freebsd.org/changeset/base/278152 Log: Do not access gmbus_ports array past its end. Reported and tested by: hselasky Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/i915/intel_iic.c Modified: head/sys/dev/drm2/i915/intel_iic.c ============================================================================== --- head/sys/dev/drm2/i915/intel_iic.c Tue Feb 3 12:09:48 2015 (r278151) +++ head/sys/dev/drm2/i915/intel_iic.c Tue Feb 3 13:43:03 2015 (r278152) @@ -556,7 +556,9 @@ intel_gmbus_attach(device_t idev) pin = device_get_unit(idev); port = pin + 1; - snprintf(sc->name, sizeof(sc->name), "gmbus %s", gmbus_ports[pin].name); + snprintf(sc->name, sizeof(sc->name), "gmbus %s", + intel_gmbus_is_port_valid(port) ? gmbus_ports[pin].name : + "reserved"); device_set_desc(idev, sc->name); /* By default use a conservative clock rate */ @@ -613,17 +615,21 @@ intel_iicbb_attach(device_t idev) { struct intel_iic_softc *sc; struct drm_i915_private *dev_priv; - int pin; + int pin, port; sc = device_get_softc(idev); sc->drm_dev = device_get_softc(device_get_parent(idev)); dev_priv = sc->drm_dev->dev_private; pin = device_get_unit(idev); + port = pin + 1; snprintf(sc->name, sizeof(sc->name), "i915 iicbb %s", - gmbus_ports[pin].name); + intel_gmbus_is_port_valid(port) ? gmbus_ports[pin].name : + "reserved"); device_set_desc(idev, sc->name); + if (!intel_gmbus_is_port_valid(port)) + pin = 1 ; /* GPIOA, VGA */ sc->reg0 = pin | GMBUS_RATE_100KHZ; sc->reg = dev_priv->gpio_mmio_base + gmbus_ports[pin].reg; From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 13:45:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72BE541E; Tue, 3 Feb 2015 13:45:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F132E3F; Tue, 3 Feb 2015 13:45:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Dj7fC060242; Tue, 3 Feb 2015 13:45:07 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Dj6wp060238; Tue, 3 Feb 2015 13:45:06 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502031345.t13Dj6wp060238@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 3 Feb 2015 13:45:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278153 - head/sys/dev/drm2/ttm 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 13:45:07 -0000 Author: kib Date: Tue Feb 3 13:45:06 2015 New Revision: 278153 URL: https://svnweb.freebsd.org/changeset/base/278153 Log: If the vm_page_alloc_contig() failed in the ttm page allocators, do what other callers of vm_page_alloc_contig() do, retry after vm_pageout_grow_cache(). Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/ttm/ttm_bo.c head/sys/dev/drm2/ttm/ttm_page_alloc.c Modified: head/sys/dev/drm2/ttm/ttm_bo.c ============================================================================== --- head/sys/dev/drm2/ttm/ttm_bo.c Tue Feb 3 13:43:03 2015 (r278152) +++ head/sys/dev/drm2/ttm/ttm_bo.c Tue Feb 3 13:45:06 2015 (r278153) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define TTM_ASSERT_LOCKED(param) #define TTM_DEBUG(fmt, arg...) @@ -1489,15 +1490,23 @@ int ttm_bo_global_init(struct drm_global container_of(ref, struct ttm_bo_global_ref, ref); struct ttm_bo_global *glob = ref->object; int ret; + int tries; sx_init(&glob->device_list_mutex, "ttmdlm"); mtx_init(&glob->lru_lock, "ttmlru", NULL, MTX_DEF); glob->mem_glob = bo_ref->mem_glob; + tries = 0; +retry: glob->dummy_read_page = vm_page_alloc_contig(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ, 1, 0, VM_MAX_ADDRESS, PAGE_SIZE, 0, VM_MEMATTR_UNCACHEABLE); if (unlikely(glob->dummy_read_page == NULL)) { + if (tries < 1) { + vm_pageout_grow_cache(tries, 0, VM_MAX_ADDRESS); + tries++; + goto retry; + } ret = -ENOMEM; goto out_no_drp; } Modified: head/sys/dev/drm2/ttm/ttm_page_alloc.c ============================================================================== --- head/sys/dev/drm2/ttm/ttm_page_alloc.c Tue Feb 3 13:43:03 2015 (r278152) +++ head/sys/dev/drm2/ttm/ttm_page_alloc.c Tue Feb 3 13:45:06 2015 (r278153) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(vm_page_t)) #define SMALL_ALLOCATION 16 @@ -460,6 +461,14 @@ static void ttm_handle_caching_state_fai } } +static vm_paddr_t +ttm_alloc_high_bound(int ttm_alloc_flags) +{ + + return ((ttm_alloc_flags & TTM_PAGE_FLAG_DMA32) ? 0xffffffff : + VM_MAX_ADDRESS); +} + /** * Allocate new pages with correct caching. * @@ -475,6 +484,7 @@ static int ttm_alloc_new_pages(struct pg unsigned i, cpages, aflags; unsigned max_cpages = min(count, (unsigned)(PAGE_SIZE/sizeof(vm_page_t))); + int tries; aflags = VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_NOOBJ | ((ttm_alloc_flags & TTM_PAGE_FLAG_ZERO_ALLOC) != 0 ? @@ -485,11 +495,18 @@ static int ttm_alloc_new_pages(struct pg M_WAITOK | M_ZERO); for (i = 0, cpages = 0; i < count; ++i) { + tries = 0; +retry: p = vm_page_alloc_contig(NULL, 0, aflags, 1, 0, - (ttm_alloc_flags & TTM_PAGE_FLAG_DMA32) ? 0xffffffff : - VM_MAX_ADDRESS, PAGE_SIZE, 0, - ttm_caching_state_to_vm(cstate)); + ttm_alloc_high_bound(ttm_alloc_flags), + PAGE_SIZE, 0, ttm_caching_state_to_vm(cstate)); if (!p) { + if (tries < 3) { + vm_pageout_grow_cache(tries, 0, + ttm_alloc_high_bound(ttm_alloc_flags)); + tries++; + goto retry; + } printf("[TTM] Unable to get page %u\n", i); /* store already allocated pages in the pool after @@ -691,6 +708,7 @@ static int ttm_get_pages(vm_page_t *page int gfp_flags, aflags; unsigned count; int r; + int tries; aflags = VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | ((flags & TTM_PAGE_FLAG_ZERO_ALLOC) != 0 ? VM_ALLOC_ZERO : 0); @@ -698,11 +716,18 @@ static int ttm_get_pages(vm_page_t *page /* No pool for cached pages */ if (pool == NULL) { for (r = 0; r < npages; ++r) { + tries = 0; +retry: p = vm_page_alloc_contig(NULL, 0, aflags, 1, 0, - (flags & TTM_PAGE_FLAG_DMA32) ? 0xffffffff : - VM_MAX_ADDRESS, PAGE_SIZE, + ttm_alloc_high_bound(flags), PAGE_SIZE, 0, ttm_caching_state_to_vm(cstate)); if (!p) { + if (tries < 3) { + vm_pageout_grow_cache(tries, 0, + ttm_alloc_high_bound(flags)); + tries++; + goto retry; + } printf("[TTM] Unable to allocate page\n"); return -ENOMEM; } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 14:17:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF14BDC8; Tue, 3 Feb 2015 14:17:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB5383A6; Tue, 3 Feb 2015 14:17:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13EHUTa074688; Tue, 3 Feb 2015 14:17:30 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13EHU9g074687; Tue, 3 Feb 2015 14:17:30 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502031417.t13EHU9g074687@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 3 Feb 2015 14:17:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278154 - head/lib/msun/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 14:17:31 -0000 Author: pfg Date: Tue Feb 3 14:17:29 2015 New Revision: 278154 URL: https://svnweb.freebsd.org/changeset/base/278154 Log: Reduce confusion in scalbnl() family of functions. The changes unrelated to the bug in r277948 made the code very difficult to understand to both coverity and regular humans so take a step back to something that is much easier to understand for both and follows better the original code. CID: 1267992, 1267993, 1267994 Discussed with: kargl Modified: head/lib/msun/src/s_scalbln.c Modified: head/lib/msun/src/s_scalbln.c ============================================================================== --- head/lib/msun/src/s_scalbln.c Tue Feb 3 13:45:06 2015 (r278153) +++ head/lib/msun/src/s_scalbln.c Tue Feb 3 14:17:29 2015 (r278154) @@ -35,7 +35,9 @@ scalbln (double x, long n) { int in; - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; + in = (int)n; + if (in != n) + in = (n > 0) ? INT_MAX: INT_MIN; return (scalbn(x, in)); } @@ -44,7 +46,9 @@ scalblnf (float x, long n) { int in; - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; + in = (int)n; + if (in != n) + in = (n > 0) ? INT_MAX: INT_MIN; return (scalbnf(x, in)); } @@ -53,6 +57,9 @@ scalblnl (long double x, long n) { int in; - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; + in = (int)n; + if (in != n) { + in = (n > 0) ? INT_MAX: INT_MIN; + } return (scalbnl(x, in)); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 15:38:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10AE5880; Tue, 3 Feb 2015 15:38:50 +0000 (UTC) Received: from mail106.syd.optusnet.com.au (mail106.syd.optusnet.com.au [211.29.132.42]) by mx1.freebsd.org (Postfix) with ESMTP id C76F5EA1; Tue, 3 Feb 2015 15:38:49 +0000 (UTC) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail106.syd.optusnet.com.au (Postfix) with ESMTPS id 1B1B73C2A65; Wed, 4 Feb 2015 02:38:41 +1100 (AEDT) Date: Wed, 4 Feb 2015 02:38:40 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: "Pedro F. Giffuni" Subject: Re: svn commit: r278154 - head/lib/msun/src In-Reply-To: <201502031417.t13EHU9g074687@svn.freebsd.org> Message-ID: <20150204012614.T1972@besplex.bde.org> References: <201502031417.t13EHU9g074687@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=A5NVYcmG c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=mchCe6mdQo55RqhEC7IA:9 a=CjuIK1q_8ugA:10 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 15:38:50 -0000 On Tue, 3 Feb 2015, Pedro F. Giffuni wrote: > Log: > Reduce confusion in scalbnl() family of functions. > > The changes unrelated to the bug in r277948 made > the code very difficult to understand to both > coverity and regular humans so take a step back > to something that is much easier to understand > for both and follows better the original code. > > CID: 1267992, 1267993, 1267994 > Discussed with: kargl You mean, take a step backwards to something that is harder to understand. You also added style bugs (excessive parentheses) in only 1 of 3 places. > Modified: head/lib/msun/src/s_scalbln.c > ============================================================================== > --- head/lib/msun/src/s_scalbln.c Tue Feb 3 13:45:06 2015 (r278153) > +++ head/lib/msun/src/s_scalbln.c Tue Feb 3 14:17:29 2015 (r278154) > @@ -35,7 +35,9 @@ scalbln (double x, long n) > { > int in; > > - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; It is a feature that this detected a bug in Coverity. I intentionally left out the cast of n at the end, after even more intentionally leaving it out at the beginning. It is obvious to humans^WC programmers, that n has been checked to fit in an int; thus any compiler warning about n possibly being truncated is a compiler defect. It is especially important that compilers understand explicit range checks and don't warn about conversions that cannot change the value when the range checks have been satisfied. > + in = (int)n; This restores a hard-to understand cast. Compilers cannot reasonably understand this at all. Without the cast, they should (optionally) warn about possible truncation. But the truncation is intentional. The programmer is using the cast to inhibit the warning (the case has no other effect). A higher level of warnings would still warn about it, and my rewrite was to prevent this and to make the code easier to understand. The second point that is hard to understand for this cast is that its behaviour is only implementation-defined. Thus it delivers a result and has no bad side effects. The third point that is hard to understand about this cast is that its result doesn't matter. The usual result is the original n truncated, but it can be complete garbage. In both cases, truncation is detected by (in != n), and we proceed to adjust the original n in the truncated cases. Implementation-defined behaviour is usually much harder to understand than this. Some entity has to read the system documentation for all supported systems (and sometimes first file bug reports to get it written) and write ifdefs for all cases. This is hard for compilers to do. Here they only have to read the C standard to check that the bahaviour is not undefined. Even language lawyers might need to check this. The fourth point that is (not so) hard to understand about this cast is that after detecting truncation, we don't use the truncated n again to complete the adjustment. > + if (in != n) > + in = (n > 0) ? INT_MAX: INT_MIN; Instead of an idiomatic conditional ladder, this now uses a combination of an if clause and simpler conditional clause. Before this, many complications are introduced by the implementation-defined behaviour. We use the else clause to separate the truncated case from the truncated case. Then in the truncated case, we still use a conditional clause which non-C programmers might find confusing, and it is essentially the first part of the conditional ladder written in an obfuscated way. Compare: first part of ladder: (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN replacement: (n > 0) ? INT_MAX: INT_MIN (n > 0) is an obfuscated/manually microoptimized way of writing (n > INT_MAX). It means the same since we are in the truncated case, so n cannot be between 0 and INT_MAX. The negation of (n > 0) means (n < INT_MIN), similarly. As pointed out in my review, the range checks could be further unobfuscated to check the limits on the exponents instead of INT_MIN and INT_MAX. These limits are significantly smaller. Using them, the magic cast to int just gets in the way. Magic still occurs in the final conversion, and it is best to leave the final n in my version uncast so that the compiler can detect problems in the algorithm or implementation. The magic is that the natural limits are smaller than INT_MIN and INT_MAX; this if we restrict to them we automatically restrict to values that can be represented as an int. Then if we make a mistake in this, the compiler has a chance of warning provided we don't kill the warning using the cast. We are only using INT_MIN and INT_MAX in the first place since they are slightly easier to spell than the natural limits (but harder to spell hard-coded limits that should be enough for any FP format). We know by non-magic that larger-than necessary limits give the same results. > return (scalbn(x, in)); > } > Similarly in the other functions, except scalblnl() has excessive braces. Bruce From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 15:41:10 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CB48A1D; Tue, 3 Feb 2015 15:41:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29664ECA; Tue, 3 Feb 2015 15:41:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13FfA8N017260; Tue, 3 Feb 2015 15:41:10 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13FfAIP017259; Tue, 3 Feb 2015 15:41:10 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201502031541.t13FfAIP017259@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 3 Feb 2015 15:41:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278159 - head/sys/dev/drm2/i915 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 15:41:10 -0000 Author: emaste Date: Tue Feb 3 15:41:09 2015 New Revision: 278159 URL: https://svnweb.freebsd.org/changeset/base/278159 Log: Remove duplicate intel_fbc_enabled prototype Fixed upstream in Linux commit 7ff0ebcc1e30e3216c8c62ee71f59ac830b10364 Differential Revision: https://reviews.freebsd.org/D1762 Reviewed by: hselasky, kib Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/drm2/i915/i915_drv.h Modified: head/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.h Tue Feb 3 15:35:58 2015 (r278158) +++ head/sys/dev/drm2/i915/i915_drv.h Tue Feb 3 15:41:09 2015 (r278159) @@ -1351,7 +1351,6 @@ extern void intel_modeset_init(struct dr extern void intel_modeset_gem_init(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev); extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); -extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); extern void ironlake_init_pch_refclk(struct drm_device *dev); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 16:09:09 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7878DEDD for ; Tue, 3 Feb 2015 16:09:09 +0000 (UTC) Received: from nm8-vm0.bullet.mail.bf1.yahoo.com (nm8-vm0.bullet.mail.bf1.yahoo.com [98.139.213.95]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 338AD31F for ; Tue, 3 Feb 2015 16:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1422979741; bh=EGu/nK5yAQbD1nGemgWHQPvmBLgxdPMSrnJxv0jOHHc=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=aM5HBhaGRthC1vDYFArtxdP/9zl4nPdG7KA+DvjL+SCIYpJMq0sGLXWsHRZuVFsvKdyoWbuG7MCn73LD3BP4SJ5SzOXFiEBcs4CEAWFg7eMVldooitXpfEklUcF1GGVyw31oQC4z7as1YdTgbcSsh52fpThR62aQ8PSg0M45i5A4kwgLAJY8lrLy+8nfkIhTRHUXm4Mo+BtoxjTFUzzQ5pSe52VeRuAziYbbKQg5R8vqwK3Aa0sWgOIt/rkVW6CzmK0y11n46MDcJhOUBWGH5DdiyPvsdaS8t6MEJgdgnZwVJ0pkQCUs/+u9lw5l4aOMdYV9NdQgTpxG04bB2X1npA== Received: from [98.139.215.140] by nm8.bullet.mail.bf1.yahoo.com with NNFMP; 03 Feb 2015 16:09:01 -0000 Received: from [98.139.211.198] by tm11.bullet.mail.bf1.yahoo.com with NNFMP; 03 Feb 2015 16:09:01 -0000 Received: from [127.0.0.1] by smtp207.mail.bf1.yahoo.com with NNFMP; 03 Feb 2015 16:09:01 -0000 X-Yahoo-Newman-Id: 754830.35050.bm@smtp207.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: HOwVN7EVM1n3urV2NC5wBcxFnnEK3f_8BXvw31lJDzOjxXU K17T7.UiitBCh80iPvI6KHS_jtBVF.ndL2eWFtv9REEslwL7cULOEztu2YP6 pkiVcvknRC4ngFMP..E1tZ8OmhuqMliKgy1ZZVRdYs1h_DD2mMY_lyLqZ33z GSBqzUNiDNxpH.vyIsmMezTNcPiaBRS9gc7YLHDFPr5s7S.QcXbJqvy2ND4F GCZz375FoXNVEQYV1EBV5qn3IzwnWNfktlqg1HJq1nz4tFjHb1GbXXywc1Gz 65mp0pyzgMuA155PVwa1_tijldEPqD7mEOjaVBoiTX1k1BpWqeHyOv2tEZd7 O8zr7.WrMg68EfzQD1xwenqTD6i85BrO4y.3N5FRcu8h.OxbP14V3zKiRSb9 pNcRxerKCbPw3kB31wSLboCr6RhRC8TvAXt5ivGDgD5EMBnJ2PIBDyDKQDfi fcnbpdu.mbIA2sto2VJR1jNlxWh7hY4UGEshx6EuD2yPGiGMP.pkaB_yj1PN AkzSFp0RPxWfRohxRGp.ycf6kthVuKNUL X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <54D0F29C.2090401@FreeBSD.org> Date: Tue, 03 Feb 2015 11:09:00 -0500 From: Pedro Giffuni Organization: FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Bruce Evans Subject: Re: svn commit: r278154 - head/lib/msun/src References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> In-Reply-To: <20150204012614.T1972@besplex.bde.org> Content-Type: text/plain; charset=windows-1252; 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 16:09:09 -0000 On 03/02/2015 10:38 a.m., Bruce Evans wrote: > On Tue, 3 Feb 2015, Pedro F. Giffuni wrote: > >> Log: >> Reduce confusion in scalbnl() family of functions. >> >> The changes unrelated to the bug in r277948 made >> the code very difficult to understand to both >> coverity and regular humans so take a step back >> to something that is much easier to understand >> for both and follows better the original code. >> >> CID: 1267992, 1267993, 1267994 >> Discussed with: kargl > > You mean, take a step backwards to something that is harder to > understand. > > You also added style bugs (excessive parentheses) in only 1 of 3 places. > >> Modified: head/lib/msun/src/s_scalbln.c >> ============================================================================== >> >> --- head/lib/msun/src/s_scalbln.c Tue Feb 3 13:45:06 2015 (r278153) >> +++ head/lib/msun/src/s_scalbln.c Tue Feb 3 14:17:29 2015 (r278154) >> @@ -35,7 +35,9 @@ scalbln (double x, long n) >> { >> int in; >> >> - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; > > It is a feature that this detected a bug in Coverity. I intentionally > left out the cast of n at the end, after even more intentionally leaving > it out at the beginning. It is obvious to humans^WC programmers, that > n has been checked to fit in an int; thus any compiler warning about n > possibly being truncated is a compiler defect. It is especially > important > that compilers understand explicit range checks and don't warn about > conversions that cannot change the value when the range checks have been > satisfied. > I noticed the implicit cast, but then the fact that you triggered a bug in coverity, could be an indication that you could also trigger the same bug in a compiler optimizer so some bogus compiler may end up optimizing the above check into /*do nothing */. >> + in = (int)n; > > This restores a hard-to understand cast. Compilers cannot reasonably > understand this at all. Without the cast, they should (optionally) > warn about possible truncation. But the truncation is intentional. > The programmer is using the cast to inhibit the warning (the case has no > other effect). A higher level of warnings would still warn about it, > and my rewrite was to prevent this and to make the code easier to > understand. > > The second point that is hard to understand for this cast is that its > behaviour is only implementation-defined. Thus it delivers a result > and has no bad side effects. > > The third point that is hard to understand about this cast is that its > result doesn't matter. The usual result is the original n truncated, > but it can be complete garbage. In both cases, truncation is detected > by (in != n), and we proceed to adjust the original n in the truncated > cases. Implementation-defined behaviour is usually much harder to > understand than this. Some entity has to read the system documentation > for all supported systems (and sometimes first file bug reports to get > it written) and write ifdefs for all cases. This is hard for compilers > to do. Here they only have to read the C standard to check that the > bahaviour is not undefined. Even language lawyers might need to check > this. > > The fourth point that is (not so) hard to understand about this cast is > that after detecting truncation, we don't use the truncated n again to > complete the adjustment. > >> + if (in != n) >> + in = (n > 0) ? INT_MAX: INT_MIN; > > Instead of an idiomatic conditional ladder, this now uses a > combination of > an if clause and simpler conditional clause. Before this, many > complications are introduced by the implementation-defined behaviour. > We use the else clause to separate the truncated case from the truncated > case. Then in the truncated case, we still use a conditional clause > which non-C programmers might find confusing, and it is essentially the > first part of the conditional ladder written in an obfuscated way. > Compare: > > first part of ladder: > (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN > replacement: > (n > 0) ? INT_MAX: INT_MIN > > (n > 0) is an obfuscated/manually microoptimized way of writing > (n > INT_MAX). It means the same since we are in the truncated case, > so n cannot be between 0 and INT_MAX. The negation of (n > 0) means > (n < INT_MIN), similarly. > > As pointed out in my review, the range checks could be further > unobfuscated > to check the limits on the exponents instead of INT_MIN and INT_MAX. > These limits are significantly smaller. Using them, the magic cast > to int just gets in the way. Magic still occurs in the final conversion, > and it is best to leave the final n in my version uncast so that the > compiler can detect problems in the algorithm or implementation. The > magic is that the natural limits are smaller than INT_MIN and INT_MAX; > this if we restrict to them we automatically restrict to values that can > be represented as an int. Then if we make a mistake in this, the > compiler > has a chance of warning provided we don't kill the warning using the > cast. > We are only using INT_MIN and INT_MAX in the first place since they are > slightly easier to spell than the natural limits (but harder to spell > hard-coded limits that should be enough for any FP format). We know by > non-magic that larger-than necessary limits give the same results. > I honestly only wanted to clean the original bug but all in all, I find our implementation of this functions somewhat disappointing: shouldn't we be doing real calculations with the requested precision instead of wrapping them around the int counterparts? It looks like NetBSD does implement them. >> return (scalbn(x, in)); >> } >> > > Similarly in the other functions, except scalblnl() has excessive braces. > Oh yes, I will fix that. > Bruce > From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 16:16:53 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7FDAF26E; Tue, 3 Feb 2015 16:16:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CBCF645; Tue, 3 Feb 2015 16:16:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13GGrWZ032551; Tue, 3 Feb 2015 16:16:53 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13GGrMB032550; Tue, 3 Feb 2015 16:16:53 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502031616.t13GGrMB032550@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 3 Feb 2015 16:16:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278160 - head/lib/msun/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 16:16:53 -0000 Author: pfg Date: Tue Feb 3 16:16:52 2015 New Revision: 278160 URL: https://svnweb.freebsd.org/changeset/base/278160 Log: scanblnl: drop extra braces. Pointed out by: bde Modified: head/lib/msun/src/s_scalbln.c Modified: head/lib/msun/src/s_scalbln.c ============================================================================== --- head/lib/msun/src/s_scalbln.c Tue Feb 3 15:41:09 2015 (r278159) +++ head/lib/msun/src/s_scalbln.c Tue Feb 3 16:16:52 2015 (r278160) @@ -58,8 +58,7 @@ scalblnl (long double x, long n) int in; in = (int)n; - if (in != n) { + if (in != n) in = (n > 0) ? INT_MAX: INT_MIN; - } return (scalbnl(x, in)); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 16:17:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C9343BD; Tue, 3 Feb 2015 16:17:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6829F656; Tue, 3 Feb 2015 16:17:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13GHuBd032725; Tue, 3 Feb 2015 16:17:56 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13GHsSD032713; Tue, 3 Feb 2015 16:17:54 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502031617.t13GHsSD032713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 3 Feb 2015 16:17:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278161 - in head: sys/cam/ctl usr.sbin/ctladm usr.sbin/ctld 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 16:17:56 -0000 Author: mav Date: Tue Feb 3 16:17:54 2015 New Revision: 278161 URL: https://svnweb.freebsd.org/changeset/base/278161 Log: Bring some more order into iSCSI portal group tags support. While ctld(8) still does not allow multiple portal groups per target to be configured, kernel should now be able to handle it. MFC after: 2 weeks Sponsored by: iXsystems, Inc. Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_frontend_iscsi.h head/usr.sbin/ctladm/ctladm.c head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/kernel.c Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Feb 3 16:16:52 2015 (r278160) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Feb 3 16:17:54 2015 (r278161) @@ -165,9 +165,10 @@ static void cfiscsi_pdu_handle_data_out( static void cfiscsi_pdu_handle_logout_request(struct icl_pdu *request); static void cfiscsi_session_terminate(struct cfiscsi_session *cs); static struct cfiscsi_target *cfiscsi_target_find(struct cfiscsi_softc - *softc, const char *name); + *softc, const char *name, uint16_t tag); static struct cfiscsi_target *cfiscsi_target_find_or_create( - struct cfiscsi_softc *softc, const char *name, const char *alias); + struct cfiscsi_softc *softc, const char *name, const char *alias, + uint16_t tag); static void cfiscsi_target_release(struct cfiscsi_target *ct); static void cfiscsi_session_delete(struct cfiscsi_session *cs); @@ -1434,7 +1435,8 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi * cihp->initiator_name, cihp->initiator_addr, cihp->target_name); - ct = cfiscsi_target_find(softc, cihp->target_name); + ct = cfiscsi_target_find(softc, cihp->target_name, + cihp->portal_group_tag); if (ct == NULL) { ci->status = CTL_ISCSI_ERROR; snprintf(ci->error_str, sizeof(ci->error_str), @@ -1484,7 +1486,6 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi * * PDU from the Login Phase received from the initiator. Thus, * the -1 below. */ - cs->cs_portal_group_tag = cihp->portal_group_tag; cs->cs_cmdsn = cihp->cmdsn; cs->cs_statsn = cihp->statsn; cs->cs_max_data_segment_length = cihp->max_recv_data_segment_length; @@ -1529,7 +1530,6 @@ restart: TAILQ_FOREACH(cs2, &softc->sessions, cs_next) { if (cs2 != cs && cs2->cs_tasks_aborted == false && cs->cs_target == cs2->cs_target && - cs->cs_portal_group_tag == cs2->cs_portal_group_tag && strcmp(cs->cs_initiator_id, cs2->cs_initiator_id) == 0) { cfiscsi_session_terminate(cs2); mtx_unlock(&softc->lock); @@ -1614,6 +1614,7 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) "%s" "%s" "%s" + "%u" "%s" "%s" "%zd" @@ -1623,6 +1624,7 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) cs->cs_id, cs->cs_initiator_name, cs->cs_initiator_addr, cs->cs_initiator_alias, cs->cs_target->ct_name, cs->cs_target->ct_alias, + cs->cs_target->ct_tag, cs->cs_conn->ic_header_crc32c ? "CRC32C" : "None", cs->cs_conn->ic_data_crc32c ? "CRC32C" : "None", cs->cs_max_data_segment_length, @@ -1980,23 +1982,25 @@ cfiscsi_ioctl_port_create(struct ctl_req { struct cfiscsi_target *ct; struct ctl_port *port; - const char *target, *alias, *tag; + const char *target, *alias, *tags; struct scsi_vpd_id_descriptor *desc; ctl_options_t opts; int retval, len, idlen; + uint16_t tag; ctl_init_opts(&opts, req->num_args, req->kern_args); target = ctl_get_opt(&opts, "cfiscsi_target"); alias = ctl_get_opt(&opts, "cfiscsi_target_alias"); - tag = ctl_get_opt(&opts, "cfiscsi_portal_group_tag"); - if (target == NULL || tag == NULL) { + tags = ctl_get_opt(&opts, "cfiscsi_portal_group_tag"); + if (target == NULL || tags == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), "Missing required argument"); ctl_free_opts(&opts); return; } - ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias); + tag = strtol(tags, (char **)NULL, 10); + ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias, tag); if (ct == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), @@ -2022,7 +2026,7 @@ cfiscsi_ioctl_port_create(struct ctl_req /* XXX KDM what should the real number be here? */ port->num_requested_ctl_io = 4096; port->port_name = "iscsi"; - port->physical_port = strtoul(tag, NULL, 0); + port->physical_port = tag; port->virtual_port = ct->ct_target_id; port->port_online = cfiscsi_online; port->port_offline = cfiscsi_offline; @@ -2054,8 +2058,7 @@ cfiscsi_ioctl_port_create(struct ctl_req desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | SVPD_ID_TYPE_SCSI_NAME; desc->length = idlen; - snprintf(desc->identifier, idlen, "%s,t,0x%4.4x", - target, port->physical_port); + snprintf(desc->identifier, idlen, "%s,t,0x%4.4x", target, tag); /* Generate Target ID. */ idlen = strlen(target) + 1; @@ -2093,19 +2096,22 @@ static void cfiscsi_ioctl_port_remove(struct ctl_req *req) { struct cfiscsi_target *ct; - const char *target; + const char *target, *tags; ctl_options_t opts; + uint16_t tag; ctl_init_opts(&opts, req->num_args, req->kern_args); target = ctl_get_opt(&opts, "cfiscsi_target"); - if (target == NULL) { + tags = ctl_get_opt(&opts, "cfiscsi_portal_group_tag"); + if (target == NULL || tags == NULL) { ctl_free_opts(&opts); req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), "Missing required argument"); return; } - ct = cfiscsi_target_find(&cfiscsi_softc, target); + tag = strtol(tags, (char **)NULL, 10); + ct = cfiscsi_target_find(&cfiscsi_softc, target, tag); if (ct == NULL) { ctl_free_opts(&opts); req->status = CTL_LUN_ERROR; @@ -2126,6 +2132,7 @@ cfiscsi_ioctl_port_remove(struct ctl_req ctl_port_offline(&ct->ct_port); cfiscsi_target_release(ct); cfiscsi_target_release(ct); + req->status = CTL_LUN_OK; } static int @@ -2234,13 +2241,14 @@ cfiscsi_target_release(struct cfiscsi_ta } static struct cfiscsi_target * -cfiscsi_target_find(struct cfiscsi_softc *softc, const char *name) +cfiscsi_target_find(struct cfiscsi_softc *softc, const char *name, uint16_t tag) { struct cfiscsi_target *ct; mtx_lock(&softc->lock); TAILQ_FOREACH(ct, &softc->targets, ct_next) { - if (strcmp(name, ct->ct_name) != 0 || + if (ct->ct_tag != tag || + strcmp(name, ct->ct_name) != 0 || ct->ct_state != CFISCSI_TARGET_STATE_ACTIVE) continue; cfiscsi_target_hold(ct); @@ -2254,7 +2262,7 @@ cfiscsi_target_find(struct cfiscsi_softc static struct cfiscsi_target * cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name, - const char *alias) + const char *alias, uint16_t tag) { struct cfiscsi_target *ct, *newct; @@ -2265,7 +2273,8 @@ cfiscsi_target_find_or_create(struct cfi mtx_lock(&softc->lock); TAILQ_FOREACH(ct, &softc->targets, ct_next) { - if (strcmp(name, ct->ct_name) != 0 || + if (ct->ct_tag != tag || + strcmp(name, ct->ct_name) != 0 || ct->ct_state == CFISCSI_TARGET_STATE_INVALID) continue; cfiscsi_target_hold(ct); @@ -2277,6 +2286,7 @@ cfiscsi_target_find_or_create(struct cfi strlcpy(newct->ct_name, name, sizeof(newct->ct_name)); if (alias != NULL) strlcpy(newct->ct_alias, alias, sizeof(newct->ct_alias)); + newct->ct_tag = tag; refcount_init(&newct->ct_refcount, 1); newct->ct_softc = softc; if (TAILQ_EMPTY(&softc->targets)) Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.h Tue Feb 3 16:16:52 2015 (r278160) +++ head/sys/cam/ctl/ctl_frontend_iscsi.h Tue Feb 3 16:17:54 2015 (r278161) @@ -42,6 +42,7 @@ struct cfiscsi_target { volatile u_int ct_refcount; char ct_name[CTL_ISCSI_NAME_LEN]; char ct_alias[CTL_ISCSI_ALIAS_LEN]; + uint16_t ct_tag; int ct_state; int ct_online; int ct_target_id; @@ -79,7 +80,6 @@ struct cfiscsi_session { struct cfiscsi_target *cs_target; struct callout cs_callout; int cs_timeout; - int cs_portal_group_tag; struct cv cs_maintenance_cv; bool cs_terminating; bool cs_tasks_aborted; Modified: head/usr.sbin/ctladm/ctladm.c ============================================================================== --- head/usr.sbin/ctladm/ctladm.c Tue Feb 3 16:16:52 2015 (r278160) +++ head/usr.sbin/ctladm/ctladm.c Tue Feb 3 16:17:54 2015 (r278161) @@ -3542,6 +3542,7 @@ cctl_islist_end_element(void *user_data, } else if (strcmp(name, "target_alias") == 0) { cur_conn->target_alias = str; str = NULL; + } else if (strcmp(name, "target_portal_group_tag") == 0) { } else if (strcmp(name, "header_digest") == 0) { cur_conn->header_digest = str; str = NULL; Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Tue Feb 3 16:16:52 2015 (r278160) +++ head/usr.sbin/ctld/ctld.c Tue Feb 3 16:17:54 2015 (r278161) @@ -59,6 +59,7 @@ static volatile bool sigterm_received = static volatile bool sigalrm_received = false; static int nchildren = 0; +static uint16_t last_portal_group_tag = 0; static void usage(void) @@ -609,8 +610,7 @@ portal_group_new(struct conf *conf, cons pg->pg_name = checked_strdup(name); TAILQ_INIT(&pg->pg_portals); pg->pg_conf = conf; - conf->conf_last_portal_group_tag++; - pg->pg_tag = conf->conf_last_portal_group_tag; + pg->pg_tag = 0; /* Assigned later in conf_apply(). */ TAILQ_INSERT_TAIL(&conf->conf_portal_groups, pg, pg_next); return (pg); @@ -1655,6 +1655,17 @@ conf_apply(struct conf *oldconf, struct } } + /* + * Go through the new portal groups, assigning tags or preserving old. + */ + TAILQ_FOREACH(newpg, &newconf->conf_portal_groups, pg_next) { + oldpg = portal_group_find(oldconf, newpg->pg_name); + if (oldpg != NULL) + newpg->pg_tag = oldpg->pg_tag; + else + newpg->pg_tag = ++last_portal_group_tag; + } + /* Deregister on removed iSNS servers. */ TAILQ_FOREACH(oldns, &oldconf->conf_isns, i_next) { TAILQ_FOREACH(newns, &newconf->conf_isns, i_next) { @@ -2372,7 +2383,7 @@ main(int argc, char **argv) log_debugx("exiting on signal; " "reloading empty configuration"); - log_debugx("disabling CTL iSCSI port " + log_debugx("removing CTL iSCSI ports " "and terminating all connections"); oldconf = newconf; Modified: head/usr.sbin/ctld/ctld.h ============================================================================== --- head/usr.sbin/ctld/ctld.h Tue Feb 3 16:16:52 2015 (r278160) +++ head/usr.sbin/ctld/ctld.h Tue Feb 3 16:17:54 2015 (r278161) @@ -180,7 +180,6 @@ struct conf { int conf_timeout; int conf_maxproc; - uint16_t conf_last_portal_group_tag; #ifdef ICL_KERNEL_PROXY int conf_portal_id; #endif Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Tue Feb 3 16:16:52 2015 (r278160) +++ head/usr.sbin/ctld/kernel.c Tue Feb 3 16:17:54 2015 (r278161) @@ -913,12 +913,8 @@ kernel_port_remove(struct target *targ) req.num_args = 2; req.args = malloc(req.num_args * sizeof(*req.args)); str_arg(&req.args[0], "cfiscsi_target", targ->t_name); - if (targ->t_portal_group) { - snprintf(tagstr, sizeof(tagstr), "%d", - targ->t_portal_group->pg_tag); - str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr); - } else - req.num_args--; + snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag); + str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr); error = ioctl(ctl_fd, CTL_PORT_REQ, &req); free(req.args); From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 16:33:31 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBAFC79F; Tue, 3 Feb 2015 16:33:31 +0000 (UTC) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 92493845; Tue, 3 Feb 2015 16:33:31 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t13GXTsh012986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 3 Feb 2015 08:33:30 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t13GXTr5012985; Tue, 3 Feb 2015 08:33:29 -0800 (PST) (envelope-from sgk) Date: Tue, 3 Feb 2015 08:33:29 -0800 From: Steve Kargl To: Bruce Evans Subject: Re: svn commit: r278154 - head/lib/msun/src Message-ID: <20150203163329.GA12706@troutmask.apl.washington.edu> References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150204012614.T1972@besplex.bde.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "Pedro F. Giffuni" , src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 16:33:32 -0000 On Wed, Feb 04, 2015 at 02:38:40AM +1100, Bruce Evans wrote: > On Tue, 3 Feb 2015, Pedro F. Giffuni wrote: > > > Log: > > Reduce confusion in scalbnl() family of functions. > > > > The changes unrelated to the bug in r277948 made > > the code very difficult to understand to both > > coverity and regular humans so take a step back > > to something that is much easier to understand > > for both and follows better the original code. > > > > CID: 1267992, 1267993, 1267994 > > Discussed with: kargl > > You mean, take a step backwards to something that is harder to understand. > Well, the correct fix should have been to ONLY fix the typo, and leave the code rewrite for a second commit. Index: s_scalbln.c =================================================================== --- s_scalbln.c (revision 276768) +++ s_scalbln.c (working copy) @@ -72,5 +72,5 @@ else in = INT_MIN; } - return (scalbnl(x, (int)n)); + return (scalbnl(x, in)); } But, that's water under the bridge. You forgot to include a diff. Here's one untested attempt at addressing your concerns. -- Steve Index: s_scalbln.c =================================================================== --- s_scalbln.c (revision 276768) +++ s_scalbln.c (working copy) @@ -27,21 +27,23 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include +#define FLT_LARGE FLT_MAX_EXP - FLT_MIN_EXP + FLT_MANT_DIG +#define FLT_SMALL FLT_MIN_EXP - FLT_MAX_EXP +#define DBL_LARGE DBL_MAX_EXP - DBL_MIN_EXP + DBL_MANT_DIG +#define DBL_SMALL DBL_MIN_EXP - DBL_MAX_EXP +#define LDBL_LARGE LDBL_MAX_EXP - LDBL_MIN_EXP + LDBL_MANT_DIG +#define LDBL_SMALL LDBL_MIN_EXP - LDBL_MAX_EXP + double scalbln (double x, long n) { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } + in = n > DBL_LARGE ? DBL_LARGE : n < DBL_SMALL ? DBL_SMALL : n; + return (scalbn(x, in)); } @@ -50,27 +52,16 @@ { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } + in = n > FLT_LARGE ? FLT_LARGE : n < FLT_SMALL ? FLT_SMALL : n; + return (scalbnf(x, in)); } - long double scalblnl (long double x, long n) { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } - return (scalbnl(x, (int)n)); + in = n > LDBL_LARGE ? LDBL_LARGE : n < LDBL_SMALL ? LDBL_SMALL : n; + + return (scalbnl(x, in)); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 16:52:05 2015 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C1A7B5E; Tue, 3 Feb 2015 16:52:05 +0000 (UTC) Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au [211.29.132.53]) by mx1.freebsd.org (Postfix) with ESMTP id 1E88A97C; Tue, 3 Feb 2015 16:52:04 +0000 (UTC) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id 66F2CD4308F; Wed, 4 Feb 2015 03:51:56 +1100 (AEDT) Date: Wed, 4 Feb 2015 03:51:55 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pedro Giffuni Subject: Re: svn commit: r278154 - head/lib/msun/src In-Reply-To: <54D0F29C.2090401@FreeBSD.org> Message-ID: <20150204031811.N2584@besplex.bde.org> References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> <54D0F29C.2090401@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=baJSDo/B c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=EA4qJ_KTQ518DKzBkYcA:9 a=CjuIK1q_8ugA:10 Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce Evans X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 16:52:05 -0000 On Tue, 3 Feb 2015, Pedro Giffuni wrote: > On 03/02/2015 10:38 a.m., Bruce Evans wrote: Please trim quotes. [... quotes truncated] >> You mean, take a step backwards to something that is harder to understand. >>> Modified: head/lib/msun/src/s_scalbln.c >>> ============================================================================== >>> --- head/lib/msun/src/s_scalbln.c Tue Feb 3 13:45:06 2015 (r278153) >>> +++ head/lib/msun/src/s_scalbln.c Tue Feb 3 14:17:29 2015 (r278154) >>> @@ -35,7 +35,9 @@ scalbln (double x, long n) >>> { >>> int in; >>> >>> - in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; >> >> It is a feature that this detected a bug in Coverity. I intentionally >> left out the cast of n at the end, after even more intentionally leaving >> it out at the beginning. It is obvious to humans^WC programmers, that >> n has been checked to fit in an int; thus any compiler warning about n >> possibly being truncated is a compiler defect. It is especially important >> that compilers understand explicit range checks and don't warn about >> conversions that cannot change the value when the range checks have been >> satisfied. > > I noticed the implicit cast, but then the fact that you triggered a bug in > coverity, > could be an indication that you could also trigger the same bug in a compiler > optimizer so some bogus compiler may end up optimizing the above check into > /*do nothing */. Not likely. >>> + in = (int)n; >> >> This restores a hard-to understand cast. Compilers cannot reasonably >> understand this at all. Without the cast, they should (optionally) >> warn about possible truncation. But the truncation is intentional. >> The programmer is using the cast to inhibit the warning (the case has no >> other effect). A higher level of warnings would still warn about it, >> and my rewrite was to prevent this and to make the code easier to >> understand. >> ... > I honestly only wanted to clean the original bug but all in all, I find our > implementation of this functions somewhat disappointing: shouldn't we > be doing real calculations with the requested precision instead of wrapping > them around the int counterparts? It looks like NetBSD does implement them. That would be a silly micro-optimization for functions that are almost never used. We are doing real calculations, with a simple translation for overflowing and undeflowing cases to avoid duplicating code. Now I wonder why these functions (the ones taking a long arg) even exist. According to a Linux man page which seems to be quoting a POSIX spec, it is to support systems with 16-bit ints and unusually large LDBL_MAX_EXP. FreeBSD only supports systems where LDBL_MAX_EXP is at most 16384, and this fits in a 16-bit int. Very little code supports these unusual systems. Most code uses plain assumes 16-bit ints and/or usual LDBL_MAX_EXP, and just uses scalbn*(). POSIX now requires 32-bit ints, so this rationale certainly doesn't apply to it. It applies to C99. So the sloppy code is now portable in POSIX but not in C99. Bruce From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 17:37:28 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53355442; Tue, 3 Feb 2015 17:37:28 +0000 (UTC) Received: from mail104.syd.optusnet.com.au (mail104.syd.optusnet.com.au [211.29.132.246]) by mx1.freebsd.org (Postfix) with ESMTP id 13F06C29; Tue, 3 Feb 2015 17:37:27 +0000 (UTC) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 713EA4265EF; Wed, 4 Feb 2015 04:37:19 +1100 (AEDT) Date: Wed, 4 Feb 2015 04:37:14 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Steve Kargl Subject: Re: svn commit: r278154 - head/lib/msun/src In-Reply-To: <20150203163329.GA12706@troutmask.apl.washington.edu> Message-ID: <20150204035337.Y2718@besplex.bde.org> References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> <20150203163329.GA12706@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=Za4kaKlA c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=NTIJw2KIuu6d3J1y6egA:9 a=CjuIK1q_8ugA:10 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "Pedro F. Giffuni" , src-committers@freebsd.org, Bruce Evans X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 17:37:28 -0000 On Tue, 3 Feb 2015, Steve Kargl wrote: > On Wed, Feb 04, 2015 at 02:38:40AM +1100, Bruce Evans wrote: >> On Tue, 3 Feb 2015, Pedro F. Giffuni wrote: >> >>> Log: >>> Reduce confusion in scalbnl() family of functions. >>> >>> The changes unrelated to the bug in r277948 made >>> the code very difficult to understand to both >>> coverity and regular humans so take a step back >>> to something that is much easier to understand >>> for both and follows better the original code. >>> >>> CID: 1267992, 1267993, 1267994 >>> Discussed with: kargl >> >> You mean, take a step backwards to something that is harder to understand. > > Well, the correct fix should have been to ONLY fix the typo, > and leave the code rewrite for a second commit. > > Index: s_scalbln.c > =================================================================== > --- s_scalbln.c (revision 276768) > +++ s_scalbln.c (working copy) > @@ -72,5 +72,5 @@ > else > in = INT_MIN; > } > - return (scalbnl(x, (int)n)); > + return (scalbnl(x, in)); > } > > But, that's water under the bridge. Indeed. > You forgot to include a diff. Here's one untested attempt at > addressing your concerns. > > Index: s_scalbln.c > =================================================================== > --- s_scalbln.c (revision 276768) > +++ s_scalbln.c (working copy) > @@ -27,21 +27,23 @@ > #include > __FBSDID("$FreeBSD$"); > > -#include > +#include > #include > > +#define FLT_LARGE FLT_MAX_EXP - FLT_MIN_EXP + FLT_MANT_DIG > +#define FLT_SMALL FLT_MIN_EXP - FLT_MAX_EXP > +#define DBL_LARGE DBL_MAX_EXP - DBL_MIN_EXP + DBL_MANT_DIG > +#define DBL_SMALL DBL_MIN_EXP - DBL_MAX_EXP > +#define LDBL_LARGE LDBL_MAX_EXP - LDBL_MIN_EXP + LDBL_MANT_DIG > +#define LDBL_SMALL LDBL_MIN_EXP - LDBL_MAX_EXP > + This is a lot of code and bugs (missing parentheses) for negative gain. To work, it depends on all of the above expressions having results that can be represented as an int. There is no guarantee of this in general. In fact, 'ln' variants of the functions only exist because this is not possible in general -- they exist because int is not large enough to represent the limits. This also means that expressions like DBL_MAX_EXP cannot have type int in general. In fact, it is not even clear that they have integer type. In n869.txt, I could only find: X [#8] The values given in the following list shall be X replaced by implementation-defined constant expressions with X values that are greater or equal in magnitude (absolute X value) to those shown, with the same sign: This is the implementation, so it can guarantee anything it wants and assume things that other parts of the implementation do. Other parts use only 32-bit ints (larger would also work) and make all the relevant constants have type plain int. However, we can show that the above values are within certain fixed limits just as easily as we can show that they are within the INT32 limits, and then hard-code the fixed limits. E,g, +-16384 might work, and +-32768 surely works when the exponent field is limited to 8 bits. Double a few more times for safety. Hard-coding a limit related to an assumed maximum supported width for the exponent field is easier to get right that the above expressions. I think the above are quite buggy, and so are my +-16384 and +-32768. The full exponent range plus more for denormals is needed in both directions. You only have it for the LARGE direction. This can be hard-coded for a 15-bit exponent field as +-32768 +- extras for denormals, -+ a couple for special exponents. This needs strictly larger than 16-bit ints for the denormals only. Make it +-65536 to avoid having to count carefully to avoid off-by-1 errors. Double a few times for larger exponent fields, or just add assertions to detect increases of the maxima, or just hard- code the limits as the int32_t extrema. > double > scalbln (double x, long n) > { > int in; > > - in = (int)n; > - if (in != n) { > - if (n > 0) > - in = INT_MAX; > - else > - in = INT_MIN; > - } > + in = n > DBL_LARGE ? DBL_LARGE : n < DBL_SMALL ? DBL_SMALL : n; > + New style bug: extra blank line. I think fdlibm doesn't have many of these, and this file is supposed to be in KNF which has none. > return (scalbn(x, in)); > } The code can't be further simlified by avoiding the local variable and the assignment to it, since that would make the single line in the function too long. Bruce From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 18:59:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 097E8C9D; Tue, 3 Feb 2015 18:59:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9E8C32A; Tue, 3 Feb 2015 18:59:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Ixrca012519; Tue, 3 Feb 2015 18:59:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Ixr4E012518; Tue, 3 Feb 2015 18:59:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201502031859.t13Ixr4E012518@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 3 Feb 2015 18:59:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278165 - head/sys/dev/fe 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 18:59:54 -0000 Author: imp Date: Tue Feb 3 18:59:52 2015 New Revision: 278165 URL: https://svnweb.freebsd.org/changeset/base/278165 Log: Silence a coverity warning about ignoring a return value. We do, but we also know that it "can't fail" given the single-threaded nature of device enumeration. Go ahead and check it just in case, but add a comment. CID: 1009393 Sponsored by: Netflix, Inc Modified: head/sys/dev/fe/if_fe_isa.c Modified: head/sys/dev/fe/if_fe_isa.c ============================================================================== --- head/sys/dev/fe/if_fe_isa.c Tue Feb 3 18:45:43 2015 (r278164) +++ head/sys/dev/fe/if_fe_isa.c Tue Feb 3 18:59:52 2015 (r278165) @@ -133,10 +133,21 @@ static int fe_isa_attach(device_t dev) { struct fe_softc *sc = device_get_softc(dev); + int error = 0; - if (sc->port_used) - fe_alloc_port(dev, sc->port_used); - fe_alloc_irq(dev, 0); + /* + * Note: these routines aren't expected to fail since we also call + * them in the probe routine. But coverity complains, so we'll honor + * that complaint since the intention here was never to ignore them.. + */ + if (sc->port_used) { + error = fe_alloc_port(dev, sc->port_used); + if (error != 0) + return (error); + } + error = fe_alloc_irq(dev, 0); + if (error != 0) + return (error); return fe_attach(dev); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 19:14:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 977C6296; Tue, 3 Feb 2015 19:14:02 +0000 (UTC) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 789D8768; Tue, 3 Feb 2015 19:14:02 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id t13JDt1c013865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 3 Feb 2015 11:13:55 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id t13JDtEY013864; Tue, 3 Feb 2015 11:13:55 -0800 (PST) (envelope-from sgk) Date: Tue, 3 Feb 2015 11:13:55 -0800 From: Steve Kargl To: Bruce Evans Subject: Re: svn commit: r278154 - head/lib/msun/src Message-ID: <20150203191355.GA13447@troutmask.apl.washington.edu> References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> <20150203163329.GA12706@troutmask.apl.washington.edu> <20150204035337.Y2718@besplex.bde.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150204035337.Y2718@besplex.bde.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "Pedro F. Giffuni" , src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 19:14:02 -0000 On Wed, Feb 04, 2015 at 04:37:14AM +1100, Bruce Evans wrote: > On Tue, 3 Feb 2015, Steve Kargl wrote: > > > -#include > > +#include > > #include > > > > +#define FLT_LARGE FLT_MAX_EXP - FLT_MIN_EXP + FLT_MANT_DIG > > +#define FLT_SMALL FLT_MIN_EXP - FLT_MAX_EXP > > +#define DBL_LARGE DBL_MAX_EXP - DBL_MIN_EXP + DBL_MANT_DIG > > +#define DBL_SMALL DBL_MIN_EXP - DBL_MAX_EXP > > +#define LDBL_LARGE LDBL_MAX_EXP - LDBL_MIN_EXP + LDBL_MANT_DIG > > +#define LDBL_SMALL LDBL_MIN_EXP - LDBL_MAX_EXP > > + > > This is a lot of code and bugs (missing parentheses) for negative gain. My crystal ball isn't function too well lately. > To work, it depends on all of the above expressions having results that > can be represented as an int. There is no guarantee of this in general. On all architecture that FreeBSD currently supports, there is a guarantee to the extent that src/sys/${MACHINE}/include/_limits.h shows #define __INT_MAX 0x7fffffff #define __INT_MIN (-0x7fffffff - 1) > However, we can show that the above values are within certain fixed > limits just as easily as we can show that they are within the INT32 > limits, and then hard-code the fixed limits. E,g, +-16384 might work, > and +-32768 surely works when the exponent field is limited to 8 bits. > Double a few more times for safety. Hard-coding a limit related to > an assumed maximum supported width for the exponent field is easier > to get right that the above expressions. I think the above are quite > buggy, and so are my +-16384 and +-32768. The full exponent range > plus more for denormals is needed in both directions. You only have > it for the LARGE direction. This can be hard-coded for a 15-bit > exponent field as +-32768 +- extras for denormals, -+ a couple for > special exponents. This needs strictly larger than 16-bit ints for > the denormals only. Make it +-65536 to avoid having to count carefully > to avoid off-by-1 errors. Double a few times for larger exponent fields, > or just add assertions to detect increases of the maxima, or just hard- > code the limits as the int32_t extrema. Given that the widest field width in IEEE754-2008 for binary128 is 15, which gives a maximum unbiased exponent of 2**15, then using +-65536 should cover our needs. The functions scalbn[fl] can then deal with values of n that may result in exponents that are too small or too large. Untested diff below. -- Steve Index: s_scalbln.c =================================================================== --- s_scalbln.c (revision 278165) +++ s_scalbln.c (working copy) @@ -27,17 +27,17 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#define LARGE 65536 +#define SMALL -65536 + double scalbln (double x, long n) { int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; + in = n > LARGE ? LARGE : n < SMALL ? SMALL : n; return (scalbn(x, in)); } @@ -46,9 +46,7 @@ { int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; + in = n > LARGE ? LARGE : n < SMALL ? SMALL : n; return (scalbnf(x, in)); } @@ -57,8 +55,6 @@ { int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; + in = n > LARGE ? LARGE : n < SMALL ? SMALL : n; return (scalbnl(x, in)); } From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 19:39:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A37F39AD; Tue, 3 Feb 2015 19:39:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D8E423B; Tue, 3 Feb 2015 19:39:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Jdskd031712; Tue, 3 Feb 2015 19:39:54 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13JdrEI031706; Tue, 3 Feb 2015 19:39:53 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502031939.t13JdrEI031706@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 3 Feb 2015 19:39:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278166 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 19:39:54 -0000 Author: pfg Date: Tue Feb 3 19:39:53 2015 New Revision: 278166 URL: https://svnweb.freebsd.org/changeset/base/278166 Log: MFV r266993: 4469 DTrace helper tracing should be dynamic Reference: https://illumos.org/issues/4469 Obtained from: Illumos Phabric: D1551 Reviewed by: markj MFC after: 2 weeks Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c head/sys/cddl/dev/dtrace/dtrace_load.c head/sys/cddl/dev/dtrace/dtrace_unload.c Directory Properties: head/sys/cddl/contrib/opensolaris/ (props changed) Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 18:59:52 2015 (r278165) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 19:39:53 2015 (r278166) @@ -351,17 +351,22 @@ dtrace_id_t dtrace_probeid_error; /* sp /* * DTrace Helper Tracing Variables - */ -uint32_t dtrace_helptrace_next = 0; -uint32_t dtrace_helptrace_nlocals; -char *dtrace_helptrace_buffer; -int dtrace_helptrace_bufsize = 512 * 1024; - -#ifdef DEBUG -int dtrace_helptrace_enabled = 1; -#else -int dtrace_helptrace_enabled = 0; -#endif + * + * These variables should be set dynamically to enable helper tracing. The + * only variables that should be set are dtrace_helptrace_enable (which should + * be set to a non-zero value to allocate helper tracing buffers on the next + * open of /dev/dtrace) and dtrace_helptrace_disable (which should be set to a + * non-zero value to deallocate helper tracing buffers on the next close of + * /dev/dtrace). When (and only when) helper tracing is disabled, the + * buffer size may also be set via dtrace_helptrace_bufsize. + */ +int dtrace_helptrace_enable = 0; +int dtrace_helptrace_disable = 0; +int dtrace_helptrace_bufsize = 16 * 1024 * 1024; +uint32_t dtrace_helptrace_nlocals; +static dtrace_helptrace_t *dtrace_helptrace_buffer; +static uint32_t dtrace_helptrace_next = 0; +static int dtrace_helptrace_wrapped = 0; /* * DTrace Error Hashing @@ -15199,10 +15204,10 @@ dtrace_helper_trace(dtrace_helper_action dtrace_mstate_t *mstate, dtrace_vstate_t *vstate, int where) { uint32_t size, next, nnext, i; - dtrace_helptrace_t *ent; + dtrace_helptrace_t *ent, *buffer; uint16_t flags = cpu_core[curcpu].cpuc_dtrace_flags; - if (!dtrace_helptrace_enabled) + if ((buffer = dtrace_helptrace_buffer) == NULL) return; ASSERT(vstate->dtvs_nlocals <= dtrace_helptrace_nlocals); @@ -15230,10 +15235,12 @@ dtrace_helper_trace(dtrace_helper_action /* * We have our slot; fill it in. */ - if (nnext == size) + if (nnext == size) { + dtrace_helptrace_wrapped++; next = 0; + } - ent = (dtrace_helptrace_t *)&dtrace_helptrace_buffer[next]; + ent = (dtrace_helptrace_t *)((uintptr_t)buffer + next); ent->dtht_helper = helper; ent->dtht_where = where; ent->dtht_nlocals = vstate->dtvs_nlocals; @@ -15267,7 +15274,7 @@ dtrace_helper(int which, dtrace_mstate_t dtrace_helper_action_t *helper; dtrace_vstate_t *vstate; dtrace_difo_t *pred; - int i, trace = dtrace_helptrace_enabled; + int i, trace = dtrace_helptrace_buffer != NULL; ASSERT(which >= 0 && which < DTRACE_NHELPER_ACTIONS); @@ -16670,17 +16677,6 @@ dtrace_attach(dev_info_t *devi, ddi_atta mutex_exit(&cpu_lock); /* - * If DTrace helper tracing is enabled, we need to allocate the - * trace buffer and initialize the values. - */ - if (dtrace_helptrace_enabled) { - ASSERT(dtrace_helptrace_buffer == NULL); - dtrace_helptrace_buffer = - kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP); - dtrace_helptrace_next = 0; - } - - /* * If there are already providers, we must ask them to provide their * probes, and then match any anonymous enabling against them. Note * that there should be no other retained enablings at this time: @@ -16793,6 +16789,18 @@ dtrace_open(struct cdev *dev, int oflags return (EBUSY); } + if (dtrace_helptrace_enable && dtrace_helptrace_buffer == NULL) { + /* + * If DTrace helper tracing is enabled, we need to allocate the + * trace buffer and initialize the values. + */ + dtrace_helptrace_buffer = + kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP); + dtrace_helptrace_next = 0; + dtrace_helptrace_wrapped = 0; + dtrace_helptrace_enable = 0; + } + state = dtrace_state_create(devp, cred_p); #else state = dtrace_state_create(dev); @@ -16829,7 +16837,10 @@ dtrace_dtr(void *data) #ifdef illumos minor_t minor = getminor(dev); dtrace_state_t *state; +#endif + dtrace_helptrace_t *buf = NULL; +#ifdef illumos if (minor == DTRACEMNRN_HELPER) return (0); @@ -16854,6 +16865,18 @@ dtrace_dtr(void *data) dtrace_state_destroy(state->dts_anon); } + if (dtrace_helptrace_disable) { + /* + * If we have been told to disable helper tracing, set the + * buffer to NULL before calling into dtrace_state_destroy(); + * we take advantage of its dtrace_sync() to know that no + * CPU is in probe context with enabled helper tracing + * after it returns. + */ + buf = dtrace_helptrace_buffer; + dtrace_helptrace_buffer = NULL; + } + #ifdef illumos dtrace_state_destroy(state); #else @@ -16875,6 +16898,11 @@ dtrace_dtr(void *data) --dtrace_opens; #endif + if (buf != NULL) { + kmem_free(buf, dtrace_helptrace_bufsize); + dtrace_helptrace_disable = 0; + } + mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); @@ -17772,11 +17800,6 @@ dtrace_detach(dev_info_t *dip, ddi_detac mutex_exit(&cpu_lock); - if (dtrace_helptrace_enabled) { - kmem_free(dtrace_helptrace_buffer, dtrace_helptrace_bufsize); - dtrace_helptrace_buffer = NULL; - } - kmem_free(dtrace_probes, dtrace_nprobes * sizeof (dtrace_probe_t *)); dtrace_probes = NULL; dtrace_nprobes = 0; Modified: head/sys/cddl/dev/dtrace/dtrace_load.c ============================================================================== --- head/sys/cddl/dev/dtrace/dtrace_load.c Tue Feb 3 18:59:52 2015 (r278165) +++ head/sys/cddl/dev/dtrace/dtrace_load.c Tue Feb 3 19:39:53 2015 (r278166) @@ -137,17 +137,6 @@ dtrace_load(void *dummy) mutex_exit(&cpu_lock); - /* - * If DTrace helper tracing is enabled, we need to allocate the - * trace buffer and initialize the values. - */ - if (dtrace_helptrace_enabled) { - ASSERT(dtrace_helptrace_buffer == NULL); - dtrace_helptrace_buffer = - kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP); - dtrace_helptrace_next = 0; - } - mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); Modified: head/sys/cddl/dev/dtrace/dtrace_unload.c ============================================================================== --- head/sys/cddl/dev/dtrace/dtrace_unload.c Tue Feb 3 18:59:52 2015 (r278165) +++ head/sys/cddl/dev/dtrace/dtrace_unload.c Tue Feb 3 19:39:53 2015 (r278166) @@ -69,11 +69,6 @@ dtrace_unload() mutex_exit(&cpu_lock); - if (dtrace_helptrace_enabled) { - kmem_free(dtrace_helptrace_buffer, 0); - dtrace_helptrace_buffer = NULL; - } - if (dtrace_probes != NULL) { kmem_free(dtrace_probes, 0); dtrace_probes = NULL; From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 20:06:31 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C855CEB9; Tue, 3 Feb 2015 20:06:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B344E771; Tue, 3 Feb 2015 20:06:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13K6VVN045687; Tue, 3 Feb 2015 20:06:31 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13K6Vdc045686; Tue, 3 Feb 2015 20:06:31 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502032006.t13K6Vdc045686@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 3 Feb 2015 20:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278167 - head/sys/cddl/contrib/opensolaris/uts/common/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 20:06:31 -0000 Author: pfg Date: Tue Feb 3 20:06:30 2015 New Revision: 278167 URL: https://svnweb.freebsd.org/changeset/base/278167 Log: MFV r266995: 4767 dtrace_probe() always has the timestamp Reference: https://illumos.org/issues/4767 Obtained from: Illumos MFC after: 2 weeks Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Directory Properties: head/sys/cddl/contrib/opensolaris/ (props changed) Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 19:39:53 2015 (r278166) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Feb 3 20:06:30 2015 (r278167) @@ -24,7 +24,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ /* @@ -7083,7 +7083,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t a return; } - now = dtrace_gethrtime(); + now = mstate.dtms_timestamp = dtrace_gethrtime(); + mstate.dtms_present |= DTRACE_MSTATE_TIMESTAMP; vtime = dtrace_vtime_references != 0; if (vtime && curthread->t_dtrace_start) From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 00:10:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DE6DF1A; Wed, 4 Feb 2015 00:10:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 39A50657; Wed, 4 Feb 2015 00:10:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t140AwbY064587; Wed, 4 Feb 2015 00:10:58 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t140Awaq064586; Wed, 4 Feb 2015 00:10:58 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201502040010.t140Awaq064586@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 4 Feb 2015 00:10:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278172 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 00:10:58 -0000 Author: bapt Date: Wed Feb 4 00:10:57 2015 New Revision: 278172 URL: https://svnweb.freebsd.org/changeset/base/278172 Log: Plug resources leak CID: 1125813 CID: 1125807 CID: 1125808 MFC after: 1 week Modified: head/usr.sbin/pkg/pkg.c Modified: head/usr.sbin/pkg/pkg.c ============================================================================== --- head/usr.sbin/pkg/pkg.c Tue Feb 3 22:49:12 2015 (r278171) +++ head/usr.sbin/pkg/pkg.c Wed Feb 4 00:10:57 2015 (r278172) @@ -371,8 +371,11 @@ load_fingerprints(const char *path, int return (NULL); STAILQ_INIT(fingerprints); - if ((d = opendir(path)) == NULL) + if ((d = opendir(path)) == NULL) { + free(fingerprints); + return (NULL); + } while ((ent = readdir(d))) { if (strcmp(ent->d_name, ".") == 0 || @@ -799,8 +802,11 @@ cleanup: close(fd_sig); unlink(tmpsig); } - close(fd_pkg); - unlink(tmppkg); + + if (fd_pkg != -1) { + close(fd_pkg); + unlink(tmppkg); + } return (ret); } @@ -849,7 +855,7 @@ bootstrap_pkg_local(const char *pkgpath, if (config_string(SIGNATURE_TYPE, &signature_type) != 0) { warnx("Error looking up SIGNATURE_TYPE"); - return (-1); + goto cleanup; } if (signature_type != NULL && strcasecmp(signature_type, "FINGERPRINTS") == 0) { From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 00:18:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99ECC348; Wed, 4 Feb 2015 00:18:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85CEF6B3; Wed, 4 Feb 2015 00:18:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t140I7dI066015; Wed, 4 Feb 2015 00:18:07 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t140I743066014; Wed, 4 Feb 2015 00:18:07 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201502040018.t140I743066014@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 4 Feb 2015 00:18:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278173 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 00:18:07 -0000 Author: bapt Date: Wed Feb 4 00:18:06 2015 New Revision: 278173 URL: https://svnweb.freebsd.org/changeset/base/278173 Log: Test the return of fetchParseURL(3) CID: 1125811 MFC after: 1 week Modified: head/usr.sbin/pkg/pkg.c Modified: head/usr.sbin/pkg/pkg.c ============================================================================== --- head/usr.sbin/pkg/pkg.c Wed Feb 4 00:10:57 2015 (r278172) +++ head/usr.sbin/pkg/pkg.c Wed Feb 4 00:18:06 2015 (r278173) @@ -202,7 +202,11 @@ fetch_to_fd(const char *url, char *path) retry = max_retry; - u = fetchParseURL(url); + if ((u = fetchParseURL(url)) == NULL) { + warn("fetchParseURL('%s')", url); + return (-1); + } + while (remote == NULL) { if (retry == max_retry) { if (strcmp(u->scheme, "file") != 0 && From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 00:22:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE82C4DE for ; Wed, 4 Feb 2015 00:22:50 +0000 (UTC) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9FF117D3 for ; Wed, 4 Feb 2015 00:22:50 +0000 (UTC) Received: by mail-pa0-f42.google.com with SMTP id bj1so102888762pad.1 for ; Tue, 03 Feb 2015 16:22:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=+/6DjI+muHb97RIYlJMBlauDCHLFX3/jnmbFlQ8zvfg=; b=NaHPvvSGJ6jlDqL0+vbnq7zNYWYSIjxyhuu8UXZrBm7x+sRVyAaLtrmCfUjKFRlcqu VLUIbjGE4T5Wj/7uza0yTd68sD/tEPyoU6j+2iJEBAod556V9CfDBtjpXk2SwoISBgsi D6afHWQocJl0myRcNdPZP/XKgqA4k4mHTcMX6ZD4tyT1aiYyvkANUy/hcbERtvVuOOtm qcXNnlUt9xlvStNwgOvarchMoU+xEqfFPiKvz114D8QmIyrV+KHjK630kGPs4uVm6nGQ Fg61mF7BdBPDtmBd1F45O1LtdLHcxOxrKS0wWY3b/DPd2pgs++mR2/WhnROD9mYS8D85 zhkw== X-Gm-Message-State: ALoCoQlYAay/W8+1mqypQyNc6q8nNgYNyxb4du8CWsCqp5nuAn1BTs1ZMx2K1VBOiICOqlvlgP4x X-Received: by 10.68.125.197 with SMTP id ms5mr42538461pbb.12.1423009364699; Tue, 03 Feb 2015 16:22:44 -0800 (PST) Received: from [10.64.26.90] ([69.53.236.236]) by mx.google.com with ESMTPSA id n3sm33521pdf.95.2015.02.03.16.22.43 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Feb 2015 16:22:44 -0800 (PST) Sender: Warner Losh Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Subject: Re: svn commit: r278108 - head/sys/dev/gpio From: Warner Losh In-Reply-To: <54CFDBAF.2010003@freebsd.org> Date: Tue, 3 Feb 2015 17:22:41 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <40055CE4-282E-4D9C-AD06-06331EAE5F5F@bsdimp.com> References: <201502021922.t12JMZDE040713@svn.freebsd.org> <54CFCEF5.70200@freebsd.org> <1422907737.15718.291.camel@freebsd.org> <54CFDBAF.2010003@freebsd.org> To: Nathan Whitehorn X-Mailer: Apple Mail (2.2070.6) Cc: Luiz Otavio O Souza , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Ian Lepore X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 00:22:50 -0000 > On Feb 2, 2015, at 1:18 PM, Nathan Whitehorn = wrote: >=20 > On 02/02/15 12:08, Ian Lepore wrote: >> On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote: >>> Please don't condition things like this on FDT. They are useful on = Open >>> Firmware systems too. >>> -Nathan >>>=20 >>=20 >> Is there something defined for OFW? The gpio code needs to work on >> hint-based (not-FDT and not-OFW) mips systems too. >=20 > There isn't right now, so far as I'm aware, but there should be. > -Nathan It=92s a one-liner in sys/conf/options to have DEV_OFWBUS defined whenever ofwbus is in the kernel. Warner >> -- Ian >>=20 >>=20 >>> On 02/02/15 11:22, Luiz Otavio O Souza wrote: >>>> Author: loos >>>> Date: Mon Feb 2 19:22:34 2015 >>>> New Revision: 278108 >>>> URL: https://svnweb.freebsd.org/changeset/base/278108 >>>>=20 >>>> Log: >>>> Register the GPIO controller device reference on xref table for = FDT systems. >>>>=20 >>>> Modified: >>>> head/sys/dev/gpio/gpiobus.c >>>> head/sys/dev/gpio/gpiobusvar.h >>>> head/sys/dev/gpio/ofw_gpiobus.c >>>>=20 >>>> Modified: head/sys/dev/gpio/gpiobus.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/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 = (r278107) >>>> +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 = (r278108) >>>> @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) >>>> device_delete_child(dev, busdev); >>>> return (NULL); >>>> } >>>> +#ifdef FDT >>>> + ofw_gpiobus_register_provider(dev); >>>> +#endif >>>> bus_generic_attach(dev); >>>>=20 >>>> return (busdev); >>>> @@ -152,6 +155,10 @@ int >>>> gpiobus_detach_bus(device_t dev) >>>> { >>>>=20 >>>> +#ifdef FDT >>>> + ofw_gpiobus_unregister_provider(dev); >>>> +#endif >>>> + >>>> return (bus_generic_detach(dev)); >>>> } >>>>=20 >>>>=20 >>>> Modified: head/sys/dev/gpio/gpiobusvar.h >>>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 = (r278107) >>>> +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 = (r278108) >>>> @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d >>>> } >>>>=20 >>>> device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); >>>> +void ofw_gpiobus_register_provider(device_t); >>>> +void ofw_gpiobus_unregister_provider(device_t); >>>> #endif >>>> int gpio_check_flags(uint32_t, uint32_t); >>>> device_t gpiobus_attach_bus(device_t); >>>>=20 >>>> Modified: head/sys/dev/gpio/ofw_gpiobus.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/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 = (r278107) >>>> +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 = (r278108) >>>> @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s >>>> return (0); >>>> } >>>>=20 >>>> +void >>>> +ofw_gpiobus_register_provider(device_t provider) >>>> +{ >>>> + phandle_t node; >>>> + >>>> + node =3D ofw_bus_get_node(provider); >>>> + OF_device_register_xref(OF_xref_from_node(node), provider); >>>> +} >>>> + >>>> +void >>>> +ofw_gpiobus_unregister_provider(device_t provider) >>>> +{ >>>> + phandle_t node; >>>> + >>>> + node =3D ofw_bus_get_node(provider); >>>> + OF_device_register_xref(OF_xref_from_node(node), NULL); >>>> +} >>>> + >>>> static struct ofw_gpiobus_devinfo * >>>> ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) >>>> { >>>>=20 >>>=20 >>>=20 >>=20 >>=20 >=20 >=20 From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 06:53:47 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 752694A8; Wed, 4 Feb 2015 06:53:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FD4225C; Wed, 4 Feb 2015 06:53:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t146rl6c054580; Wed, 4 Feb 2015 06:53:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t146rjKY054573; Wed, 4 Feb 2015 06:53:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502040653.t146rjKY054573@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 06:53:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278182 - in head: . lib lib/libpam/modules share/mk tools/build/options usr.sbin/ppp 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 06:53:47 -0000 Author: ngie Date: Wed Feb 4 06:53:45 2015 New Revision: 278182 URL: https://svnweb.freebsd.org/changeset/base/278182 Log: Conditionalize building radius support into libpam, ppp, etc via MK_RADIUS_SUPPORT MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Added: head/tools/build/options/WITHOUT_RADIUS_SUPPORT (contents, props changed) Modified: head/Makefile.inc1 head/lib/Makefile head/lib/libpam/modules/modules.inc head/share/mk/src.opts.mk head/usr.sbin/ppp/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Feb 4 04:55:04 2015 (r278181) +++ head/Makefile.inc1 Wed Feb 4 06:53:45 2015 (r278182) @@ -1634,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Wed Feb 4 04:55:04 2015 (r278181) +++ head/lib/Makefile Wed Feb 4 06:53:45 2015 (r278182) @@ -82,7 +82,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libpmc} \ ${_libproc} \ libprocstat \ - libradius \ + ${_libradius} \ librpcsvc \ librt \ ${_librtld_db} \ @@ -142,7 +142,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssap SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd -SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} +SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd @@ -286,6 +286,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm Modified: head/lib/libpam/modules/modules.inc ============================================================================== --- head/lib/libpam/modules/modules.inc Wed Feb 4 04:55:04 2015 (r278181) +++ head/lib/libpam/modules/modules.inc Wed Feb 4 06:53:45 2015 (r278182) @@ -21,7 +21,9 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit +.if ${MK_RADIUS_SUPPORT} != "no" MODULES += pam_radius +.endif MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Feb 4 04:55:04 2015 (r278181) +++ head/share/mk/src.opts.mk Wed Feb 4 06:53:45 2015 (r278182) @@ -135,6 +135,7 @@ __DEFAULT_YES_OPTIONS = \ PORTSNAP \ PPP \ QUOTAS \ + RADIUS_SUPPORT \ RCMDS \ RCS \ RESCUE \ Added: head/tools/build/options/WITHOUT_RADIUS_SUPPORT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_RADIUS_SUPPORT Wed Feb 4 06:53:45 2015 (r278182) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . Modified: head/usr.sbin/ppp/Makefile ============================================================================== --- head/usr.sbin/ppp/Makefile Wed Feb 4 04:55:04 2015 (r278181) +++ head/usr.sbin/ppp/Makefile Wed Feb 4 06:53:45 2015 (r278182) @@ -31,6 +31,9 @@ PPP_NO_NETGRAPH= .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif +.if ${MK_RADIUS_SUPPORT} == "no" +PPP_NO_RADIUS= +.endif .if defined(PPP_NO_SUID) BINMODE=554 From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 08:26:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 914A432F; Wed, 4 Feb 2015 08:26:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AC2DD17; Wed, 4 Feb 2015 08:26:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t148QkSM096730; Wed, 4 Feb 2015 08:26:46 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t148Qi8W096721; Wed, 4 Feb 2015 08:26:44 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201502040826.t148Qi8W096721@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Wed, 4 Feb 2015 08:26:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278183 - in head/sys: amd64/include conf dev/xen/timer i386/include i386/xen x86/include x86/x86 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 08:26:46 -0000 Author: bryanv Date: Wed Feb 4 08:26:43 2015 New Revision: 278183 URL: https://svnweb.freebsd.org/changeset/base/278183 Log: Generalized parts of the XEN timer code into a generic pvclock KVM clock shares the same data structures between the guest and the host as Xen so it makes sense to just have a single copy of this code. Differential Revision: https://reviews.freebsd.org/D1429 Reviewed by: royger (eariler version) MFC after: 1 month Added: head/sys/amd64/include/pvclock.h (contents, props changed) head/sys/i386/include/pvclock.h (contents, props changed) head/sys/x86/include/pvclock.h (contents, props changed) head/sys/x86/x86/pvclock.c (contents, props changed) Modified: head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/dev/xen/timer/timer.c head/sys/i386/xen/clock.c Added: head/sys/amd64/include/pvclock.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/amd64/include/pvclock.h Wed Feb 4 08:26:43 2015 (r278183) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Wed Feb 4 06:53:45 2015 (r278182) +++ head/sys/conf/files.amd64 Wed Feb 4 08:26:43 2015 (r278183) @@ -569,6 +569,7 @@ x86/x86/mptable.c optional mptable x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci x86/x86/nexus.c standard +x86/x86/pvclock.c standard x86/x86/tsc.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Wed Feb 4 06:53:45 2015 (r278182) +++ head/sys/conf/files.i386 Wed Feb 4 08:26:43 2015 (r278183) @@ -588,6 +588,7 @@ x86/x86/mptable_pci.c optional apic nat x86/x86/msi.c optional apic pci x86/x86/nexus.c standard x86/x86/tsc.c standard +x86/x86/pvclock.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm Modified: head/sys/dev/xen/timer/timer.c ============================================================================== --- head/sys/dev/xen/timer/timer.c Wed Feb 4 06:53:45 2015 (r278182) +++ head/sys/dev/xen/timer/timer.c Wed Feb 4 08:26:43 2015 (r278183) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -95,9 +96,6 @@ struct xentimer_softc { struct eventtimer et; }; -/* Last time; this guarantees a monotonically increasing clock. */ -volatile uint64_t xen_timer_last_time = 0; - static void xentimer_identify(driver_t *driver, device_t parent) { @@ -148,128 +146,20 @@ xentimer_probe(device_t dev) return (BUS_PROBE_NOWILDCARD); } -/* - * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, - * yielding a 64-bit result. - */ -static inline uint64_t -scale_delta(uint64_t delta, uint32_t mul_frac, int shift) -{ - uint64_t product; - - if (shift < 0) - delta >>= -shift; - else - delta <<= shift; - -#if defined(__i386__) - { - uint32_t tmp1, tmp2; - - /** - * For i386, the formula looks like: - * - * lower = (mul_frac * (delta & UINT_MAX)) >> 32 - * upper = mul_frac * (delta >> 32) - * product = lower + upper - */ - __asm__ ( - "mul %5 ; " - "mov %4,%%eax ; " - "mov %%edx,%4 ; " - "mul %5 ; " - "xor %5,%5 ; " - "add %4,%%eax ; " - "adc %5,%%edx ; " - : "=A" (product), "=r" (tmp1), "=r" (tmp2) - : "a" ((uint32_t)delta), "1" ((uint32_t)(delta >> 32)), - "2" (mul_frac) ); - } -#elif defined(__amd64__) - { - unsigned long tmp; - - __asm__ ( - "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]" - : [lo]"=a" (product), [hi]"=d" (tmp) - : "0" (delta), [mul_frac]"rm"((uint64_t)mul_frac)); - } -#else -#error "xentimer: unsupported architecture" -#endif - - return (product); -} - -static uint64_t -get_nsec_offset(struct vcpu_time_info *tinfo) -{ - - return (scale_delta(rdtsc() - tinfo->tsc_timestamp, - tinfo->tsc_to_system_mul, tinfo->tsc_shift)); -} - -/* - * Read the current hypervisor system uptime value from Xen. - * See for a description of how this works. - */ -static uint32_t -xen_fetch_vcpu_tinfo(struct vcpu_time_info *dst, struct vcpu_time_info *src) -{ - - do { - dst->version = src->version; - rmb(); - dst->tsc_timestamp = src->tsc_timestamp; - dst->system_time = src->system_time; - dst->tsc_to_system_mul = src->tsc_to_system_mul; - dst->tsc_shift = src->tsc_shift; - rmb(); - } while ((src->version & 1) | (dst->version ^ src->version)); - - return (dst->version); -} - /** * \brief Get the current time, in nanoseconds, since the hypervisor booted. * * \param vcpu vcpu_info structure to fetch the time from. * - * \note This function returns the current CPU's idea of this value, unless - * it happens to be less than another CPU's previously determined value. */ static uint64_t xen_fetch_vcpu_time(struct vcpu_info *vcpu) { - struct vcpu_time_info dst; - struct vcpu_time_info *src; - uint32_t pre_version; - uint64_t now; - volatile uint64_t last; + struct pvclock_vcpu_time_info *time; - src = &vcpu->time; - - do { - pre_version = xen_fetch_vcpu_tinfo(&dst, src); - barrier(); - now = dst.system_time + get_nsec_offset(&dst); - barrier(); - } while (pre_version != src->version); + time = (struct pvclock_vcpu_time_info *) &vcpu->time; - /* - * Enforce a monotonically increasing clock time across all - * VCPUs. If our time is too old, use the last time and return. - * Otherwise, try to update the last time. - */ - do { - last = xen_timer_last_time; - if (last > now) { - now = last; - break; - } - } while (!atomic_cmpset_64(&xen_timer_last_time, last, now)); - - return (now); + return (pvclock_get_timecount(time)); } static uint32_t @@ -302,15 +192,11 @@ static void xen_fetch_wallclock(struct timespec *ts) { shared_info_t *src = HYPERVISOR_shared_info; - uint32_t version = 0; + struct pvclock_wall_clock *wc; - do { - version = src->wc_version; - rmb(); - ts->tv_sec = src->wc_sec; - ts->tv_nsec = src->wc_nsec; - rmb(); - } while ((src->wc_version & 1) | (version ^ src->wc_version)); + wc = (struct pvclock_wall_clock *) &src->wc_version; + + pvclock_get_wallclock(wc, ts); } static void @@ -574,7 +460,7 @@ xentimer_resume(device_t dev) } /* Reset the last uptime value */ - xen_timer_last_time = 0; + pvclock_resume(); /* Reset the RTC clock */ inittodr(time_second); Added: head/sys/i386/include/pvclock.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/i386/include/pvclock.h Wed Feb 4 08:26:43 2015 (r278183) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: head/sys/i386/xen/clock.c ============================================================================== --- head/sys/i386/xen/clock.c Wed Feb 4 06:53:45 2015 (r278182) +++ head/sys/i386/xen/clock.c Wed Feb 4 08:26:43 2015 (r278183) @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #if defined(SMP) #include #endif @@ -127,8 +128,6 @@ u_int timer_freq = TIMER_FREQ; static u_long cyc2ns_scale; static uint64_t processed_system_time; /* stime (ns) at last processing. */ -extern volatile uint64_t xen_timer_last_time; - #define do_div(n,base) ({ \ unsigned long __upper, __low, __high, __mod, __base; \ __base = (base); \ @@ -172,7 +171,7 @@ static inline unsigned long long cycles_ static uint32_t getit(void) { - return (xen_timer_last_time); + return (pvclock_get_last_cycles()); } Added: head/sys/x86/include/pvclock.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/x86/include/pvclock.h Wed Feb 4 08:26:43 2015 (r278183) @@ -0,0 +1,58 @@ +/*- + * Copyright (c) 2014, Bryan Venteicher + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef X86_PVCLOCK +#define X86_PVCLOCK + +struct pvclock_vcpu_time_info { + uint32_t version; + uint32_t pad0; + uint64_t tsc_timestamp; + uint64_t system_time; + uint32_t tsc_to_system_mul; + int8_t tsc_shift; + uint8_t flags; + uint8_t pad[2]; +}; + +#define PVCLOCK_FLAG_TSC_STABLE 0x01 +#define PVCLOCK_FLAG_GUEST_PASUED 0x02 + +struct pvclock_wall_clock { + uint32_t version; + uint32_t sec; + uint32_t nsec; +}; + +void pvclock_resume(void); +uint64_t pvclock_get_last_cycles(void); +uint64_t pvclock_get_timecount(struct pvclock_vcpu_time_info *ti); +void pvclock_get_wallclock(struct pvclock_wall_clock *wc, + struct timespec *ts); + +#endif Added: head/sys/x86/x86/pvclock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/x86/x86/pvclock.c Wed Feb 4 08:26:43 2015 (r278183) @@ -0,0 +1,188 @@ +/*- + * Copyright (c) 2009 Adrian Chadd + * Copyright (c) 2012 Spectra Logic Corporation + * Copyright (c) 2014 Bryan Venteicher + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +#include +#include +#include +#include + +/* + * Last time; this guarantees a monotonically increasing clock for when + * a stable TSC is not provided. + */ +static volatile uint64_t pvclock_last_cycles; + +void +pvclock_resume(void) +{ + + atomic_store_rel_64(&pvclock_last_cycles, 0); +} + +uint64_t +pvclock_get_last_cycles(void) +{ + + return (atomic_load_acq_64(&pvclock_last_cycles)); +} + +/* + * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, + * yielding a 64-bit result. + */ +static inline uint64_t +pvclock_scale_delta(uint64_t delta, uint32_t mul_frac, int shift) +{ + uint64_t product; + + if (shift < 0) + delta >>= -shift; + else + delta <<= shift; + +#if defined(__i386__) + { + uint32_t tmp1, tmp2; + + /** + * For i386, the formula looks like: + * + * lower = (mul_frac * (delta & UINT_MAX)) >> 32 + * upper = mul_frac * (delta >> 32) + * product = lower + upper + */ + __asm__ ( + "mul %5 ; " + "mov %4,%%eax ; " + "mov %%edx,%4 ; " + "mul %5 ; " + "xor %5,%5 ; " + "add %4,%%eax ; " + "adc %5,%%edx ; " + : "=A" (product), "=r" (tmp1), "=r" (tmp2) + : "a" ((uint32_t)delta), "1" ((uint32_t)(delta >> 32)), + "2" (mul_frac) ); + } +#elif defined(__amd64__) + { + unsigned long tmp; + + __asm__ ( + "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]" + : [lo]"=a" (product), [hi]"=d" (tmp) + : "0" (delta), [mul_frac]"rm"((uint64_t)mul_frac)); + } +#else +#error "pvclock: unsupported x86 architecture?" +#endif + + return (product); +} + +static uint64_t +pvclock_get_nsec_offset(struct pvclock_vcpu_time_info *ti) +{ + uint64_t delta; + + delta = rdtsc() - ti->tsc_timestamp; + + return (pvclock_scale_delta(delta, ti->tsc_to_system_mul, + ti->tsc_shift)); +} + +static void +pvclock_read_time_info(struct pvclock_vcpu_time_info *ti, + uint64_t *cycles, uint8_t *flags) +{ + uint32_t version; + + do { + version = ti->version; + rmb(); + *cycles = ti->system_time + pvclock_get_nsec_offset(ti); + *flags = ti->flags; + rmb(); + } while ((ti->version & 1) != 0 || ti->version != version); +} + +static void +pvclock_read_wall_clock(struct pvclock_wall_clock *wc, uint32_t *sec, + uint32_t *nsec) +{ + uint32_t version; + + do { + version = wc->version; + rmb(); + *sec = wc->sec; + *nsec = wc->nsec; + rmb(); + } while ((wc->version & 1) != 0 || wc->version != version); +} + +uint64_t +pvclock_get_timecount(struct pvclock_vcpu_time_info *ti) +{ + uint64_t now, last; + uint8_t flags; + + pvclock_read_time_info(ti, &now, &flags); + + if (flags & PVCLOCK_FLAG_TSC_STABLE) + return (now); + + /* + * Enforce a monotonically increasing clock time across all VCPUs. + * If our time is too old, use the last time and return. Otherwise, + * try to update the last time. + */ + do { + last = atomic_load_acq_64(&pvclock_last_cycles); + if (last > now) + return (last); + } while (!atomic_cmpset_64(&pvclock_last_cycles, last, now)); + + return (now); +} + +void +pvclock_get_wallclock(struct pvclock_wall_clock *wc, struct timespec *ts) +{ + uint32_t sec, nsec; + + pvclock_read_wall_clock(wc, &sec, &nsec); + ts->tv_sec = sec; + ts->tv_nsec = nsec; +} From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 08:33:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68A504BE; Wed, 4 Feb 2015 08:33:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53DC7DD9; Wed, 4 Feb 2015 08:33:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t148X5H2001151; Wed, 4 Feb 2015 08:33:05 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t148X4cJ001146; Wed, 4 Feb 2015 08:33:04 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201502040833.t148X4cJ001146@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Wed, 4 Feb 2015 08:33:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278184 - in head/sys/x86: include x86 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 08:33:05 -0000 Author: bryanv Date: Wed Feb 4 08:33:04 2015 New Revision: 278184 URL: https://svnweb.freebsd.org/changeset/base/278184 Log: Add interface to derive a TSC frequency from the pvclock This can later use this to determine the TSC frequency like is done with VMware, instead of using a DELAY loop that is not always accurate in an VM. MFC after: 1 month Modified: head/sys/x86/include/pvclock.h head/sys/x86/x86/pvclock.c Modified: head/sys/x86/include/pvclock.h ============================================================================== --- head/sys/x86/include/pvclock.h Wed Feb 4 08:26:43 2015 (r278183) +++ head/sys/x86/include/pvclock.h Wed Feb 4 08:33:04 2015 (r278184) @@ -51,6 +51,7 @@ struct pvclock_wall_clock { void pvclock_resume(void); uint64_t pvclock_get_last_cycles(void); +uint64_t pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti); uint64_t pvclock_get_timecount(struct pvclock_vcpu_time_info *ti); void pvclock_get_wallclock(struct pvclock_wall_clock *wc, struct timespec *ts); Modified: head/sys/x86/x86/pvclock.c ============================================================================== --- head/sys/x86/x86/pvclock.c Wed Feb 4 08:26:43 2015 (r278183) +++ head/sys/x86/x86/pvclock.c Wed Feb 4 08:33:04 2015 (r278184) @@ -58,6 +58,21 @@ pvclock_get_last_cycles(void) return (atomic_load_acq_64(&pvclock_last_cycles)); } +uint64_t +pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti) +{ + uint64_t freq; + + freq = (1000000000ULL << 32) / ti->tsc_to_system_mul; + + if (ti->tsc_shift < 0) + freq <<= -ti->tsc_shift; + else + freq >>= ti->tsc_shift; + + return (freq); +} + /* * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, * yielding a 64-bit result. From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 10:19:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1DAC6D2; Wed, 4 Feb 2015 10:19:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F341CB5C; Wed, 4 Feb 2015 10:19:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14AJarH048343; Wed, 4 Feb 2015 10:19:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14AJX1n048324; Wed, 4 Feb 2015 10:19:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041019.t14AJX1n048324@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 10:19:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278192 - in head: etc libexec share/mk tools/build/options usr.bin usr.sbin 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 10:19:37 -0000 Author: ngie Date: Wed Feb 4 10:19:32 2015 New Revision: 278192 URL: https://svnweb.freebsd.org/changeset/base/278192 Log: Add the following options to enable/disable several features in the base system WITHOUT_BOOTPARAMD - bootparamd WITHOUT_BOOTPD - bootpd WITHOUT_FINGER - finger, fingerd WITHOUT_FTP - ftp, ftpd WITHOUT_INETD - inetd WITHOUT_RBOOTD - rbootd WITHOUT_TCP_WRAPPERS - tcpd, et al WITHOUT_TFTP - tftp, tftp-server WITHOUT_TIMED - timed MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Added: head/tools/build/options/WITHOUT_BOOTPARAMD (contents, props changed) head/tools/build/options/WITHOUT_BOOTPD (contents, props changed) head/tools/build/options/WITHOUT_FINGER (contents, props changed) head/tools/build/options/WITHOUT_FTP (contents, props changed) head/tools/build/options/WITHOUT_INETD (contents, props changed) head/tools/build/options/WITHOUT_RBOOTD (contents, props changed) head/tools/build/options/WITHOUT_TCP_WRAPPERS (contents, props changed) head/tools/build/options/WITHOUT_TFTP (contents, props changed) head/tools/build/options/WITHOUT_TIMED (contents, props changed) Modified: head/etc/Makefile head/libexec/Makefile head/share/mk/src.opts.mk head/usr.bin/Makefile head/usr.sbin/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Wed Feb 4 09:33:42 2015 (r278191) +++ head/etc/Makefile Wed Feb 4 10:19:32 2015 (r278192) @@ -21,13 +21,11 @@ BIN1= crontab \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -101,6 +99,14 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Wed Feb 4 09:33:42 2015 (r278191) +++ head/libexec/Makefile Wed Feb 4 10:19:32 2015 (r278192) @@ -5,18 +5,14 @@ SUBDIR= ${_atf} \ ${_atrun} \ - bootpd \ ${_casper} \ ${_comsat} \ ${_dma} \ ${_dma-mbox-create} \ - fingerd \ - ftpd \ getty \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ - rbootd \ revnetgroup \ ${_rlogind} \ rpc.rquotad \ @@ -28,10 +24,8 @@ SUBDIR= ${_atf} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - tcpd \ ${_telnetd} \ ${_tests} \ - tftpd \ ${_tftp-proxy} \ ulog-helper \ ${_ypxfr} @@ -40,10 +34,22 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif +.if ${MK_BOOTPD} != "no" +SUBDIR+= bootpd +.endif + .if ${MK_CASPER} != "no" _casper= casper .endif +.if ${MK_FINGER} != "no" +SUBDIR+= fingerd +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftpd +.endif + .if ${MK_MAIL} != "no" _comsat= comsat .endif @@ -70,6 +76,10 @@ _tftp-proxy= tftp-proxy _rtld-elf= rtld-elf .endif +.if ${MK_RBOOTD} != "no" +SUBDIR+= rbootd +.endif + .if ${MK_RCMDS} != "no" _rlogind= rlogind _rshd= rshd @@ -84,10 +94,18 @@ _smrsh= smrsh SUBDIR+= talkd .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpd +.endif + .if ${MK_TELNET} != "no" _telnetd= telnetd .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftpd +.endif + .if ${MK_TESTS} != "no" _atf= atf _tests= tests Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Feb 4 09:33:42 2015 (r278191) +++ head/share/mk/src.opts.mk Wed Feb 4 10:19:32 2015 (r278192) @@ -58,6 +58,8 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ BOOT \ + BOOTPARAMD \ + BOOTPD \ BSD_CPIO \ BSDINSTALL \ BSNMP \ @@ -81,11 +83,13 @@ __DEFAULT_YES_OPTIONS = \ ELFTOOLCHAIN_TOOLS \ EXAMPLES \ FDT \ + FINGER \ FLOPPY \ FMTREE \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ + FTP \ GAMES \ GCOV \ GDB \ @@ -100,6 +104,7 @@ __DEFAULT_YES_OPTIONS = \ ICONV \ INET \ INET6 \ + INETD \ IPFILTER \ IPFW \ ISCSI \ @@ -137,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \ QUOTAS \ RADIUS_SUPPORT \ RCMDS \ + RBOOTD \ RCS \ RESCUE \ ROUTED \ @@ -151,10 +157,13 @@ __DEFAULT_YES_OPTIONS = \ SYSCONS \ SYSINSTALL \ TALK \ + TCP_WRAPPERS \ TCSH \ TELNET \ TESTS \ TEXTPROC \ + TFTP \ + TIMED \ UNBOUND \ USB \ UTMPX \ Added: head/tools/build/options/WITHOUT_BOOTPARAMD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_BOOTPARAMD Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootparamd 8 . Added: head/tools/build/options/WITHOUT_BOOTPD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_BOOTPD Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootpd 8 . Added: head/tools/build/options/WITHOUT_FINGER ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_FINGER Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . Added: head/tools/build/options/WITHOUT_FTP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_FTP Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . Added: head/tools/build/options/WITHOUT_INETD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_INETD Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . Added: head/tools/build/options/WITHOUT_RBOOTD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_RBOOTD Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr rbootd 8 . Added: head/tools/build/options/WITHOUT_TCP_WRAPPERS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_TCP_WRAPPERS Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tcpd 8 , +and related utilities. Added: head/tools/build/options/WITHOUT_TFTP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_TFTP Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . Added: head/tools/build/options/WITHOUT_TIMED ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_TIMED Wed Feb 4 10:19:32 2015 (r278192) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr timed 8 . Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Wed Feb 4 09:33:42 2015 (r278191) +++ head/usr.bin/Makefile Wed Feb 4 10:19:32 2015 (r278192) @@ -50,12 +50,10 @@ SUBDIR= ${_addr2line} \ fetch \ file \ find \ - finger \ fmt \ fold \ fstat \ fsync \ - ftp \ gcore \ gencat \ getconf \ @@ -166,7 +164,6 @@ SUBDIR= ${_addr2line} \ tcopy \ tee \ ${_tests} \ - tftp \ time \ timeout \ tip \ @@ -249,10 +246,18 @@ _size= size _strings= strings .endif +.if ${MK_FINGER} != "no" +SUBDIR+= finger +.endif + .if ${MK_FMAKE} != "no" SUBDIR+= make .endif +.if ${MK_FTP} != "no" +SUBDIR+= ftp +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif @@ -365,6 +370,10 @@ SUBDIR+= colcrt SUBDIR+= ul .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftp +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Wed Feb 4 09:33:42 2015 (r278191) +++ head/usr.sbin/Makefile Wed Feb 4 10:19:32 2015 (r278192) @@ -6,7 +6,6 @@ SUBDIR= adduser \ arp \ binmiscctl \ - bootparamd \ bsdconfig \ cdcontrol \ chkgrp \ @@ -34,7 +33,6 @@ SUBDIR= adduser \ gstat \ i2c \ ifmcstat \ - inetd \ iostat \ kldxref \ mailwrapper \ @@ -82,11 +80,8 @@ SUBDIR= adduser \ spray \ syslogd \ sysrc \ - tcpdchk \ - tcpdmatch \ tcpdrop \ tcpdump \ - timed \ traceroute \ trpt \ tzsetup \ @@ -131,6 +126,10 @@ SUBDIR+= autofs SUBDIR+= bluetooth .endif +.if ${MK_BOOTPARAMD} != "no" +SUBDIR+= bootparamd +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif @@ -179,6 +178,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif @@ -300,10 +303,19 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpdchk +SUBDIR+= tcpdmatch +.endif + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif +.if ${MK_TIMED} != "no" +SUBDIR+= timed +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 10:24:41 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9B15251; Wed, 4 Feb 2015 10:24:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB827C0F; Wed, 4 Feb 2015 10:24:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14AOfKK052426; Wed, 4 Feb 2015 10:24:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14AOe9a052421; Wed, 4 Feb 2015 10:24:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041024.t14AOe9a052421@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 10:24:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278193 - in head: lib share/mk tools/build/options usr.bin 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 10:24:42 -0000 Author: ngie Date: Wed Feb 4 10:24:40 2015 New Revision: 278193 URL: https://svnweb.freebsd.org/changeset/base/278193 Log: Add MK_FILE to control whether or not to build file(1), libmagic(3), etc MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Added: head/tools/build/options/WITHOUT_FILE (contents, props changed) Modified: head/lib/Makefile head/share/mk/src.opts.mk head/usr.bin/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Wed Feb 4 10:19:32 2015 (r278192) +++ head/lib/Makefile Wed Feb 4 10:24:40 2015 (r278193) @@ -63,7 +63,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libkvm \ ${_libldns} \ liblzma \ - libmagic \ + ${_libmagic} \ libmandoc \ libmemstat \ libmd \ @@ -195,6 +195,10 @@ _cuse= libcuse _libelftc= libelftc .endif +.if ${MK_FILE} != "no" +_libmagic= libmagic +.endif + .if ${MK_GPIO} != "no" _libgpio= libgpio .endif Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Feb 4 10:19:32 2015 (r278192) +++ head/share/mk/src.opts.mk Wed Feb 4 10:24:40 2015 (r278193) @@ -83,6 +83,7 @@ __DEFAULT_YES_OPTIONS = \ ELFTOOLCHAIN_TOOLS \ EXAMPLES \ FDT \ + FILE \ FINGER \ FLOPPY \ FMTREE \ Added: head/tools/build/options/WITHOUT_FILE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_FILE Wed Feb 4 10:24:40 2015 (r278193) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr file 1 +and related programs. Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Wed Feb 4 10:19:32 2015 (r278192) +++ head/usr.bin/Makefile Wed Feb 4 10:24:40 2015 (r278193) @@ -48,7 +48,6 @@ SUBDIR= ${_addr2line} \ expand \ false \ fetch \ - file \ find \ fmt \ fold \ @@ -246,6 +245,10 @@ _size= size _strings= strings .endif +.if ${MK_FILE} != "no" +SUBDIR+= file +.endif + .if ${MK_FINGER} != "no" SUBDIR+= finger .endif From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 10:29:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2907C4C1; Wed, 4 Feb 2015 10:29:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09B9BC54; Wed, 4 Feb 2015 10:29:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14ATruB053059; Wed, 4 Feb 2015 10:29:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14ATrR9053058; Wed, 4 Feb 2015 10:29:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041029.t14ATrR9053058@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 10:29:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278194 - head/share/man/man5 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 10:29:54 -0000 Author: ngie Date: Wed Feb 4 10:29:53 2015 New Revision: 278194 URL: https://svnweb.freebsd.org/changeset/base/278194 Log: Regen src.conf(5) Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Feb 4 10:24:40 2015 (r278193) +++ head/share/man/man5/src.conf.5 Wed Feb 4 10:29:53 2015 (r278194) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd January 25, 2015 +.Dd February 4, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -154,6 +154,14 @@ Set to not build Bluetooth related kerne .It Va WITHOUT_BOOT .\" from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru Set to not build the boot blocks and loader. +.It Va WITHOUT_BOOTPARAMD +.\" from FreeBSD: head/tools/build/options/WITHOUT_BOOTPARAMD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr bootparamd 8 . +.It Va WITHOUT_BOOTPD +.\" from FreeBSD: head/tools/build/options/WITHOUT_BOOTPD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr bootpd 8 . .It Va WITHOUT_BSDINSTALL .\" from FreeBSD: head/tools/build/options/WITHOUT_BSDINSTALL 277677 2015-01-25 04:43:13Z ngie Set to not build @@ -430,6 +438,17 @@ Set to avoid installing examples to .\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 221539 2011-05-06 19:10:27Z ru Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. +.It Va WITHOUT_FILE +.\" from FreeBSD: head/tools/build/options/WITHOUT_FILE 278193 2015-02-04 10:24:40Z ngie +Set to not build +.Xr file 1 +and related programs. +.It Va WITHOUT_FINGER +.\" from FreeBSD: head/tools/build/options/WITHOUT_FINGER 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs @@ -461,6 +480,12 @@ without floating-point support. .\" from FreeBSD: head/tools/build/options/WITHOUT_FREEBSD_UPDATE 183242 2008-09-21 22:02:26Z sam Set to not build .Xr freebsd-update 8 . +.It Va WITHOUT_FTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_FTP 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . .It Va WITHOUT_GAMES .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru Set to not build games. @@ -602,6 +627,10 @@ When set, it also enforces the following .It Va WITHOUT_INET6_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_INET6_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build libraries, programs, and kernel modules without IPv6 support. +.It Va WITHOUT_INETD +.\" from FreeBSD: head/tools/build/options/WITHOUT_INETD 278192 2015-02-04 10:19:32Z ngie +Set to not build +.Xr inetd 8 . .It Va WITHOUT_INET_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_INET_SUPPORT 221266 2011-04-30 17:58:28Z bz Set to build libraries, programs, and kernel modules without IPv4 support. @@ -977,6 +1006,16 @@ Set to avoid compiling profiled librarie Set to not build .Xr quota 8 and related programs. +.It Va WITHOUT_RADIUS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_RADIUS_SUPPORT 278182 2015-02-04 06:53:45Z ngie +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . +.It Va WITHOUT_RBOOTD +.\" from FreeBSD: head/tools/build/options/WITHOUT_RBOOTD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr rbootd 8 . .It Va WITHOUT_RCMDS .\" from FreeBSD: head/tools/build/options/WITHOUT_RCMDS 156932 2006-03-21 07:50:50Z ru Disable building of the @@ -1080,6 +1119,11 @@ Set to not build or install .Xr talk 1 and .Xr talkd 8 . +.It Va WITHOUT_TCP_WRAPPERS +.\" from FreeBSD: head/tools/build/options/WITHOUT_TCP_WRAPPERS 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr tcpd 8 , +and related utilities. .It Va WITHOUT_TCSH .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru Set to not build and install @@ -1120,6 +1164,16 @@ When set, it also enforces the following .It .Va WITHOUT_GROFF .El +.It Va WITHOUT_TFTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_TFTP 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . +.It Va WITHOUT_TIMED +.\" from FreeBSD: head/tools/build/options/WITHOUT_TIMED 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr timed 8 . .It Va WITHOUT_TOOLCHAIN .\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 273172 2014-10-16 15:55:13Z brooks Set to not install header or From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 11:43:22 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21CD2CE0; Wed, 4 Feb 2015 11:43:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02FC6810; Wed, 4 Feb 2015 11:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14BhLKf089772; Wed, 4 Feb 2015 11:43:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14BhKRD089764; Wed, 4 Feb 2015 11:43:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041143.t14BhKRD089764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 11:43:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278202 - in head: include share/examples share/man/man4 share/man/man9 share/misc tools/build/mk 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 11:43:22 -0000 Author: ngie Date: Wed Feb 4 11:43:19 2015 New Revision: 278202 URL: https://svnweb.freebsd.org/changeset/base/278202 Log: Clean up more usb related files when MK_USB == no when dealing with manpages, libraries, and binaries MFC after: 1 week X-MFC with: r278135 Sponsored by: EMC / Isilon Storage Division Modified: head/include/Makefile head/share/examples/Makefile head/share/man/man4/Makefile head/share/man/man9/Makefile head/share/misc/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: head/ (props changed) head/include/ (props changed) head/share/ (props changed) head/share/man/man4/ (props changed) Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Wed Feb 4 11:25:34 2015 (r278201) +++ head/include/Makefile Wed Feb 4 11:43:19 2015 (r278202) @@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/hwpmc \ dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ - dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ + dev/speaker dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ @@ -56,6 +56,10 @@ LSUBDIRS= cam/ata cam/scsi \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MK_USB} != "no" +LSUBDIRS+= dev/usb +.endif + LSUBSUBDIRS= dev/mpt/mpilib .if ${MK_CUSE} != "no" Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Wed Feb 4 11:25:34 2015 (r278201) +++ head/share/examples/Makefile Wed Feb 4 11:43:19 2015 (r278202) @@ -18,7 +18,6 @@ LDIRS= BSD_daemon \ ipfw \ jails \ kld \ - libusb20 \ libvgl \ mdoc \ netgraph \ @@ -92,12 +91,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/syscall/module/syscall.c \ kld/syscall/test/Makefile \ kld/syscall/test/call.c \ - libusb20/Makefile \ - libusb20/README \ - libusb20/util.c \ - libusb20/util.h \ - libusb20/bulk.c \ - libusb20/control.c \ libvgl/Makefile \ libvgl/demo.c \ mdoc/POSIX-copyright \ @@ -203,6 +196,16 @@ XFILES+= hast/ucarp.sh \ hast/vip-up.sh .endif +.if ${MK_USB} != "no" +LDIRS+= libusb20 +XFILES+= libusb20/Makefile \ + libusb20/README \ + libusb20/util.c \ + libusb20/util.h \ + libusb20/bulk.c \ + libusb20/control.c +.endif + .if ${MACHINE_CPUARCH} == "amd64" .if ${MK_BHYVE} != "no" LDIRS+= bhyve Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Wed Feb 4 11:25:34 2015 (r278201) +++ head/share/man/man4/Makefile Wed Feb 4 11:43:19 2015 (r278202) @@ -503,56 +503,6 @@ MAN= aac.4 \ tws.4 \ tx.4 \ txp.4 \ - u3g.4 \ - uark.4 \ - uart.4 \ - uath.4 \ - ubsa.4 \ - ubsec.4 \ - ubser.4 \ - ubtbcmfw.4 \ - uchcom.4 \ - ucom.4 \ - ucycom.4 \ - udav.4 \ - udbp.4 \ - udp.4 \ - udplite.4 \ - uep.4 \ - ufm.4 \ - ufoma.4 \ - uftdi.4 \ - ugen.4 \ - uhci.4 \ - uhid.4 \ - uhso.4 \ - uipaq.4 \ - ukbd.4 \ - uled.4 \ - ulpt.4 \ - umass.4 \ - umcs.4 \ - umct.4 \ - umodem.4 \ - umoscom.4 \ - ums.4 \ - unix.4 \ - upgt.4 \ - uplcom.4 \ - ural.4 \ - urio.4 \ - urndis.4 \ - ${_urtw.4} \ - urtwn.4 \ - urtwnfw.4 \ - usb.4 \ - usb_template.4 \ - usb_quirk.4 \ - uslcom.4 \ - usfs.4 \ - utopia.4 \ - uvisor.4 \ - uvscom.4 \ vale.4 \ vga.4 \ vge.4 \ @@ -735,13 +685,6 @@ MLINKS+=tl.4 if_tl.4 MLINKS+=tun.4 if_tun.4 MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 -MLINKS+=u3g.4 u3gstub.4 -MLINKS+=uath.4 if_uath.4 -MLINKS+=udav.4 if_udav.4 -MLINKS+=upgt.4 if_upgt.4 -MLINKS+=ural.4 if_ural.4 -MLINKS+=urndis.4 if_urndis.4 -MLINKS+=${_urtw.4} ${_if_urtw.4} MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vxlan.4 if_vxlan.4 @@ -883,4 +826,66 @@ _pflog.4= pflog.4 _pfsync.4= pfsync.4 .endif +.if ${MK_USB} != "no" +MAN+= \ + u3g.4 \ + uark.4 \ + uart.4 \ + uath.4 \ + ubsa.4 \ + ubsec.4 \ + ubser.4 \ + ubtbcmfw.4 \ + uchcom.4 \ + ucom.4 \ + ucycom.4 \ + udav.4 \ + udbp.4 \ + udp.4 \ + udplite.4 \ + uep.4 \ + ufm.4 \ + ufoma.4 \ + uftdi.4 \ + ugen.4 \ + uhci.4 \ + uhid.4 \ + uhso.4 \ + uipaq.4 \ + ukbd.4 \ + uled.4 \ + ulpt.4 \ + umass.4 \ + umcs.4 \ + umct.4 \ + umodem.4 \ + umoscom.4 \ + ums.4 \ + unix.4 \ + upgt.4 \ + uplcom.4 \ + ural.4 \ + urio.4 \ + urndis.4 \ + ${_urtw.4} \ + urtwn.4 \ + urtwnfw.4 \ + usb.4 \ + usb_quirk.4 \ + usb_template.4 \ + usfs.4 \ + uslcom.4 \ + utopia.4 \ + uvisor.4 \ + uvscom.4 \ + +MLINKS+=u3g.4 u3gstub.4 +MLINKS+=uath.4 if_uath.4 +MLINKS+=udav.4 if_udav.4 +MLINKS+=upgt.4 if_upgt.4 +MLINKS+=ural.4 if_ural.4 +MLINKS+=urndis.4 if_urndis.4 +MLINKS+=${_urtw.4} ${_if_urtw.4} +.endif + .include Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Wed Feb 4 11:25:34 2015 (r278201) +++ head/share/man/man9/Makefile Wed Feb 4 11:43:19 2015 (r278202) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + MAN= accept_filter.9 \ accf_data.9 \ accf_dns.9 \ @@ -271,7 +273,6 @@ MAN= accept_filter.9 \ uidinfo.9 \ uio.9 \ unr.9 \ - usbdi.9 \ utopia.9 \ vaccess.9 \ vaccess_acl_nfs4.9 \ @@ -1593,6 +1594,9 @@ MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 \ uio.9 uiomove_nofault.9 + +.if ${MK_USB} != "no" +MAN+= usbdi.9 MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ @@ -1644,6 +1648,7 @@ MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usb_fifo_reset.9 \ usbdi.9 usb_fifo_softc.9 \ usbdi.9 usb_fifo_wakeup.9 +.endif MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ Modified: head/share/misc/Makefile ============================================================================== --- head/share/misc/Makefile Wed Feb 4 11:25:34 2015 (r278201) +++ head/share/misc/Makefile Wed Feb 4 11:43:19 2015 (r278202) @@ -1,15 +1,22 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../../sys/dev/usb FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ committers-src.dot eqnchar flowers init.ee \ iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ - scsi_modes usb_hid_usages usbdevs \ + scsi_modes \ organization.dot NO_OBJ= FILESDIR= ${BINDIR}/misc +.if ${MK_USB} != "no" +FILES+= usb_hid_usages +FILES+= usbdevs +.endif + .include Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:25:34 2015 (r278201) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:43:19 2015 (r278202) @@ -7366,6 +7366,13 @@ OLD_FILES+=usr/sbin/uathload OLD_FILES+=usr/sbin/uhsoctl OLD_FILES+=usr/sbin/usbconfig OLD_FILES+=usr/sbin/usbdump +OLD_FILES+=usr/share/examples/libusb20/Makefile +OLD_FILES+=usr/share/examples/libusb20/README +OLD_FILES+=usr/share/examples/libusb20/bulk.c +OLD_FILES+=usr/share/examples/libusb20/control.c +OLD_FILES+=usr/share/examples/libusb20/util.c +OLD_FILES+=usr/share/examples/libusb20/util.h +OLD_DIRS+=usr/share/examples/libusb20 OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz @@ -7568,9 +7575,114 @@ OLD_FILES+=usr/share/man/man3/usb_set_co OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz OLD_FILES+=usr/share/man/man3/usbhid.3.gz +OLD_FILES+=usr/share/man/man4/u3g.4.gz +OLD_FILES+=usr/share/man/man4/u3gstub.4.gz +OLD_FILES+=usr/share/man/man4/uark.4.gz +OLD_FILES+=usr/share/man/man4/uart.4.gz +OLD_FILES+=usr/share/man/man4/uath.4.gz +OLD_FILES+=usr/share/man/man4/ubsa.4.gz +OLD_FILES+=usr/share/man/man4/ubsec.4.gz +OLD_FILES+=usr/share/man/man4/ubser.4.gz +OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz +OLD_FILES+=usr/share/man/man4/uchcom.4.gz +OLD_FILES+=usr/share/man/man4/ucom.4.gz +OLD_FILES+=usr/share/man/man4/ucycom.4.gz +OLD_FILES+=usr/share/man/man4/udav.4.gz +OLD_FILES+=usr/share/man/man4/udbp.4.gz +OLD_FILES+=usr/share/man/man4/udp.4.gz +OLD_FILES+=usr/share/man/man4/udplite.4.gz +OLD_FILES+=usr/share/man/man4/uep.4.gz +OLD_FILES+=usr/share/man/man4/ufm.4.gz +OLD_FILES+=usr/share/man/man4/ufoma.4.gz +OLD_FILES+=usr/share/man/man4/uftdi.4.gz +OLD_FILES+=usr/share/man/man4/ugen.4.gz +OLD_FILES+=usr/share/man/man4/uhci.4.gz +OLD_FILES+=usr/share/man/man4/uhid.4.gz +OLD_FILES+=usr/share/man/man4/uhso.4.gz +OLD_FILES+=usr/share/man/man4/uipaq.4.gz +OLD_FILES+=usr/share/man/man4/ukbd.4.gz +OLD_FILES+=usr/share/man/man4/uled.4.gz +OLD_FILES+=usr/share/man/man4/ulpt.4.gz +OLD_FILES+=usr/share/man/man4/umass.4.gz +OLD_FILES+=usr/share/man/man4/umcs.4.gz +OLD_FILES+=usr/share/man/man4/umct.4.gz +OLD_FILES+=usr/share/man/man4/umodem.4.gz +OLD_FILES+=usr/share/man/man4/umoscom.4.gz +OLD_FILES+=usr/share/man/man4/ums.4.gz +OLD_FILES+=usr/share/man/man4/unix.4.gz +OLD_FILES+=usr/share/man/man4/upgt.4.gz +OLD_FILES+=usr/share/man/man4/uplcom.4.gz +OLD_FILES+=usr/share/man/man4/ural.4.gz +OLD_FILES+=usr/share/man/man4/urio.4.gz +OLD_FILES+=usr/share/man/man4/urndis.4.gz +OLD_FILES+=usr/share/man/man4/urtw.4.gz +OLD_FILES+=usr/share/man/man4/urtwn.4.gz +OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz +OLD_FILES+=usr/share/man/man4/usb.4.gz +OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz +OLD_FILES+=usr/share/man/man4/usb_template.4.gz +OLD_FILES+=usr/share/man/man4/usfs.4.gz +OLD_FILES+=usr/share/man/man4/uslcom.4.gz +OLD_FILES+=usr/share/man/man4/utopia.4.gz +OLD_FILES+=usr/share/man/man4/uvisor.4.gz +OLD_FILES+=usr/share/man/man4/uvscom.4.gz OLD_FILES+=usr/share/man/man8/uathload.8.gz OLD_FILES+=usr/share/man/man8/usbconfig.8.gz OLD_FILES+=usr/share/man/man8/usbdump.8.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz +OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz +OLD_FILES+=usr/share/man/man9/usbdi.9.gz +OLD_FILES+=usr/share/misc/usb_hid_usages +OLD_FILES+=usr/share/misc/usbdevs .endif .if ${MK_UTMPX} == no From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 11:48:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5BF5F5D; Wed, 4 Feb 2015 11:48:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1B1C83A; Wed, 4 Feb 2015 11:48:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14BmYQm090549; Wed, 4 Feb 2015 11:48:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14BmYGG090548; Wed, 4 Feb 2015 11:48:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041148.t14BmYGG090548@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 11:48:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278204 - head/include 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 11:48:34 -0000 Author: ngie Date: Wed Feb 4 11:48:33 2015 New Revision: 278204 URL: https://svnweb.freebsd.org/changeset/base/278204 Log: Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/include/Makefile Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Wed Feb 4 11:45:15 2015 (r278203) +++ head/include/Makefile Wed Feb 4 11:48:33 2015 (r278204) @@ -56,18 +56,14 @@ LSUBDIRS= cam/ata cam/scsi \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs -.if ${MK_USB} != "no" -LSUBDIRS+= dev/usb -.endif - LSUBSUBDIRS= dev/mpt/mpilib -.if ${MK_CUSE} != "no" -LSUBDIRS+= fs/cuse +.if ${MK_BLUETOOTH} != "no" +LSUBSUBDIRS+= netgraph/bluetooth/include .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" -_dev_powermac_nvram= dev/powermac_nvram +.if ${MK_CUSE} != "no" +LSUBDIRS+= fs/cuse .endif .if ${MK_GSSAPI} != "no" @@ -79,15 +75,18 @@ INCS+= gssapi.h INCS+= hesiod.h .endif -.if ${MK_BLUETOOTH} != "no" -LSUBSUBDIRS+= netgraph/bluetooth/include -.endif - # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" INCS+= iconv.h .endif - + +.if ${MK_USB} != "no" +LSUBDIRS+= dev/usb +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" +_dev_powermac_nvram= dev/powermac_nvram +.endif # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 11:55:33 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3F39332; Wed, 4 Feb 2015 11:55:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0286919; Wed, 4 Feb 2015 11:55:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14BtXjB094958; Wed, 4 Feb 2015 11:55:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14BtXCp094957; Wed, 4 Feb 2015 11:55:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502041155.t14BtXCp094957@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 4 Feb 2015 11:55:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278206 - head/release 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 11:55:33 -0000 Author: gjb Date: Wed Feb 4 11:55:32 2015 New Revision: 278206 URL: https://svnweb.freebsd.org/changeset/base/278206 Log: Bump copyright after r277458. MFC after: 2 weeks X-MFC-with: r277458, r277536, r277606, r277609, r277836, r278118, r278119 Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Wed Feb 4 11:51:46 2015 (r278205) +++ head/release/release.sh Wed Feb 4 11:55:32 2015 (r278206) @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013, 2014 The FreeBSD Foundation +# Copyright (c) 2013-2015 The FreeBSD Foundation # Copyright (c) 2013 Glen Barber # Copyright (c) 2011 Nathan Whitehorn # All rights reserved. From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 14:49:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48B342D3; Wed, 4 Feb 2015 14:49:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BD65B0; Wed, 4 Feb 2015 14:49:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14Enl95075640; Wed, 4 Feb 2015 14:49:47 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14EnlJV075639; Wed, 4 Feb 2015 14:49:47 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502041449.t14EnlJV075639@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 4 Feb 2015 14:49:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278209 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 14:49:48 -0000 Author: kib Date: Wed Feb 4 14:49:47 2015 New Revision: 278209 URL: https://svnweb.freebsd.org/changeset/base/278209 Log: Add ddb command 'show clocksource' to display state of the per-cpu clock events. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/kern/kern_clocksource.c Modified: head/sys/kern/kern_clocksource.c ============================================================================== --- head/sys/kern/kern_clocksource.c Wed Feb 4 13:56:38 2015 (r278208) +++ head/sys/kern/kern_clocksource.c Wed Feb 4 14:49:47 2015 (r278209) @@ -908,3 +908,42 @@ sysctl_kern_eventtimer_periodic(SYSCTL_H SYSCTL_PROC(_kern_eventtimer, OID_AUTO, periodic, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, sysctl_kern_eventtimer_periodic, "I", "Enable event timer periodic mode"); + +#include "opt_ddb.h" + +#ifdef DDB +#include + +DB_SHOW_COMMAND(clocksource, db_show_clocksource) +{ + struct pcpu_state *st; + int c; + + CPU_FOREACH(c) { + st = DPCPU_ID_PTR(c, timerstate); + db_printf( + "CPU %2d: action %d handle %d ipi %d idle %d\n" + " now %#jx nevent %#jx (%jd)\n" + " ntick %#jx (%jd) nhard %#jx (%jd)\n" + " nstat %#jx (%jd) nprof %#jx (%jd)\n" + " ncall %#jx (%jd) ncallopt %#jx (%jd)\n", + c, st->action, st->handle, st->ipi, st->idle, + (uintmax_t)st->now, + (uintmax_t)st->nextevent, + (uintmax_t)(st->nextevent - st->now) / tick_sbt, + (uintmax_t)st->nexttick, + (uintmax_t)(st->nexttick - st->now) / tick_sbt, + (uintmax_t)st->nexthard, + (uintmax_t)(st->nexthard - st->now) / tick_sbt, + (uintmax_t)st->nextstat, + (uintmax_t)(st->nextstat - st->now) / tick_sbt, + (uintmax_t)st->nextprof, + (uintmax_t)(st->nextprof - st->now) / tick_sbt, + (uintmax_t)st->nextcall, + (uintmax_t)(st->nextcall - st->now) / tick_sbt, + (uintmax_t)st->nextcallopt, + (uintmax_t)(st->nextcallopt - st->now) / tick_sbt); + } +} + +#endif From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 15:59:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 787954A5; Wed, 4 Feb 2015 15:59:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64A87B00; Wed, 4 Feb 2015 15:59:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14FxqHl008649; Wed, 4 Feb 2015 15:59:52 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14FxqrC008648; Wed, 4 Feb 2015 15:59:52 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201502041559.t14FxqrC008648@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 4 Feb 2015 15:59:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278210 - head/sys/dev/ed 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 15:59:52 -0000 Author: imp Date: Wed Feb 4 15:59:51 2015 New Revision: 278210 URL: https://svnweb.freebsd.org/changeset/base/278210 Log: Add comment about why checking for 0xff is OK. There's two bits in the ISR that are normally clear. RST is one, though in some overflow cases it can be set. RDC is only set when a remote DMA is finished from the memory mapped memory to the transmit rings, which we poll fore in the code with ED_LOCK around the operation that would set it. Modified: head/sys/dev/ed/if_ed.c Modified: head/sys/dev/ed/if_ed.c ============================================================================== --- head/sys/dev/ed/if_ed.c Wed Feb 4 14:49:47 2015 (r278209) +++ head/sys/dev/ed/if_ed.c Wed Feb 4 15:59:51 2015 (r278210) @@ -976,8 +976,10 @@ edintr(void *arg) /* * loop until there are no more new interrupts. When the card goes * away, the hardware will read back 0xff. Looking at the interrupts, - * it would appear that 0xff is impossible, or at least extremely - * unlikely. + * it would appear that 0xff is impossible as ED_ISR_RST is noramlly + * clear. ED_ISR_RDC is also normally clear and only set while + * we're transferring memory to the card and we're holding the + * ED_LOCK (so we can't get into here). */ while ((isr = ed_nic_inb(sc, ED_P0_ISR)) != 0 && isr != 0xff) { From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 16:19:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 011C0A90; Wed, 4 Feb 2015 16:19:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1CACD5B; Wed, 4 Feb 2015 16:19:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14GJV2I018139; Wed, 4 Feb 2015 16:19:31 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14GJV6H018138; Wed, 4 Feb 2015 16:19:31 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201502041619.t14GJV6H018138@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 4 Feb 2015 16:19:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278211 - head/sys/dev/ed 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 16:19:32 -0000 Author: imp Date: Wed Feb 4 16:19:31 2015 New Revision: 278211 URL: https://svnweb.freebsd.org/changeset/base/278211 Log: Fix typo Submitted by: matteo@ Modified: head/sys/dev/ed/if_ed.c Modified: head/sys/dev/ed/if_ed.c ============================================================================== --- head/sys/dev/ed/if_ed.c Wed Feb 4 15:59:51 2015 (r278210) +++ head/sys/dev/ed/if_ed.c Wed Feb 4 16:19:31 2015 (r278211) @@ -976,7 +976,7 @@ edintr(void *arg) /* * loop until there are no more new interrupts. When the card goes * away, the hardware will read back 0xff. Looking at the interrupts, - * it would appear that 0xff is impossible as ED_ISR_RST is noramlly + * it would appear that 0xff is impossible as ED_ISR_RST is normally * clear. ED_ISR_RDC is also normally clear and only set while * we're transferring memory to the card and we're holding the * ED_LOCK (so we can't get into here). From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 16:21:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A083C19; Wed, 4 Feb 2015 16:21:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E08EEE16; Wed, 4 Feb 2015 16:21:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14GLjCo021447; Wed, 4 Feb 2015 16:21:45 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14GLjxl021446; Wed, 4 Feb 2015 16:21:45 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502041621.t14GLjxl021446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Wed, 4 Feb 2015 16:21:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278212 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 16:21:46 -0000 Author: loos Date: Wed Feb 4 16:21:45 2015 New Revision: 278212 URL: https://svnweb.freebsd.org/changeset/base/278212 Log: Remove some duplicate calls to bus_release_resource() and destroy the mutex on error cases. While here remove unnecessary includes. Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:19:31 2015 (r278211) +++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:21:45 2015 (r278212) @@ -29,32 +29,17 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include -#include -#include #include -#include #include #include #include #include -#include -#include #include #include #include -#include -#include -#include - -#include #include -#include -#include -#include -#include #include #include @@ -211,16 +196,12 @@ bcm_sdhci_attach(device_t dev) RF_ACTIVE); if (!sc->sc_irq_res) { device_printf(dev, "cannot allocate interrupt\n"); - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); err = ENXIO; goto fail; } if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, bcm_sdhci_intr, sc, &sc->sc_intrhand)) - { - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res); + NULL, bcm_sdhci_intr, sc, &sc->sc_intrhand)) { device_printf(dev, "cannot setup interrupt handler\n"); err = ENXIO; goto fail; @@ -286,6 +267,7 @@ fail: bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res); if (sc->sc_mem_res) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); + mtx_destroy(&sc->sc_mtx); return (err); } From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 16:36:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2933C202; Wed, 4 Feb 2015 16:36:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF8CDF89; Wed, 4 Feb 2015 16:36:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14GapOx027422; Wed, 4 Feb 2015 16:36:51 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14Gap4k027421; Wed, 4 Feb 2015 16:36:51 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502041636.t14Gap4k027421@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Wed, 4 Feb 2015 16:36:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278213 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 16:36:52 -0000 Author: loos Date: Wed Feb 4 16:36:51 2015 New Revision: 278213 URL: https://svnweb.freebsd.org/changeset/base/278213 Log: Remove stale comments about the issues with HS mode. Remove a previous workaround to limit the minimum sdhci frequency that isn't needed anymore. Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:21:45 2015 (r278212) +++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:36:51 2015 (r278213) @@ -67,19 +67,9 @@ __FBSDID("$FreeBSD$"); #define dprintf(fmt, args...) #endif -/* - * Arasan HC seems to have problem with Data CRC on lower frequencies. - * Use this tunable to cap initialization sequence frequency at higher - * value. Default is standard 400kHz. - * HS mode brings too many problems for most of cards, so disable HS mode - * until a better fix comes up. - * HS mode still can be enabled with the tunable. - */ -static int bcm2835_sdhci_min_freq = 400000; static int bcm2835_sdhci_hs = 1; static int bcm2835_sdhci_pio_mode = 0; -TUNABLE_INT("hw.bcm2835.sdhci.min_freq", &bcm2835_sdhci_min_freq); TUNABLE_INT("hw.bcm2835.sdhci.hs", &bcm2835_sdhci_hs); TUNABLE_INT("hw.bcm2835.sdhci.pio_mode", &bcm2835_sdhci_pio_mode); @@ -404,13 +394,6 @@ bcm_sdhci_write_multi_4(device_t dev, st bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh, off, data, count); } -static uint32_t -bcm_sdhci_min_freq(device_t dev, struct sdhci_slot *slot) -{ - - return bcm2835_sdhci_min_freq; -} - static void bcm_sdhci_start_dma_seg(struct bcm_sdhci_softc *sc) { @@ -663,7 +646,6 @@ static device_method_t bcm_sdhci_methods DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), - DEVMETHOD(sdhci_min_freq, bcm_sdhci_min_freq), /* Platform transfer methods */ DEVMETHOD(sdhci_platform_will_handle, bcm_sdhci_will_handle_transfer), DEVMETHOD(sdhci_platform_start_transfer, bcm_sdhci_start_transfer), From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 17:23:03 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDA20C1; Wed, 4 Feb 2015 17:23:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9BA2889; Wed, 4 Feb 2015 17:23:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14HN3JI051296; Wed, 4 Feb 2015 17:23:03 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14HN3nC051295; Wed, 4 Feb 2015 17:23:03 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502041723.t14HN3nC051295@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Wed, 4 Feb 2015 17:23:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278214 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 17:23:04 -0000 Author: loos Date: Wed Feb 4 17:23:02 2015 New Revision: 278214 URL: https://svnweb.freebsd.org/changeset/base/278214 Log: Sort and remove unnecessary includes. Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Wed Feb 4 16:36:51 2015 (r278213) +++ head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Wed Feb 4 17:23:02 2015 (r278214) @@ -31,26 +31,18 @@ __FBSDID("$FreeBSD$"); #include #include #include - +#include #include -#include -#include #include +#include #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include #include #include -#include #include From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 18:15:29 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3814FD28; Wed, 4 Feb 2015 18:15:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2389BE42; Wed, 4 Feb 2015 18:15:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14IFTf9075960; Wed, 4 Feb 2015 18:15:29 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14IFSoj075959; Wed, 4 Feb 2015 18:15:28 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502041815.t14IFSoj075959@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Wed, 4 Feb 2015 18:15:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278215 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 18:15:29 -0000 Author: loos Date: Wed Feb 4 18:15:28 2015 New Revision: 278215 URL: https://svnweb.freebsd.org/changeset/base/278215 Log: Add GPIO interrupt support for BCM2835 (Raspberry pi). With this commit any of the GPIO pins can now be programmed to act as an interrupt source for GPIO devices (i.e. limited to devices directly attached to gpiobus - at least for now). Differential Revision: https://reviews.freebsd.org/D1000 Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Wed Feb 4 17:23:02 2015 (r278214) +++ head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Wed Feb 4 18:15:28 2015 (r278215) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -57,6 +58,7 @@ __FBSDID("$FreeBSD$"); #define BCM_GPIO_IRQS 4 #define BCM_GPIO_PINS 54 +#define BCM_GPIO_PINS_PER_BANK 32 #define BCM_GPIO_DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | \ GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN) @@ -81,12 +83,15 @@ struct bcm_gpio_softc { struct resource * sc_res[BCM_GPIO_IRQS + 1]; bus_space_tag_t sc_bst; bus_space_handle_t sc_bsh; - void * sc_intrhand; + void * sc_intrhand[BCM_GPIO_IRQS]; int sc_gpio_npins; int sc_ro_npins; int sc_ro_pins[BCM_GPIO_PINS]; struct gpio_pin sc_gpio_pins[BCM_GPIO_PINS]; + struct intr_event * sc_events[BCM_GPIO_PINS]; struct bcm_gpio_sysctl sc_sysctl[BCM_GPIO_PINS]; + enum intr_trigger sc_irq_trigger[BCM_GPIO_PINS]; + enum intr_polarity sc_irq_polarity[BCM_GPIO_PINS]; }; enum bcm_gpio_pud { @@ -95,21 +100,35 @@ enum bcm_gpio_pud { BCM_GPIO_PULLUP, }; -#define BCM_GPIO_LOCK(_sc) mtx_lock(&_sc->sc_mtx) -#define BCM_GPIO_UNLOCK(_sc) mtx_unlock(&_sc->sc_mtx) -#define BCM_GPIO_LOCK_ASSERT(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED) - -#define BCM_GPIO_GPFSEL(_bank) 0x00 + _bank * 4 -#define BCM_GPIO_GPSET(_bank) 0x1c + _bank * 4 -#define BCM_GPIO_GPCLR(_bank) 0x28 + _bank * 4 -#define BCM_GPIO_GPLEV(_bank) 0x34 + _bank * 4 -#define BCM_GPIO_GPPUD(_bank) 0x94 -#define BCM_GPIO_GPPUDCLK(_bank) 0x98 + _bank * 4 - +#define BCM_GPIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) +#define BCM_GPIO_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) +#define BCM_GPIO_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) #define BCM_GPIO_WRITE(_sc, _off, _val) \ - bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val) + bus_space_write_4((_sc)->sc_bst, (_sc)->sc_bsh, _off, _val) #define BCM_GPIO_READ(_sc, _off) \ - bus_space_read_4(_sc->sc_bst, _sc->sc_bsh, _off) + bus_space_read_4((_sc)->sc_bst, (_sc)->sc_bsh, _off) +#define BCM_GPIO_CLEAR_BITS(_sc, _off, _bits) \ + BCM_GPIO_WRITE(_sc, _off, BCM_GPIO_READ(_sc, _off) & ~(_bits)) +#define BCM_GPIO_SET_BITS(_sc, _off, _bits) \ + BCM_GPIO_WRITE(_sc, _off, BCM_GPIO_READ(_sc, _off) | _bits) +#define BCM_GPIO_BANK(a) (a / BCM_GPIO_PINS_PER_BANK) +#define BCM_GPIO_MASK(a) (1U << (a % BCM_GPIO_PINS_PER_BANK)) + +#define BCM_GPIO_GPFSEL(_bank) (0x00 + _bank * 4) /* Function Select */ +#define BCM_GPIO_GPSET(_bank) (0x1c + _bank * 4) /* Pin Out Set */ +#define BCM_GPIO_GPCLR(_bank) (0x28 + _bank * 4) /* Pin Out Clear */ +#define BCM_GPIO_GPLEV(_bank) (0x34 + _bank * 4) /* Pin Level */ +#define BCM_GPIO_GPEDS(_bank) (0x40 + _bank * 4) /* Event Status */ +#define BCM_GPIO_GPREN(_bank) (0x4c + _bank * 4) /* Rising Edge irq */ +#define BCM_GPIO_GPFEN(_bank) (0x58 + _bank * 4) /* Falling Edge irq */ +#define BCM_GPIO_GPHEN(_bank) (0x64 + _bank * 4) /* High Level irq */ +#define BCM_GPIO_GPLEN(_bank) (0x70 + _bank * 4) /* Low Level irq */ +#define BCM_GPIO_GPAREN(_bank) (0x7c + _bank * 4) /* Async Rising Edge */ +#define BCM_GPIO_GPAFEN(_bank) (0x88 + _bank * 4) /* Async Falling Egde */ +#define BCM_GPIO_GPPUD(_bank) (0x94) /* Pin Pull up/down */ +#define BCM_GPIO_GPPUDCLK(_bank) (0x98 + _bank * 4) /* Pin Pull up clock */ + +static struct bcm_gpio_softc *bcm_gpio_sc = NULL; static int bcm_gpio_pin_is_ro(struct bcm_gpio_softc *sc, int pin) @@ -657,6 +676,40 @@ bcm_gpio_get_reserved_pins(struct bcm_gp } static int +bcm_gpio_intr(void *arg) +{ + int bank_last, irq; + struct bcm_gpio_softc *sc; + struct intr_event *event; + uint32_t bank, mask, reg; + + sc = (struct bcm_gpio_softc *)arg; + reg = 0; + bank_last = -1; + for (irq = 0; irq < BCM_GPIO_PINS; irq++) { + bank = BCM_GPIO_BANK(irq); + mask = BCM_GPIO_MASK(irq); + if (bank != bank_last) { + reg = BCM_GPIO_READ(sc, BCM_GPIO_GPEDS(bank)); + bank_last = bank; + } + if (reg & mask) { + event = sc->sc_events[irq]; + if (event != NULL && !TAILQ_EMPTY(&event->ie_handlers)) + intr_event_handle(event, NULL); + else { + device_printf(sc->sc_dev, "Stray IRQ %d\n", + irq); + } + /* Clear the Status bit by writing '1' to it. */ + BCM_GPIO_WRITE(sc, BCM_GPIO_GPEDS(bank), mask); + } + } + + return (FILTER_HANDLED); +} + +static int bcm_gpio_probe(device_t dev) { @@ -671,6 +724,39 @@ bcm_gpio_probe(device_t dev) } static int +bcm_gpio_intr_attach(device_t dev) +{ + struct bcm_gpio_softc *sc; + int i; + + sc = device_get_softc(dev); + for (i = 0; i < BCM_GPIO_IRQS; i++) { + if (bus_setup_intr(dev, sc->sc_res[i + 1], + INTR_TYPE_MISC | INTR_MPSAFE, bcm_gpio_intr, + NULL, sc, &sc->sc_intrhand[i]) != 0) { + return (-1); + } + } + + return (0); +} + +static void +bcm_gpio_intr_detach(device_t dev) +{ + struct bcm_gpio_softc *sc; + int i; + + sc = device_get_softc(dev); + for (i = 0; i < BCM_GPIO_IRQS; i++) { + if (sc->sc_intrhand[i]) { + bus_teardown_intr(dev, sc->sc_res[i + 1], + sc->sc_intrhand[i]); + } + } +} + +static int bcm_gpio_attach(device_t dev) { int i, j; @@ -678,30 +764,34 @@ bcm_gpio_attach(device_t dev) struct bcm_gpio_softc *sc; uint32_t func; - sc = device_get_softc(dev); - sc->sc_dev = dev; - mtx_init(&sc->sc_mtx, "bcm gpio", "gpio", MTX_DEF); + if (bcm_gpio_sc != NULL) + return (ENXIO); + + bcm_gpio_sc = sc = device_get_softc(dev); + sc->sc_dev = dev; + mtx_init(&sc->sc_mtx, "bcm gpio", "gpio", MTX_SPIN); if (bus_alloc_resources(dev, bcm_gpio_res_spec, sc->sc_res) != 0) { device_printf(dev, "cannot allocate resources\n"); goto fail; } sc->sc_bst = rman_get_bustag(sc->sc_res[0]); sc->sc_bsh = rman_get_bushandle(sc->sc_res[0]); - + /* Setup the GPIO interrupt handler. */ + if (bcm_gpio_intr_attach(dev)) { + device_printf(dev, "unable to setup the gpio irq handler\n"); + goto fail; + } /* Find our node. */ gpio = ofw_bus_get_node(sc->sc_dev); - if (!OF_hasprop(gpio, "gpio-controller")) /* Node is not a GPIO controller. */ goto fail; - /* * Find the read-only pins. These are pins we never touch or bad * things could happen. */ if (bcm_gpio_get_reserved_pins(sc) == -1) goto fail; - /* Initialize the software controlled pins. */ for (i = 0, j = 0; j < BCM_GPIO_PINS; j++) { snprintf(sc->sc_gpio_pins[i].gp_name, GPIOMAXNAME, @@ -710,6 +800,9 @@ bcm_gpio_attach(device_t dev) sc->sc_gpio_pins[i].gp_pin = j; sc->sc_gpio_pins[i].gp_caps = BCM_GPIO_DEFAULT_CAPS; sc->sc_gpio_pins[i].gp_flags = bcm_gpio_func_flag(func); + /* The default is active-low interrupts. */ + sc->sc_irq_trigger[i] = INTR_TRIGGER_LEVEL; + sc->sc_irq_polarity[i] = INTR_POLARITY_LOW; i++; } sc->sc_gpio_npins = i; @@ -721,6 +814,7 @@ bcm_gpio_attach(device_t dev) return (0); fail: + bcm_gpio_intr_detach(dev); bus_release_resources(dev, bcm_gpio_res_spec, sc->sc_res); mtx_destroy(&sc->sc_mtx); @@ -734,6 +828,177 @@ bcm_gpio_detach(device_t dev) return (EBUSY); } +static uint32_t +bcm_gpio_intr_reg(struct bcm_gpio_softc *sc, unsigned int irq, uint32_t bank) +{ + + if (irq > BCM_GPIO_PINS) + return (0); + if (sc->sc_irq_trigger[irq] == INTR_TRIGGER_LEVEL) { + if (sc->sc_irq_polarity[irq] == INTR_POLARITY_LOW) + return (BCM_GPIO_GPLEN(bank)); + else if (sc->sc_irq_polarity[irq] == INTR_POLARITY_HIGH) + return (BCM_GPIO_GPHEN(bank)); + } else if (sc->sc_irq_trigger[irq] == INTR_TRIGGER_EDGE) { + if (sc->sc_irq_polarity[irq] == INTR_POLARITY_LOW) + return (BCM_GPIO_GPFEN(bank)); + else if (sc->sc_irq_polarity[irq] == INTR_POLARITY_HIGH) + return (BCM_GPIO_GPREN(bank)); + } + + return (0); +} + +static void +bcm_gpio_mask_irq(void *source) +{ + uint32_t bank, mask, reg; + unsigned int irq; + + irq = (unsigned int)source; + if (irq > BCM_GPIO_PINS) + return; + if (bcm_gpio_pin_is_ro(bcm_gpio_sc, irq)) + return; + bank = BCM_GPIO_BANK(irq); + mask = BCM_GPIO_MASK(irq); + BCM_GPIO_LOCK(bcm_gpio_sc); + reg = bcm_gpio_intr_reg(bcm_gpio_sc, irq, bank); + if (reg != 0) + BCM_GPIO_CLEAR_BITS(bcm_gpio_sc, reg, mask); + BCM_GPIO_UNLOCK(bcm_gpio_sc); +} + +static void +bcm_gpio_unmask_irq(void *source) +{ + uint32_t bank, mask, reg; + unsigned int irq; + + irq = (unsigned int)source; + if (irq > BCM_GPIO_PINS) + return; + if (bcm_gpio_pin_is_ro(bcm_gpio_sc, irq)) + return; + bank = BCM_GPIO_BANK(irq); + mask = BCM_GPIO_MASK(irq); + BCM_GPIO_LOCK(bcm_gpio_sc); + reg = bcm_gpio_intr_reg(bcm_gpio_sc, irq, bank); + if (reg != 0) + BCM_GPIO_SET_BITS(bcm_gpio_sc, reg, mask); + BCM_GPIO_UNLOCK(bcm_gpio_sc); +} + +static int +bcm_gpio_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + int pin; + + if (type != SYS_RES_IRQ) + return (ENXIO); + /* Unmask the interrupt. */ + pin = rman_get_start(res); + bcm_gpio_unmask_irq((void *)pin); + + return (0); +} + +static int +bcm_gpio_deactivate_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + int pin; + + if (type != SYS_RES_IRQ) + return (ENXIO); + /* Mask the interrupt. */ + pin = rman_get_start(res); + bcm_gpio_mask_irq((void *)pin); + + return (0); +} + +static int +bcm_gpio_config_intr(device_t dev, int irq, enum intr_trigger trig, + enum intr_polarity pol) +{ + int bank; + struct bcm_gpio_softc *sc; + uint32_t mask, oldreg, reg; + + if (irq > BCM_GPIO_PINS) + return (EINVAL); + /* There is no standard trigger or polarity. */ + if (trig == INTR_TRIGGER_CONFORM || pol == INTR_POLARITY_CONFORM) + return (EINVAL); + sc = device_get_softc(dev); + if (bcm_gpio_pin_is_ro(sc, irq)) + return (EINVAL); + bank = BCM_GPIO_BANK(irq); + mask = BCM_GPIO_MASK(irq); + BCM_GPIO_LOCK(sc); + oldreg = bcm_gpio_intr_reg(sc, irq, bank); + sc->sc_irq_trigger[irq] = trig; + sc->sc_irq_polarity[irq] = pol; + reg = bcm_gpio_intr_reg(sc, irq, bank); + if (reg != 0) + BCM_GPIO_SET_BITS(sc, reg, mask); + if (reg != oldreg && oldreg != 0) + BCM_GPIO_CLEAR_BITS(sc, oldreg, mask); + BCM_GPIO_UNLOCK(sc); + + return (0); +} + +static int +bcm_gpio_setup_intr(device_t bus, device_t child, struct resource *ires, + int flags, driver_filter_t *filt, driver_intr_t *handler, + void *arg, void **cookiep) +{ + struct bcm_gpio_softc *sc; + struct intr_event *event; + int pin, error; + + sc = device_get_softc(bus); + pin = rman_get_start(ires); + if (pin > BCM_GPIO_PINS) + panic("%s: bad pin %d", __func__, pin); + event = sc->sc_events[pin]; + if (event == NULL) { + error = intr_event_create(&event, (void *)pin, 0, pin, + bcm_gpio_mask_irq, bcm_gpio_unmask_irq, NULL, NULL, + "gpio%d pin%d:", device_get_unit(bus), pin); + if (error != 0) + return (error); + sc->sc_events[pin] = event; + } + intr_event_add_handler(event, device_get_nameunit(child), filt, + handler, arg, intr_priority(flags), flags, cookiep); + + return (0); +} + +static int +bcm_gpio_teardown_intr(device_t dev, device_t child, struct resource *ires, + void *cookie) +{ + struct bcm_gpio_softc *sc; + int pin, err; + + sc = device_get_softc(dev); + pin = rman_get_start(ires); + if (pin > BCM_GPIO_PINS) + panic("%s: bad pin %d", __func__, pin); + if (sc->sc_events[pin] == NULL) + panic("Trying to teardown unoccupied IRQ"); + err = intr_event_remove_handler(cookie); + if (!err) + sc->sc_events[pin] = NULL; + + return (err); +} + static phandle_t bcm_gpio_get_node(device_t bus, device_t dev) { @@ -759,6 +1024,13 @@ static device_method_t bcm_gpio_methods[ DEVMETHOD(gpio_pin_set, bcm_gpio_pin_set), DEVMETHOD(gpio_pin_toggle, bcm_gpio_pin_toggle), + /* Bus interface */ + DEVMETHOD(bus_activate_resource, bcm_gpio_activate_resource), + DEVMETHOD(bus_deactivate_resource, bcm_gpio_deactivate_resource), + DEVMETHOD(bus_config_intr, bcm_gpio_config_intr), + DEVMETHOD(bus_setup_intr, bcm_gpio_setup_intr), + DEVMETHOD(bus_teardown_intr, bcm_gpio_teardown_intr), + /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, bcm_gpio_get_node), From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 18:35:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE12A46E; Wed, 4 Feb 2015 18:35:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA58A15E; Wed, 4 Feb 2015 18:35:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14IZoGp085771; Wed, 4 Feb 2015 18:35:50 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14IZoFh085770; Wed, 4 Feb 2015 18:35:50 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502041835.t14IZoFh085770@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Wed, 4 Feb 2015 18:35:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278216 - head/sys/arm/ti 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 18:35:50 -0000 Author: loos Date: Wed Feb 4 18:35:49 2015 New Revision: 278216 URL: https://svnweb.freebsd.org/changeset/base/278216 Log: Fix a bug where an interrupt could be masked unintentionally when bus_config_intr() is called with the same interrupt type and polarity that is already set. Pointy hat: loos Modified: head/sys/arm/ti/ti_gpio.c Modified: head/sys/arm/ti/ti_gpio.c ============================================================================== --- head/sys/arm/ti/ti_gpio.c Wed Feb 4 18:15:28 2015 (r278215) +++ head/sys/arm/ti/ti_gpio.c Wed Feb 4 18:35:49 2015 (r278216) @@ -1004,7 +1004,7 @@ ti_gpio_config_intr(device_t dev, int ir val |= TI_GPIO_MASK(irq); ti_gpio_write_4(sc, TI_GPIO_BANK(irq), reg, val); } - if (oldreg != 0) { + if (reg != oldreg && oldreg != 0) { /* Remove the old settings. */ val = ti_gpio_read_4(sc, TI_GPIO_BANK(irq), oldreg); val &= ~TI_GPIO_MASK(irq); From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 19:58:55 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 316E88E8; Wed, 4 Feb 2015 19:58:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D096C77; Wed, 4 Feb 2015 19:58:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14Jwsir025344; Wed, 4 Feb 2015 19:58:54 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14JwsbV025343; Wed, 4 Feb 2015 19:58:54 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502041958.t14JwsbV025343@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Wed, 4 Feb 2015 19:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278220 - head/sys/dev/sfxge/common 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 19:58:55 -0000 Author: arybchik Date: Wed Feb 4 19:58:54 2015 New Revision: 278220 URL: https://svnweb.freebsd.org/changeset/base/278220 Log: sfxge: Implement EFSYS_MEM_READ_BARRIER() Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/common/efsys.h Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:40:30 2015 (r278219) +++ head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:58:54 2015 (r278220) @@ -677,8 +677,7 @@ typedef struct efsys_bar_s { /* BARRIERS */ -/* Strict ordering guaranteed by devacc.devacc_attr_dataorder */ -#define EFSYS_MEM_READ_BARRIER() +#define EFSYS_MEM_READ_BARRIER() rmb() #define EFSYS_PIO_WRITE_BARRIER() /* TIMESTAMP */ From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 20:04:00 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2595DAE0; Wed, 4 Feb 2015 20:04:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1021CD62; Wed, 4 Feb 2015 20:04:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14K40eZ029662; Wed, 4 Feb 2015 20:04:00 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14K3wBb029644; Wed, 4 Feb 2015 20:03:58 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502042003.t14K3wBb029644@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Wed, 4 Feb 2015 20:03:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278221 - in head/sys/dev/sfxge: . common 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 20:04:00 -0000 Author: arybchik Date: Wed Feb 4 20:03:57 2015 New Revision: 278221 URL: https://svnweb.freebsd.org/changeset/base/278221 Log: sfxge: Add macros to init, destroy, acquire, release and assert locks Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/common/efsys.h head/sys/dev/sfxge/sfxge.c head/sys/dev/sfxge/sfxge.h head/sys/dev/sfxge/sfxge_ev.c head/sys/dev/sfxge/sfxge_mcdi.c head/sys/dev/sfxge/sfxge_port.c head/sys/dev/sfxge/sfxge_rx.c head/sys/dev/sfxge/sfxge_tx.c head/sys/dev/sfxge/sfxge_tx.h Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/common/efsys.h Wed Feb 4 20:03:57 2015 (r278221) @@ -517,6 +517,15 @@ typedef struct efsys_bar_s { struct resource *esb_res; } efsys_bar_t; +#define SFXGE_BAR_LOCK_INIT(_esbp, _name) \ + mtx_init(&(_esbp)->esb_lock, (_name), NULL, MTX_DEF) +#define SFXGE_BAR_LOCK_DESTROY(_esbp) \ + mtx_destroy(&(_esbp)->esb_lock) +#define SFXGE_BAR_LOCK(_esbp) \ + mtx_lock(&(_esbp)->esb_lock) +#define SFXGE_BAR_UNLOCK(_esbp) \ + mtx_unlock(&(_esbp)->esb_lock) + #define EFSYS_BAR_READD(_esbp, _offset, _edp, _lock) \ do { \ _NOTE(CONSTANTCONDITION) \ @@ -525,7 +534,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ (_edp)->ed_u32[0] = bus_space_read_4((_esbp)->esb_tag, \ (_esbp)->esb_handle, (_offset)); \ @@ -535,7 +544,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -545,7 +554,7 @@ typedef struct efsys_bar_s { KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ ("not power of 2 aligned")); \ \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ (_eqp)->eq_u32[0] = bus_space_read_4((_esbp)->esb_tag, \ (_esbp)->esb_handle, (_offset)); \ @@ -556,7 +565,7 @@ typedef struct efsys_bar_s { uint32_t, (_eqp)->eq_u32[1], \ uint32_t, (_eqp)->eq_u32[0]); \ \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -568,7 +577,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ (_eop)->eo_u32[0] = bus_space_read_4((_esbp)->esb_tag, \ (_esbp)->esb_handle, (_offset)); \ @@ -587,7 +596,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -599,7 +608,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ EFSYS_PROBE2(bar_writed, unsigned int, (_offset), \ uint32_t, (_edp)->ed_u32[0]); \ @@ -609,7 +618,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -619,7 +628,7 @@ typedef struct efsys_bar_s { KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ ("not power of 2 aligned")); \ \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ EFSYS_PROBE3(bar_writeq, unsigned int, (_offset), \ uint32_t, (_eqp)->eq_u32[1], \ @@ -630,7 +639,7 @@ typedef struct efsys_bar_s { bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\ (_offset+4), (_eqp)->eq_u32[1]); \ \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -642,7 +651,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_lock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_LOCK(_esbp); \ \ EFSYS_PROBE5(bar_writeo, unsigned int, (_offset), \ uint32_t, (_eop)->eo_u32[3], \ @@ -661,7 +670,7 @@ typedef struct efsys_bar_s { \ _NOTE(CONSTANTCONDITION) \ if (_lock) \ - mtx_unlock(&((_esbp)->esb_lock)); \ + SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) Modified: head/sys/dev/sfxge/sfxge.c ============================================================================== --- head/sys/dev/sfxge/sfxge.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge.c Wed Feb 4 20:03:57 2015 (r278221) @@ -95,7 +95,7 @@ sfxge_start(struct sfxge_softc *sc) { int rc; - sx_assert(&sc->softc_lock, LA_XLOCKED); + SFXGE_ADAPTER_LOCK_ASSERT_OWNED(sc); if (sc->init_state == SFXGE_STARTED) return (0); @@ -164,15 +164,15 @@ sfxge_if_init(void *arg) sc = (struct sfxge_softc *)arg; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); (void)sfxge_start(sc); - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); } static void sfxge_stop(struct sfxge_softc *sc) { - sx_assert(&sc->softc_lock, LA_XLOCKED); + SFXGE_ADAPTER_LOCK_ASSERT_OWNED(sc); if (sc->init_state != SFXGE_STARTED) return; @@ -212,7 +212,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign switch (command) { case SIOCSIFFLAGS: - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { if ((ifp->if_flags ^ sc->if_flags) & @@ -225,7 +225,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign if (ifp->if_drv_flags & IFF_DRV_RUNNING) sfxge_stop(sc); sc->if_flags = ifp->if_flags; - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); break; case SIOCSIFMTU: if (ifr->ifr_mtu == ifp->if_mtu) { @@ -238,11 +238,11 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign error = 0; } else { /* Restart required */ - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); sfxge_stop(sc); ifp->if_mtu = ifr->ifr_mtu; error = sfxge_start(sc); - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); if (error != 0) { ifp->if_flags &= ~IFF_UP; ifp->if_drv_flags &= ~IFF_DRV_RUNNING; @@ -256,7 +256,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign sfxge_mac_filter_set(sc); break; case SIOCSIFCAP: - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); /* * The networking core already rejects attempts to @@ -266,7 +266,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign */ if (~ifr->ifr_reqcap & SFXGE_CAP_FIXED) { error = EINVAL; - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); break; } @@ -280,7 +280,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign else ifp->if_hwassist &= ~CSUM_TSO; - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); break; case SIOCSIFMEDIA: case SIOCGIFMEDIA: @@ -298,9 +298,9 @@ sfxge_ifnet_fini(struct ifnet *ifp) { struct sfxge_softc *sc = ifp->if_softc; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); sfxge_stop(sc); - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); ifmedia_removeall(&sc->media); ether_ifdetach(ifp); @@ -376,7 +376,7 @@ sfxge_bar_init(struct sfxge_softc *sc) } esbp->esb_tag = rman_get_bustag(esbp->esb_res); esbp->esb_handle = rman_get_bushandle(esbp->esb_res); - mtx_init(&esbp->esb_lock, "sfxge_efsys_bar", NULL, MTX_DEF); + SFXGE_BAR_LOCK_INIT(esbp, "sfxge_efsys_bar"); return (0); } @@ -388,7 +388,7 @@ sfxge_bar_fini(struct sfxge_softc *sc) bus_release_resource(sc->dev, SYS_RES_MEMORY, esbp->esb_rid, esbp->esb_res); - mtx_destroy(&esbp->esb_lock); + SFXGE_BAR_LOCK_DESTROY(esbp); } static int @@ -401,7 +401,7 @@ sfxge_create(struct sfxge_softc *sc) dev = sc->dev; - sx_init(&sc->softc_lock, "sfxge_softc"); + SFXGE_ADAPTER_LOCK_INIT(sc, "sfxge_softc"); sc->max_rss_channels = 0; snprintf(rss_param_name, sizeof(rss_param_name), @@ -545,7 +545,7 @@ fail3: fail: sc->dev = NULL; - sx_destroy(&sc->softc_lock); + SFXGE_ADAPTER_LOCK_DESTROY(sc); return (error); } @@ -594,7 +594,7 @@ sfxge_destroy(struct sfxge_softc *sc) taskqueue_drain(taskqueue_thread, &sc->task_reset); /* Destroy the softc lock. */ - sx_destroy(&sc->softc_lock); + SFXGE_ADAPTER_LOCK_DESTROY(sc); } static int @@ -696,7 +696,7 @@ sfxge_reset(void *arg, int npending) sc = (struct sfxge_softc *)arg; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); if (sc->init_state != SFXGE_STARTED) goto done; @@ -709,7 +709,7 @@ sfxge_reset(void *arg, int npending) rc); done: - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); } void Modified: head/sys/dev/sfxge/sfxge.h ============================================================================== --- head/sys/dev/sfxge/sfxge.h Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge.h Wed Feb 4 20:03:57 2015 (r278221) @@ -314,4 +314,48 @@ extern int sfxge_port_ifmedia_init(struc #define SFXGE_MAX_MTU (9 * 1024) +#define SFXGE_ADAPTER_LOCK_INIT(_sc, _name) \ + sx_init(&(_sc)->softc_lock, (_name)) +#define SFXGE_ADAPTER_LOCK_DESTROY(_sc) \ + sx_destroy(&(_sc)->softc_lock) +#define SFXGE_ADAPTER_LOCK(_sc) \ + sx_xlock(&(_sc)->softc_lock) +#define SFXGE_ADAPTER_UNLOCK(_sc) \ + sx_xunlock(&(_sc)->softc_lock) +#define SFXGE_ADAPTER_LOCK_ASSERT_OWNED(_sc) \ + sx_assert(&(_sc)->softc_lock, LA_XLOCKED) + +#define SFXGE_PORT_LOCK_INIT(_port, _name) \ + mtx_init(&(_port)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_PORT_LOCK_DESTROY(_port) \ + mtx_destroy(&(_port)->lock) +#define SFXGE_PORT_LOCK(_port) \ + mtx_lock(&(_port)->lock) +#define SFXGE_PORT_UNLOCK(_port) \ + mtx_unlock(&(_port)->lock) +#define SFXGE_PORT_LOCK_ASSERT_OWNED(_port) \ + mtx_assert(&(_port)->lock, MA_OWNED) + +#define SFXGE_MCDI_LOCK_INIT(_mcdi, _name) \ + mtx_init(&(_mcdi)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_MCDI_LOCK_DESTROY(_mcdi) \ + mtx_destroy(&(_mcdi)->lock) +#define SFXGE_MCDI_LOCK(_mcdi) \ + mtx_lock(&(_mcdi)->lock) +#define SFXGE_MCDI_UNLOCK(_mcdi) \ + mtx_unlock(&(_mcdi)->lock) +#define SFXGE_MCDI_LOCK_ASSERT_OWNED(_mcdi) \ + mtx_assert(&(_mcdi)->lock, MA_OWNED) + +#define SFXGE_EVQ_LOCK_INIT(_evq, _name) \ + mtx_init(&(_evq)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_EVQ_LOCK_DESTROY(_evq) \ + mtx_destroy(&(_evq)->lock) +#define SFXGE_EVQ_LOCK(_evq) \ + mtx_lock(&(_evq)->lock) +#define SFXGE_EVQ_UNLOCK(_evq) \ + mtx_unlock(&(_evq)->lock) +#define SFXGE_EVQ_LOCK_ASSERT_OWNED(_evq) \ + mtx_assert(&(_evq)->lock, MA_OWNED) + #endif /* _SFXGE_H */ Modified: head/sys/dev/sfxge/sfxge_ev.c ============================================================================== --- head/sys/dev/sfxge/sfxge_ev.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge_ev.c Wed Feb 4 20:03:57 2015 (r278221) @@ -415,7 +415,7 @@ sfxge_ev_stat_update(struct sfxge_softc unsigned int index; clock_t now; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); if (sc->evq[0]->init_state != SFXGE_EVQ_STARTED) goto out; @@ -429,12 +429,12 @@ sfxge_ev_stat_update(struct sfxge_softc /* Add event counts from each event queue in turn */ for (index = 0; index < sc->intr.n_alloc; index++) { evq = sc->evq[index]; - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); efx_ev_qstats_update(evq->common, sc->ev_stats); - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); } out: - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); } static int @@ -495,7 +495,7 @@ sfxge_int_mod_handler(SYSCTL_HANDLER_ARG int error; int index; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); if (req->newptr != NULL) { if ((error = SYSCTL_IN(req, &moderation, sizeof(moderation))) @@ -522,7 +522,7 @@ sfxge_int_mod_handler(SYSCTL_HANDLER_ARG } out: - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); return (error); } @@ -577,7 +577,7 @@ sfxge_ev_qpoll(struct sfxge_evq *evq) { int rc; - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); if (evq->init_state != SFXGE_EVQ_STARTING && evq->init_state != SFXGE_EVQ_STARTED) { @@ -607,12 +607,12 @@ sfxge_ev_qpoll(struct sfxge_evq *evq) if ((rc = efx_ev_qprime(evq->common, evq->read_ptr)) != 0) goto fail; - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); return (0); fail: - mtx_unlock(&(evq->lock)); + SFXGE_EVQ_UNLOCK(evq); return (rc); } @@ -626,7 +626,7 @@ sfxge_ev_qstop(struct sfxge_softc *sc, u KASSERT(evq->init_state == SFXGE_EVQ_STARTED, ("evq->init_state != SFXGE_EVQ_STARTED")); - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); evq->init_state = SFXGE_EVQ_INITIALIZED; evq->read_ptr = 0; evq->exception = B_FALSE; @@ -639,7 +639,7 @@ sfxge_ev_qstop(struct sfxge_softc *sc, u efx_ev_qdestroy(evq->common); efx_sram_buf_tbl_clear(sc->enp, evq->buf_base_id, EFX_EVQ_NBUFS(evq->entries)); - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); } static int @@ -669,7 +669,7 @@ sfxge_ev_qstart(struct sfxge_softc *sc, evq->buf_base_id, &evq->common)) != 0) goto fail; - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); /* Set the default moderation */ (void)efx_ev_qmoderate(evq->common, sc->ev_moderation); @@ -680,7 +680,7 @@ sfxge_ev_qstart(struct sfxge_softc *sc, evq->init_state = SFXGE_EVQ_STARTING; - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); /* Wait for the initialization event */ count = 0; @@ -701,10 +701,10 @@ done: return (0); fail3: - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); evq->init_state = SFXGE_EVQ_INITIALIZED; fail2: - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); efx_ev_qdestroy(evq->common); fail: efx_sram_buf_tbl_clear(sc->enp, evq->buf_base_id, @@ -785,7 +785,7 @@ sfxge_ev_qfini(struct sfxge_softc *sc, u sc->evq[index] = NULL; - mtx_destroy(&evq->lock); + SFXGE_EVQ_LOCK_DESTROY(evq); free(evq, M_SFXGE); } @@ -832,7 +832,7 @@ sfxge_ev_qinit(struct sfxge_softc *sc, u sfxge_sram_buf_tbl_alloc(sc, EFX_EVQ_NBUFS(evq->entries), &evq->buf_base_id); - mtx_init(&evq->lock, "evq", NULL, MTX_DEF); + SFXGE_EVQ_LOCK_INIT(evq, "evq"); evq->init_state = SFXGE_EVQ_INITIALIZED; Modified: head/sys/dev/sfxge/sfxge_mcdi.c ============================================================================== --- head/sys/dev/sfxge/sfxge_mcdi.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge_mcdi.c Wed Feb 4 20:03:57 2015 (r278221) @@ -52,8 +52,7 @@ __FBSDID("$FreeBSD$"); static void sfxge_mcdi_acquire(struct sfxge_mcdi *mcdi) { - - mtx_lock(&mcdi->lock); + SFXGE_MCDI_LOCK(mcdi); KASSERT(mcdi->state != SFXGE_MCDI_UNINITIALIZED, ("MCDI not initialized")); @@ -61,15 +60,14 @@ sfxge_mcdi_acquire(struct sfxge_mcdi *mc (void)cv_wait_sig(&mcdi->cv, &mcdi->lock); mcdi->state = SFXGE_MCDI_BUSY; - mtx_unlock(&mcdi->lock); + SFXGE_MCDI_UNLOCK(mcdi); } /* Release ownership of MCDI on request completion. */ static void sfxge_mcdi_release(struct sfxge_mcdi *mcdi) { - - mtx_lock(&mcdi->lock); + SFXGE_MCDI_LOCK(mcdi); KASSERT((mcdi->state == SFXGE_MCDI_BUSY || mcdi->state == SFXGE_MCDI_COMPLETED), ("MCDI not busy or task not completed")); @@ -77,7 +75,7 @@ sfxge_mcdi_release(struct sfxge_mcdi *mc mcdi->state = SFXGE_MCDI_INITIALIZED; cv_broadcast(&mcdi->cv); - mtx_unlock(&mcdi->lock); + SFXGE_MCDI_UNLOCK(mcdi); } static void @@ -160,11 +158,11 @@ sfxge_mcdi_ev_cpl(void *arg) sc = (struct sfxge_softc *)arg; mcdi = &sc->mcdi; - mtx_lock(&mcdi->lock); + SFXGE_MCDI_LOCK(mcdi); KASSERT(mcdi->state == SFXGE_MCDI_BUSY, ("MCDI not busy")); mcdi->state = SFXGE_MCDI_COMPLETED; cv_broadcast(&mcdi->cv); - mtx_unlock(&mcdi->lock); + SFXGE_MCDI_UNLOCK(mcdi); } static void @@ -203,7 +201,7 @@ sfxge_mcdi_init(struct sfxge_softc *sc) KASSERT(mcdi->state == SFXGE_MCDI_UNINITIALIZED, ("MCDI already initialized")); - mtx_init(&mcdi->lock, "sfxge_mcdi", NULL, MTX_DEF); + SFXGE_MCDI_LOCK_INIT(mcdi, "sfxge_mcdi"); mcdi->state = SFXGE_MCDI_INITIALIZED; @@ -220,7 +218,7 @@ sfxge_mcdi_init(struct sfxge_softc *sc) return (0); fail: - mtx_destroy(&mcdi->lock); + SFXGE_MCDI_LOCK_DESTROY(mcdi); mcdi->state = SFXGE_MCDI_UNINITIALIZED; return (rc); } @@ -236,7 +234,7 @@ sfxge_mcdi_fini(struct sfxge_softc *sc) mcdi = &sc->mcdi; emtp = &mcdi->transport; - mtx_lock(&mcdi->lock); + SFXGE_MCDI_LOCK(mcdi); KASSERT(mcdi->state == SFXGE_MCDI_INITIALIZED, ("MCDI not initialized")); @@ -244,7 +242,7 @@ sfxge_mcdi_fini(struct sfxge_softc *sc) bzero(emtp, sizeof(*emtp)); cv_destroy(&mcdi->cv); - mtx_unlock(&mcdi->lock); + SFXGE_MCDI_UNLOCK(mcdi); - mtx_destroy(&mcdi->lock); + SFXGE_MCDI_LOCK_DESTROY(mcdi); } Modified: head/sys/dev/sfxge/sfxge_port.c ============================================================================== --- head/sys/dev/sfxge/sfxge_port.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge_port.c Wed Feb 4 20:03:57 2015 (r278221) @@ -48,7 +48,7 @@ sfxge_mac_stat_update(struct sfxge_softc unsigned int count; int rc; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); if (port->init_state != SFXGE_PORT_STARTED) { rc = 0; @@ -82,7 +82,7 @@ sfxge_mac_stat_update(struct sfxge_softc rc = ETIMEDOUT; out: - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (rc); } @@ -170,7 +170,7 @@ sfxge_port_wanted_fc_handler(SYSCTL_HAND sc = arg1; port = &sc->port; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); if (req->newptr != NULL) { if ((error = SYSCTL_IN(req, &fcntl, sizeof(fcntl))) != 0) @@ -191,7 +191,7 @@ sfxge_port_wanted_fc_handler(SYSCTL_HAND } out: - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (error); } @@ -207,13 +207,13 @@ sfxge_port_link_fc_handler(SYSCTL_HANDLE sc = arg1; port = &sc->port; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); if (port->init_state == SFXGE_PORT_STARTED && SFXGE_LINK_UP(sc)) efx_mac_fcntl_get(sc->enp, &wanted_fc, &link_fc); else link_fc = 0; error = SYSCTL_OUT(req, &link_fc, sizeof(link_fc)); - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (error); } @@ -262,7 +262,7 @@ sfxge_mac_poll_work(void *arg, int npend enp = sc->enp; port = &sc->port; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); if (port->init_state != SFXGE_PORT_STARTED) goto done; @@ -272,7 +272,7 @@ sfxge_mac_poll_work(void *arg, int npend sfxge_mac_link_update(sc, mode); done: - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); } static int @@ -320,7 +320,7 @@ sfxge_mac_filter_set(struct sfxge_softc struct sfxge_port *port = &sc->port; int rc; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); /* * The function may be called without softc_lock held in the * case of SIOCADDMULTI and SIOCDELMULTI ioctls. ioctl handler @@ -335,7 +335,7 @@ sfxge_mac_filter_set(struct sfxge_softc rc = sfxge_mac_filter_set_locked(sc); else rc = 0; - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (rc); } @@ -348,7 +348,7 @@ sfxge_port_stop(struct sfxge_softc *sc) port = &sc->port; enp = sc->enp; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); KASSERT(port->init_state == SFXGE_PORT_STARTED, ("port not started")); @@ -367,7 +367,7 @@ sfxge_port_stop(struct sfxge_softc *sc) /* Destroy the common code port object. */ efx_port_fini(sc->enp); - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); } int @@ -383,7 +383,7 @@ sfxge_port_start(struct sfxge_softc *sc) port = &sc->port; enp = sc->enp; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); KASSERT(port->init_state == SFXGE_PORT_INITIALIZED, ("port not initialized")); @@ -426,7 +426,7 @@ sfxge_port_start(struct sfxge_softc *sc) port->init_state = SFXGE_PORT_STARTED; /* Single poll in case there were missing initial events */ - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); sfxge_mac_poll_work(sc, 0); return (0); @@ -439,7 +439,7 @@ fail3: fail2: efx_port_fini(sc->enp); fail: - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (rc); } @@ -453,7 +453,7 @@ sfxge_phy_stat_update(struct sfxge_softc unsigned int count; int rc; - mtx_lock(&port->lock); + SFXGE_PORT_LOCK(port); if (port->init_state != SFXGE_PORT_STARTED) { rc = 0; @@ -487,7 +487,7 @@ sfxge_phy_stat_update(struct sfxge_softc rc = ETIMEDOUT; out: - mtx_unlock(&port->lock); + SFXGE_PORT_UNLOCK(port); return (rc); } @@ -554,7 +554,7 @@ sfxge_port_fini(struct sfxge_softc *sc) sfxge_dma_free(esmp); free(port->mac_stats.decode_buf, M_SFXGE); - mtx_destroy(&port->lock); + SFXGE_PORT_LOCK_DESTROY(port); port->sc = NULL; } @@ -577,7 +577,7 @@ sfxge_port_init(struct sfxge_softc *sc) port->sc = sc; - mtx_init(&port->lock, "sfxge_port", NULL, MTX_DEF); + SFXGE_PORT_LOCK_INIT(port, "sfxge_port"); port->phy_stats.decode_buf = malloc(EFX_PHY_NSTATS * sizeof(uint32_t), M_SFXGE, M_WAITOK | M_ZERO); @@ -615,7 +615,7 @@ fail2: sfxge_dma_free(phy_stats_buf); fail: free(port->phy_stats.decode_buf, M_SFXGE); - (void)mtx_destroy(&port->lock); + SFXGE_PORT_LOCK_DESTROY(port); port->sc = NULL; return (rc); } @@ -655,7 +655,7 @@ sfxge_media_status(struct ifnet *ifp, st efx_link_mode_t mode; sc = ifp->if_softc; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; @@ -669,7 +669,7 @@ sfxge_media_status(struct ifnet *ifp, st ifmr->ifm_active |= sfxge_port_link_fc_ifm(sc); } - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); } static int @@ -682,7 +682,7 @@ sfxge_media_change(struct ifnet *ifp) sc = ifp->if_softc; ifm = sc->media.ifm_cur; - sx_xlock(&sc->softc_lock); + SFXGE_ADAPTER_LOCK(sc); if (!SFXGE_RUNNING(sc)) { rc = 0; @@ -695,7 +695,7 @@ sfxge_media_change(struct ifnet *ifp) rc = efx_phy_adv_cap_set(sc->enp, ifm->ifm_data); out: - sx_xunlock(&sc->softc_lock); + SFXGE_ADAPTER_UNLOCK(sc); return (rc); } Modified: head/sys/dev/sfxge/sfxge_rx.c ============================================================================== --- head/sys/dev/sfxge/sfxge_rx.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge_rx.c Wed Feb 4 20:03:57 2015 (r278221) @@ -207,7 +207,7 @@ sfxge_rx_qfill(struct sfxge_rxq *rxq, un prefetch_read_many(sc->enp); prefetch_read_many(rxq->common); - mtx_assert(&evq->lock, MA_OWNED); + SFXGE_EVQ_LOCK_ASSERT_OWNED(evq); if (rxq->init_state != SFXGE_RXQ_STARTED) return; @@ -749,7 +749,7 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq index = rxq->index; evq = sc->evq[index]; - mtx_assert(&evq->lock, MA_OWNED); + SFXGE_EVQ_LOCK_ASSERT_OWNED(evq); completed = rxq->completed; while (completed != rxq->pending) { @@ -834,7 +834,7 @@ sfxge_rx_qstop(struct sfxge_softc *sc, u rxq = sc->rxq[index]; evq = sc->evq[index]; - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); KASSERT(rxq->init_state == SFXGE_RXQ_STARTED, ("rxq not started")); @@ -849,7 +849,7 @@ again: /* Flush the receive queue */ efx_rx_qflush(rxq->common); - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); count = 0; do { @@ -861,7 +861,7 @@ again: } while (++count < 20); - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); if (rxq->flush_state == SFXGE_FLUSH_FAILED) goto again; @@ -885,7 +885,7 @@ again: efx_sram_buf_tbl_clear(sc->enp, rxq->buf_base_id, EFX_RXQ_NBUFS(sc->rxq_entries)); - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); } static int @@ -916,7 +916,7 @@ sfxge_rx_qstart(struct sfxge_softc *sc, &rxq->common)) != 0) goto fail; - mtx_lock(&evq->lock); + SFXGE_EVQ_LOCK(evq); /* Enable the receive queue. */ efx_rx_qenable(rxq->common); @@ -926,7 +926,7 @@ sfxge_rx_qstart(struct sfxge_softc *sc, /* Try to fill the queue from the pool. */ sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(sc->rxq_entries), B_FALSE); - mtx_unlock(&evq->lock); + SFXGE_EVQ_UNLOCK(evq); return (0); Modified: head/sys/dev/sfxge/sfxge_tx.c ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.c Wed Feb 4 19:58:54 2015 (r278220) +++ head/sys/dev/sfxge/sfxge_tx.c Wed Feb 4 20:03:57 2015 (r278221) @@ -118,7 +118,7 @@ sfxge_tx_qcomplete(struct sfxge_txq *txq { unsigned int completed; - mtx_assert(&evq->lock, MA_OWNED); + SFXGE_EVQ_LOCK_ASSERT_OWNED(evq); completed = txq->completed; while (completed != txq->pending) { @@ -178,7 +178,7 @@ sfxge_tx_qdpl_swizzle(struct sfxge_txq * unsigned int count; unsigned int non_tcp_count; - mtx_assert(&txq->lock, MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); stdp = &txq->dpl; @@ -221,7 +221,7 @@ sfxge_tx_qdpl_swizzle(struct sfxge_txq * static void sfxge_tx_qreap(struct sfxge_txq *txq) { - mtx_assert(SFXGE_TXQ_LOCK(txq), MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); txq->reaped = txq->completed; } @@ -233,7 +233,7 @@ sfxge_tx_qlist_post(struct sfxge_txq *tx unsigned int level; int rc; - mtx_assert(SFXGE_TXQ_LOCK(txq), MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); KASSERT(txq->n_pend_desc != 0, ("txq->n_pend_desc == 0")); KASSERT(txq->n_pend_desc <= SFXGE_TSO_MAX_DESC, @@ -408,7 +408,7 @@ sfxge_tx_qdpl_drain(struct sfxge_txq *tx unsigned int pushed; int rc; - mtx_assert(&txq->lock, MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); sc = txq->sc; stdp = &txq->dpl; @@ -484,7 +484,7 @@ sfxge_tx_qdpl_drain(struct sfxge_txq *tx static inline void sfxge_tx_qdpl_service(struct sfxge_txq *txq) { - mtx_assert(&txq->lock, MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); do { if (SFXGE_TX_QDPL_PENDING(txq)) @@ -493,9 +493,9 @@ sfxge_tx_qdpl_service(struct sfxge_txq * if (!txq->blocked) sfxge_tx_qdpl_drain(txq); - mtx_unlock(&txq->lock); + SFXGE_TXQ_UNLOCK(txq); } while (SFXGE_TX_QDPL_PENDING(txq) && - mtx_trylock(&txq->lock)); + SFXGE_TXQ_TRYLOCK(txq)); } /* @@ -519,7 +519,7 @@ sfxge_tx_qdpl_put(struct sfxge_txq *txq, KASSERT(mbuf->m_nextpkt == NULL, ("mbuf->m_nextpkt != NULL")); if (locked) { - mtx_assert(&txq->lock, MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); sfxge_tx_qdpl_swizzle(txq); @@ -588,11 +588,11 @@ sfxge_tx_packet_add(struct sfxge_txq *tx * the packet will be appended to the "get list" of the deferred * packet list. Otherwise, it will be pushed on the "put list". */ - locked = mtx_trylock(&txq->lock); + locked = SFXGE_TXQ_TRYLOCK(txq); if (sfxge_tx_qdpl_put(txq, m, locked) != 0) { if (locked) - mtx_unlock(&txq->lock); + SFXGE_TXQ_UNLOCK(txq); rc = ENOBUFS; goto fail; } @@ -605,7 +605,7 @@ sfxge_tx_packet_add(struct sfxge_txq *tx * is processing the list. */ if (!locked) - locked = mtx_trylock(&txq->lock); + locked = SFXGE_TXQ_TRYLOCK(txq); if (locked) { /* Try to service the list. */ @@ -626,7 +626,7 @@ sfxge_tx_qdpl_flush(struct sfxge_txq *tx struct sfxge_tx_dpl *stdp = &txq->dpl; struct mbuf *mbuf, *next; - mtx_lock(&txq->lock); + SFXGE_TXQ_LOCK(txq); sfxge_tx_qdpl_swizzle(txq); for (mbuf = stdp->std_get; mbuf != NULL; mbuf = next) { @@ -638,7 +638,7 @@ sfxge_tx_qdpl_flush(struct sfxge_txq *tx stdp->std_get_non_tcp_count = 0; stdp->std_getp = &stdp->std_get; - mtx_unlock(&txq->lock); + SFXGE_TXQ_UNLOCK(txq); } void @@ -753,21 +753,20 @@ void sfxge_if_start(struct ifnet *ifp) { struct sfxge_softc *sc = ifp->if_softc; - mtx_lock(&sc->tx_lock); + SFXGE_TXQ_LOCK(sc->txq[0]); sfxge_if_start_locked(ifp); - mtx_unlock(&sc->tx_lock); + SFXGE_TXQ_UNLOCK(sc->txq[0]); } static inline void sfxge_tx_qdpl_service(struct sfxge_txq *txq) { - struct sfxge_softc *sc = txq->sc; - struct ifnet *ifp = sc->ifnet; + struct ifnet *ifp = txq->sc->ifnet; - mtx_assert(&sc->tx_lock, MA_OWNED); + SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sfxge_if_start_locked(ifp); - mtx_unlock(&sc->tx_lock); + SFXGE_TXQ_UNLOCK(txq); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 20:55:22 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92B76AE4; Wed, 4 Feb 2015 20:55:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E7BA3D5; Wed, 4 Feb 2015 20:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14KtMOG054348; Wed, 4 Feb 2015 20:55:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14KtM6X054347; Wed, 4 Feb 2015 20:55:22 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502042055.t14KtM6X054347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 4 Feb 2015 20:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278222 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 20:55:22 -0000 Author: dim Date: Wed Feb 4 20:55:21 2015 New Revision: 278222 URL: https://svnweb.freebsd.org/changeset/base/278222 Log: Mark typedefs for manually implementing _Static_assert() as unused, so they won't show up unecessarily for -Wunused-local-typedefs. MFC after: 3 days Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Wed Feb 4 20:03:57 2015 (r278221) +++ head/sys/sys/cdefs.h Wed Feb 4 20:55:21 2015 (r278222) @@ -293,7 +293,8 @@ #elif defined(__COUNTER__) #define _Static_assert(x, y) __Static_assert(x, __COUNTER__) #define __Static_assert(x, y) ___Static_assert(x, y) -#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] +#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] \ + __unused #else #define _Static_assert(x, y) struct __hack #endif From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:00:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DB01E6C; Wed, 4 Feb 2015 21:00:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3976B612; Wed, 4 Feb 2015 21:00:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14L0UMx055490; Wed, 4 Feb 2015 21:00:30 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14L0Ued055489; Wed, 4 Feb 2015 21:00:30 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502042100.t14L0Ued055489@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 4 Feb 2015 21:00:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278223 - head/lib/clang 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:00:30 -0000 Author: dim Date: Wed Feb 4 21:00:29 2015 New Revision: 278223 URL: https://svnweb.freebsd.org/changeset/base/278223 Log: For now, add -stdlib=libc++ to the flags for building clang, since that makes it easier to build head on stable/9, where libstdc++ is still the default. We can revisit this when somebody will try to build base with gcc 4.8.1 or higher, and its included libstdc++. Reported by: rpaulo Modified: head/lib/clang/clang.build.mk Modified: head/lib/clang/clang.build.mk ============================================================================== --- head/lib/clang/clang.build.mk Wed Feb 4 20:55:21 2015 (r278222) +++ head/lib/clang/clang.build.mk Wed Feb 4 21:00:29 2015 (r278223) @@ -34,7 +34,7 @@ BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_ CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" -CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti +CXXFLAGS+= -std=c++11 -stdlib=libc++ -fno-exceptions -fno-rtti .PATH: ${LLVM_SRCS}/${SRCDIR} From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:09:31 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56E702C3; Wed, 4 Feb 2015 21:09:31 +0000 (UTC) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E26D76C; Wed, 4 Feb 2015 21:09:31 +0000 (UTC) Received: by mail-ig0-f176.google.com with SMTP id hl2so37811910igb.3; Wed, 04 Feb 2015 13:09:30 -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=I9aNXSe0XtGsk10KbYyazv00d3Tx5dnnM9EKTgheVhA=; b=vVklyZmzGvtoCw25bQh/feDsQwx5FTBMBGoVQHAImbnjhnAYUvpXc++x9GtWX+QGqz nlsVkrHc8hA9Qr0TgMdTpQgxRrlS3E6nXLVWMdafxBFjZZmYSK01E7YLy+TSbbZD4CBE aIU8dyX1FrlU9C5nAfedfk+wdk1KWQCEwkx0kFpXu5lbxO0ltWZGeZnxEE5IbET54szW hloHvIUtry1JpROfIAuAIasaWxMDChblUacjlz4Mjyv8yKt69dzZrNIaPy2K+oR4/lM6 1hnonLSxaG+w5wedCzewOJ3tyQjJVNAzHEUhIiLAY6/IpfW9kAaJHGF5gfQJkwvN/hDI h+zQ== MIME-Version: 1.0 X-Received: by 10.50.154.106 with SMTP id vn10mr26541508igb.49.1423084170488; Wed, 04 Feb 2015 13:09:30 -0800 (PST) Received: by 10.50.182.233 with HTTP; Wed, 4 Feb 2015 13:09:30 -0800 (PST) In-Reply-To: <201502042100.t14L0Ued055489@svn.freebsd.org> References: <201502042100.t14L0Ued055489@svn.freebsd.org> Date: Wed, 4 Feb 2015 13:09:30 -0800 Message-ID: Subject: Re: svn commit: r278223 - head/lib/clang From: NGie Cooper To: Dimitry Andric 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:09:31 -0000 On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: > Author: dim > Date: Wed Feb 4 21:00:29 2015 > New Revision: 278223 > URL: https://svnweb.freebsd.org/changeset/base/278223 > > Log: > For now, add -stdlib=libc++ to the flags for building clang, since that > makes it easier to build head on stable/9, where libstdc++ is still the > default. We can revisit this when somebody will try to build base with > gcc 4.8.1 or higher, and its included libstdc++. Maybe this should be conditionalized on COMPILER_TYPE? From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:16:59 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 798574BC; Wed, 4 Feb 2015 21:16:59 +0000 (UTC) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19729869; Wed, 4 Feb 2015 21:16:59 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::d66:7769:9ca9:807e] (unknown [IPv6:2001:7b8:3a7:0:d66:7769:9ca9:807e]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3C4F95C2E; Wed, 4 Feb 2015 22:16:52 +0100 (CET) Subject: Re: svn commit: r278223 - head/lib/clang Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_AB36565E-CDC2-4082-9645-849187671688"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 (755500a+) From: Dimitry Andric In-Reply-To: Date: Wed, 4 Feb 2015 22:16:47 +0100 Message-Id: <7338E032-8668-44D2-AE98-C3E50E512DDD@FreeBSD.org> References: <201502042100.t14L0Ued055489@svn.freebsd.org> To: NGie Cooper X-Mailer: Apple Mail (2.2070.6) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:16:59 -0000 --Apple-Mail=_AB36565E-CDC2-4082-9645-849187671688 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 04 Feb 2015, at 22:09, NGie Cooper wrote: > > On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: >> Author: dim >> Date: Wed Feb 4 21:00:29 2015 >> New Revision: 278223 >> URL: https://svnweb.freebsd.org/changeset/base/278223 >> >> Log: >> For now, add -stdlib=libc++ to the flags for building clang, since that >> makes it easier to build head on stable/9, where libstdc++ is still the >> default. We can revisit this when somebody will try to build base with >> gcc 4.8.1 or higher, and its included libstdc++. > > Maybe this should be conditionalized on COMPILER_TYPE? COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we need a CXX_LIBRARY_TYPE setting for it? That said, you may be right that it should be conditionalized on the compiler type anyway, since gcc does not support the -stdlib= option. -Dimitry --Apple-Mail=_AB36565E-CDC2-4082-9645-849187671688 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTSjEIACgkQsF6jCi4glqP4RQCdFNVHO/UigCPBnBQ1kf86e6e7 1PMAn3fWQ0knM5I8iotG4/kQyinHCuP2 =lqhD -----END PGP SIGNATURE----- --Apple-Mail=_AB36565E-CDC2-4082-9645-849187671688-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:23:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C82A7706; Wed, 4 Feb 2015 21:23:56 +0000 (UTC) Received: from mail-ig0-x22d.google.com (mail-ig0-x22d.google.com [IPv6:2607:f8b0:4001:c05::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8CE8E95D; Wed, 4 Feb 2015 21:23:56 +0000 (UTC) Received: by mail-ig0-f173.google.com with SMTP id a13so37765800igq.0; Wed, 04 Feb 2015 13:23:56 -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=LgNYT2BcLf/Ve+XmTfAVRU8jgxyBdsT9MenVRVYb3xc=; b=ImRi9r4ySiOTAqwxno1lk9c/Z15xOrjzGi0y3XIZXTAhFAf8xCR0IaEnjB/BpkHNRh adKwhzv3dhCUgtVMTGEF0HJ9RUDZSNl2J8iWHc1mTz34G5LWkcKY7xz1HTaqycapMptn vu9mNL6QE3jPeJyPsuk5xq0Gae2w+OP8EOUuYA38l1vPdza2P17Ax7LNbK/qTHoHbSJ/ 2NoAyswPJjoa52vpswOj9k6gzZ00SaDIEaP+RmnIxYOzna35qrDJ3YP/8WDUL8rBfdYh BKhDWLRsuKgAgCS/Z3wQudGJwSprXPNXRjI3cFxzHHGFO/QZczL29YUZSsI84VFmbkz9 XL+A== MIME-Version: 1.0 X-Received: by 10.50.137.99 with SMTP id qh3mr4756810igb.7.1423085036008; Wed, 04 Feb 2015 13:23:56 -0800 (PST) Received: by 10.50.182.233 with HTTP; Wed, 4 Feb 2015 13:23:55 -0800 (PST) In-Reply-To: <7338E032-8668-44D2-AE98-C3E50E512DDD@FreeBSD.org> References: <201502042100.t14L0Ued055489@svn.freebsd.org> <7338E032-8668-44D2-AE98-C3E50E512DDD@FreeBSD.org> Date: Wed, 4 Feb 2015 13:23:55 -0800 Message-ID: Subject: Re: svn commit: r278223 - head/lib/clang From: NGie Cooper To: Dimitry Andric 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:23:56 -0000 On Wed, Feb 4, 2015 at 1:16 PM, Dimitry Andric wrote: > On 04 Feb 2015, at 22:09, NGie Cooper wrote: >> >> On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: >>> Author: dim >>> Date: Wed Feb 4 21:00:29 2015 >>> New Revision: 278223 >>> URL: https://svnweb.freebsd.org/changeset/base/278223 >>> >>> Log: >>> For now, add -stdlib=libc++ to the flags for building clang, since that >>> makes it easier to build head on stable/9, where libstdc++ is still the >>> default. We can revisit this when somebody will try to build base with >>> gcc 4.8.1 or higher, and its included libstdc++. >> >> Maybe this should be conditionalized on COMPILER_TYPE? > > COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we > need a CXX_LIBRARY_TYPE setting for it? > > That said, you may be right that it should be conditionalized on the > compiler type anyway, since gcc does not support the -stdlib= option. Yeah... true. My original point was coming more from a perspective that this was being done strictly for the GNU toolchain, so conditionalizing the CFLAGS on the compiler being used seemed reasonable. Thanks! From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:44:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD3FDA5C; Wed, 4 Feb 2015 21:44:21 +0000 (UTC) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 81847B43; Wed, 4 Feb 2015 21:44:21 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::d66:7769:9ca9:807e] (unknown [IPv6:2001:7b8:3a7:0:d66:7769:9ca9:807e]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 7993D5C44; Wed, 4 Feb 2015 22:44:12 +0100 (CET) Subject: Re: svn commit: r278223 - head/lib/clang Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_A4D962F5-2F03-4490-9D4B-5C2682E83516"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 (755500a+) From: Dimitry Andric In-Reply-To: Date: Wed, 4 Feb 2015 22:44:11 +0100 Message-Id: References: <201502042100.t14L0Ued055489@svn.freebsd.org> <7338E032-8668-44D2-AE98-C3E50E512DDD@FreeBSD.org> To: NGie Cooper X-Mailer: Apple Mail (2.2070.6) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:44:21 -0000 --Apple-Mail=_A4D962F5-2F03-4490-9D4B-5C2682E83516 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 04 Feb 2015, at 22:23, NGie Cooper wrote: > > On Wed, Feb 4, 2015 at 1:16 PM, Dimitry Andric wrote: >> On 04 Feb 2015, at 22:09, NGie Cooper wrote: >>> >>> On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: >>>> Author: dim >>>> Date: Wed Feb 4 21:00:29 2015 >>>> New Revision: 278223 >>>> URL: https://svnweb.freebsd.org/changeset/base/278223 >>>> >>>> Log: >>>> For now, add -stdlib=libc++ to the flags for building clang, since that >>>> makes it easier to build head on stable/9, where libstdc++ is still the >>>> default. We can revisit this when somebody will try to build base with >>>> gcc 4.8.1 or higher, and its included libstdc++. >>> >>> Maybe this should be conditionalized on COMPILER_TYPE? >> >> COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we >> need a CXX_LIBRARY_TYPE setting for it? >> >> That said, you may be right that it should be conditionalized on the >> compiler type anyway, since gcc does not support the -stdlib= option. > > Yeah... true. > My original point was coming more from a perspective that this was > being done strictly for the GNU toolchain, so conditionalizing the > CFLAGS on the compiler being used seemed reasonable. This flag is only relevant when you are 1) using clang to compile, and 2) on freebsd 9.x. You cannot compile clang in head with base gcc anyway. -Dimitry --Apple-Mail=_A4D962F5-2F03-4490-9D4B-5C2682E83516 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTSkqsACgkQsF6jCi4glqOTLgCeOrh0cqhZ7WGSFHGxNTvktTm5 yM4An0uqBLFizkwIWhd1WPsmtvCD3avX =1jQO -----END PGP SIGNATURE----- --Apple-Mail=_A4D962F5-2F03-4490-9D4B-5C2682E83516-- From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:48:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DCBFC51; Wed, 4 Feb 2015 21:48:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79A50B81; Wed, 4 Feb 2015 21:48:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14LmpCv078887; Wed, 4 Feb 2015 21:48:51 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14LmpW9078886; Wed, 4 Feb 2015 21:48:51 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502042148.t14LmpW9078886@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 4 Feb 2015 21:48:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278225 - head/lib/clang 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:48:51 -0000 Author: dim Date: Wed Feb 4 21:48:50 2015 New Revision: 278225 URL: https://svnweb.freebsd.org/changeset/base/278225 Log: Followup to r278223, by only using -stdlib=libc++ when the compiler is clang; not even recent versions of gcc support the -stdlib flag. Noticed by: ngie Modified: head/lib/clang/clang.build.mk Modified: head/lib/clang/clang.build.mk ============================================================================== --- head/lib/clang/clang.build.mk Wed Feb 4 21:08:28 2015 (r278224) +++ head/lib/clang/clang.build.mk Wed Feb 4 21:48:50 2015 (r278225) @@ -34,7 +34,8 @@ BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_ CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" -CXXFLAGS+= -std=c++11 -stdlib=libc++ -fno-exceptions -fno-rtti +CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti +CXXFLAGS.clang+= -stdlib=libc++ .PATH: ${LLVM_SRCS}/${SRCDIR} From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 21:52:26 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3738DF1; Wed, 4 Feb 2015 21:52:26 +0000 (UTC) Received: from mail-ig0-x22b.google.com (mail-ig0-x22b.google.com [IPv6:2607:f8b0:4001:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90B73C45; Wed, 4 Feb 2015 21:52:26 +0000 (UTC) Received: by mail-ig0-f171.google.com with SMTP id h15so21771560igd.4; Wed, 04 Feb 2015 13:52:25 -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=HiuuSx8uWYUY7NT2ZvVr/dgrkZzwa/ucVVvycWIXJ58=; b=HAxHGilpxcTy8mDt1DmFq9RshRFldkZlHSvwZZmKPjiqe5xkwnbYFbLe1QJyWY6hnP ElWsDJ/hiI85kJwiCnR4luAUBF07L236m7MeSo9E7nBEB4OfX1lO9fzxPZSap8WZmay7 i3vUpo38AYAaQFDfmkbQRuF2dt76774o3lAUgs7B7QP9b9n2ucONhxR1wC3p4/32oFS6 m0eHQJsLRthWJQQ811yQo21UKqiQ93RaJ/7h3sveI3pfWmvCJTogIa3G6T2og2dq3kRE coIcwXZh/gbj4qq4vgo78iOTBkeLeirOB7/PzFG6bWpLIYv95k8r2qiRowu5jFcEDwId FhBw== MIME-Version: 1.0 X-Received: by 10.50.62.83 with SMTP id w19mr4872033igr.26.1423086745873; Wed, 04 Feb 2015 13:52:25 -0800 (PST) Received: by 10.50.182.233 with HTTP; Wed, 4 Feb 2015 13:52:25 -0800 (PST) In-Reply-To: References: <201502042100.t14L0Ued055489@svn.freebsd.org> <7338E032-8668-44D2-AE98-C3E50E512DDD@FreeBSD.org> Date: Wed, 4 Feb 2015 13:52:25 -0800 Message-ID: Subject: Re: svn commit: r278223 - head/lib/clang From: NGie Cooper To: Dimitry Andric 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 21:52:26 -0000 On Wed, Feb 4, 2015 at 1:44 PM, Dimitry Andric wrote: ... > This flag is only relevant when you are 1) using clang to compile, and > 2) on freebsd 9.x. You cannot compile clang in head with base gcc > anyway. Good point. From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 00:12:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 255462A5; Thu, 5 Feb 2015 00:12:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1099AD65; Thu, 5 Feb 2015 00:12:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t150CMfd051230; Thu, 5 Feb 2015 00:12:22 GMT (envelope-from ken@FreeBSD.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t150CLaH051225; Thu, 5 Feb 2015 00:12:21 GMT (envelope-from ken@FreeBSD.org) Message-Id: <201502050012.t150CLaH051225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ken set sender to ken@FreeBSD.org using -f From: "Kenneth D. Merry" Date: Thu, 5 Feb 2015 00:12:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278228 - in head/sys: cam cam/scsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 00:12:23 -0000 Author: ken Date: Thu Feb 5 00:12:21 2015 New Revision: 278228 URL: https://svnweb.freebsd.org/changeset/base/278228 Log: Add support for probing the SCSI VPD Extended Inquiry page (0x86). This VPD page is effectively an extension of the standard Inquiry data page, and includes lots of additional bits. This commit includes support for probing the page in the SCSI probe code, and an additional request type for the XPT_DEV_ADVINFO CCB. CTL already supports the Extended Inquiry page. Support for querying this page in the sa(4) driver will come later. sys/cam/scsi/scsi_xpt.c: Probe the Extended Inquiry page, if the device supports it, and return it in response to a XPT_DEV_ADVINFO CCB if it is requested. sys/cam/scsi/cam_ccb.h: Define a new advanced information CCB data type, CDAI_TYPE_EXT_INQ. sys/cam/cam_xpt.c: Free the extended inquiry data in a device when the device goes away. sys/cam/cam_xpt_internal.h: Add an extended inquiry data pointer and length to struct cam_ed. sys/sys/param.h Bump __FreeBSD_version for the addition of the new CDAI_TYPE_EXT_INQ advanced information type. Sponsored by: Spectra Logic MFC after: 1 week Modified: head/sys/cam/cam_ccb.h head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt_internal.h head/sys/cam/scsi/scsi_xpt.c head/sys/sys/param.h Modified: head/sys/cam/cam_ccb.h ============================================================================== --- head/sys/cam/cam_ccb.h Thu Feb 5 00:11:05 2015 (r278227) +++ head/sys/cam/cam_ccb.h Thu Feb 5 00:12:21 2015 (r278228) @@ -1147,6 +1147,7 @@ struct ccb_dev_advinfo { #define CDAI_TYPE_SERIAL_NUM 2 #define CDAI_TYPE_PHYS_PATH 3 #define CDAI_TYPE_RCAPLONG 4 +#define CDAI_TYPE_EXT_INQ 5 off_t bufsiz; /* IN: Size of external buffer */ #define CAM_SCSI_DEVID_MAXLEN 65536 /* length in buffer is an uint16_t */ off_t provsiz; /* OUT: Size required/used */ Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Thu Feb 5 00:11:05 2015 (r278227) +++ head/sys/cam/cam_xpt.c Thu Feb 5 00:12:21 2015 (r278228) @@ -4795,6 +4795,7 @@ xpt_release_device(struct cam_ed *device */ free(device->supported_vpds, M_CAMXPT); free(device->device_id, M_CAMXPT); + free(device->ext_inq, M_CAMXPT); free(device->physpath, M_CAMXPT); free(device->rcap_buf, M_CAMXPT); free(device->serial_num, M_CAMXPT); Modified: head/sys/cam/cam_xpt_internal.h ============================================================================== --- head/sys/cam/cam_xpt_internal.h Thu Feb 5 00:11:05 2015 (r278227) +++ head/sys/cam/cam_xpt_internal.h Thu Feb 5 00:12:21 2015 (r278228) @@ -83,6 +83,8 @@ struct cam_ed { uint8_t supported_vpds_len; uint32_t device_id_len; uint8_t *device_id; + uint32_t ext_inq_len; + uint8_t *ext_inq; uint8_t physpath_len; uint8_t *physpath; /* physical path string form */ uint32_t rcap_len; Modified: head/sys/cam/scsi/scsi_xpt.c ============================================================================== --- head/sys/cam/scsi/scsi_xpt.c Thu Feb 5 00:11:05 2015 (r278227) +++ head/sys/cam/scsi/scsi_xpt.c Thu Feb 5 00:12:21 2015 (r278228) @@ -139,6 +139,7 @@ typedef enum { PROBE_MODE_SENSE, PROBE_SUPPORTED_VPD_LIST, PROBE_DEVICE_ID, + PROBE_EXTENDED_INQUIRY, PROBE_SERIAL_NUM, PROBE_TUR_FOR_NEGOTIATION, PROBE_INQUIRY_BASIC_DV1, @@ -156,6 +157,7 @@ static char *probe_action_text[] = { "PROBE_MODE_SENSE", "PROBE_SUPPORTED_VPD_LIST", "PROBE_DEVICE_ID", + "PROBE_EXTENDED_INQUIRY", "PROBE_SERIAL_NUM", "PROBE_TUR_FOR_NEGOTIATION", "PROBE_INQUIRY_BASIC_DV1", @@ -923,6 +925,34 @@ done: } goto done; } + case PROBE_EXTENDED_INQUIRY: + { + struct scsi_vpd_extended_inquiry_data *ext_inq; + + ext_inq = NULL; + if (scsi_vpd_supported_page(periph, SVPD_EXTENDED_INQUIRY_DATA)) + ext_inq = malloc(sizeof(*ext_inq), M_CAMXPT, + M_NOWAIT | M_ZERO); + + if (ext_inq != NULL) { + scsi_inquiry(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + (uint8_t *)ext_inq, + sizeof(*ext_inq), + /*evpd*/TRUE, + SVPD_EXTENDED_INQUIRY_DATA, + SSD_MIN_SIZE, + /*timeout*/60 * 1000); + break; + } + /* + * We'll have to do without, let our probedone + * routine finish up for us. + */ + goto done; + } case PROBE_SERIAL_NUM: { struct scsi_vpd_unit_serial_number *serial_buf; @@ -1454,6 +1484,50 @@ out: if (devid && length == 0) free(devid, M_CAMXPT); xpt_release_ccb(done_ccb); + PROBE_SET_ACTION(softc, PROBE_EXTENDED_INQUIRY); + xpt_schedule(periph, priority); + goto out; + } + case PROBE_EXTENDED_INQUIRY: { + struct scsi_vpd_extended_inquiry_data *ext_inq; + struct ccb_scsiio *csio; + int32_t length = 0; + + csio = &done_ccb->csio; + ext_inq = (struct scsi_vpd_extended_inquiry_data *) + csio->data_ptr; + if (path->device->ext_inq != NULL) { + path->device->ext_inq_len = 0; + free(path->device->ext_inq, M_CAMXPT); + path->device->ext_inq = NULL; + } + + if (ext_inq == NULL) { + /* Don't process the command as it was never sent */ + } else if (CCB_COMPLETED_OK(csio->ccb_h)) { + length = scsi_2btoul(ext_inq->page_length) + + __offsetof(struct scsi_vpd_extended_inquiry_data, + flags1); + length = min(length, sizeof(*ext_inq)); + length -= csio->resid; + if (length > 0) { + path->device->ext_inq_len = length; + path->device->ext_inq = (uint8_t *)ext_inq; + } + } else if (cam_periph_error(done_ccb, 0, + SF_RETRY_UA, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + + /* Free the device id space if we don't use it */ + if (ext_inq && length <= 0) + free(ext_inq, M_CAMXPT); + xpt_release_ccb(done_ccb); PROBE_SET_ACTION(softc, PROBE_SERIAL_NUM); xpt_schedule(periph, priority); goto out; @@ -2477,6 +2551,21 @@ scsi_dev_advinfo(union ccb *start_ccb) memcpy(cdai->buf, device->rcap_buf, amt); } break; + case CDAI_TYPE_EXT_INQ: + /* + * We fetch extended inquiry data during probe, if + * available. We don't allow changing it. + */ + if (cdai->flags & CDAI_FLAG_STORE) + return; + cdai->provsiz = device->ext_inq_len; + if (device->ext_inq_len == 0) + break; + amt = device->ext_inq_len; + if (cdai->provsiz > cdai->bufsiz) + amt = cdai->bufsiz; + memcpy(cdai->buf, device->ext_inq, amt); + break; default: return; } Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Thu Feb 5 00:11:05 2015 (r278227) +++ head/sys/sys/param.h Thu Feb 5 00:12:21 2015 (r278228) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100057 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100058 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 01:36:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DD0F42A; Thu, 5 Feb 2015 01:36:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19FA3A7C; Thu, 5 Feb 2015 01:36:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t151arEB088864; Thu, 5 Feb 2015 01:36:53 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t151arDn088863; Thu, 5 Feb 2015 01:36:53 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201502050136.t151arDn088863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Thu, 5 Feb 2015 01:36:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278229 - head/sys/conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 01:36:54 -0000 Author: peter Date: Thu Feb 5 01:36:53 2015 New Revision: 278229 URL: https://svnweb.freebsd.org/changeset/base/278229 Log: Add -fwrapv to CFLAGS for the kernel. This essentially un-reverts r259045. The C standard undefines behavior when signed integers overflow. The compiler toolchain has become more adept at detecting this and taking advantage of faster undefined behavior. At the current time this has the unfortunate effect of the clock stopping after 24 days of uptime. clang makes no distinction between -fwrapv and -fno-strict-overflow. gcc does treat them differently but -fwrapv is mature in gcc and is the behavior are actually expecting. Obtained from: kib Modified: head/sys/conf/kern.mk Modified: head/sys/conf/kern.mk ============================================================================== --- head/sys/conf/kern.mk Thu Feb 5 00:12:21 2015 (r278228) +++ head/sys/conf/kern.mk Thu Feb 5 01:36:53 2015 (r278229) @@ -158,6 +158,14 @@ INLINE_LIMIT?= 8000 CFLAGS+= -ffreestanding # +# The C standard leaves signed integer overflow behavior undefined. +# gcc and clang opimizers take advantage of this. The kernel makes +# use of signed integer wraparound mechanics so we need the compiler +# to treat it as a wraparound and not take shortcuts. +# +CFLAGS+= -fwrapv + +# # GCC SSP support # .if ${MK_SSP} != "no" && \ From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 01:43:22 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BACC691E; Thu, 5 Feb 2015 01:43:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A701CB6F; Thu, 5 Feb 2015 01:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t151hMAI093058; Thu, 5 Feb 2015 01:43:22 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t151hMX7093057; Thu, 5 Feb 2015 01:43:22 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201502050143.t151hMX7093057@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Thu, 5 Feb 2015 01:43:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278230 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 01:43:22 -0000 Author: peter Date: Thu Feb 5 01:43:21 2015 New Revision: 278230 URL: https://svnweb.freebsd.org/changeset/base/278230 Log: Initialize ticks so that it wraps 10 minutes after boot to increase the chances of finding problems related to wraparound sooner. This comes from P4 change 167856 on 2009/08/26 around when we had problems with the TCP stack with ticks after 24 days of uptime. Modified: head/sys/kern/kern_clock.c Modified: head/sys/kern/kern_clock.c ============================================================================== --- head/sys/kern/kern_clock.c Thu Feb 5 01:36:53 2015 (r278229) +++ head/sys/kern/kern_clock.c Thu Feb 5 01:43:21 2015 (r278230) @@ -410,6 +410,11 @@ initclocks(dummy) #ifdef SW_WATCHDOG EVENTHANDLER_REGISTER(watchdog_list, watchdog_config, NULL, 0); #endif + /* + * Arrange for ticks to wrap 10 minutes after boot to help catch + * sign problems sooner. + */ + ticks = INT_MAX - (hz * 10 * 60); } /* From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 03:56:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE2B4DEE; Thu, 5 Feb 2015 03:56:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A67EAF7; Thu, 5 Feb 2015 03:56:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t153uoxW055025; Thu, 5 Feb 2015 03:56:50 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t153uoPC055024; Thu, 5 Feb 2015 03:56:50 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201502050356.t153uoPC055024@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Thu, 5 Feb 2015 03:56:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278231 - head/lib/csu/powerpc64 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 03:56:50 -0000 Author: jhibbits Date: Thu Feb 5 03:56:49 2015 New Revision: 278231 URL: https://svnweb.freebsd.org/changeset/base/278231 Log: powerpc64 csu needs to be built by gcc, so enforce that. With this change, world is one step closer to being clang-able. MFC after: 2 weeks Modified: head/lib/csu/powerpc64/Makefile Modified: head/lib/csu/powerpc64/Makefile ============================================================================== --- head/lib/csu/powerpc64/Makefile Thu Feb 5 01:43:21 2015 (r278230) +++ head/lib/csu/powerpc64/Makefile Thu Feb 5 03:56:49 2015 (r278231) @@ -9,6 +9,9 @@ CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include \ -mlongcall +CC:= gcc +COMPILER_TYPE:= gcc + all: ${OBJS} CLEANFILES= ${OBJS} From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 06:08:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A794638; Thu, 5 Feb 2015 06:08:11 +0000 (UTC) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 3F1C3C9B; Thu, 5 Feb 2015 06:08:11 +0000 (UTC) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 72E421A526E; Thu, 5 Feb 2015 17:08:03 +1100 (AEDT) Date: Thu, 5 Feb 2015 17:08:03 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Steve Kargl Subject: Re: svn commit: r278154 - head/lib/msun/src In-Reply-To: <20150203191355.GA13447@troutmask.apl.washington.edu> Message-ID: <20150205164453.B1011@besplex.bde.org> References: <201502031417.t13EHU9g074687@svn.freebsd.org> <20150204012614.T1972@besplex.bde.org> <20150203163329.GA12706@troutmask.apl.washington.edu> <20150204035337.Y2718@besplex.bde.org> <20150203191355.GA13447@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=A5NVYcmG c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=A-V0UxWgyvbpZVGELtMA:9 a=CjuIK1q_8ugA:10 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "Pedro F. Giffuni" , src-committers@freebsd.org, Bruce Evans X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 06:08:11 -0000 On Tue, 3 Feb 2015, Steve Kargl wrote: > On Wed, Feb 04, 2015 at 04:37:14AM +1100, Bruce Evans wrote: >> On Tue, 3 Feb 2015, Steve Kargl wrote: >> >>> -#include >>> +#include >>> #include >>> >>> +#define FLT_LARGE FLT_MAX_EXP - FLT_MIN_EXP + FLT_MANT_DIG >>> +... >> >> This is a lot of code and bugs (missing parentheses) for negative gain. > > My crystal ball isn't function too well lately. I thought I mentioned this in my first reply. (I didn't write lines like the above because they are too verbose, and I didn't write down hard limits because I didn't have time to choose them carefully.) > Given that the widest field width in IEEE754-2008 for > binary128 is 15, which gives a maximum unbiased exponent > of 2**15, then using +-65536 should cover our needs. The > functions scalbn[fl] can then deal with values of n > that may result in exponents that are too small or too > large. Untested diff below. Doesn't IEEE allow extensions? More than 15 is just not currently needed, and also not likely to be common soon. I agree that it is enough. Elwhere, we have many checks like LDBL_MAX_EXP == 0x4000 since we only support long doubles if they are either mere doubles or have a 15-exponent with the usual encoding. So anyone enlarging the exponent long doubles would have a lot of work to do and shouldn't need to be reminded to do it here too. > Index: s_scalbln.c > =================================================================== > --- s_scalbln.c (revision 278165) > +++ s_scalbln.c (working copy) > @@ -27,17 +27,17 @@ > #include > __FBSDID("$FreeBSD$"); > > -#include > #include > > +#define LARGE 65536 > +#define SMALL -65536 > + > double > scalbln (double x, long n) > { > int in; > > - in = (int)n; > - if (in != n) > - in = (n > 0) ? INT_MAX: INT_MIN; > + in = n > LARGE ? LARGE : n < SMALL ? SMALL : n; > return (scalbn(x, in)); > } > You also removed extra parentheses around the comparison operator. I put them in since I'm trying to sell conditional operators but some people find conditional operators more confusing without extra parentheses. The extra parentheses around the inner comparisons are possibly the ones least needed for technical reasons, but seem to improve readability. After shortening it with shorter limit variable names and no extra parentheses, it fits in 1 line: double scalbln (double x, long n) { return (scalbn(x, n > LARGE ? LARGE : n < SMALL ? SMALL : n); } Not using the temporary variable makes it more readable IMO. I would also drop the strict KNF of having an empty line after the null local declarations, and restore the cast on the final n. In previous versions, there was an explicit conversion of the expression's value from long to int by assignment to 'in'. Now there is only an implicit conversion by the prototype. Casting the final n would make the expression have type int. Also fix the gnu-style parentheses in 'scalbln ('. This bug apparently came from fdlibm for scalbn(). It has been cloned to several other scal*'s but isn't in all, even for fdlibm. Bruce From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 06:38:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11311591; Thu, 5 Feb 2015 06:38:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFE057E5; Thu, 5 Feb 2015 06:38:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t156c3xM029270; Thu, 5 Feb 2015 06:38:03 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t156c0F6029243; Thu, 5 Feb 2015 06:38:00 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502050638.t156c0F6029243@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 5 Feb 2015 06:38:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278232 - in head: sys/dev/iscsi usr.bin/iscsictl usr.sbin/iscsid 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 06:38:04 -0000 Author: trasz Date: Thu Feb 5 06:37:59 2015 New Revision: 278232 URL: https://svnweb.freebsd.org/changeset/base/278232 Log: Make it possible to set (via iscsi.conf(5)) and query (via iscsictl -v) initiator iSCSI offload. Pass maximum data segment size supported by chosen offload module to iscsid(8), and make iscsid(8) not try to negotiate anything larger than that. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/icl.h head/sys/dev/iscsi/icl_soft.c head/sys/dev/iscsi/iscsi.c head/sys/dev/iscsi/iscsi_ioctl.h head/usr.bin/iscsictl/iscsi.conf.5 head/usr.bin/iscsictl/iscsictl.c head/usr.bin/iscsictl/iscsictl.h head/usr.bin/iscsictl/parse.y head/usr.bin/iscsictl/token.l head/usr.sbin/iscsid/iscsid.c head/usr.sbin/iscsid/iscsid.h head/usr.sbin/iscsid/login.c Modified: head/sys/dev/iscsi/icl.h ============================================================================== --- head/sys/dev/iscsi/icl.h Thu Feb 5 03:56:49 2015 (r278231) +++ head/sys/dev/iscsi/icl.h Thu Feb 5 06:37:59 2015 (r278232) @@ -113,6 +113,7 @@ struct icl_conn { bool ic_disconnecting; bool ic_iser; const char *ic_name; + const char *ic_offload; void (*ic_receive)(struct icl_pdu *); void (*ic_error)(struct icl_conn *); Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Thu Feb 5 03:56:49 2015 (r278231) +++ head/sys/dev/iscsi/icl_soft.c Thu Feb 5 06:37:59 2015 (r278232) @@ -1185,6 +1185,7 @@ icl_soft_new_conn(const char *name, stru #endif ic->ic_max_data_segment_length = ICL_MAX_DATA_SEGMENT_LENGTH; ic->ic_name = name; + ic->ic_offload = "none"; return (ic); } Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Thu Feb 5 03:56:49 2015 (r278231) +++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 06:37:59 2015 (r278232) @@ -1306,6 +1306,16 @@ iscsi_ioctl_daemon_wait(struct iscsi_sof request->idr_tsih = 0; /* New or reinstated session. */ memcpy(&request->idr_conf, &is->is_conf, sizeof(request->idr_conf)); + + error = icl_limits(is->is_conf.isc_offload, + &request->idr_limits.isl_max_data_segment_length); + if (error != 0) { + ISCSI_SESSION_WARN(is, "icl_limits for offload \"%s\" " + "failed with error %d", is->is_conf.isc_offload, + error); + sx_sunlock(&sc->sc_lock); + return (error); + } sx_sunlock(&sc->sc_lock); return (0); @@ -1731,7 +1741,13 @@ iscsi_ioctl_session_add(struct iscsi_sof return (EBUSY); } - is->is_conn = icl_new_conn(NULL, "iscsi", &is->is_lock); + is->is_conn = icl_new_conn(is->is_conf.isc_offload, + "iscsi", &is->is_lock); + if (is->is_conn == NULL) { + sx_xunlock(&sc->sc_lock); + free(is, M_ISCSI); + return (EINVAL); + } is->is_conn->ic_receive = iscsi_receive_callback; is->is_conn->ic_error = iscsi_error_callback; is->is_conn->ic_prv0 = is; @@ -1836,6 +1852,7 @@ iscsi_ioctl_session_list(struct iscsi_so iss.iss_id = is->is_id; strlcpy(iss.iss_target_alias, is->is_target_alias, sizeof(iss.iss_target_alias)); strlcpy(iss.iss_reason, is->is_reason, sizeof(iss.iss_reason)); + strlcpy(iss.iss_offload, is->is_conn->ic_offload, sizeof(iss.iss_offload)); if (is->is_conn->ic_header_crc32c) iss.iss_header_digest = ISCSI_DIGEST_CRC32C; Modified: head/sys/dev/iscsi/iscsi_ioctl.h ============================================================================== --- head/sys/dev/iscsi/iscsi_ioctl.h Thu Feb 5 03:56:49 2015 (r278231) +++ head/sys/dev/iscsi/iscsi_ioctl.h Thu Feb 5 06:37:59 2015 (r278232) @@ -43,6 +43,7 @@ #define ISCSI_ADDR_LEN 47 /* INET6_ADDRSTRLEN + '\0' */ #define ISCSI_ALIAS_LEN 256 /* XXX: Where did it come from? */ #define ISCSI_SECRET_LEN 17 /* 16 + '\0' */ +#define ISCSI_OFFLOAD_LEN 8 #define ISCSI_REASON_LEN 64 #define ISCSI_DIGEST_NONE 0 @@ -65,7 +66,16 @@ struct iscsi_session_conf { int isc_header_digest; int isc_data_digest; int isc_iser; - int isc_spare[4]; + char isc_offload[ISCSI_OFFLOAD_LEN]; + int isc_spare[2]; +}; + +/* + * Additional constraints imposed by chosen ICL offload module; + * iscsid(8) must obey those when negotiating operational parameters. + */ +struct iscsi_session_limits { + size_t isl_max_data_segment_length; }; /* @@ -81,20 +91,21 @@ struct iscsi_session_state { int iss_immediate_data; int iss_connected; char iss_reason[ISCSI_REASON_LEN]; - int iss_spare[4]; + char iss_offload[ISCSI_OFFLOAD_LEN]; + int iss_spare[2]; }; /* - * For use with iscsid(8). + * The following ioctls are used by iscsid(8). */ - struct iscsi_daemon_request { unsigned int idr_session_id; struct iscsi_session_conf idr_conf; uint8_t idr_isid[6]; uint16_t idr_tsih; uint16_t idr_spare_cid; - int idr_spare[4]; + struct iscsi_session_limits idr_limits; + int idr_spare[2]; }; struct iscsi_daemon_handoff { @@ -182,9 +193,8 @@ struct iscsi_daemon_receive { #endif /* ICL_KERNEL_PROXY */ /* - * For use with iscsictl(8). + * The following ioctls are used by iscsictl(8). */ - struct iscsi_session_add { struct iscsi_session_conf isa_conf; int isa_spare[4]; Modified: head/usr.bin/iscsictl/iscsi.conf.5 ============================================================================== --- head/usr.bin/iscsictl/iscsi.conf.5 Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.bin/iscsictl/iscsi.conf.5 Thu Feb 5 06:37:59 2015 (r278232) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 17, 2013 +.Dd February 4, 2015 .Dt ISCSI.CONF 5 .Os .Sh NAME @@ -110,6 +110,8 @@ flag of The following are not specified in the .Sy RFC 3720 .Bl -tag -width sockbufsize +.It Cm offload +Name of selected iSCSI hardware offload driver. .It Cm port The iSCSI port used by the iSCSI protocol, defaults to 3260. .It Cm tags Modified: head/usr.bin/iscsictl/iscsictl.c ============================================================================== --- head/usr.bin/iscsictl/iscsictl.c Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.bin/iscsictl/iscsictl.c Thu Feb 5 06:37:59 2015 (r278232) @@ -327,6 +327,9 @@ conf_from_target(struct iscsi_session_co conf->isc_discovery = 1; if (targ->t_protocol == PROTOCOL_ISER) conf->isc_iser = 1; + if (targ->t_offload != NULL) + strlcpy(conf->isc_offload, targ->t_offload, + sizeof(conf->isc_offload)); if (targ->t_header_digest == DIGEST_CRC32C) conf->isc_header_digest = ISCSI_DIGEST_CRC32C; else @@ -517,6 +520,7 @@ kernel_list(int iscsi_fd, const struct t state->iss_immediate_data ? "Yes" : "No"); printf("iSER (RDMA): %s\n", conf->isc_iser ? "Yes" : "No"); + printf("Offload driver: %s\n", state->iss_offload); printf("Device nodes: "); print_periphs(state->iss_id); printf("\n\n"); Modified: head/usr.bin/iscsictl/iscsictl.h ============================================================================== --- head/usr.bin/iscsictl/iscsictl.h Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.bin/iscsictl/iscsictl.h Thu Feb 5 06:37:59 2015 (r278232) @@ -72,6 +72,7 @@ struct target { int t_auth_method; int t_session_type; int t_protocol; + char *t_offload; char *t_user; char *t_secret; char *t_mutual_user; Modified: head/usr.bin/iscsictl/parse.y ============================================================================== --- head/usr.bin/iscsictl/parse.y Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.bin/iscsictl/parse.y Thu Feb 5 06:37:59 2015 (r278232) @@ -57,8 +57,8 @@ extern void yyrestart(FILE *); %token AUTH_METHOD HEADER_DIGEST DATA_DIGEST TARGET_NAME TARGET_ADDRESS %token INITIATOR_NAME INITIATOR_ADDRESS INITIATOR_ALIAS USER SECRET -%token MUTUAL_USER MUTUAL_SECRET SEMICOLON SESSION_TYPE PROTOCOL IGNORED -%token EQUALS OPENING_BRACKET CLOSING_BRACKET +%token MUTUAL_USER MUTUAL_SECRET SEMICOLON SESSION_TYPE PROTOCOL OFFLOAD +%token IGNORED EQUALS OPENING_BRACKET CLOSING_BRACKET %union { @@ -117,6 +117,8 @@ target_entry: | session_type | + offload + | protocol | ignored @@ -250,6 +252,14 @@ session_type: SESSION_TYPE EQUALS STR } ; +offload: OFFLOAD EQUALS STR + { + if (target->t_offload != NULL) + errx(1, "duplicated offload at line %d", lineno); + target->t_offload = $3; + } + ; + protocol: PROTOCOL EQUALS STR { if (target->t_protocol != PROTOCOL_UNSPECIFIED) Modified: head/usr.bin/iscsictl/token.l ============================================================================== --- head/usr.bin/iscsictl/token.l Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.bin/iscsictl/token.l Thu Feb 5 06:37:59 2015 (r278232) @@ -63,6 +63,7 @@ tgtChapSecret { return MUTUAL_SECRET; } AuthMethod { return AUTH_METHOD; } SessionType { return SESSION_TYPE; } protocol { return PROTOCOL; } +offload { return OFFLOAD; } port { return IGNORED; } MaxConnections { return IGNORED; } TargetAlias { return IGNORED; } Modified: head/usr.sbin/iscsid/iscsid.c ============================================================================== --- head/usr.sbin/iscsid/iscsid.c Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.sbin/iscsid/iscsid.c Thu Feb 5 06:37:59 2015 (r278232) @@ -152,7 +152,8 @@ resolve_addr(const struct connection *co static struct connection * connection_new(unsigned int session_id, const uint8_t isid[8], uint16_t tsih, - const struct iscsi_session_conf *conf, int iscsi_fd) + const struct iscsi_session_conf *conf, const struct iscsi_session_limits + *limits, int iscsi_fd) { struct connection *conn; struct addrinfo *from_ai, *to_ai; @@ -186,6 +187,7 @@ connection_new(unsigned int session_id, * XXX: Should we sanitize this somehow? */ memcpy(&conn->conn_conf, conf, sizeof(conn->conn_conf)); + memcpy(&conn->conn_limits, limits, sizeof(conn->conn_limits)); from_addr = conn->conn_conf.isc_initiator_addr; to_addr = conn->conn_conf.isc_target_addr; @@ -443,7 +445,8 @@ handle_request(int iscsi_fd, const struc } conn = connection_new(request->idr_session_id, request->idr_isid, - request->idr_tsih, &request->idr_conf, iscsi_fd); + request->idr_tsih, &request->idr_conf, &request->idr_limits, + iscsi_fd); set_timeout(timeout); capsicate(conn); login(conn); Modified: head/usr.sbin/iscsid/iscsid.h ============================================================================== --- head/usr.sbin/iscsid/iscsid.h Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.sbin/iscsid/iscsid.h Thu Feb 5 06:37:59 2015 (r278232) @@ -51,6 +51,7 @@ struct connection { int conn_socket; unsigned int conn_session_id; struct iscsi_session_conf conn_conf; + struct iscsi_session_limits conn_limits; char conn_target_alias[ISCSI_ADDR_LEN]; uint8_t conn_isid[6]; uint16_t conn_tsih; Modified: head/usr.sbin/iscsid/login.c ============================================================================== --- head/usr.sbin/iscsid/login.c Thu Feb 5 03:56:49 2015 (r278231) +++ head/usr.sbin/iscsid/login.c Thu Feb 5 06:37:59 2015 (r278232) @@ -441,6 +441,10 @@ login_negotiate(struct connection *conn) request = login_new_request(conn, BHSLR_STAGE_OPERATIONAL_NEGOTIATION); request_keys = keys_new(); + log_debugx("offload \"%s\" limits MaxRecvDataSegmentLength to %zd", + conn->conn_conf.isc_offload, + conn->conn_limits.isl_max_data_segment_length); + /* * The following keys are irrelevant for discovery sessions. */ @@ -456,9 +460,9 @@ login_negotiate(struct connection *conn) keys_add(request_keys, "ImmediateData", "Yes"); keys_add_int(request_keys, "MaxBurstLength", - 2 * ISCSI_MAX_DATA_SEGMENT_LENGTH); + 2 * conn->conn_limits.isl_max_data_segment_length); keys_add_int(request_keys, "FirstBurstLength", - ISCSI_MAX_DATA_SEGMENT_LENGTH); + conn->conn_limits.isl_max_data_segment_length); keys_add(request_keys, "InitialR2T", "Yes"); keys_add(request_keys, "MaxOutstandingR2T", "1"); } else { @@ -467,7 +471,7 @@ login_negotiate(struct connection *conn) } keys_add_int(request_keys, "MaxRecvDataSegmentLength", - ISCSI_MAX_DATA_SEGMENT_LENGTH); + conn->conn_limits.isl_max_data_segment_length); keys_add(request_keys, "DefaultTime2Wait", "0"); keys_add(request_keys, "DefaultTime2Retain", "0"); keys_add(request_keys, "ErrorRecoveryLevel", "0"); From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 07:16:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A99CB3C; Thu, 5 Feb 2015 07:16:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EACF7B7D; Thu, 5 Feb 2015 07:16:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157Gj87047807; Thu, 5 Feb 2015 07:16:45 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157Gjf9047806; Thu, 5 Feb 2015 07:16:45 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502050716.t157Gjf9047806@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 5 Feb 2015 07:16:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278233 - head/sys/dev/iscsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:16:46 -0000 Author: trasz Date: Thu Feb 5 07:16:45 2015 New Revision: 278233 URL: https://svnweb.freebsd.org/changeset/base/278233 Log: Fix error handling. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/iscsi.c Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Thu Feb 5 06:37:59 2015 (r278232) +++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:16:45 2015 (r278233) @@ -1766,15 +1766,17 @@ iscsi_ioctl_session_add(struct iscsi_sof arc4rand(&is->is_isid[1], 5, 0); is->is_tsih = 0; callout_init(&is->is_callout, 1); - callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is); - TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next); error = kthread_add(iscsi_maintenance_thread, is, NULL, NULL, 0, 0, "iscsimt"); if (error != 0) { ISCSI_SESSION_WARN(is, "kthread_add(9) failed with error %d", error); + sx_xunlock(&sc->sc_lock); return (error); } + callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is); + TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next); + /* * Trigger immediate reconnection. */ From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 07:19:31 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C50B8D8F; Thu, 5 Feb 2015 07:19:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0A8FB95; Thu, 5 Feb 2015 07:19:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157JVbe048162; Thu, 5 Feb 2015 07:19:31 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157JVeQ048160; Thu, 5 Feb 2015 07:19:31 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502050719.t157JVeQ048160@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Thu, 5 Feb 2015 07:19:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278234 - in head/sys/boot: amd64/efi efi/include 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:19:32 -0000 Author: rpaulo Date: Thu Feb 5 07:19:30 2015 New Revision: 278234 URL: https://svnweb.freebsd.org/changeset/base/278234 Log: EFI: print more information about EFI Tables. This adds the GUIDs for DXE, HOB, Memory Type Information and Debug Image Info. Modified: head/sys/boot/amd64/efi/main.c head/sys/boot/efi/include/efiapi.h Modified: head/sys/boot/amd64/efi/main.c ============================================================================== --- head/sys/boot/amd64/efi/main.c Thu Feb 5 07:16:45 2015 (r278233) +++ head/sys/boot/amd64/efi/main.c Thu Feb 5 07:19:30 2015 (r278234) @@ -53,6 +53,10 @@ EFI_GUID imgid = LOADED_IMAGE_PROTOCOL; EFI_GUID mps = MPS_TABLE_GUID; EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL; EFI_GUID smbios = SMBIOS_TABLE_GUID; +EFI_GUID dxe = DXE_SERVICES_TABLE_GUID; +EFI_GUID hoblist = HOB_LIST_TABLE_GUID; +EFI_GUID memtype = MEMORY_TYPE_INFORMATION_TABLE_GUID; +EFI_GUID debugimg = DEBUG_IMAGE_INFO_TABLE_GUID; EFI_STATUS main(int argc, CHAR16 *argv[]) @@ -264,6 +268,14 @@ command_configuration(int argc, char *ar printf("ACPI 2.0 Table"); else if (!memcmp(guid, &smbios, sizeof(EFI_GUID))) printf("SMBIOS Table"); + else if (!memcmp(guid, &dxe, sizeof(EFI_GUID))) + printf("DXE Table"); + else if (!memcmp(guid, &hoblist, sizeof(EFI_GUID))) + printf("HOB List Table"); + else if (!memcmp(guid, &memtype, sizeof(EFI_GUID))) + printf("Memory Type Information Table"); + else if (!memcmp(guid, &debugimg, sizeof(EFI_GUID))) + printf("Debug Image Info Table"); else printf("Unknown Table (%s)", guid_to_string(guid)); printf(" at %p\n", ST->ConfigurationTable[i].VendorTable); @@ -319,7 +331,7 @@ command_mode(int argc, char *argv[]) } if (i != 0) - printf("Choose the mode with \"col \"\n"); + printf("Choose the mode with \"col \"\n"); return (CMD_OK); } Modified: head/sys/boot/efi/include/efiapi.h ============================================================================== --- head/sys/boot/efi/include/efiapi.h Thu Feb 5 07:16:45 2015 (r278233) +++ head/sys/boot/efi/include/efiapi.h Thu Feb 5 07:19:30 2015 (r278234) @@ -88,7 +88,7 @@ EFI_STATUS IN VOID *Buffer ); -typedef +typedef EFI_STATUS (EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) ( IN UINTN MemoryMapSize, @@ -103,7 +103,7 @@ EFI_STATUS #define EFI_INTERNAL_PTR 0x00000004 // Pointer to internal runtime data -typedef +typedef EFI_STATUS (EFIAPI *EFI_CONVERT_POINTER) ( IN UINTN DebugDisposition, @@ -168,7 +168,7 @@ EFI_STATUS IN EFI_EVENT Event ); -typedef +typedef EFI_STATUS (EFIAPI *EFI_WAIT_FOR_EVENT) ( IN UINTN NumberOfEvents, @@ -194,8 +194,8 @@ EFI_STATUS #define TPL_APPLICATION 4 #define TPL_CALLBACK 8 -#define TPL_NOTIFY 16 -#define TPL_HIGH_LEVEL 31 +#define TPL_NOTIFY 16 +#define TPL_HIGH_LEVEL 31 typedef EFI_TPL @@ -320,14 +320,14 @@ EFI_STATUS // Image Entry prototype -typedef +typedef EFI_STATUS (EFIAPI *EFI_IMAGE_ENTRY_POINT) ( IN EFI_HANDLE ImageHandle, IN struct _EFI_SYSTEM_TABLE *SystemTable ); -typedef +typedef EFI_STATUS (EFIAPI *EFI_IMAGE_LOAD) ( IN BOOLEAN BootPolicy, @@ -338,7 +338,7 @@ EFI_STATUS OUT EFI_HANDLE *ImageHandle ); -typedef +typedef EFI_STATUS (EFIAPI *EFI_IMAGE_START) ( IN EFI_HANDLE ImageHandle, @@ -355,7 +355,7 @@ EFI_STATUS IN CHAR16 *ExitData OPTIONAL ); -typedef +typedef EFI_STATUS (EFIAPI *EFI_IMAGE_UNLOAD) ( IN EFI_HANDLE ImageHandle @@ -491,7 +491,7 @@ EFI_STATUS ); typedef -EFI_STATUS +EFI_STATUS (EFIAPI *EFI_REGISTER_PROTOCOL_NOTIFY) ( IN EFI_GUID *Protocol, IN EFI_EVENT Event, @@ -535,7 +535,7 @@ EFI_STATUS ); typedef -EFI_STATUS +EFI_STATUS (EFIAPI *EFI_CONNECT_CONTROLLER) ( IN EFI_HANDLE ControllerHandle, IN EFI_HANDLE *DriverImageHandle OPTIONAL, @@ -544,19 +544,19 @@ EFI_STATUS ); typedef -EFI_STATUS +EFI_STATUS (EFIAPI *EFI_DISCONNECT_CONTROLLER)( IN EFI_HANDLE ControllerHandle, IN EFI_HANDLE DriverImageHandle, OPTIONAL IN EFI_HANDLE ChildHandle OPTIONAL - ); + ); -#define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL 0x00000001 -#define EFI_OPEN_PROTOCOL_GET_PROTOCOL 0x00000002 -#define EFI_OPEN_PROTOCOL_TEST_PROTOCOL 0x00000004 -#define EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER 0x00000008 -#define EFI_OPEN_PROTOCOL_BY_DRIVER 0x00000010 -#define EFI_OPEN_PROTOCOL_EXCLUSIVE 0x00000020 +#define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL 0x00000001 +#define EFI_OPEN_PROTOCOL_GET_PROTOCOL 0x00000002 +#define EFI_OPEN_PROTOCOL_TEST_PROTOCOL 0x00000004 +#define EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER 0x00000008 +#define EFI_OPEN_PROTOCOL_BY_DRIVER 0x00000010 +#define EFI_OPEN_PROTOCOL_EXCLUSIVE 0x00000020 typedef EFI_STATUS @@ -804,7 +804,7 @@ typedef struct { // EFI_PROTOCOLS_PER_HANDLE ProtocolsPerHandle; EFI_LOCATE_HANDLE_BUFFER LocateHandleBuffer; - EFI_LOCATE_PROTOCOL LocateProtocol; + EFI_LOCATE_PROTOCOL LocateProtocol; EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES InstallMultipleProtocolInterfaces; EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES UninstallMultipleProtocolInterfaces; @@ -845,6 +845,18 @@ typedef struct { #define FDT_TABLE_GUID \ { 0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } +#define DXE_SERVICES_TABLE_GUID \ + { 0x5ad34ba, 0x6f02, 0x4214, 0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9 } + +#define HOB_LIST_TABLE_GUID \ + { 0x7739f24c, 0x93d7, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } + +#define MEMORY_TYPE_INFORMATION_TABLE_GUID \ + { 0x4c19049f, 0x4137, 0x4dd3, 0x9c, 0x10, 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa } + +#define DEBUG_IMAGE_INFO_TABLE_GUID \ + { 0x49152e77, 0x1ada, 0x4764, 0xb7, 0xa2, 0x7a, 0xfe, 0xfe, 0xd9, 0x5e, 0x8b } + typedef struct _EFI_CONFIGURATION_TABLE { EFI_GUID VendorGuid; VOID *VendorTable; From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 07:32:25 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04E7E4A1; Thu, 5 Feb 2015 07:32:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAA83E2E; Thu, 5 Feb 2015 07:32:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157WOdb056998; Thu, 5 Feb 2015 07:32:24 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157WOIg056997; Thu, 5 Feb 2015 07:32:24 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502050732.t157WOIg056997@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 5 Feb 2015 07:32:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278236 - head/usr.sbin/iscsid 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:32:25 -0000 Author: trasz Date: Thu Feb 5 07:32:24 2015 New Revision: 278236 URL: https://svnweb.freebsd.org/changeset/base/278236 Log: The connection_new() routine was taking an absurd number of parameters; fix it. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/iscsid/iscsid.c Modified: head/usr.sbin/iscsid/iscsid.c ============================================================================== --- head/usr.sbin/iscsid/iscsid.c Thu Feb 5 07:24:17 2015 (r278235) +++ head/usr.sbin/iscsid/iscsid.c Thu Feb 5 07:32:24 2015 (r278236) @@ -151,9 +151,7 @@ resolve_addr(const struct connection *co } static struct connection * -connection_new(unsigned int session_id, const uint8_t isid[8], uint16_t tsih, - const struct iscsi_session_conf *conf, const struct iscsi_session_limits - *limits, int iscsi_fd) +connection_new(int iscsi_fd, const struct iscsi_daemon_request *request) { struct connection *conn; struct addrinfo *from_ai, *to_ai; @@ -177,17 +175,13 @@ connection_new(unsigned int session_id, conn->conn_max_data_segment_length = 8192; conn->conn_max_burst_length = 262144; conn->conn_first_burst_length = 65536; - - conn->conn_session_id = session_id; - memcpy(&conn->conn_isid, isid, sizeof(conn->conn_isid)); - conn->conn_tsih = tsih; conn->conn_iscsi_fd = iscsi_fd; - /* - * XXX: Should we sanitize this somehow? - */ - memcpy(&conn->conn_conf, conf, sizeof(conn->conn_conf)); - memcpy(&conn->conn_limits, limits, sizeof(conn->conn_limits)); + conn->conn_session_id = request->idr_session_id; + memcpy(&conn->conn_conf, &request->idr_conf, sizeof(conn->conn_conf)); + memcpy(&conn->conn_isid, &request->idr_isid, sizeof(conn->conn_isid)); + conn->conn_tsih = request->idr_tsih; + memcpy(&conn->conn_limits, &request->idr_limits, sizeof(conn->conn_limits)); from_addr = conn->conn_conf.isc_initiator_addr; to_addr = conn->conn_conf.isc_target_addr; @@ -444,9 +438,7 @@ handle_request(int iscsi_fd, const struc setproctitle("%s", request->idr_conf.isc_target_addr); } - conn = connection_new(request->idr_session_id, request->idr_isid, - request->idr_tsih, &request->idr_conf, &request->idr_limits, - iscsi_fd); + conn = connection_new(iscsi_fd, request); set_timeout(timeout); capsicate(conn); login(conn); From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 07:46:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A11D5888; Thu, 5 Feb 2015 07:46:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CA0FF5D; Thu, 5 Feb 2015 07:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157kZME062167; Thu, 5 Feb 2015 07:46:35 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157kZRg062166; Thu, 5 Feb 2015 07:46:35 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502050746.t157kZRg062166@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 5 Feb 2015 07:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278237 - head/sys/dev/iscsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:46:35 -0000 Author: trasz Date: Thu Feb 5 07:46:34 2015 New Revision: 278237 URL: https://svnweb.freebsd.org/changeset/base/278237 Log: Don't call callout_drain() with iscsi mutex held; this fixes a warning that was introduced recently. While here, don't try to access is_terminating without lock. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/iscsi.c Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:32:24 2015 (r278236) +++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:46:34 2015 (r278237) @@ -421,6 +421,7 @@ iscsi_maintenance_thread_terminate(struc sx_xunlock(&sc->sc_lock); icl_conn_close(is->is_conn); + callout_drain(&is->is_callout); ISCSI_SESSION_LOCK(is); @@ -434,8 +435,6 @@ iscsi_maintenance_thread_terminate(struc cv_signal(&is->is_login_cv); #endif - callout_drain(&is->is_callout); - iscsi_session_cleanup(is, true); KASSERT(TAILQ_EMPTY(&is->is_outstanding), @@ -511,6 +510,7 @@ iscsi_session_reconnect(struct iscsi_ses static void iscsi_session_terminate(struct iscsi_session *is) { + if (is->is_terminating) return; @@ -532,12 +532,14 @@ iscsi_callout(void *context) is = context; - if (is->is_terminating) + ISCSI_SESSION_LOCK(is); + if (is->is_terminating) { + ISCSI_SESSION_UNLOCK(is); return; + } callout_schedule(&is->is_callout, 1 * hz); - ISCSI_SESSION_LOCK(is); is->is_timeout++; if (is->is_waiting_for_iscsid) { From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 07:51:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 364B2B16; Thu, 5 Feb 2015 07:51:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 222DF97; Thu, 5 Feb 2015 07:51:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t157peg9064380; Thu, 5 Feb 2015 07:51:40 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t157pd1K064377; Thu, 5 Feb 2015 07:51:39 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201502050751.t157pd1K064377@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Thu, 5 Feb 2015 07:51:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278238 - in head/sys: conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 07:51:40 -0000 Author: jmg Date: Thu Feb 5 07:51:38 2015 New Revision: 278238 URL: https://svnweb.freebsd.org/changeset/base/278238 Log: turn GEOM_UNCOMPRESS_DEBUG into a proper option so it can be specified in kernel config files.. put VERBOSE_SYSINIT in it's own option header so the one file, init_main.c, can use it instead of requiring an entire kernel recompile to change one file.. Modified: head/sys/conf/options head/sys/kern/init_main.c Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Thu Feb 5 07:46:34 2015 (r278237) +++ head/sys/conf/options Thu Feb 5 07:51:38 2015 (r278238) @@ -129,6 +129,7 @@ GEOM_SHSEC opt_geom.h GEOM_STRIPE opt_geom.h GEOM_SUNLABEL opt_geom.h GEOM_UNCOMPRESS opt_geom.h +GEOM_UNCOMPRESS_DEBUG opt_geom.h GEOM_UZIP opt_geom.h GEOM_VINUM opt_geom.h GEOM_VIRSTOR opt_geom.h @@ -209,7 +210,7 @@ SW_WATCHDOG opt_watchdog.h TURNSTILE_PROFILING UMTX_PROFILING VFS_AIO -VERBOSE_SYSINIT opt_global.h +VERBOSE_SYSINIT WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Thu Feb 5 07:46:34 2015 (r278237) +++ head/sys/kern/init_main.c Thu Feb 5 07:51:38 2015 (r278238) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_init_path.h" +#include "opt_verbose_sysinit.h" #include #include From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 08:52:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE58579D; Thu, 5 Feb 2015 08:52:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB89690B; Thu, 5 Feb 2015 08:52:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t158qLsU094064; Thu, 5 Feb 2015 08:52:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t158qLg9094063; Thu, 5 Feb 2015 08:52:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <201502050852.t158qLg9094063@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 5 Feb 2015 08:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278239 - head/sys/dev/cxgbe 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 08:52:21 -0000 Author: np Date: Thu Feb 5 08:52:20 2015 New Revision: 278239 URL: https://svnweb.freebsd.org/changeset/base/278239 Log: cxgbe(4): reserve id for iSCSI upper layer driver. Modified: head/sys/dev/cxgbe/offload.h Modified: head/sys/dev/cxgbe/offload.h ============================================================================== --- head/sys/dev/cxgbe/offload.h Thu Feb 5 07:51:38 2015 (r278238) +++ head/sys/dev/cxgbe/offload.h Thu Feb 5 08:52:20 2015 (r278239) @@ -129,6 +129,7 @@ struct t4_virt_res { enum { ULD_TOM = 1, ULD_IWARP = 2, + ULD_ISCSI = 3, }; struct adapter; From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 11:37:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AC56209; Thu, 5 Feb 2015 11:37:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D873C40; Thu, 5 Feb 2015 11:37:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Bb7Ia070447; Thu, 5 Feb 2015 11:37:07 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Bb7K7070446; Thu, 5 Feb 2015 11:37:07 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502051137.t15Bb7K7070446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Thu, 5 Feb 2015 11:37:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278248 - head/sys/dev/sfxge 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 11:37:08 -0000 Author: arybchik Date: Thu Feb 5 11:37:07 2015 New Revision: 278248 URL: https://svnweb.freebsd.org/changeset/base/278248 Log: sfxge: access statistics buffers under port lock Allow access to statistics data not only from sysctl handlers. Submitted by: Boris Misenov Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/sfxge_port.c Modified: head/sys/dev/sfxge/sfxge_port.c ============================================================================== --- head/sys/dev/sfxge/sfxge_port.c Thu Feb 5 10:50:51 2015 (r278247) +++ head/sys/dev/sfxge/sfxge_port.c Thu Feb 5 11:37:07 2015 (r278248) @@ -48,7 +48,7 @@ sfxge_mac_stat_update(struct sfxge_softc unsigned int count; int rc; - SFXGE_PORT_LOCK(port); + SFXGE_PORT_LOCK_ASSERT_OWNED(port); if (port->init_state != SFXGE_PORT_STARTED) { rc = 0; @@ -82,7 +82,6 @@ sfxge_mac_stat_update(struct sfxge_softc rc = ETIMEDOUT; out: - SFXGE_PORT_UNLOCK(port); return (rc); } @@ -93,12 +92,16 @@ sfxge_mac_stat_handler(SYSCTL_HANDLER_AR unsigned int id = arg2; int rc; + SFXGE_PORT_LOCK(&sc->port); if ((rc = sfxge_mac_stat_update(sc)) != 0) - return (rc); + goto out; - return (SYSCTL_OUT(req, - (uint64_t *)sc->port.mac_stats.decode_buf + id, - sizeof(uint64_t))); + rc = SYSCTL_OUT(req, + (uint64_t *)sc->port.mac_stats.decode_buf + id, + sizeof(uint64_t)); +out: + SFXGE_PORT_UNLOCK(&sc->port); + return (rc); } static void @@ -453,7 +456,7 @@ sfxge_phy_stat_update(struct sfxge_softc unsigned int count; int rc; - SFXGE_PORT_LOCK(port); + SFXGE_PORT_LOCK_ASSERT_OWNED(port); if (port->init_state != SFXGE_PORT_STARTED) { rc = 0; @@ -487,7 +490,6 @@ sfxge_phy_stat_update(struct sfxge_softc rc = ETIMEDOUT; out: - SFXGE_PORT_UNLOCK(port); return (rc); } @@ -498,12 +500,16 @@ sfxge_phy_stat_handler(SYSCTL_HANDLER_AR unsigned int id = arg2; int rc; + SFXGE_PORT_LOCK(&sc->port); if ((rc = sfxge_phy_stat_update(sc)) != 0) - return (rc); + goto out; - return (SYSCTL_OUT(req, - (uint32_t *)sc->port.phy_stats.decode_buf + id, - sizeof(uint32_t))); + rc = SYSCTL_OUT(req, + (uint32_t *)sc->port.phy_stats.decode_buf + id, + sizeof(uint32_t)); +out: + SFXGE_PORT_UNLOCK(&sc->port); + return (rc); } static void From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 11:38:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56137377; Thu, 5 Feb 2015 11:38:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41D50C61; Thu, 5 Feb 2015 11:38:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15BcUFr070664; Thu, 5 Feb 2015 11:38:30 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15BcUlj070663; Thu, 5 Feb 2015 11:38:30 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502051138.t15BcUlj070663@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 11:38:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278249 - head/etc/rc.d 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 11:38:30 -0000 Author: ngie Date: Thu Feb 5 11:38:29 2015 New Revision: 278249 URL: https://svnweb.freebsd.org/changeset/base/278249 Log: Honor the following flags with the following rc.d scripts for services that can be easily decoupled from the boot process without disrupting other services - MK_APM && MK_ACPI: powerd - MK_BOOTPARAMD: bootparams - MK_FTP: ftpd - MK_INETD: inetd - MK_LEGACY_CONSOLE: moused, syscons - MK_MAIL: othermta - MK_NS_CACHING: nscd - MK_NTP: ntpd (ntpdate is required by other services and can't be easily conditionalized -- yet..) - MK_ROUTED: routed - MK_SENDMAIL: sendmail - MK_TIMED: timed - MK_VI: virecover MFC after: 3 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/etc/rc.d/Makefile Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Thu Feb 5 11:37:07 2015 (r278248) +++ head/etc/rc.d/Makefile Thu Feb 5 11:38:29 2015 (r278249) @@ -19,7 +19,6 @@ FILES= DAEMON \ auditdistd \ bgfsck \ ${_bluetooth} \ - bootparams \ bridge \ ${_bthidd} \ ${_casperd} \ @@ -35,7 +34,6 @@ FILES= DAEMON \ dmesg \ dumpon \ fsck \ - ftpd \ gbde \ geli \ geli2 \ @@ -46,7 +44,6 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ - inetd \ ip6addrctl \ ipfilter \ ipfs \ @@ -72,7 +69,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - moused \ mroute6d \ msgs \ natd \ @@ -87,14 +83,11 @@ FILES= DAEMON \ nisdomain \ ${_nscd} \ nsswitch \ - ntpd \ ntpdate \ ${_opensm} \ - othermta \ pf \ pflog \ pfsync \ - powerd \ ppp \ pppoed \ pwcheck \ @@ -124,17 +117,14 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - syscons \ sysctl \ syslogd \ - timed \ tmp \ ${_ubthidhci} \ ugidfw \ ${_unbound} \ ${_utx} \ var \ - virecover \ watchdogd \ ypbind \ yppasswdd \ @@ -153,6 +143,10 @@ FILES+= accounting FILES+= power_profile .endif +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" +FILES+= powerd +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif @@ -175,6 +169,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BOOTPARAMD} != "no" +FILES+= bootparams +.endif + .if ${MK_BSNMP} != "no" FILES+= bsnmpd .endif @@ -187,10 +185,18 @@ _casperd= casperd FILES+= ccd .endif +.if ${MK_FTP} != "no" +FILES+= ftpd +.endif + .if ${MK_HAST} != "no" FILES+= hastd .endif +.if ${MK_INETD} != "no" +_inetd= inetd +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -200,12 +206,13 @@ FILES+= iscsid FILES+= jail .endif -.if ${MK_LPR} != "no" -FILES+= lpd +.if ${MK_LEGACY_CONSOLE} != "no" +FILES+= moused +FILES+= syscons .endif -.if ${MK_NS_CACHING} != "no" -_nscd= nscd +.if ${MK_LPR} != "no" +FILES+= lpd .endif .if ${MK_KERBEROS} != "no" @@ -217,6 +224,18 @@ _kfd= kfd _kpasswdd= kpasswdd .endif +.if ${MK_MAIL} != "no" +FILES+= othermta +.endif + +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif + +.if ${MK_NTP} != "no" +FILES+= ntpd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif @@ -237,6 +256,18 @@ FILES+= ftp-proxy FILES+= rwho .endif +.if ${MK_ROUTED} != "no" +FILES+= routed +.endif + +.if ${MK_SENDMAIL} != "no" +FILES+= sendmail +.endif + +.if ${MK_TIMED} != "no" +FILES+= timed +.endif + .if ${MK_UNBOUND} != "no" _unbound= local_unbound .endif @@ -245,6 +276,10 @@ _unbound= local_unbound _utx= utx .endif +.if ${MK_VI} != "no" +FILES+= virecover +.endif + .if ${MK_WIRELESS} != "no" FILES+= hostapd FILES+= wpa_supplicant From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 11:39:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05EA84C3; Thu, 5 Feb 2015 11:39:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E51BEC6C; Thu, 5 Feb 2015 11:39:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15BdHXl070808; Thu, 5 Feb 2015 11:39:17 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15BdFUS070793; Thu, 5 Feb 2015 11:39:15 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502051139.t15BdFUS070793@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Thu, 5 Feb 2015 11:39:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278250 - in head/sys/dev/sfxge: . common 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 11:39:18 -0000 Author: arybchik Date: Thu Feb 5 11:39:15 2015 New Revision: 278250 URL: https://svnweb.freebsd.org/changeset/base/278250 Log: sfxge: make lock names unique Lock name should include interface name. Tx queue and event queue lock name should include queue number. Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/common/efsys.h head/sys/dev/sfxge/sfxge.c head/sys/dev/sfxge/sfxge.h head/sys/dev/sfxge/sfxge_ev.c head/sys/dev/sfxge/sfxge_mcdi.c head/sys/dev/sfxge/sfxge_port.c head/sys/dev/sfxge/sfxge_tx.c head/sys/dev/sfxge/sfxge_tx.h Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/common/efsys.h Thu Feb 5 11:39:15 2015 (r278250) @@ -509,16 +509,26 @@ typedef struct efsys_mem_s { /* BAR */ +#define SFXGE_LOCK_NAME_MAX 16 + typedef struct efsys_bar_s { struct mtx esb_lock; + char esb_lock_name[SFXGE_LOCK_NAME_MAX]; bus_space_tag_t esb_tag; bus_space_handle_t esb_handle; int esb_rid; struct resource *esb_res; } efsys_bar_t; -#define SFXGE_BAR_LOCK_INIT(_esbp, _name) \ - mtx_init(&(_esbp)->esb_lock, (_name), NULL, MTX_DEF) +#define SFXGE_BAR_LOCK_INIT(_esbp, _ifname) \ + do { \ + snprintf((_esbp)->esb_lock_name, \ + sizeof((_esbp)->esb_lock_name), \ + "%s:bar", (_ifname)); \ + mtx_init(&(_esbp)->esb_lock, (_esbp)->esb_lock_name, \ + NULL, MTX_DEF); \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) #define SFXGE_BAR_LOCK_DESTROY(_esbp) \ mtx_destroy(&(_esbp)->esb_lock) #define SFXGE_BAR_LOCK(_esbp) \ @@ -721,13 +731,35 @@ typedef clock_t efsys_timestamp_t; /* LOCK */ -typedef struct mtx efsys_lock_t; +typedef struct efsys_lock_s { + struct mtx lock; + char lock_name[SFXGE_LOCK_NAME_MAX]; +} efsys_lock_t; + +#define SFXGE_EFSYS_LOCK_INIT(_eslp, _ifname, _label) \ + do { \ + efsys_lock_t *__eslp = (_eslp); \ + \ + snprintf((__eslp)->lock_name, \ + sizeof((__eslp)->lock_name), \ + "%s:%s", (_ifname), (_label)); \ + mtx_init(&(__eslp)->lock, (__eslp)->lock_name, \ + NULL, MTX_DEF); \ + } while (B_FALSE) +#define SFXGE_EFSYS_LOCK_DESTROY(_eslp) \ + mtx_destroy(&(_eslp)->lock) +#define SFXGE_EFSYS_LOCK(_eslp) \ + mtx_lock(&(_eslp)->lock) +#define SFXGE_EFSYS_UNLOCK(_eslp) \ + mtx_unlock(&(_eslp)->lock) +#define SFXGE_EFSYS_LOCK_ASSERT_OWNED(_eslp) \ + mtx_assert(&(_eslp)->lock, MA_OWNED) #define EFSYS_LOCK_MAGIC 0x000010c4 #define EFSYS_LOCK(_lockp, _state) \ do { \ - mtx_lock(_lockp); \ + SFXGE_EFSYS_LOCK(_lockp); \ (_state) = EFSYS_LOCK_MAGIC; \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) @@ -736,7 +768,7 @@ typedef struct mtx efsys_lock_t; do { \ if ((_state) != EFSYS_LOCK_MAGIC) \ KASSERT(B_FALSE, ("not locked")); \ - mtx_unlock(_lockp); \ + SFXGE_EFSYS_UNLOCK(_lockp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) Modified: head/sys/dev/sfxge/sfxge.c ============================================================================== --- head/sys/dev/sfxge/sfxge.c Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge.c Thu Feb 5 11:39:15 2015 (r278250) @@ -338,7 +338,9 @@ sfxge_ifnet_init(struct ifnet *ifp, stru ifp->if_snd.ifq_drv_maxlen = sc->txq_entries - 1; IFQ_SET_READY(&ifp->if_snd); - mtx_init(&sc->tx_lock, "txq", NULL, MTX_DEF); + snprintf(sc->tx_lock_name, sizeof(sc->tx_lock_name), + "%s:tx", device_get_nameunit(sc->dev)); + mtx_init(&sc->tx_lock, sc->tx_lock_name, NULL, MTX_DEF); #endif if ((rc = sfxge_port_ifmedia_init(sc)) != 0) @@ -376,7 +378,8 @@ sfxge_bar_init(struct sfxge_softc *sc) } esbp->esb_tag = rman_get_bustag(esbp->esb_res); esbp->esb_handle = rman_get_bushandle(esbp->esb_res); - SFXGE_BAR_LOCK_INIT(esbp, "sfxge_efsys_bar"); + + SFXGE_BAR_LOCK_INIT(esbp, device_get_nameunit(sc->dev)); return (0); } @@ -401,7 +404,7 @@ sfxge_create(struct sfxge_softc *sc) dev = sc->dev; - SFXGE_ADAPTER_LOCK_INIT(sc, "sfxge_softc"); + SFXGE_ADAPTER_LOCK_INIT(sc, device_get_nameunit(sc->dev)); sc->max_rss_channels = 0; snprintf(rss_param_name, sizeof(rss_param_name), @@ -435,7 +438,8 @@ sfxge_create(struct sfxge_softc *sc) KASSERT(error == 0, ("Family should be filtered by sfxge_probe()")); /* Create the common code nic object. */ - mtx_init(&sc->enp_lock, "sfxge_nic", NULL, MTX_DEF); + SFXGE_EFSYS_LOCK_INIT(&sc->enp_lock, + device_get_nameunit(sc->dev), "nic"); if ((error = efx_nic_create(sc->family, (efsys_identifier_t *)sc, &sc->bar, &sc->enp_lock, &enp)) != 0) goto fail3; @@ -537,7 +541,7 @@ fail_tx_ring_entries: fail_rx_ring_entries: sc->enp = NULL; efx_nic_destroy(enp); - mtx_destroy(&sc->enp_lock); + SFXGE_EFSYS_LOCK_DESTROY(&sc->enp_lock); fail3: sfxge_bar_fini(sc); Modified: head/sys/dev/sfxge/sfxge.h ============================================================================== --- head/sys/dev/sfxge/sfxge.h Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge.h Thu Feb 5 11:39:15 2015 (r278250) @@ -122,6 +122,7 @@ struct sfxge_evq { /* Structure members not used on event processing path */ unsigned int buf_base_id; unsigned int entries; + char lock_name[SFXGE_LOCK_NAME_MAX]; } __aligned(CACHE_LINE_SIZE); #define SFXGE_NDESCS 1024 @@ -162,6 +163,9 @@ struct sfxge_mcdi { struct cv cv; enum sfxge_mcdi_state state; efx_mcdi_transport_t transport; + + /* Only used in debugging output */ + char lock_name[SFXGE_LOCK_NAME_MAX]; }; struct sfxge_hw_stats { @@ -186,6 +190,9 @@ struct sfxge_port { struct sfxge_hw_stats phy_stats; struct sfxge_hw_stats mac_stats; efx_link_mode_t link_mode; + + /* Only used in debugging output */ + char lock_name[SFXGE_LOCK_NAME_MAX]; }; enum sfxge_softc_state { @@ -198,6 +205,7 @@ enum sfxge_softc_state { struct sfxge_softc { device_t dev; struct sx softc_lock; + char softc_lock_name[SFXGE_LOCK_NAME_MAX]; enum sfxge_softc_state init_state; struct ifnet *ifnet; unsigned int if_flags; @@ -210,7 +218,7 @@ struct sfxge_softc { caddr_t vpd_data; size_t vpd_size; efx_nic_t *enp; - struct mtx enp_lock; + efsys_lock_t enp_lock; unsigned int rxq_entries; unsigned int txq_entries; @@ -249,6 +257,7 @@ struct sfxge_softc { #ifndef SFXGE_HAVE_MQ struct mtx tx_lock __aligned(CACHE_LINE_SIZE); + char tx_lock_name[SFXGE_LOCK_NAME_MAX]; #endif }; @@ -314,8 +323,15 @@ extern int sfxge_port_ifmedia_init(struc #define SFXGE_MAX_MTU (9 * 1024) -#define SFXGE_ADAPTER_LOCK_INIT(_sc, _name) \ - sx_init(&(_sc)->softc_lock, (_name)) +#define SFXGE_ADAPTER_LOCK_INIT(_sc, _ifname) \ + do { \ + struct sfxge_softc *__sc = (_sc); \ + \ + snprintf((__sc)->softc_lock_name, \ + sizeof((__sc)->softc_lock_name), \ + "%s:softc", (_ifname)); \ + sx_init(&(__sc)->softc_lock, (__sc)->softc_lock_name); \ + } while (B_FALSE) #define SFXGE_ADAPTER_LOCK_DESTROY(_sc) \ sx_destroy(&(_sc)->softc_lock) #define SFXGE_ADAPTER_LOCK(_sc) \ @@ -325,8 +341,16 @@ extern int sfxge_port_ifmedia_init(struc #define SFXGE_ADAPTER_LOCK_ASSERT_OWNED(_sc) \ sx_assert(&(_sc)->softc_lock, LA_XLOCKED) -#define SFXGE_PORT_LOCK_INIT(_port, _name) \ - mtx_init(&(_port)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_PORT_LOCK_INIT(_port, _ifname) \ + do { \ + struct sfxge_port *__port = (_port); \ + \ + snprintf((__port)->lock_name, \ + sizeof((__port)->lock_name), \ + "%s:port", (_ifname)); \ + mtx_init(&(__port)->lock, (__port)->lock_name, \ + NULL, MTX_DEF); \ + } while (B_FALSE) #define SFXGE_PORT_LOCK_DESTROY(_port) \ mtx_destroy(&(_port)->lock) #define SFXGE_PORT_LOCK(_port) \ @@ -336,8 +360,16 @@ extern int sfxge_port_ifmedia_init(struc #define SFXGE_PORT_LOCK_ASSERT_OWNED(_port) \ mtx_assert(&(_port)->lock, MA_OWNED) -#define SFXGE_MCDI_LOCK_INIT(_mcdi, _name) \ - mtx_init(&(_mcdi)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_MCDI_LOCK_INIT(_mcdi, _ifname) \ + do { \ + struct sfxge_mcdi *__mcdi = (_mcdi); \ + \ + snprintf((__mcdi)->lock_name, \ + sizeof((__mcdi)->lock_name), \ + "%s:mcdi", (_ifname)); \ + mtx_init(&(__mcdi)->lock, (__mcdi)->lock_name, \ + NULL, MTX_DEF); \ + } while (B_FALSE) #define SFXGE_MCDI_LOCK_DESTROY(_mcdi) \ mtx_destroy(&(_mcdi)->lock) #define SFXGE_MCDI_LOCK(_mcdi) \ @@ -347,8 +379,16 @@ extern int sfxge_port_ifmedia_init(struc #define SFXGE_MCDI_LOCK_ASSERT_OWNED(_mcdi) \ mtx_assert(&(_mcdi)->lock, MA_OWNED) -#define SFXGE_EVQ_LOCK_INIT(_evq, _name) \ - mtx_init(&(_evq)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_EVQ_LOCK_INIT(_evq, _ifname, _evq_index) \ + do { \ + struct sfxge_evq *__evq = (_evq); \ + \ + snprintf((__evq)->lock_name, \ + sizeof((__evq)->lock_name), \ + "%s:evq%u", (_ifname), (_evq_index)); \ + mtx_init(&(__evq)->lock, (__evq)->lock_name, \ + NULL, MTX_DEF); \ + } while (B_FALSE) #define SFXGE_EVQ_LOCK_DESTROY(_evq) \ mtx_destroy(&(_evq)->lock) #define SFXGE_EVQ_LOCK(_evq) \ Modified: head/sys/dev/sfxge/sfxge_ev.c ============================================================================== --- head/sys/dev/sfxge/sfxge_ev.c Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge_ev.c Thu Feb 5 11:39:15 2015 (r278250) @@ -832,7 +832,7 @@ sfxge_ev_qinit(struct sfxge_softc *sc, u sfxge_sram_buf_tbl_alloc(sc, EFX_EVQ_NBUFS(evq->entries), &evq->buf_base_id); - SFXGE_EVQ_LOCK_INIT(evq, "evq"); + SFXGE_EVQ_LOCK_INIT(evq, device_get_nameunit(sc->dev), index); evq->init_state = SFXGE_EVQ_INITIALIZED; Modified: head/sys/dev/sfxge/sfxge_mcdi.c ============================================================================== --- head/sys/dev/sfxge/sfxge_mcdi.c Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge_mcdi.c Thu Feb 5 11:39:15 2015 (r278250) @@ -201,7 +201,7 @@ sfxge_mcdi_init(struct sfxge_softc *sc) KASSERT(mcdi->state == SFXGE_MCDI_UNINITIALIZED, ("MCDI already initialized")); - SFXGE_MCDI_LOCK_INIT(mcdi, "sfxge_mcdi"); + SFXGE_MCDI_LOCK_INIT(mcdi, device_get_nameunit(sc->dev)); mcdi->state = SFXGE_MCDI_INITIALIZED; Modified: head/sys/dev/sfxge/sfxge_port.c ============================================================================== --- head/sys/dev/sfxge/sfxge_port.c Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge_port.c Thu Feb 5 11:39:15 2015 (r278250) @@ -583,7 +583,7 @@ sfxge_port_init(struct sfxge_softc *sc) port->sc = sc; - SFXGE_PORT_LOCK_INIT(port, "sfxge_port"); + SFXGE_PORT_LOCK_INIT(port, device_get_nameunit(sc->dev)); port->phy_stats.decode_buf = malloc(EFX_PHY_NSTATS * sizeof(uint32_t), M_SFXGE, M_WAITOK | M_ZERO); Modified: head/sys/dev/sfxge/sfxge_tx.c ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.c Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge_tx.c Thu Feb 5 11:39:15 2015 (r278250) @@ -1467,7 +1467,7 @@ sfxge_tx_qinit(struct sfxge_softc *sc, u stdp->std_get_non_tcp_max = sfxge_tx_dpl_get_non_tcp_max; stdp->std_getp = &stdp->std_get; - SFXGE_TXQ_LOCK_INIT(txq, "txq"); + SFXGE_TXQ_LOCK_INIT(txq, device_get_nameunit(sc->dev), txq_index); SYSCTL_ADD_UINT(device_get_sysctl_ctx(sc->dev), SYSCTL_CHILDREN(txq_node), OID_AUTO, Modified: head/sys/dev/sfxge/sfxge_tx.h ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.h Thu Feb 5 11:38:29 2015 (r278249) +++ head/sys/dev/sfxge/sfxge_tx.h Thu Feb 5 11:39:15 2015 (r278250) @@ -130,8 +130,16 @@ enum sfxge_txq_type { #define SFXGE_TX_SCALE(sc) 1 #endif -#define SFXGE_TXQ_LOCK_INIT(_txq, _name) \ - mtx_init(&(_txq)->lock, (_name), NULL, MTX_DEF) +#define SFXGE_TXQ_LOCK_INIT(_txq, _ifname, _txq_index) \ + do { \ + struct sfxge_txq *__txq = (_txq); \ + \ + snprintf((__txq)->lock_name, \ + sizeof((__txq)->lock_name), \ + "%s:txq%u", (_ifname), (_txq_index)); \ + mtx_init(&(__txq)->lock, (__txq)->lock_name, \ + NULL, MTX_DEF); \ + } while (B_FALSE) #define SFXGE_TXQ_LOCK_DESTROY(_txq) \ mtx_destroy(&(_txq)->lock) #define SFXGE_TXQ_LOCK(_txq) \ @@ -164,6 +172,8 @@ struct sfxge_txq { efsys_mem_t *tsoh_buffer; + char lock_name[SFXGE_LOCK_NAME_MAX]; + /* This field changes more often and is read regularly on both * the initiation and completion paths */ From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 11:43:00 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50B5E64E; Thu, 5 Feb 2015 11:43:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 316BDD25; Thu, 5 Feb 2015 11:43:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Bh054074737; Thu, 5 Feb 2015 11:43:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Bh0Jh074731; Thu, 5 Feb 2015 11:43:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502051143.t15Bh0Jh074731@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 11:43:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278251 - head/etc 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 11:43:00 -0000 Author: ngie Date: Thu Feb 5 11:42:59 2015 New Revision: 278251 URL: https://svnweb.freebsd.org/changeset/base/278251 Log: Honor the following flags for items that can be conditionalized out of the build/install without disrupting other dependent services (see r278249, et al): - MK_LOCATE - MK_MAN - MK_NLS - MK_OPENSSL - MK_PKGBOOTSTRAP - MK_SENDMAIL Additional flags need to be handled in etc/Makefile, but it requires refactoring the relevant scripts in etc/rc.d/* MFC after: 3 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/etc/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Thu Feb 5 11:39:15 2015 (r278250) +++ head/etc/Makefile Thu Feb 5 11:42:59 2015 (r278251) @@ -44,7 +44,6 @@ BIN1= crontab \ rc.bsdextended \ rc.firewall \ rc.initdiskless \ - rc.sendmail \ rc.shutdown \ rc.subr \ remote \ @@ -144,6 +143,10 @@ BIN1+= portsnap.conf BIN1+= pf.os .endif +.if ${MK_SENDMAIL} != "no" +BIN1+= rc.sendmail +.endif + .if ${MK_TCSH} != "no" BIN1+= csh.cshrc csh.login csh.logout .endif @@ -254,7 +257,9 @@ distribution: .endif ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install +.if ${MK_PKGBOOTSTRAP} != "no" ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt @@ -316,8 +321,10 @@ distribution: .endif ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates +.if ${MK_LOCATE} != "no" ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database +.endif ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ @@ -385,6 +392,7 @@ distrib-dirs: ${MTREES:N/*} done; true .endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys +.if ${MK_MAN} != "no" cd ${DESTDIR}/usr/share/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ @@ -392,23 +400,30 @@ distrib-dirs: ${MTREES:N/*} ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/man/en.UTF-8/; \ done +.if ${MK_OPENSSL} != "no" cd ${DESTDIR}/usr/share/openssl/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ done +.endif set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \ - ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}/usr/share/openssl/man/$$1"; \ + if [ "${MK_OPENSSL}" != "no" ]; then \ + ${INSTALL_SYMLINK} "$$2" \ + "${DESTDIR}/usr/share/openssl/man/$$1"; \ + fi; \ shift; shift; \ done +.endif +.if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ shift; shift; \ done +.endif etc-examples: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 12:08:26 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6054514B; Thu, 5 Feb 2015 12:08:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B238F73; Thu, 5 Feb 2015 12:08:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15C8QhI084846; Thu, 5 Feb 2015 12:08:26 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15C8Qom084845; Thu, 5 Feb 2015 12:08:26 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502051208.t15C8Qom084845@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Thu, 5 Feb 2015 12:08:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278254 - head/sys/dev/sfxge/common 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 12:08:26 -0000 Author: arybchik Date: Thu Feb 5 12:08:25 2015 New Revision: 278254 URL: https://svnweb.freebsd.org/changeset/base/278254 Log: sfxge: using 64-bit access for x86-64 Submitted by: Artem V. Andreev Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/common/efsys.h Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Thu Feb 5 11:54:55 2015 (r278253) +++ head/sys/dev/sfxge/common/efsys.h Thu Feb 5 12:08:25 2015 (r278254) @@ -51,7 +51,11 @@ extern "C" { #include #define EFSYS_HAS_UINT64 1 +#if defined(__x86_64__) +#define EFSYS_USE_UINT64 1 +#else #define EFSYS_USE_UINT64 0 +#endif #if _BYTE_ORDER == _BIG_ENDIAN #define EFSYS_IS_BIG_ENDIAN 1 #define EFSYS_IS_LITTLE_ENDIAN 0 @@ -398,6 +402,26 @@ typedef struct efsys_mem_s { _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#if defined(__x86_64__) +#define EFSYS_MEM_READQ(_esmp, _offset, _eqp) \ + do { \ + uint64_t *addr; \ + \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ + ("not power of 2 aligned")); \ + \ + addr = (void *)((_esmp)->esm_base + (_offset)); \ + \ + (_eqp)->eq_u64[0] = *addr; \ + \ + EFSYS_PROBE3(mem_readq, unsigned int, (_offset), \ + uint32_t, (_eqp)->eq_u32[1], \ + uint32_t, (_eqp)->eq_u32[0]); \ + \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) +#else #define EFSYS_MEM_READQ(_esmp, _offset, _eqp) \ do { \ uint32_t *addr; \ @@ -417,7 +441,31 @@ typedef struct efsys_mem_s { \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif +#if defined(__x86_64__) +#define EFSYS_MEM_READO(_esmp, _offset, _eop) \ + do { \ + uint64_t *addr; \ + \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)), \ + ("not power of 2 aligned")); \ + \ + addr = (void *)((_esmp)->esm_base + (_offset)); \ + \ + (_eop)->eo_u64[0] = *addr++; \ + (_eop)->eo_u64[1] = *addr; \ + \ + EFSYS_PROBE5(mem_reado, unsigned int, (_offset), \ + uint32_t, (_eop)->eo_u32[3], \ + uint32_t, (_eop)->eo_u32[2], \ + uint32_t, (_eop)->eo_u32[1], \ + uint32_t, (_eop)->eo_u32[0]); \ + \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) +#else #define EFSYS_MEM_READO(_esmp, _offset, _eop) \ do { \ uint32_t *addr; \ @@ -441,6 +489,7 @@ typedef struct efsys_mem_s { \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif #define EFSYS_MEM_WRITED(_esmp, _offset, _edp) \ do { \ @@ -460,6 +509,27 @@ typedef struct efsys_mem_s { _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#if defined(__x86_64__) +#define EFSYS_MEM_WRITEQ(_esmp, _offset, _eqp) \ + do { \ + uint64_t *addr; \ + \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ + ("not power of 2 aligned")); \ + \ + EFSYS_PROBE3(mem_writeq, unsigned int, (_offset), \ + uint32_t, (_eqp)->eq_u32[1], \ + uint32_t, (_eqp)->eq_u32[0]); \ + \ + addr = (void *)((_esmp)->esm_base + (_offset)); \ + \ + *addr = (_eqp)->eq_u64[0]; \ + \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) + +#else #define EFSYS_MEM_WRITEQ(_esmp, _offset, _eqp) \ do { \ uint32_t *addr; \ @@ -479,7 +549,31 @@ typedef struct efsys_mem_s { \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif +#if defined(__x86_64__) +#define EFSYS_MEM_WRITEO(_esmp, _offset, _eop) \ + do { \ + uint64_t *addr; \ + \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)), \ + ("not power of 2 aligned")); \ + \ + EFSYS_PROBE5(mem_writeo, unsigned int, (_offset), \ + uint32_t, (_eop)->eo_u32[3], \ + uint32_t, (_eop)->eo_u32[2], \ + uint32_t, (_eop)->eo_u32[1], \ + uint32_t, (_eop)->eo_u32[0]); \ + \ + addr = (void *)((_esmp)->esm_base + (_offset)); \ + \ + *addr++ = (_eop)->eo_u64[0]; \ + *addr = (_eop)->eo_u64[1]; \ + \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) +#else #define EFSYS_MEM_WRITEO(_esmp, _offset, _eop) \ do { \ uint32_t *addr; \ @@ -503,6 +597,7 @@ typedef struct efsys_mem_s { \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif #define EFSYS_MEM_ADDR(_esmp) \ ((_esmp)->esm_addr) @@ -558,6 +653,7 @@ typedef struct efsys_bar_s { _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#if defined(__x86_64__) #define EFSYS_BAR_READQ(_esbp, _offset, _eqp) \ do { \ _NOTE(CONSTANTCONDITION) \ @@ -566,6 +662,53 @@ typedef struct efsys_bar_s { \ SFXGE_BAR_LOCK(_esbp); \ \ + (_eqp)->eq_u64[0] = bus_space_read_8((_esbp)->esb_tag, \ + (_esbp)->esb_handle, (_offset)); \ + \ + EFSYS_PROBE3(bar_readq, unsigned int, (_offset), \ + uint32_t, (_eqp)->eq_u32[1], \ + uint32_t, (_eqp)->eq_u32[0]); \ + \ + mtx_unlock(&((_esbp)->esb_lock)); \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) + +#define EFSYS_BAR_READO(_esbp, _offset, _eop, _lock) \ + do { \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)), \ + ("not power of 2 aligned")); \ + \ + _NOTE(CONSTANTCONDITION) \ + if (_lock) \ + mtx_lock(&((_esbp)->esb_lock)); \ + \ + (_eop)->eo_u64[0] = bus_space_read_8((_esbp)->esb_tag, \ + (_esbp)->esb_handle, (_offset)); \ + (_eop)->eo_u64[1] = bus_space_read_8((_esbp)->esb_tag, \ + (_esbp)->esb_handle, (_offset+8)); \ + \ + EFSYS_PROBE5(bar_reado, unsigned int, (_offset), \ + uint32_t, (_eop)->eo_u32[3], \ + uint32_t, (_eop)->eo_u32[2], \ + uint32_t, (_eop)->eo_u32[1], \ + uint32_t, (_eop)->eo_u32[0]); \ + \ + _NOTE(CONSTANTCONDITION) \ + if (_lock) \ + mtx_unlock(&((_esbp)->esb_lock)); \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) + +#else +#define EFSYS_BAR_READQ(_esbp, _offset, _eqp) \ + do { \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ + ("not power of 2 aligned")); \ + \ + mtx_lock(&((_esbp)->esb_lock)); \ + \ (_eqp)->eq_u32[0] = bus_space_read_4((_esbp)->esb_tag, \ (_esbp)->esb_handle, (_offset)); \ (_eqp)->eq_u32[1] = bus_space_read_4((_esbp)->esb_tag, \ @@ -609,6 +752,7 @@ typedef struct efsys_bar_s { SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif #define EFSYS_BAR_WRITED(_esbp, _offset, _edp, _lock) \ do { \ @@ -632,6 +776,7 @@ typedef struct efsys_bar_s { _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#if defined(__x86_64__) #define EFSYS_BAR_WRITEQ(_esbp, _offset, _eqp) \ do { \ _NOTE(CONSTANTCONDITION) \ @@ -644,6 +789,25 @@ typedef struct efsys_bar_s { uint32_t, (_eqp)->eq_u32[1], \ uint32_t, (_eqp)->eq_u32[0]); \ \ + bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\ + (_offset), (_eqp)->eq_u64[0]); \ + \ + mtx_unlock(&((_esbp)->esb_lock)); \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) +#else +#define EFSYS_BAR_WRITEQ(_esbp, _offset, _eqp) \ + do { \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)), \ + ("not power of 2 aligned")); \ + \ + mtx_lock(&((_esbp)->esb_lock)); \ + \ + EFSYS_PROBE3(bar_writeq, unsigned int, (_offset), \ + uint32_t, (_eqp)->eq_u32[1], \ + uint32_t, (_eqp)->eq_u32[0]); \ + \ bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\ (_offset), (_eqp)->eq_u32[0]); \ bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\ @@ -652,7 +816,9 @@ typedef struct efsys_bar_s { SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif +#if defined(__x86_64__) #define EFSYS_BAR_WRITEO(_esbp, _offset, _eop, _lock) \ do { \ _NOTE(CONSTANTCONDITION) \ @@ -669,6 +835,34 @@ typedef struct efsys_bar_s { uint32_t, (_eop)->eo_u32[1], \ uint32_t, (_eop)->eo_u32[0]); \ \ + bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\ + (_offset), (_eop)->eo_u64[0]); \ + bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\ + (_offset+8), (_eop)->eo_u64[1]); \ + \ + _NOTE(CONSTANTCONDITION) \ + if (_lock) \ + mtx_unlock(&((_esbp)->esb_lock)); \ + _NOTE(CONSTANTCONDITION) \ + } while (B_FALSE) + +#else +#define EFSYS_BAR_WRITEO(_esbp, _offset, _eop, _lock) \ + do { \ + _NOTE(CONSTANTCONDITION) \ + KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)), \ + ("not power of 2 aligned")); \ + \ + _NOTE(CONSTANTCONDITION) \ + if (_lock) \ + mtx_lock(&((_esbp)->esb_lock)); \ + \ + EFSYS_PROBE5(bar_writeo, unsigned int, (_offset), \ + uint32_t, (_eop)->eo_u32[3], \ + uint32_t, (_eop)->eo_u32[2], \ + uint32_t, (_eop)->eo_u32[1], \ + uint32_t, (_eop)->eo_u32[0]); \ + \ bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\ (_offset), (_eop)->eo_u32[0]); \ bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\ @@ -683,6 +877,7 @@ typedef struct efsys_bar_s { SFXGE_BAR_UNLOCK(_esbp); \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) +#endif /* SPIN */ From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 12:10:25 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45ACD3DA; Thu, 5 Feb 2015 12:10:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18AF4F97; Thu, 5 Feb 2015 12:10:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15CAOOs087028; Thu, 5 Feb 2015 12:10:24 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15CAOTL087026; Thu, 5 Feb 2015 12:10:24 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201502051210.t15CAOTL087026@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Thu, 5 Feb 2015 12:10:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278255 - head/sys/dev/sfxge 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 12:10:25 -0000 Author: arybchik Date: Thu Feb 5 12:10:23 2015 New Revision: 278255 URL: https://svnweb.freebsd.org/changeset/base/278255 Log: sfxge: Add statistics for partially dropped TSO packets Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor) Modified: head/sys/dev/sfxge/sfxge_tx.c head/sys/dev/sfxge/sfxge_tx.h Modified: head/sys/dev/sfxge/sfxge_tx.c ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.c Thu Feb 5 12:08:25 2015 (r278254) +++ head/sys/dev/sfxge/sfxge_tx.c Thu Feb 5 12:10:23 2015 (r278255) @@ -1094,12 +1094,16 @@ sfxge_tx_queue_tso(struct sfxge_txq *txq * roll back the work we have done. */ if (txq->n_pend_desc > - SFXGE_TSO_MAX_DESC - (1 + SFXGE_TX_MAPPING_MAX_SEG)) + SFXGE_TSO_MAX_DESC - (1 + SFXGE_TX_MAPPING_MAX_SEG)) { + txq->tso_pdrop_too_many++; break; + } next_id = (id + 1) & txq->ptr_mask; if (__predict_false(tso_start_new_packet(txq, &tso, - next_id))) + next_id))) { + txq->tso_pdrop_no_rsrc++; break; + } id = next_id; } } @@ -1516,6 +1520,8 @@ static const struct { SFXGE_TX_STAT(tso_bursts, tso_bursts), SFXGE_TX_STAT(tso_packets, tso_packets), SFXGE_TX_STAT(tso_long_headers, tso_long_headers), + SFXGE_TX_STAT(tso_pdrop_too_many, tso_pdrop_too_many), + SFXGE_TX_STAT(tso_pdrop_no_rsrc, tso_pdrop_no_rsrc), SFXGE_TX_STAT(tx_collapses, collapses), SFXGE_TX_STAT(tx_drops, drops), SFXGE_TX_STAT(tx_get_overflow, get_overflow), Modified: head/sys/dev/sfxge/sfxge_tx.h ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.h Thu Feb 5 12:08:25 2015 (r278254) +++ head/sys/dev/sfxge/sfxge_tx.h Thu Feb 5 12:10:23 2015 (r278255) @@ -201,6 +201,8 @@ struct sfxge_txq { unsigned long get_non_tcp_overflow; unsigned long put_overflow; unsigned long netdown_drops; + unsigned long tso_pdrop_too_many; + unsigned long tso_pdrop_no_rsrc; /* The following fields change more often, and are used mostly * on the completion path From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 13:00:28 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D19B41E; Thu, 5 Feb 2015 13:00:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F7257D8; Thu, 5 Feb 2015 13:00:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15D0SmQ009994; Thu, 5 Feb 2015 13:00:28 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15D0SRI009993; Thu, 5 Feb 2015 13:00:28 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502051300.t15D0SRI009993@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 5 Feb 2015 13:00:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278257 - head/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 13:00:28 -0000 Author: kib Date: Thu Feb 5 13:00:27 2015 New Revision: 278257 URL: https://svnweb.freebsd.org/changeset/base/278257 Log: Partially revert r277922, avoid sleeping and do flush if we a awaken, instead of waiting for the FLUSH_* flags. Also, when requesting flush, do the wakeups unconditionally even when FLUSH_CLEANUP flag was already set. Reported and tested by: dim, "Lundberg, Johannes" Bisected by: dim MFC after: 2 weeks Modified: head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Thu Feb 5 12:21:05 2015 (r278256) +++ head/sys/ufs/ffs/ffs_softdep.c Thu Feb 5 13:00:27 2015 (r278257) @@ -1393,7 +1393,7 @@ softdep_flush(addr) VFSTOUFS(mp)->softdep_jblocks->jb_suspended)) kthread_suspend_check(); ACQUIRE_LOCK(ump); - while ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) + if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) msleep(&ump->softdep_flushtd, LOCK_PTR(ump), PVM, "sdflush", hz / 2); ump->softdep_flags &= ~FLUSH_CLEANUP; @@ -1423,10 +1423,9 @@ worklist_speedup(mp) ump = VFSTOUFS(mp); LOCK_OWNED(ump); - if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) { + if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) ump->softdep_flags |= FLUSH_CLEANUP; - wakeup(&ump->softdep_flushtd); - } + wakeup(&ump->softdep_flushtd); } static int @@ -1471,11 +1470,10 @@ softdep_speedup(ump) TAILQ_INSERT_TAIL(&softdepmounts, sdp, sd_next); FREE_GBLLOCK(&lk); if ((altump->softdep_flags & - (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) { + (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) altump->softdep_flags |= FLUSH_CLEANUP; - altump->um_softdep->sd_cleanups++; - wakeup(&altump->softdep_flushtd); - } + altump->um_softdep->sd_cleanups++; + wakeup(&altump->softdep_flushtd); FREE_LOCK(altump); } } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 13:49:06 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39114F1E; Thu, 5 Feb 2015 13:49:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A027D44; Thu, 5 Feb 2015 13:49:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Dn5kK032025; Thu, 5 Feb 2015 13:49:05 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Dn58r032016; Thu, 5 Feb 2015 13:49:05 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201502051349.t15Dn58r032016@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 5 Feb 2015 13:49:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278259 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 13:49:06 -0000 Author: melifaro Date: Thu Feb 5 13:49:04 2015 New Revision: 278259 URL: https://svnweb.freebsd.org/changeset/base/278259 Log: * Make sure table algorithm destroy hook is always called without locks * Explicitly lock freeing interface references in ta_destroy_ifidx * Change ipfw_iface_unref() to require UH lock * Add forgotten ipfw_iface_unref() to destroy_ifidx_locked() PR: kern/197276 Submitted by: lev Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed) head/sys/netpfil/ipfw/ip_fw_private.h head/sys/netpfil/ipfw/ip_fw_table.c head/sys/netpfil/ipfw/ip_fw_table_algo.c Modified: head/sys/netpfil/ipfw/ip_fw_iface.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_iface.c Thu Feb 5 13:07:41 2015 (r278258) +++ head/sys/netpfil/ipfw/ip_fw_iface.c Thu Feb 5 13:49:04 2015 (r278259) @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: projects/ipfw/sys/netpfil/ipfw/ip_fw_iface.c 267384 2014-06-12 09:59:11Z melifaro $"); +__FBSDID("$FreeBSD$"); /* * Kernel interface tracking API. @@ -397,20 +397,20 @@ ipfw_iface_del_notify(struct ip_fw_chain /* * Unreference interface specified by @ic. - * Must be called without holding any locks. + * Must be called while holding UH lock. */ void ipfw_iface_unref(struct ip_fw_chain *ch, struct ipfw_ifc *ic) { struct ipfw_iface *iif; + IPFW_UH_WLOCK_ASSERT(ch); + iif = ic->iface; ic->iface = NULL; - IPFW_UH_WLOCK(ch); iif->no.refcnt--; /* TODO: check for references & delete */ - IPFW_UH_WUNLOCK(ch); } /* Modified: head/sys/netpfil/ipfw/ip_fw_private.h ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_private.h Thu Feb 5 13:07:41 2015 (r278258) +++ head/sys/netpfil/ipfw/ip_fw_private.h Thu Feb 5 13:49:04 2015 (r278259) @@ -429,6 +429,7 @@ struct ipfw_ifc { #define IPFW_UH_RLOCK_ASSERT(_chain) rw_assert(&(_chain)->uh_lock, RA_RLOCKED) #define IPFW_UH_WLOCK_ASSERT(_chain) rw_assert(&(_chain)->uh_lock, RA_WLOCKED) +#define IPFW_UH_UNLOCK_ASSERT(_chain) rw_assert(&(_chain)->uh_lock, RA_UNLOCKED) #define IPFW_UH_RLOCK(p) rw_rlock(&(p)->uh_lock) #define IPFW_UH_RUNLOCK(p) rw_runlock(&(p)->uh_lock) Modified: head/sys/netpfil/ipfw/ip_fw_table.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table.c Thu Feb 5 13:07:41 2015 (r278258) +++ head/sys/netpfil/ipfw/ip_fw_table.c Thu Feb 5 13:49:04 2015 (r278259) @@ -1198,7 +1198,7 @@ flush_table(struct ip_fw_chain *ch, stru void *astate_old, *astate_new; char algostate[64], *pstate; struct tableop_state ts; - int error; + int error, need_gc; uint16_t kidx; uint8_t tflags; @@ -1212,6 +1212,9 @@ flush_table(struct ip_fw_chain *ch, stru IPFW_UH_WUNLOCK(ch); return (ESRCH); } + need_gc = 0; + astate_new = NULL; + memset(&ti_new, 0, sizeof(ti_new)); restart: /* Set up swap handler */ memset(&ts, 0, sizeof(ts)); @@ -1237,6 +1240,14 @@ restart: IPFW_UH_WUNLOCK(ch); /* + * Stage 1.5: if this is not the first attempt, destroy previous state + */ + if (need_gc != 0) { + ta->destroy(astate_new, &ti_new); + need_gc = 0; + } + + /* * Stage 2: allocate new table instance using same algo. */ memset(&ti_new, 0, sizeof(struct table_info)); @@ -1262,7 +1273,8 @@ restart: * complex checks. */ if (ts.modified != 0) { - ta->destroy(astate_new, &ti_new); + /* Delay destroying data since we're holding UH lock */ + need_gc = 1; goto restart; } @@ -3042,6 +3054,7 @@ free_table_config(struct namedobj_instan { KASSERT(tc->linked == 0, ("free() on linked config")); + /* UH lock MUST NOT be held */ /* * We're using ta without any locking/referencing. Modified: head/sys/netpfil/ipfw/ip_fw_table_algo.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table_algo.c Thu Feb 5 13:07:41 2015 (r278258) +++ head/sys/netpfil/ipfw/ip_fw_table_algo.c Thu Feb 5 13:49:04 2015 (r278259) @@ -97,7 +97,7 @@ __FBSDID("$FreeBSD$"); * * -destroy: request to destroy table instance. * typedef void (ta_destroy)(void *ta_state, struct table_info *ti); - * MANDATORY, may be locked (UH+WLOCK). (M_NOWAIT). + * MANDATORY, unlocked. (M_WAITOK). * * Frees all table entries and all tables structures allocated by -init. * @@ -2134,6 +2134,7 @@ destroy_ifidx_locked(struct namedobj_ins ife = (struct ifentry *)no; ipfw_iface_del_notify(ch, &ife->ic); + ipfw_iface_unref(ch, &ife->ic); free(ife, M_IPFW_TBL); } @@ -2153,7 +2154,9 @@ ta_destroy_ifidx(void *ta_state, struct if (icfg->main_ptr != NULL) free(icfg->main_ptr, M_IPFW); + IPFW_UH_WLOCK(ch); ipfw_objhash_foreach(icfg->ii, destroy_ifidx_locked, ch); + IPFW_UH_WUNLOCK(ch); ipfw_objhash_destroy(icfg->ii); @@ -2333,8 +2336,9 @@ ta_del_ifidx(void *ta_state, struct tabl /* Unlink from local list */ ipfw_objhash_del(icfg->ii, &ife->no); - /* Unlink notifier */ + /* Unlink notifier and deref */ ipfw_iface_del_notify(icfg->ch, &ife->ic); + ipfw_iface_unref(icfg->ch, &ife->ic); icfg->count--; tei->value = ife->value; @@ -2357,11 +2361,8 @@ ta_flush_ifidx_entry(struct ip_fw_chain tb = (struct ta_buf_ifidx *)ta_buf; - if (tb->ife != NULL) { - /* Unlink first */ - ipfw_iface_unref(ch, &tb->ife->ic); + if (tb->ife != NULL) free(tb->ife, M_IPFW_TBL); - } } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 13:59:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DC7F3C9; Thu, 5 Feb 2015 13:59:08 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77277E63; Thu, 5 Feb 2015 13:59:08 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 6CC9FB926; Thu, 5 Feb 2015 08:59:07 -0500 (EST) From: John Baldwin To: Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 05 Feb 2015 08:04:48 -0500 Message-ID: <1724492.FMbRRniWv7@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502051138.t15BcUlj070663@svn.freebsd.org> References: <201502051138.t15BcUlj070663@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Feb 2015 08:59:07 -0500 (EST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 13:59:08 -0000 On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: > Author: ngie > Date: Thu Feb 5 11:38:29 2015 > New Revision: 278249 > URL: https://svnweb.freebsd.org/changeset/base/278249 > > Log: > Honor the following flags with the following rc.d scripts for services > that can be easily decoupled from the boot process without disrupting other > services > > - MK_APM && MK_ACPI: powerd > - MK_BOOTPARAMD: bootparams > - MK_FTP: ftpd > - MK_INETD: inetd > - MK_LEGACY_CONSOLE: moused, syscons I'm using moused with vt(4). It is not syscons-specific. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 14:08:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82B53A49; Thu, 5 Feb 2015 14:08:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6DEB8FC0; Thu, 5 Feb 2015 14:08:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15E8Y5L041372; Thu, 5 Feb 2015 14:08:34 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15E8YO4041371; Thu, 5 Feb 2015 14:08:34 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201502051408.t15E8YO4041371@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 5 Feb 2015 14:08:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278261 - head/sbin/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 14:08:34 -0000 Author: melifaro Date: Thu Feb 5 14:08:33 2015 New Revision: 278261 URL: https://svnweb.freebsd.org/changeset/base/278261 Log: Retrieve counters from kernel if rule timstamping is requested. PR: kern/197271 Submitted by: lev Sponsored by: Yandex LLC Modified: head/sbin/ipfw/ipfw2.c Modified: head/sbin/ipfw/ipfw2.c ============================================================================== --- head/sbin/ipfw/ipfw2.c Thu Feb 5 13:53:31 2015 (r278260) +++ head/sbin/ipfw/ipfw2.c Thu Feb 5 14:08:33 2015 (r278261) @@ -61,6 +61,7 @@ struct format_opts { int bcwidth; int pcwidth; int show_counters; + int show_time; /* show timestamp */ uint32_t set_mask; /* enabled sets mask */ uint32_t flags; /* request flags */ uint32_t first; /* first rule to request */ @@ -2402,7 +2403,7 @@ list_static_range(struct cmdline_opts *c for (n = seen = 0; n < rcnt; n++, rtlv = (ipfw_obj_tlv *)((caddr_t)rtlv + rtlv->length)) { - if (fo->show_counters != 0) { + if ((fo->show_counters | fo->show_time) != 0) { cntr = (struct ip_fw_bcounter *)(rtlv + 1); r = (struct ip_fw_rule *)((caddr_t)cntr + cntr->size); } else { @@ -2504,10 +2505,11 @@ ipfw_list(int ac, char *av[], int show_c /* get configuraion from kernel */ cfg = NULL; sfo.show_counters = show_counters; + sfo.show_time = co.do_time; sfo.flags = IPFW_CFG_GET_STATIC; if (co.do_dynamic != 0) sfo.flags |= IPFW_CFG_GET_STATES; - if (sfo.show_counters != 0) + if ((sfo.show_counters | sfo.show_time) != 0) sfo.flags |= IPFW_CFG_GET_COUNTERS; if (ipfw_get_config(&co, &sfo, &cfg, &sz) != 0) err(EX_OSERR, "retrieving config failed"); From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 14:08:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1588B8F; Thu, 5 Feb 2015 14:08:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCD7BFD0; Thu, 5 Feb 2015 14:08:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15E8wWG041477; Thu, 5 Feb 2015 14:08:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15E8w0Z041476; Thu, 5 Feb 2015 14:08:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502051408.t15E8w0Z041476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 5 Feb 2015 14:08:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278262 - head/release/doc/share/xml 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 14:08:58 -0000 Author: gjb Date: Thu Feb 5 14:08:57 2015 New Revision: 278262 URL: https://svnweb.freebsd.org/changeset/base/278262 Log: Add an entity to use to link to SAs and ENs. Prefer https:// for other URLs. While here, update release.prev.stable entity to 9.3-RELEASE. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/share/xml/release.ent Modified: head/release/doc/share/xml/release.ent ============================================================================== --- head/release/doc/share/xml/release.ent Thu Feb 5 14:08:33 2015 (r278261) +++ head/release/doc/share/xml/release.ent Thu Feb 5 14:08:57 2015 (r278262) @@ -16,7 +16,7 @@ - + @@ -25,7 +25,10 @@ - + + + + @@ -51,7 +54,7 @@ - + From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 14:54:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44E676A0; Thu, 5 Feb 2015 14:54:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 309BB85A; Thu, 5 Feb 2015 14:54:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Ess6O064655; Thu, 5 Feb 2015 14:54:54 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Essxh064654; Thu, 5 Feb 2015 14:54:54 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201502051454.t15Essxh064654@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 5 Feb 2015 14:54:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278264 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 14:54:54 -0000 Author: melifaro Date: Thu Feb 5 14:54:53 2015 New Revision: 278264 URL: https://svnweb.freebsd.org/changeset/base/278264 Log: Fix IP_FW_NAT44_LIST_NAT size calculation. Found by: lev Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/ip_fw_nat.c Modified: head/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_nat.c Thu Feb 5 14:12:05 2015 (r278263) +++ head/sys/netpfil/ipfw/ip_fw_nat.c Thu Feb 5 14:54:53 2015 (r278264) @@ -691,7 +691,7 @@ nat44_get_cfg(struct ip_fw_chain *chain, export_nat_cfg(ptr, ucfg); /* Estimate memory amount */ - sz = sizeof(struct nat44_cfg_nat); + sz = sizeof(ipfw_obj_header) + sizeof(struct nat44_cfg_nat); LIST_FOREACH(r, &ptr->redir_chain, _next) { sz += sizeof(struct nat44_cfg_redir); LIST_FOREACH(s, &r->spool_chain, _next) @@ -699,7 +699,7 @@ nat44_get_cfg(struct ip_fw_chain *chain, } ucfg->size = sz; - if (sd->valsize < sz + sizeof(*oh)) { + if (sd->valsize < sz) { /* * Submitted buffer size is not enough. From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 15:46:03 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2DF860A; Thu, 5 Feb 2015 15:46:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E372DDC; Thu, 5 Feb 2015 15:46:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Fk36R089445; Thu, 5 Feb 2015 15:46:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Fk2EB089440; Thu, 5 Feb 2015 15:46:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502051546.t15Fk2EB089440@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 5 Feb 2015 15:46:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278265 - in head/release/doc: en_US.ISO8859-1/errata en_US.ISO8859-1/relnotes share/xml 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 15:46:03 -0000 Author: gjb Date: Thu Feb 5 15:46:01 2015 New Revision: 278265 URL: https://svnweb.freebsd.org/changeset/base/278265 Log: Security Advisory information is included on several pages in the release notes. Rather than duplicating the information between various files, add two new files to include in all pages that currently display the information. Sponsored by: The FreeBSD Foundation Added: head/release/doc/share/xml/errata.xml (contents, props changed) head/release/doc/share/xml/security.xml (contents, props changed) Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb 5 14:54:53 2015 (r278264) +++ head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb 5 15:46:01 2015 (r278265) @@ -4,6 +4,8 @@ %release; + + ]>
Security Advisories - No advisory. + &security; + + + + Errata Notices + + &errata; Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Feb 5 14:54:53 2015 (r278264) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Feb 5 15:46:01 2015 (r278265) @@ -7,6 +7,8 @@ %sponsor; %vendor; + + ]>
@@ -138,15 +140,13 @@ Security Advisories - No advisories. - + &security; Errata Notices - No errata notices. - + &errata; Added: head/release/doc/share/xml/errata.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/doc/share/xml/errata.xml Thu Feb 5 15:46:01 2015 (r278265) @@ -0,0 +1,28 @@ + + + + + + + + + + Errata + Date + Topic + + + + + + No errata notices. +   +   + + + + Added: head/release/doc/share/xml/security.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/doc/share/xml/security.xml Thu Feb 5 15:46:01 2015 (r278265) @@ -0,0 +1,28 @@ + + + + + + + + + + Advisory + Date + Topic + + + + + + No advisories. +   +   + + + + From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 16:00:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5ED8D69; Thu, 5 Feb 2015 16:00:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92190F36; Thu, 5 Feb 2015 16:00:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15G0ZuU095283; Thu, 5 Feb 2015 16:00:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15G0ZCo095282; Thu, 5 Feb 2015 16:00:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502051600.t15G0ZCo095282@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 5 Feb 2015 16:00:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278266 - head/release/doc/en_US.ISO8859-1/errata 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 16:00:35 -0000 Author: gjb Date: Thu Feb 5 16:00:34 2015 New Revision: 278266 URL: https://svnweb.freebsd.org/changeset/base/278266 Log: Bump copyright year. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb 5 15:46:01 2015 (r278265) +++ head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb 5 16:00:34 2015 (r278266) @@ -19,7 +19,7 @@ $FreeBSD$ - 2014 + 2015 The &os; Documentation Project From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 16:29:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F828A2A; Thu, 5 Feb 2015 16:29:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BF8038E; Thu, 5 Feb 2015 16:29:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15GTR1A010012; Thu, 5 Feb 2015 16:29:27 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15GTRl1010011; Thu, 5 Feb 2015 16:29:27 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201502051629.t15GTRl1010011@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 5 Feb 2015 16:29:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278268 - head/sys/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 16:29:27 -0000 Author: ae Date: Thu Feb 5 16:29:26 2015 New Revision: 278268 URL: https://svnweb.freebsd.org/changeset/base/278268 Log: Print IPv6 address in log message instead of address of pointer. MFC after: 1 week Modified: head/sys/netinet6/in6.c Modified: head/sys/netinet6/in6.c ============================================================================== --- head/sys/netinet6/in6.c Thu Feb 5 16:28:18 2015 (r278267) +++ head/sys/netinet6/in6.c Thu Feb 5 16:29:26 2015 (r278268) @@ -1333,6 +1333,7 @@ in6_purgeaddr(struct ifaddr *ifa) static void in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) { + char ip6buf[INET6_ADDRSTRLEN]; IF_ADDR_WLOCK(ifp); TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link); @@ -1356,7 +1357,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st if (ia->ia6_ndpr == NULL) { nd6log((LOG_NOTICE, "in6_unlink_ifa: autoconf'ed address " - "%p has no prefix\n", ia)); + "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); } else { ia->ia6_ndpr->ndpr_refcnt--; ia->ia6_ndpr = NULL; From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 18:31:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4019067E; Thu, 5 Feb 2015 18:31:01 +0000 (UTC) Received: from mail-lb0-x232.google.com (mail-lb0-x232.google.com [IPv6:2a00:1450:4010:c04::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 646966D3; Thu, 5 Feb 2015 18:31:00 +0000 (UTC) Received: by mail-lb0-f178.google.com with SMTP id b6so3807981lbj.9; Thu, 05 Feb 2015 10:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=tw4ICIfVIg7R5+5Z5ZOBGCfE96F4hiTLN0gtgaJmxtc=; b=Lm8RbbzPY9dKCFeTZy+255+LmD0kigS7EoUwLtQj5e5+DzQgkGyo2X70+WFRZAB6LX mXseojSBkVnReNnLgdiaDabNb9rnvm8Hj0G7C41ZmLPFY2Wmzq1zDUM0aA7uduuXTzdL IP5H8jv7Q/QFoz9cHSBBfSqD7UMUGuT0BVKL+4MI5zdaSeATQts9FyNFR6OpWQNSpjF1 HJQMzPTUaTU+tZnpKT9wo8OI2FDpWodwDCuabvsnhpV8IR3QDyxMqBViezhAX6RkewNU xK8m1Lx3eALnsHZn2NpKhOe84UUXuahtrKGBhjcJmayTD1z6TmEPgpCEeRohqcaRQmlp Swww== MIME-Version: 1.0 X-Received: by 10.152.43.67 with SMTP id u3mr5355260lal.23.1423161057968; Thu, 05 Feb 2015 10:30:57 -0800 (PST) Sender: rizzo.unipi@gmail.com Received: by 10.114.19.206 with HTTP; Thu, 5 Feb 2015 10:30:57 -0800 (PST) Date: Thu, 5 Feb 2015 19:30:57 +0100 X-Google-Sender-Auth: -OsdDhGQeNYelZEhT1vAq2cl0Qc Message-ID: Subject: lost change 272451 - CAP_EVENT for tcpdump (Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump From: Luigi Rizzo To: Xin LI Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 18:31:01 -0000 Hi, the update to tcpdump 4.6.2 also lost svn272451 and 272653 (addition of CAP_EVENT to the capabilities given to tcpdump). Given this and the other bug fixed in 277638, I am not sure if there are other local changes that have been lost in the merge. Also I wonder whether there is something we should have done differently when applying local changes to code in contrib/ to make sure that the merge from vendor does not overwrite them ? cheers luigi On Wed, Jan 7, 2015 at 8:55 PM, Xin LI wrote: > Author: delphij > Date: Wed Jan 7 19:55:18 2015 > New Revision: 276788 > URL: https://svnweb.freebsd.org/changeset/base/276788 > > Log: > MFV r276761: tcpdump 4.6.2. > > MFC after: 1 month > > Added: > head/contrib/tcpdump/README.md > - copied unchanged from r276761, vendor/tcpdump/dist/README.md > head/contrib/tcpdump/getopt_long.h > - copied unchanged from r276761, vendor/tcpdump/dist/getopt_long.h > head/contrib/tcpdump/missing/getopt_long.c > - copied unchanged from r276761, vendor/tcpdump/dist/missing/getopt_= long.c > head/contrib/tcpdump/openflow.h > - copied unchanged from r276761, vendor/tcpdump/dist/openflow.h > head/contrib/tcpdump/print-ahcp.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-ahcp.c > head/contrib/tcpdump/print-aoe.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-aoe.c > head/contrib/tcpdump/print-calm-fast.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-calm-fast= .c > head/contrib/tcpdump/print-geonet.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-geonet.c > head/contrib/tcpdump/print-loopback.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-loopback.= c > head/contrib/tcpdump/print-m3ua.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-m3ua.c > head/contrib/tcpdump/print-mptcp.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-mptcp.c > head/contrib/tcpdump/print-nflog.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-nflog.c > head/contrib/tcpdump/print-openflow-1.0.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-openflow-= 1.0.c > head/contrib/tcpdump/print-openflow.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-openflow.= c > head/contrib/tcpdump/print-pktap.c > - copied unchanged from r276761, vendor/tcpdump/dist/print-pktap.c > head/contrib/tcpdump/rpl.h > - copied unchanged from r276761, vendor/tcpdump/dist/rpl.h > Deleted: > head/contrib/tcpdump/README > head/contrib/tcpdump/acconfig.h > head/contrib/tcpdump/aodv.h > head/contrib/tcpdump/arcnet.h > head/contrib/tcpdump/bgp.h > head/contrib/tcpdump/dccp.h > head/contrib/tcpdump/decnet.h > head/contrib/tcpdump/decode_prefix.h > head/contrib/tcpdump/enc.h > head/contrib/tcpdump/esp.h > head/contrib/tcpdump/fddi.h > head/contrib/tcpdump/forces.h > head/contrib/tcpdump/icmp6.h > head/contrib/tcpdump/ieee802_11.h > head/contrib/tcpdump/ieee802_11_radio.h > head/contrib/tcpdump/igrp.h > head/contrib/tcpdump/ipfc.h > head/contrib/tcpdump/ipnet.h > head/contrib/tcpdump/ipsec_doi.h > head/contrib/tcpdump/ipx.h > head/contrib/tcpdump/isakmp.h > head/contrib/tcpdump/l2tp.h > head/contrib/tcpdump/lane.h > head/contrib/tcpdump/missing/sockstorage.h > head/contrib/tcpdump/netbios.h > head/contrib/tcpdump/ntp.h > head/contrib/tcpdump/oakley.h > head/contrib/tcpdump/ospf6.h > head/contrib/tcpdump/pmap_prot.h > head/contrib/tcpdump/ppi.h > head/contrib/tcpdump/print-netbios.c > head/contrib/tcpdump/route6d.h > head/contrib/tcpdump/rx.h > head/contrib/tcpdump/sctpConstants.h > head/contrib/tcpdump/sctpHeader.h > head/contrib/tcpdump/slip.h > head/contrib/tcpdump/sll.h > head/contrib/tcpdump/telnet.h > head/contrib/tcpdump/tftp.h > head/contrib/tcpdump/timed.h > head/contrib/tcpdump/token.h > Modified: > head/contrib/tcpdump/CHANGES > head/contrib/tcpdump/CREDITS > head/contrib/tcpdump/INSTALL.txt > head/contrib/tcpdump/Makefile-devel-adds > head/contrib/tcpdump/Makefile.in > head/contrib/tcpdump/VERSION > head/contrib/tcpdump/addrtoname.c > head/contrib/tcpdump/addrtoname.h > head/contrib/tcpdump/af.c > head/contrib/tcpdump/af.h > head/contrib/tcpdump/ah.h > head/contrib/tcpdump/appletalk.h > head/contrib/tcpdump/atm.h > head/contrib/tcpdump/atmuni31.h > head/contrib/tcpdump/bootp.h > head/contrib/tcpdump/bpf_dump.c > head/contrib/tcpdump/chdlc.h > head/contrib/tcpdump/checksum.c > head/contrib/tcpdump/config.guess > head/contrib/tcpdump/config.h.in > head/contrib/tcpdump/config.sub > head/contrib/tcpdump/configure > head/contrib/tcpdump/configure.in > head/contrib/tcpdump/cpack.c > head/contrib/tcpdump/cpack.h > head/contrib/tcpdump/ether.h > head/contrib/tcpdump/ethertype.h > head/contrib/tcpdump/extract.h > head/contrib/tcpdump/gmpls.c > head/contrib/tcpdump/gmpls.h > head/contrib/tcpdump/gmt2local.c > head/contrib/tcpdump/gmt2local.h > head/contrib/tcpdump/in_cksum.c > head/contrib/tcpdump/install-sh > head/contrib/tcpdump/interface.h > head/contrib/tcpdump/ip.h > head/contrib/tcpdump/ip6.h > head/contrib/tcpdump/ipproto.c > head/contrib/tcpdump/ipproto.h > head/contrib/tcpdump/l2vpn.c > head/contrib/tcpdump/l2vpn.h > head/contrib/tcpdump/lbl/os-osf4.h > head/contrib/tcpdump/lbl/os-solaris2.h > head/contrib/tcpdump/lbl/os-sunos4.h > head/contrib/tcpdump/lbl/os-ultrix4.h > head/contrib/tcpdump/llc.h > head/contrib/tcpdump/machdep.c > head/contrib/tcpdump/machdep.h > head/contrib/tcpdump/makemib > head/contrib/tcpdump/missing/addrinfo.h > head/contrib/tcpdump/missing/datalinks.c > head/contrib/tcpdump/missing/dlnames.c > head/contrib/tcpdump/missing/getnameinfo.c > head/contrib/tcpdump/missing/inet_aton.c > head/contrib/tcpdump/missing/inet_ntop.c > head/contrib/tcpdump/missing/inet_pton.c > head/contrib/tcpdump/missing/snprintf.c > head/contrib/tcpdump/missing/strdup.c > head/contrib/tcpdump/missing/strlcat.c > head/contrib/tcpdump/missing/strlcpy.c > head/contrib/tcpdump/missing/strsep.c > head/contrib/tcpdump/mkdep > head/contrib/tcpdump/mpls.h > head/contrib/tcpdump/nameser.h > head/contrib/tcpdump/netdissect.h > head/contrib/tcpdump/nfs.h > head/contrib/tcpdump/nfsfh.h > head/contrib/tcpdump/nlpid.c > head/contrib/tcpdump/nlpid.h > head/contrib/tcpdump/ospf.h > head/contrib/tcpdump/oui.c > head/contrib/tcpdump/oui.h > head/contrib/tcpdump/parsenfsfh.c > head/contrib/tcpdump/pcap-missing.h > head/contrib/tcpdump/pcap_dump_ftell.c > head/contrib/tcpdump/ppp.h > head/contrib/tcpdump/print-802_11.c > head/contrib/tcpdump/print-802_15_4.c > head/contrib/tcpdump/print-ah.c > head/contrib/tcpdump/print-aodv.c > head/contrib/tcpdump/print-ap1394.c > head/contrib/tcpdump/print-arcnet.c > head/contrib/tcpdump/print-arp.c > head/contrib/tcpdump/print-ascii.c > head/contrib/tcpdump/print-atalk.c > head/contrib/tcpdump/print-atm.c > head/contrib/tcpdump/print-babel.c > head/contrib/tcpdump/print-beep.c > head/contrib/tcpdump/print-bfd.c > head/contrib/tcpdump/print-bgp.c > head/contrib/tcpdump/print-bootp.c > head/contrib/tcpdump/print-bt.c > head/contrib/tcpdump/print-carp.c > head/contrib/tcpdump/print-cdp.c > head/contrib/tcpdump/print-cfm.c > head/contrib/tcpdump/print-chdlc.c > head/contrib/tcpdump/print-cip.c > head/contrib/tcpdump/print-cnfp.c > head/contrib/tcpdump/print-dccp.c > head/contrib/tcpdump/print-decnet.c > head/contrib/tcpdump/print-dhcp6.c > head/contrib/tcpdump/print-domain.c > head/contrib/tcpdump/print-dtp.c > head/contrib/tcpdump/print-dvmrp.c > head/contrib/tcpdump/print-eap.c > head/contrib/tcpdump/print-egp.c > head/contrib/tcpdump/print-eigrp.c > head/contrib/tcpdump/print-enc.c > head/contrib/tcpdump/print-esp.c > head/contrib/tcpdump/print-ether.c > head/contrib/tcpdump/print-fddi.c > head/contrib/tcpdump/print-forces.c > head/contrib/tcpdump/print-fr.c > head/contrib/tcpdump/print-frag6.c > head/contrib/tcpdump/print-gre.c > head/contrib/tcpdump/print-hsrp.c > head/contrib/tcpdump/print-icmp.c > head/contrib/tcpdump/print-icmp6.c > head/contrib/tcpdump/print-igmp.c > head/contrib/tcpdump/print-igrp.c > head/contrib/tcpdump/print-ip.c > head/contrib/tcpdump/print-ip6.c > head/contrib/tcpdump/print-ip6opts.c > head/contrib/tcpdump/print-ipcomp.c > head/contrib/tcpdump/print-ipfc.c > head/contrib/tcpdump/print-ipnet.c > head/contrib/tcpdump/print-ipx.c > head/contrib/tcpdump/print-isakmp.c > head/contrib/tcpdump/print-isoclns.c > head/contrib/tcpdump/print-juniper.c > head/contrib/tcpdump/print-krb.c > head/contrib/tcpdump/print-l2tp.c > head/contrib/tcpdump/print-lane.c > head/contrib/tcpdump/print-ldp.c > head/contrib/tcpdump/print-llc.c > head/contrib/tcpdump/print-lldp.c > head/contrib/tcpdump/print-lmp.c > head/contrib/tcpdump/print-lspping.c > head/contrib/tcpdump/print-lwapp.c > head/contrib/tcpdump/print-lwres.c > head/contrib/tcpdump/print-mobile.c > head/contrib/tcpdump/print-mobility.c > head/contrib/tcpdump/print-mpcp.c > head/contrib/tcpdump/print-mpls.c > head/contrib/tcpdump/print-msdp.c > head/contrib/tcpdump/print-msnlb.c > head/contrib/tcpdump/print-nfs.c > head/contrib/tcpdump/print-ntp.c > head/contrib/tcpdump/print-null.c > head/contrib/tcpdump/print-olsr.c > head/contrib/tcpdump/print-ospf.c > head/contrib/tcpdump/print-ospf6.c > head/contrib/tcpdump/print-otv.c > head/contrib/tcpdump/print-pflog.c > head/contrib/tcpdump/print-pfsync.c > head/contrib/tcpdump/print-pgm.c > head/contrib/tcpdump/print-pim.c > head/contrib/tcpdump/print-ppi.c > head/contrib/tcpdump/print-ppp.c > head/contrib/tcpdump/print-pppoe.c > head/contrib/tcpdump/print-pptp.c > head/contrib/tcpdump/print-radius.c > head/contrib/tcpdump/print-raw.c > head/contrib/tcpdump/print-rip.c > head/contrib/tcpdump/print-ripng.c > head/contrib/tcpdump/print-rpki-rtr.c > head/contrib/tcpdump/print-rrcp.c > head/contrib/tcpdump/print-rsvp.c > head/contrib/tcpdump/print-rt6.c > head/contrib/tcpdump/print-rx.c > head/contrib/tcpdump/print-sctp.c > head/contrib/tcpdump/print-sflow.c > head/contrib/tcpdump/print-sip.c > head/contrib/tcpdump/print-sl.c > head/contrib/tcpdump/print-sll.c > head/contrib/tcpdump/print-slow.c > head/contrib/tcpdump/print-smb.c > head/contrib/tcpdump/print-snmp.c > head/contrib/tcpdump/print-stp.c > head/contrib/tcpdump/print-sunatm.c > head/contrib/tcpdump/print-sunrpc.c > head/contrib/tcpdump/print-symantec.c > head/contrib/tcpdump/print-syslog.c > head/contrib/tcpdump/print-tcp.c > head/contrib/tcpdump/print-telnet.c > head/contrib/tcpdump/print-tftp.c > head/contrib/tcpdump/print-timed.c > head/contrib/tcpdump/print-tipc.c > head/contrib/tcpdump/print-token.c > head/contrib/tcpdump/print-udld.c > head/contrib/tcpdump/print-udp.c > head/contrib/tcpdump/print-usb.c > head/contrib/tcpdump/print-vjc.c > head/contrib/tcpdump/print-vqp.c > head/contrib/tcpdump/print-vrrp.c > head/contrib/tcpdump/print-vtp.c > head/contrib/tcpdump/print-vxlan.c > head/contrib/tcpdump/print-wb.c > head/contrib/tcpdump/print-zephyr.c > head/contrib/tcpdump/print-zeromq.c > head/contrib/tcpdump/rpc_auth.h > head/contrib/tcpdump/rpc_msg.h > head/contrib/tcpdump/setsignal.c > head/contrib/tcpdump/setsignal.h > head/contrib/tcpdump/signature.c > head/contrib/tcpdump/signature.h > head/contrib/tcpdump/slcompress.h > head/contrib/tcpdump/smb.h > head/contrib/tcpdump/smbutil.c > head/contrib/tcpdump/strcasecmp.c > head/contrib/tcpdump/tcp.h > head/contrib/tcpdump/tcpdump-stdinc.h > head/contrib/tcpdump/tcpdump.1.in > head/contrib/tcpdump/tcpdump.c > head/contrib/tcpdump/udp.h > head/contrib/tcpdump/util.c > head/contrib/tcpdump/vfprintf.c > head/usr.sbin/tcpdump/tcpdump/Makefile > head/usr.sbin/tcpdump/tcpdump/config.h > head/usr.sbin/tcpdump/tcpdump/tcpdump.1 > Directory Properties: > head/contrib/tcpdump/ (props changed) > > Modified: head/contrib/tcpdump/CHANGES > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/tcpdump/CHANGES Wed Jan 7 19:38:52 2015 (= r276787) > +++ head/contrib/tcpdump/CHANGES Wed Jan 7 19:55:18 2015 (= r276788) > @@ -1,4 +1,61 @@ > -Thursday February 19, 2013 guy@alum.mit.edu. > +Tuesday Sep. 2, 2014 mcr@sandelman.ca > + fix out-of-source-tree builds: find libpcap that is out of source > + better configure check for libsmi > + > +Saturday Jul. 19, 2014 mcr@sandelman.ca > + Summary for 4.6.1 tcpdump release > + added FreeBSD capsicum > + add a short option '#', same as long option '--number' > + > +Wednesday Jul. 2, 2014 mcr@sandelman.ca > + Summary for 4.6.0 tcpdump release > + all of tcpdump is now using the new "NDO" code base (Thanks Deni= s!) > + nflog, mobile, forces, pptp, AODV, AHCP, IPv6, OSPFv4, RPL, DHCP= v6 enhancements/fixes > + M3UA decode added. > + many new test cases: 82 in 4.5.1 to 133 in 4.6.0 > + many improvements to travis continuous integration system: OSX, = and Coverity options > + cleaned up some unnecessary header files > + Added bittok2str(). > + a number of unaligned access faults fixed > + -A flag does not consider CR to be printable anymore > + fx.lebail took over coverity baby sitting > + default snapshot size increased to 256K for accomodate USB captu= res > + WARNING: this release contains a lot of very worthwhile code chu= rn. > + > +Wednesday Jan. 15, 2014 guy@alum.mit.edu > + Summary for 4.5.2 tcpdump release > + Man page fix > + Fix crashes on SPARC > + > +Monday Nov. 11, 2013 mcr@sandelman.ca > + Summary for 4.5.1 tcpdump release > + CREDITS file fixes > + > +Thursday Nov. 7, 2013 mcr@sandelman.ca and guy@alum.mit.edu. > + Summary for 4.5.0 tcpdump release > + some NFSv4 fixes for printing > + fix printing of unknown TCP options, and tcp fast-open > + fixes for syslog parser > + some gcc-version-specific flag tuning > + adopt MacOS deprecation workarounds for openssl > + improvements to babel printing > + add OpenFlow 1.0 (no SSL) and test cases > + GeoNet printer. > + added STBC Rx support > + improvements to DHCPv6 decoder > + clarify which autoconf is needed > + Point users to the the-tcpdump-group repository on GitHub rather > + than the mcr repository > + Add MSDP printer. > + Fixed IPv6 check on Solaris and other OSes requiring extra > + networking libraries. > + Add support for VXLAN (draft-mahalingam-dutt-dcops-vxlan-03), > + and add "vxlan" as an option for -T. > + Add support for OTV (draft-hasmit-otv-04). > + fixes for DLT_IEEE802_11_RADIO datalink types > + added MPTCP decoder > + > +Saturday April 6, 2013 guy@alum.mit.edu. > Summary for 4.4.0 tcpdump release > RPKI-RTR (RFC6810) is now official (TCP Port 323) > Fix detection of OpenSSL libcrypto. > @@ -16,6 +73,8 @@ Thursday February 19, 2013 guy@alum.mit > On Linux systems with cap-ng.h, drop root privileges > using Linux Capabilities. > Add support for reading multiple files. > + Add MS NLB heartbeat printer. > + Separate multiple nexthops in BGP. > > Wednesday November 28, 2012 guy@alum.mit.edu. > Summary for 4.3.1 tcpdump release > @@ -32,7 +91,7 @@ Wednesday November 28, 2012 guy@alum.mi > Use the right maximum path length > Don't treat 192_1_2, when passed to -i, as an interface number > > -Friday April 3, 2011. mcr@sandelman.ca. > +Friday April 3, 2012. mcr@sandelman.ca. > Summary for 4.3.0 tcpdump release > fixes for forces: SPARSE data (per RFC 5810) > some more test cases added > @@ -113,7 +172,7 @@ Thu. April 1, 2010. guy@alum.mit.edu. > Summary for 4.1.1 tcpdump release > Fix build on systems with PF, such as FreeBSD and OpenBSD. > Don't blow up if a zero-length link-layer address is passed to > - linkaddr_string(). > + linkaddr_string(). > > Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. > Summary for 4.1.0 tcpdump release > @@ -142,7 +201,7 @@ Thu. March 11, 2010. ken@netfunctional. > Add printer for ForCES > Handle frames with an FCS > Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frame= s > - Fix TCP sequence number printing > + Fix TCP sequence number printing > Report 802.2 packets as 802.2 instead of 802.3 > Don't include -L/usr/lib in LDFLAGS > On x86_64 Linux, look in lib64 directory too > @@ -178,13 +237,13 @@ Mon. September 10, 2007. ken@xeleran > Converted print-isakmp.c to NETDISSECT > Moved AF specific stuff into af.h > Test subsystem now table driven, and saves outputs and diffs to = one place > - Require for pf definitions - allows reading of pfl= og formatted > + Require for pf definitions - allows reading of pfl= og formatted > libpcap files on an OS other than where the file was generated > > > Wed. July 23, 2007. mcr@xelerance.com. Summary for 3.9.7 libpcap rel= ease > > - NFS: Print unsigned values as such. > + NFS: Print unsigned values as such. > RX: parse safely. > BGP: fixes for IPv6-less builds. > 801.1ag: use standard codepoint. > @@ -194,7 +253,7 @@ Wed. July 23, 2007. mcr@xelerance.com. > smb: squelch an uninitialized complaint from coverity. > NFS: from NetBSD; don't interpret the reply as a possible NFS rep= ly > if it got MSG_DENIED. > - BGP: don't print TLV values that didn't fit, from www.digit-labs.= org. > + BGP: don't print TLV values that didn't fit, from www.digit-labs.= org. > revised INSTALL.txt about libpcap dependancy. > > Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump rel= ease > @@ -212,11 +271,11 @@ Wed. April 25, 2007. ken@xelerance.com. > Add support for 802.3ah loopback ctrl msg > Add support for Multiple-STP as per 802.1s > Add support for rapid-SPT as per 802.1w > - Add support for CFM Link-trace msg, Link-trace-Reply msg, > + Add support for CFM Link-trace msg, Link-trace-Reply msg, > Sender-ID tlv, private tlv, port, interface status > Add support for unidirectional link detection as per > http://www.ietf.org/internet-drafts/draft-foschiano-udld-02.txt > - Add support for the olsr protocol as per RFC 3626 plus the LQ > + Add support for the olsr protocol as per RFC 3626 plus the LQ > extensions from olsr.org > Add support for variable-length checksum in DCCP, as per section = 9 of > RFC 4340. > @@ -228,7 +287,7 @@ Wed. April 25, 2007. ken@xelerance.com. > > > Tue. September 19, 2006. ken@xelerance.com. Summary for 3.9.5 tcpdump = release > - > + > Fix compiling on AIX (, at end of ENUM) > Updated list of DNS RR typecodes > Use local Ethernet defs on WIN32 > @@ -243,7 +302,7 @@ Tue. September 19, 2006. ken@xelerance.c > Add support for BGP signaled VPLS > Cleanup the bootp printer > Add support for PPP over Frame-Relay > - Add some bounds checking to the IP options code, and clean up > + Add some bounds checking to the IP options code, and clean up > the options output a bit. > Add additional modp groups to ISAKMP printer > Add support for Address-Withdraw and Label-Withdraw Msgs > > Modified: head/contrib/tcpdump/CREDITS > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/tcpdump/CREDITS Wed Jan 7 19:38:52 2015 (= r276787) > +++ head/contrib/tcpdump/CREDITS Wed Jan 7 19:55:18 2015 (= r276788) > @@ -2,18 +2,20 @@ This file lists people who have contribu > > The current maintainers: > Bill Fenner > - David Young > + Denis Ovsienko > Fulvio Risso > Guy Harris > Hannes Gredler > Michael Richardson > + Francois-Xavier Le Bail > > Additional people who have contributed patches: > > - A Costa > Aaron Campbell > - Alfredo Andres > + A Costa > Albert Chin > + Alexandra Kossovsky > + Alfredo Andres > Ananth Suryanarayana > Andrea Bittau > Andrew Brown > @@ -26,17 +28,19 @@ Additional people who have contributed p > Arkadiusz Miskiewicz > Armando L. Caro Jr. > Arnaldo Carvalho de Melo > - Ben Byer > Atsushi Onoe > + Baptiste Jonglez > + Ben Byer > Ben Smithurst > Bert Vermeulen > Bjoern A. Zeeb > + Bram > Brent L. Bates > Brian Ginsbach > Bruce M. Simpson > Carles Kishimoto Bisbe > - Charlie Lenahan > Charles M. Hannum > + Charlie Lenahan > Chris Cogdon > Chris G. Demetriou > Chris Jepeway > @@ -52,7 +56,7 @@ Additional people who have contributed p > David Horn > David Smith > David Young > - Denis Ovsienko > + Dmitrij Tejblum > Dmitry Eremin-Solenikov > Don Ebright > Eddie Kohler > @@ -60,22 +64,24 @@ Additional people who have contributed p > Fang Wang > Florent Drouin > Florian Forster > - Francis Dupont > + fra > + Francesco Fondelli > Francisco Matias Cuenca-Acuna > - Francois-Xavier Le Bail > + Francis Dupont > Frank Volf > Fulvio Risso > George Bakos > Gerald Combs > Gerrit Renker > Gert Doering > + Gilbert Ramirez Jr. > + Gisle Vanem > Greg Minshall > + Gr=C3=A9goire Henry > + Gregory Detal > Greg Stark > - Gr=C3=A9goire Henry > - Gilbert Ramirez Jr. > - Gisle Vanem > - Hannes Viertel > Hank Leininger > + Hannes Viertel > Harry Raaymakers > Heinz-Ado Arnolds > Hendrik Scholz > @@ -90,34 +96,37 @@ Additional people who have contributed p > Jeffrey Hutzelman > Jesper Peterson > Jim Hutchins > - Jonathan Heusser > - Tatuya Jinmei > Jo=C3=A3o Medeiros > - Joerg Mayer > - J=C3=B8rgen Thomsen > + Joerg Mayer > + Jonathan Heusser > + Jorge Boncompte [DTI2] > + J=C3=B8rgen Thomsen > Julian Cowley > - Juliusz Chroboczek > + Juliusz Chroboczek > Kaarthik Sivakumar > Kaladhar Musunuru > Karl Norby > Kazushi Sugyo > Kelly Carmichael > Ken Hornstein > - Kevin Steves > Kenichi Maehashi > + Kevin Steves > Klaus Klein > Kris Kennaway > Krzysztof Halasa > Larry Lile > Lennert Buytenhek > + Loganaden Velvindron > + Longinus00 > Loris Degioanni > Love H=C3=B6rnquist-=C3=85strand > Lucas C. Villa Real > Luis MartinGarcia > Maciej W. Rozycki > Manu Pathak > - Marc Binderberger > + Marc Abramowitz > Marc A. Lehmann > + Marc Binderberger > Mark Ellzey Thomas > Marko Kiiskila > Markus Sch=C3=B6pflin > @@ -136,14 +145,16 @@ Additional people who have contributed p > Minto Jeyananth > Monroe Williams > Motonori Shindo > - Nathan J. Williams > Nathaniel Couper-Noles > + Nathan J. Williams > Neil T. Spring > - Niels Provos > Nickolai Zeldovich > Nicolas Ferrero > + Niels Provos > Noritoshi Demizu > Olaf Kirch > + Ola Martin Lykkja > + Oleksij Rempel > Onno van der Linden > Paolo Abeni > Pascal Hennequin > @@ -153,11 +164,12 @@ Additional people who have contributed p > Paul S. Traina > Pavlin Radoslavov > Pawel Worach > - Pekka Savola > + Pekka Savola > + Petar Alilovic > Peter Fales > Peter Jeremy > - > Peter Volkov > + > Phil Wood > Rafal Maszkowski > Randy Sofia > @@ -169,9 +181,10 @@ Additional people who have contributed p > Robert Edmonds > Roderick Schertler > Romain Francoise > + Ruben Kerkhof > Sagun Shakya > Sami Farin > - Scott Mcmillan > + Scott Mcmillan > Scott Rose > Sebastian Krahmer > Sebastien Raveau > @@ -181,20 +194,27 @@ Additional people who have contributed p > Shinsuke Suzuki > Simon Ruderich > Steinar Haug > + Stephane Bortzmeyer > Swaminathan Chandrasekaran > + Swaathi Vetrivel > Takashi Yamamoto > + Tatuya Jinmei > Terry Kennedy > + Thomas Jacob > Timo Koskiahde > Tony Li > Toshihiro Kanda > + Udayakumar > Uns Lider > Victor Oppleman > + Vyacheslav Trushkin > Weesan Lee > Wesley Griffin > Wesley Shields > Wilbert de Graaf > Will Drewry > William J. Hulley > + Wim Torfs > Yen Yen Lim > Yoshifumi Nishida > > @@ -204,4 +224,4 @@ The original LBL crew: > Van Jacobson > > Past maintainers: > - Jun-ichiro itojun Hagino > + Jun-ichiro itojun Hagino = Also see: http://www.wide.ad.jp/itojun-award/ > > Modified: head/contrib/tcpdump/INSTALL.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/tcpdump/INSTALL.txt Wed Jan 7 19:38:52 2015 (= r276787) > +++ head/contrib/tcpdump/INSTALL.txt Wed Jan 7 19:55:18 2015 (= r276788) > @@ -1,5 +1,3 @@ > -@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47= :53 guy Exp $ (LBL) > - > If you have not built libpcap, and your system does not have libpcap > installed, install libpcap first. Your system might provide a version > of libpcap that can be installed; if so, to compile tcpdump you might > @@ -9,9 +7,7 @@ libpcap; see the README file in this dir > > You will need an ANSI C compiler to build tcpdump. The configure script > will abort if your compiler is not ANSI compliant. If this happens, use > -the GNU C compiler, available via anonymous ftp: > - > - ftp://ftp.gnu.org/pub/gnu/gcc/ > +the generally available GNU C compiler (GCC). > > After libpcap has been built (either install it with "make install" or > make sure both the libpcap and tcpdump source trees are in the same > @@ -42,25 +38,20 @@ FILES > ----- > CHANGES - description of differences between releases > CREDITS - people that have helped tcpdump along > -FILES - list of files exported as part of the distribution > INSTALL.txt - this file > LICENSE - the license under which tcpdump is distributed > Makefile.in - compilation rules (input to the configure script) > README - description of distribution > Readme.Win32 - notes on building tcpdump on Win32 systems (with WinPca= p) > VERSION - version of this release > -acconfig.h - autoconf input > aclocal.m4 - autoconf macros > addrtoname.c - address to hostname routines > addrtoname.h - address to hostname definitions > ah.h - IPSEC Authentication Header definitions > -aodv.h - AODV definitions > appletalk.h - AppleTalk definitions > -arcnet.h - ARCNET definitions > atime.awk - TCP ack awk script > atm.h - ATM traffic type definitions > atmuni31.h - ATM Q.2931 definitions > -bgp.h - BGP declarations > bootp.h - BOOTP definitions > bpf_dump.c - BPF program printing routines, in case libpcap doesn't > have them > @@ -72,37 +63,21 @@ config.h.in - autoconf input > config.sub - autoconf support > configure - configure script (run this first) > configure.in - configure script source > -dccp.h - DCCP definitions > -decnet.h - DECnet definitions > -decode_prefix.h - Declarations of "decode_prefix{4,6}()" > -enc.h - OpenBSD IPsec encapsulation BPF layer definitions > -esp.h - IPSEC Encapsulating Security Payload definitions > ether.h - Ethernet definitions > ethertype.h - Ethernet type value definitions > extract.h - alignment definitions > -fddi.h - Fiber Distributed Data Interface definitions > gmpls.c - GMPLS definitions > gmpls.h - GMPLS declarations > gmt2local.c - time conversion routines > gmt2local.h - time conversion prototypes > -icmp6.h - ICMPv6 definitiions > -ieee802_11.h - IEEE 802.11 definitions > -ieee802_11_radio.h - radiotap header definitions > -igrp.h - Interior Gateway Routing Protocol definitions > install-sh - BSD style install script > interface.h - globals, prototypes and definitions > ip.h - IP definitions > ip6.h - IPv6 definitions > -ipfc.h - IP-over-Fibre Channel definitions > ipproto.c - IP protocol type value-to-name table > ipproto.h - IP protocol type value definitions > -ipsec_doi.h - ISAKMP packet definitions - RFC2407 > -ipx.h - IPX definitions > -isakmp.h - ISAKMP packet definitions - RFC2408 > l2vpn.c - L2VPN encapsulation value-to-name table > l2vpn.h - L2VPN encapsulation definitions > -l2tp.h - Layer Two Tunneling Protocol definitions > -lane.h - ATM LANE definitions > lbl/os-*.h - OS-dependent defines and prototypes > llc.h - LLC definitions > machdep.c - machine dependent routines > @@ -113,23 +88,18 @@ missing/* - replacements for missing lib > mkdep - construct Makefile dependency list > mpls.h - MPLS definitions > nameser.h - DNS definitions > -netbios.h - NETBIOS definitions > netdissect.h - definitions and declarations for tcpdump-as-library > (under development) > nfs.h - Network File System V2 definitions > nfsfh.h - Network File System file handle definitions > nlpid.c - OSI NLPID value-to-name table > nlpid.h - OSI NLPID definitions > -ntp.h - Network Time Protocol definitions > -oakley.h - ISAKMP packet definitions - RFC2409 > ospf.h - Open Shortest Path First definitions > -ospf6.h - IPv6 Open Shortest Path First definitions > packetdat.awk - TCP chunk summary awk script > parsenfsfh.c - Network File System file parser routines > pcap_dump_ftell.c - pcap_dump_ftell() implementation, in case libpcap > doesn't have it > pcap-missing.h - declarations of functions possibly missing from libpcap > -pmap_prot.h - definitions for ONC RPC portmapper protocol > ppp.h - Point to Point Protocol definitions > print-802_11.c - IEEE 802.11 printer routines > print-ap1394.c - Apple IP-over-IEEE 1394 printer routines > @@ -184,7 +154,6 @@ print-mobile.c - IPv4 mobility printer r > print-mobility.c - IPv6 mobility printer routines > print-mpls.c - Multi-Protocol Label Switching printer routines > print-msdp.c - Multicast Source Discovery Protocol printer routines > -print-netbios.c - NetBIOS frame protocol printer routines > print-nfs.c - Network File System printer routines > print-ntp.c - Network Time Protocol printer routines > print-null.c - BSD loopback device printer routines > @@ -226,18 +195,12 @@ print-vjc.c - PPP Van Jacobson compressi > print-vrrp.c - Virtual Router Redundancy Protocol > print-wb.c - White Board printer routines > print-zephyr.c - Zephyr printer routines > -route6d.h - packet definition for IPv6 Routing Information Protocol > rpc_auth.h - definitions for ONC RPC authentication > rpc_msg.h - definitions for ONC RPC messages > -rx.h - AFS RX definitions > -sctpConstants.h - Stream Control Transmission Protocol constant d= efinitions > -sctpHeader.h - Stream Control Transmission Protocol packet definitions > send-ack.awk - unidirectional tcp send/ack awk script > setsignal.c - OS-independent signal routines > setsignal.h - OS-independent signal prototypes > slcompress.h - SLIP/PPP Van Jacobson compression (RFC1144) definitions > -slip.h - SLIP definitions > -sll.h - Linux "cooked" capture definitions > smb.h - SMB/CIFS definitions > smbutil.c - SMB/CIFS utility routines > stime.awk - TCP send awk script > @@ -245,10 +208,6 @@ strcasecmp.c - missing routine > tcp.h - TCP definitions > tcpdump.1 - manual entry > tcpdump.c - main program > -telnet.h - Telnet definitions > -tftp.h - TFTP definitions > -timed.h - BSD time daemon protocol definitions > -token.h - Token Ring definitions > udp.h - UDP definitions > util.c - utility routines > vfprintf.c - emulation routine > > Modified: head/contrib/tcpdump/Makefile-devel-adds > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/tcpdump/Makefile-devel-adds Wed Jan 7 19:38:52 2015 = (r276787) > +++ head/contrib/tcpdump/Makefile-devel-adds Wed Jan 7 19:55:18 2015 = (r276788) > @@ -2,12 +2,12 @@ > # Auto-regenerate configure script or Makefile when things change. > # From autoconf.info . Works best with GNU Make. > # > -${srcdir}/configure: configure.in > +${srcdir}/configure: configure.in aclocal.m4 > cd ${srcdir} && autoconf > > # autoheader might not change config.h.in, so touch a stamp file. > ${srcdir}/config.h.in: ${srcdir}/stamp-h.in > -${srcdir}/stamp-h.in: configure.in acconfig.h > +${srcdir}/stamp-h.in: configure.in aclocal.m4 > cd ${srcdir} && autoheader > echo timestamp > ${srcdir}/stamp-h.in > > > Modified: head/contrib/tcpdump/Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/tcpdump/Makefile.in Wed Jan 7 19:38:52 2015 (= r276787) > +++ head/contrib/tcpdump/Makefile.in Wed Jan 7 19:55:18 2015 (= r276788) > @@ -16,8 +16,6 @@ > # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIE= D > # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF > # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. > -# > -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 2= 3:17:26 guy Exp $ (LBL) > > # > # Various configurable paths (remember to edit Makefile.in, not Makefile= ) > @@ -41,6 +39,8 @@ VPATH =3D @srcdir@ > # > > CC =3D @CC@ > +AR =3D @AR@ > +MKDEP =3D @MKDEP@ > PROG =3D tcpdump > CCOPT =3D @V_CCOPT@ > INCLS =3D -I. @V_INCLS@ > @@ -61,6 +61,8 @@ INSTALL_PROGRAM =3D @INSTALL_PROGRAM@ > INSTALL_DATA =3D @INSTALL_DATA@ > RANLIB =3D @RANLIB@ > > +DEPENDENCY_CFLAG =3D @DEPENDENCY_CFLAG@ > + > # Explicitly define compilation rule since SunOS 4's make doesn't like g= cc. > # Also, gcc does not remove the .o before forking 'as', which can be a > # problem if you don't own the file but can write to the directory. > @@ -68,126 +70,205 @@ RANLIB =3D @RANLIB@ > @rm -f $@ > $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c > > -CSRC =3D addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c = ipproto.c \ > - nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \ > - print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \ > - print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk= .c \ > - print-atm.c print-beep.c print-bfd.c print-bgp.c \ > - print-bootp.c print-bt.c print-carp.c print-cdp.c print-cfm.c \ > - print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.= c \ > - print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c = \ > - print-eap.c print-eigrp.c\ > - print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c = \ > - print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ > - print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c= \ > - print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ > - print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ > - print-lmp.c print-lspping.c print-lwapp.c \ > - print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-msdp= .c \ > - print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c p= rint-ospf.c \ > - print-pgm.c print-pim.c \ > - print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \ > - print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrc= p.c print-rsvp.c \ > - print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c prin= t-sll.c \ > - print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc= .c \ > - print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-= tftp.c \ > - print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c= \ > - print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \ > - print-wb.c print-zephyr.c print-zeromq.c print-vxlan.c print-otv.= c signature.c setsignal.c tcpdump.c util.c > +CSRC =3D setsignal.c tcpdump.c > > -LIBNETDISSECT_SRC=3Dprint-isakmp.c > -LIBNETDISSECT_OBJ=3D$(LIBNETDISSECT_SRC:.c=3D.o) > -LIBNETDISSECT=3Dlibnetdissect.a > +LIBNETDISSECT_SRC=3D\ > + addrtoname.c \ > + af.c \ > + checksum.c \ > + cpack.c \ > + gmpls.c \ > + gmt2local.c \ > + in_cksum.c \ > + ipproto.c \ > + l2vpn.c \ > + machdep.c \ > + nlpid.c \ > + oui.c \ > + parsenfsfh.c \ > + print-802_11.c \ > + print-802_15_4.c \ > + print-ah.c \ > + print-ahcp.c \ > + print-aodv.c \ > + print-aoe.c \ > + print-ap1394.c \ > + print-arcnet.c \ > + print-arp.c \ > + print-ascii.c \ > + print-atalk.c \ > + print-atm.c \ > + print-beep.c \ > + print-bfd.c \ > + print-bgp.c \ > + print-bootp.c \ > + print-bt.c \ > + print-calm-fast.c \ > + print-carp.c \ > + print-cdp.c \ > + print-cfm.c \ > + print-chdlc.c \ > + print-cip.c \ > + print-cnfp.c \ > + print-dccp.c \ > + print-decnet.c \ > + print-domain.c \ > + print-dtp.c \ > + print-dvmrp.c \ > + print-eap.c \ > + print-egp.c \ > + print-eigrp.c \ > + print-enc.c \ > + print-esp.c \ > + print-ether.c \ > + print-fddi.c \ > + print-forces.c \ > + print-fr.c \ > + print-geonet.c \ > + print-gre.c \ > + print-hsrp.c \ > + print-icmp.c \ > + print-igmp.c \ > + print-igrp.c \ > + print-ip.c \ > + print-ipcomp.c \ > + print-ipfc.c \ > + print-ipnet.c \ > + print-ipx.c \ > + print-isakmp.c \ > + print-isoclns.c \ > + print-juniper.c \ > + print-krb.c \ > + print-l2tp.c \ > + print-lane.c \ > + print-ldp.c \ > + print-llc.c \ > + print-lldp.c \ > + print-lmp.c \ > + print-loopback.c \ > + print-lspping.c \ > + print-lwapp.c \ > + print-lwres.c \ > + print-m3ua.c \ > + print-mobile.c \ > + print-mpcp.c \ > + print-mpls.c \ > + print-mptcp.c \ > + print-msdp.c \ > + print-msnlb.c \ > + print-nflog.c \ > + print-nfs.c \ > + print-ntp.c \ > + print-null.c \ > + print-olsr.c \ > + print-openflow-1.0.c \ > + print-openflow.c \ > + print-ospf.c \ > + print-otv.c \ > + print-pgm.c \ > + print-pim.c \ > + print-pktap.c \ > + print-ppi.c \ > + print-ppp.c \ > + print-pppoe.c \ > + print-pptp.c \ > + print-radius.c \ > + print-raw.c \ > + print-rip.c \ > + print-rpki-rtr.c \ > + print-rrcp.c \ > + print-rsvp.c \ > + print-rx.c \ > + print-sctp.c \ > + print-sflow.c \ > + print-sip.c \ > + print-sl.c \ > + print-sll.c \ > + print-slow.c \ > + print-snmp.c \ > + print-stp.c \ > + print-sunatm.c \ > + print-sunrpc.c \ > + print-symantec.c \ > + print-syslog.c \ > + print-tcp.c \ > + print-telnet.c \ > + print-tftp.c \ > + print-timed.c \ > + print-tipc.c \ > + print-token.c \ > + print-udld.c \ > + print-udp.c \ > + print-usb.c \ > + print-vjc.c \ > + print-vqp.c \ > + print-vrrp.c \ > + print-vtp.c \ > + print-vxlan.c \ > + print-wb.c \ > + print-zephyr.c \ > + print-zeromq.c \ > + signature.c \ > + util.c > > LOCALSRC =3D @LOCALSRC@ > GENSRC =3D version.c > LIBOBJS =3D @LIBOBJS@ > > +LIBNETDISSECT_OBJ=3D$(LIBNETDISSECT_SRC:.c=3D.o) ${LOCALSRC:.c=3D.o} ${L= IBOBJS} > +LIBNETDISSECT=3Dlibnetdissect.a > + > + > SRC =3D $(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC) > > # We would like to say "OBJ =3D $(SRC:.c=3D.o)" but Ultrix's make cannot > # hack the extra indirection > -OBJ =3D $(CSRC:.c=3D.o) $(GENSRC:.c=3D.o) $(LOCALSRC:.c=3D.o) $(LIBOBJS= ) $(LIBNETDISSECT_OBJ) > +OBJ =3D $(CSRC:.c=3D.o) $(GENSRC:.c=3D.o) $(LIBNETDISSECT_OBJ) > HDR =3D \ > - acconfig.h \ > addrtoname.h \ > af.h \ > ah.h \ > - aodv.h \ > appletalk.h \ > - arcnet.h \ > atm.h \ > atmuni31.h \ > bootp.h \ > - bgp.h \ > chdlc.h \ > cpack.h \ > - dccp.h \ > - decnet.h \ > - decode_prefix.h \ > - enc.h \ > - esp.h \ > ether.h \ > ethertype.h \ > extract.h \ > - fddi.h \ > - forces.h \ > + getopt_long.h \ > gmpls.h \ > gmt2local.h \ > - icmp6.h \ > - ieee802_11.h \ > - ieee802_11_radio.h \ > - igrp.h \ > interface.h \ > interface.h \ > ip.h \ > ip6.h \ > - ipfc.h \ > - ipnet.h \ > ipproto.h \ > - ipsec_doi.h \ > - ipx.h \ > - isakmp.h \ > - l2tp.h \ > l2vpn.h \ > - lane.h \ > llc.h \ > machdep.h \ > mib.h \ > mpls.h \ > nameser.h \ > - netbios.h \ > netdissect.h \ > nfs.h \ > nfsfh.h \ > nlpid.h \ > - ntp.h \ > - oakley.h \ > + openflow.h \ > ospf.h \ > - ospf6.h \ > oui.h \ > pcap-missing.h \ > - pmap_prot.h \ > - ppi.h \ > ppp.h \ > - route6d.h \ > rpc_auth.h \ > rpc_msg.h \ > - rx.h \ > - sctpConstants.h \ > - sctpHeader.h \ > + rpl.h \ > setsignal.h \ > signature.h \ > slcompress.h \ > - slip.h \ > - sll.h \ > smb.h \ > tcp.h \ > tcpdump-stdinc.h \ > - telnet.h \ > - tftp.h \ > - timed.h \ > - token.h \ > udp.h > > TAGHDR =3D \ > @@ -212,7 +293,7 @@ EXTRA_DIST =3D \ > LICENSE \ > Makefile.in \ > Makefile-devel-adds \ > - README \ > + README.md \ > Readme.Win32 \ > VERSION \ > aclocal.m4 \ > @@ -233,11 +314,11 @@ EXTRA_DIST =3D \ > missing/dlnames.c \ > missing/datalinks.c \ > missing/getnameinfo.c \ > + missing/getopt_long.c \ > missing/inet_aton.c \ > missing/inet_ntop.c \ > missing/inet_pton.c \ > missing/snprintf.c \ > - missing/sockstorage.h \ > missing/strdup.c \ > missing/strlcat.c \ > missing/strlcpy.c \ > @@ -252,7 +333,6 @@ EXTRA_DIST =3D \ > print-ip6.c \ > print-ip6opts.c \ > print-mobility.c \ > - print-netbios.c \ > print-ospf6.c \ > print-pflog.c \ > print-ripng.c \ > @@ -264,18 +344,14 @@ EXTRA_DIST =3D \ > strcasecmp.c \ > tcpdump.1.in \ > vfprintf.c \ > - win32/Include/bittypes.h \ > - win32/Include/errno.h \ > - win32/Include/getopt.h \ > win32/Include/w32_fzs.h \ > - win32/Src/getopt.c \ > win32/prj/GNUmakefile \ > win32/prj/WinDump.dsp \ > win32/prj/WinDump.dsw > > TEST_DIST=3D `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prun= e \) -o -type f \! -name '.*' \! -name '*~' -print` > > -all: $(PROG) > +all: $(PROG) $(LIBNETDISSECT) > > $(PROG): $(OBJ) @V_PCAPDEP@ > @rm -f $@ > @@ -283,7 +359,7 @@ $(PROG): $(OBJ) @V_PCAPDEP@ > > $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) > @rm -f $@ > - $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) > + $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) > $(RANLIB) $@ > > datalinks.o: $(srcdir)/missing/datalinks.c > @@ -292,8 +368,8 @@ dlnames.o: $(srcdir)/missing/dlnames.c > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c > getnameinfo.o: $(srcdir)/missing/getnameinfo.c > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c > -getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c > - $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c > +getopt_long.o: $(srcdir)/missing/getopt_long.c > + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c > inet_pton.o: $(srcdir)/missing/inet_pton.c > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c > inet_ntop.o: $(srcdir)/missing/inet_ntop.c > @@ -302,6 +378,8 @@ inet_aton.o: $(srcdir)/missing/inet_aton > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c > snprintf.o: $(srcdir)/missing/snprintf.c > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c > +strdup.o: $(srcdir)/missing/strdup.c > + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strdup.c > strlcat.o: $(srcdir)/missing/strlcat.c > $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c > strlcpy.o: $(srcdir)/missing/strlcpy.c > @@ -345,8 +423,10 @@ clean: > > distclean: > rm -f $(CLEANFILES) Makefile config.cache config.log config.statu= s \ > - config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 > - rm -rf autom4te.cache > + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 \ > + libnetdissect.a tests/.failed tests/.passed \ > + tests/failure-outputs.txt > + rm -rf autom4te.cache tests/DIFF tests/NEW > > check: tcpdump > (cd tests && ./TESTrun.sh) > @@ -368,4 +448,4 @@ testlist: > echo $(TEST_DIST) > > depend: $(GENSRC) > - ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) > + $(MKDEP) -c $(CC) -m $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC) > > Copied: head/contrib/tcpdump/README.md (from r276761, vendor/tcpdump/dist= /README.md) > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/contrib/tcpdump/README.md Wed Jan 7 19:55:18 2015 (= r276788, copy of r276761, vendor/tcpdump/dist/README.md) > @@ -0,0 +1,243 @@ > +# tcpdump > + > +[![Build > +Status](https://travis-ci.org/the-tcpdump-group/tcpdump.png)](https://tr= avis-ci.org/the-tcpdump-group/tcpdump) > + > +TCPDUMP 4.x.y > +Now maintained by "The Tcpdump Group" > +See www.tcpdump.org > + > +Please send inquiries/comments/reports to: > + > +* tcpdump-workers@lists.tcpdump.org > + > +Anonymous Git is available via: > + > + git clone git://bpf.tcpdump.org/tcpdump > + > +Please submit patches by forking the branch on GitHub at: > + > +* http://github.com/the-tcpdump-group/tcpdump/tree/master > + > +and issuing a pull request. > + > +formerly from Lawrence Berkeley National Laboratory > + Network Research Group > + ftp://ftp.ee.lbl.gov/old/tcpdump.tar.Z (3.4) > + > +This directory contains source code for tcpdump, a tool for network > +monitoring and data acquisition. This software was originally > +developed by the Network Research Group at the Lawrence Berkeley > +National Laboratory. The original distribution is available via > +anonymous ftp to `ftp.ee.lbl.gov`, in `tcpdump.tar.Z`. More recent > +development is performed at tcpdump.org, http://www.tcpdump.org/ > + > +Tcpdump uses libpcap, a system-independent interface for user-level > +packet capture. Before building tcpdump, you must first retrieve and > +build libpcap, also originally from LBL and now being maintained by > +tcpdump.org; see http://www.tcpdump.org/ . > + > +Once libpcap is built (either install it or make sure it's in > +`../libpcap`), you can build tcpdump using the procedure in the `INSTALL= .txt` > +file. > + > +The program is loosely based on SMI's "etherfind" although none of the > +etherfind code remains. It was originally written by Van Jacobson as > +part of an ongoing research project to investigate and improve tcp and > +internet gateway performance. The parts of the program originally > +taken from Sun's etherfind were later re-written by Steven McCanne of > +LBL. To insure that there would be no vestige of proprietary code in > +tcpdump, Steve wrote these pieces from the specification given by the > +manual entry, with no access to the source of tcpdump or etherfind. > + > +Over the past few years, tcpdump has been steadily improved by the > +excellent contributions from the Internet community (just browse > +through the `CHANGES` file). We are grateful for all the input. > + > +Richard Stevens gives an excellent treatment of the Internet protocols > +in his book *"TCP/IP Illustrated, Volume 1"*. If you want to learn more > +about tcpdump and how to interpret its output, pick up this book. > + > +Some tools for viewing and analyzing tcpdump trace files are available > +from the Internet Traffic Archive: > + > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** > --=20 -----------------------------------------+------------------------------- Prof. Luigi RIZZO, rizzo@iet.unipi.it . Dip. di Ing. dell'Informazione http://www.iet.unipi.it/~luigi/ . Universita` di Pisa TEL +39-050-2211611 . via Diotisalvi 2 Mobile +39-338-6809875 . 56122 PISA (Italy) -----------------------------------------+------------------------------- From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 19:17:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5988A8F; Thu, 5 Feb 2015 19:17:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1E94BFA; Thu, 5 Feb 2015 19:17:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15JHcho094177; Thu, 5 Feb 2015 19:17:38 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15JHca4094176; Thu, 5 Feb 2015 19:17:38 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201502051917.t15JHca4094176@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 5 Feb 2015 19:17:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278274 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 19:17:38 -0000 Author: jkim Date: Thu Feb 5 19:17:37 2015 New Revision: 278274 URL: https://svnweb.freebsd.org/changeset/base/278274 Log: Remove splvm(). It is no longer in the tree. Modified: head/sys/sys/systm.h Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Thu Feb 5 19:15:03 2015 (r278273) +++ head/sys/sys/systm.h Thu Feb 5 19:17:37 2015 (r278274) @@ -357,7 +357,6 @@ static __inline intrmask_t splhigh(void) static __inline intrmask_t splimp(void) { return 0; } static __inline intrmask_t splnet(void) { return 0; } static __inline intrmask_t spltty(void) { return 0; } -static __inline intrmask_t splvm(void) { return 0; } static __inline void splx(intrmask_t ipl __unused) { return; } /* From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 19:36:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D27816EB; Thu, 5 Feb 2015 19:36:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BEC6DE0D; Thu, 5 Feb 2015 19:36:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15JaUPw003875; Thu, 5 Feb 2015 19:36:30 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15JaUeg003874; Thu, 5 Feb 2015 19:36:30 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502051936.t15JaUeg003874@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Thu, 5 Feb 2015 19:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278276 - head/sys/dev/vt/hw/vga 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 19:36:30 -0000 Author: rpaulo Date: Thu Feb 5 19:36:29 2015 New Revision: 278276 URL: https://svnweb.freebsd.org/changeset/base/278276 Log: vtvga: improve the device description. Modified: head/sys/dev/vt/hw/vga/vt_vga.c Modified: head/sys/dev/vt/hw/vga/vt_vga.c ============================================================================== --- head/sys/dev/vt/hw/vga/vt_vga.c Thu Feb 5 19:31:41 2015 (r278275) +++ head/sys/dev/vt/hw/vga/vt_vga.c Thu Feb 5 19:36:29 2015 (r278276) @@ -1263,7 +1263,8 @@ static int vtvga_probe(device_t dev) { - device_set_desc(dev, "vt_vga driver"); + device_set_desc(dev, "VT VGA driver"); + return (BUS_PROBE_NOWILDCARD); } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 19:54:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1FC1DE91; Thu, 5 Feb 2015 19:54:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 083C6B1; Thu, 5 Feb 2015 19:54:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Js46g013090; Thu, 5 Feb 2015 19:54:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Js3Rw013083; Thu, 5 Feb 2015 19:54:03 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201502051954.t15Js3Rw013083@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 5 Feb 2015 19:54:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278277 - in head/sys: arm/broadcom/bcm2835 conf contrib/vchiq contrib/vchiq/interface contrib/vchiq/interface/compat contrib/vchiq/interface/vchi contrib/vchiq/interface/vchi/connectio... 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 19:54:05 -0000 Author: gonzo Date: Thu Feb 5 19:54:03 2015 New Revision: 278277 URL: https://svnweb.freebsd.org/changeset/base/278277 Log: Import VCHI driver for Broadcom's VideoCore IV GPU Differential Revision: D1753 Added: head/sys/contrib/vchiq/ head/sys/contrib/vchiq/interface/ head/sys/contrib/vchiq/interface/compat/ head/sys/contrib/vchiq/interface/compat/list.h (contents, props changed) head/sys/contrib/vchiq/interface/compat/vchi_bsd.c (contents, props changed) head/sys/contrib/vchiq/interface/compat/vchi_bsd.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/ head/sys/contrib/vchiq/interface/vchi/connections/ head/sys/contrib/vchiq/interface/vchi/connections/connection.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/message_drivers/ head/sys/contrib/vchiq/interface/vchi/message_drivers/message.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/vchi.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/vchi_cfg.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/vchi_cfg_internal.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/vchi_common.h (contents, props changed) head/sys/contrib/vchiq/interface/vchi/vchi_mh.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_build_info.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_cfg.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_if.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_ioctl.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_memdrv.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_pagelist.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_proc.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_shim.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.c (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.h (contents, props changed) head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_version.c (contents, props changed) Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835 head/sys/conf/kern.pre.mk Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- head/sys/arm/broadcom/bcm2835/files.bcm2835 Thu Feb 5 19:36:29 2015 (r278276) +++ head/sys/arm/broadcom/bcm2835/files.bcm2835 Thu Feb 5 19:54:03 2015 (r278277) @@ -27,3 +27,23 @@ kern/kern_clocksource.c dev/mbox/mbox_if.m standard dev/ofw/ofw_cpu.c standard + +# VideoCore driver +contrib/vchiq/interface/compat/vchi_bsd.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c standard \ + compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_arm.c standard \ + compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_connected.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_core.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_shim.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" +contrib/vchiq/interface/vchiq_arm/vchiq_util.c standard \ + compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Thu Feb 5 19:36:29 2015 (r278276) +++ head/sys/conf/kern.pre.mk Thu Feb 5 19:54:03 2015 (r278277) @@ -79,6 +79,9 @@ INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm +# ... and the same for vchiq +INCLUDES+= -I$S/contrib/vchiq + # ... and the same for twa INCLUDES+= -I$S/dev/twa Added: head/sys/contrib/vchiq/interface/compat/list.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/vchiq/interface/compat/list.h Thu Feb 5 19:54:03 2015 (r278277) @@ -0,0 +1,256 @@ +/* $NetBSD: list.h,v 1.5 2014/08/20 15:26:52 riastradh Exp $ */ + +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Notes on porting: + * + * - LIST_HEAD(x) means a declaration `struct list_head x = + * LIST_HEAD_INIT(x)' in Linux, but something else in NetBSD. + * Replace by the expansion. + * + * - The `_rcu' routines here are not actually pserialize(9)-safe. + * They need dependent read memory barriers added. Please fix this + * if you need to use them with pserialize(9). + */ + +#ifndef _LINUX_LIST_H_ +#define _LINUX_LIST_H_ + +#include + +#define container_of(ptr, type, member) \ +({ \ + __typeof(((type *)0)->member) *_p = (ptr); \ + (type *)((char *)_p - offsetof(type, member)); \ +}) + +/* + * Doubly-linked lists. + */ + +struct list_head { + struct list_head *prev; + struct list_head *next; +}; + +#define LIST_HEAD_INIT(name) { .prev = &(name), .next = &(name) } + +static inline void +INIT_LIST_HEAD(struct list_head *head) +{ + head->prev = head; + head->next = head; +} + +static inline struct list_head * +list_first(const struct list_head *head) +{ + return head->next; +} + +static inline struct list_head * +list_last(const struct list_head *head) +{ + return head->prev; +} + +static inline struct list_head * +list_next(const struct list_head *node) +{ + return node->next; +} + +static inline struct list_head * +list_prev(const struct list_head *node) +{ + return node->prev; +} + +static inline int +list_empty(const struct list_head *head) +{ + return (head->next == head); +} + +static inline int +list_is_singular(const struct list_head *head) +{ + + if (list_empty(head)) + return false; + if (head->next != head->prev) + return false; + return true; +} + +static inline void +__list_add_between(struct list_head *prev, struct list_head *node, + struct list_head *next) +{ + prev->next = node; + node->prev = prev; + node->next = next; + next->prev = node; +} + +static inline void +list_add(struct list_head *node, struct list_head *head) +{ + __list_add_between(head, node, head->next); +} + +static inline void +list_add_tail(struct list_head *node, struct list_head *head) +{ + __list_add_between(head->prev, node, head); +} + +static inline void +list_del(struct list_head *entry) +{ + entry->prev->next = entry->next; + entry->next->prev = entry->prev; +} + +static inline void +__list_splice_between(struct list_head *prev, const struct list_head *list, + struct list_head *next) +{ + struct list_head *first = list->next; + struct list_head *last = list->prev; + + first->prev = prev; + prev->next = first; + + last->next = next; + next->prev = last; +} + +static inline void +list_splice(const struct list_head *list, struct list_head *head) +{ + if (!list_empty(list)) + __list_splice_between(head, list, head->next); +} + +static inline void +list_splice_tail(const struct list_head *list, struct list_head *head) +{ + if (!list_empty(list)) + __list_splice_between(head->prev, list, head); +} + +static inline void +list_move(struct list_head *node, struct list_head *head) +{ + list_del(node); + list_add(node, head); +} + +static inline void +list_move_tail(struct list_head *node, struct list_head *head) +{ + list_del(node); + list_add_tail(node, head); +} + +static inline void +list_replace(struct list_head *old, struct list_head *new) +{ + new->prev = old->prev; + old->prev->next = new; + new->next = old->next; + old->next->prev = new; +} + +static inline void +list_del_init(struct list_head *node) +{ + list_del(node); + INIT_LIST_HEAD(node); +} + +#define list_entry(PTR, TYPE, FIELD) container_of(PTR, TYPE, FIELD) +#define list_first_entry(PTR, TYPE, FIELD) \ + list_entry(list_first((PTR)), TYPE, FIELD) +#define list_last_entry(PTR, TYPE, FIELD) \ + list_entry(list_last((PTR)), TYPE, FIELD) +#define list_next_entry(ENTRY, FIELD) \ + list_entry(list_next(&(ENTRY)->FIELD), typeof(*(ENTRY)), FIELD) +#define list_prev_entry(ENTRY, FIELD) \ + list_entry(list_prev(&(ENTRY)->FIELD), typeof(*(ENTRY)), FIELD) + +#define list_for_each(VAR, HEAD) \ + for ((VAR) = list_first((HEAD)); \ + (VAR) != (HEAD); \ + (VAR) = list_next((VAR))) + +#define list_for_each_safe(VAR, NEXT, HEAD) \ + for ((VAR) = list_first((HEAD)); \ + ((VAR) != (HEAD)) && ((NEXT) = list_next((VAR)), 1); \ + (VAR) = (NEXT)) + +#define list_for_each_entry(VAR, HEAD, FIELD) \ + for ((VAR) = list_entry(list_first((HEAD)), typeof(*(VAR)), FIELD); \ + &(VAR)->FIELD != (HEAD); \ + (VAR) = list_entry(list_next(&(VAR)->FIELD), typeof(*(VAR)), \ + FIELD)) + +#define list_for_each_entry_reverse(VAR, HEAD, FIELD) \ + for ((VAR) = list_entry(list_last((HEAD)), typeof(*(VAR)), FIELD); \ + &(VAR)->FIELD != (HEAD); \ + (VAR) = list_entry(list_prev(&(VAR)->FIELD), typeof(*(VAR)), \ + FIELD)) + +#define list_for_each_entry_safe(VAR, NEXT, HEAD, FIELD) \ + for ((VAR) = list_entry(list_first((HEAD)), typeof(*(VAR)), FIELD); \ + (&(VAR)->FIELD != (HEAD)) && \ + ((NEXT) = list_entry(list_next(&(VAR)->FIELD), \ + typeof(*(VAR)), FIELD), 1); \ + (VAR) = (NEXT)) + +#define list_for_each_entry_continue(VAR, HEAD, FIELD) \ + for ((VAR) = list_next_entry((VAR), FIELD); \ + &(VAR)->FIELD != (HEAD); \ + (VAR) = list_next_entry((VAR), FIELD)) + +#define list_for_each_entry_continue_reverse(VAR, HEAD, FIELD) \ + for ((VAR) = list_prev_entry((VAR), FIELD); \ + &(VAR)->FIELD != (HEAD); \ + (VAR) = list_prev_entry((VAR), FIELD)) + +#define list_for_each_entry_safe_from(VAR, NEXT, HEAD, FIELD) \ + for (; \ + (&(VAR)->FIELD != (HEAD)) && \ + ((NEXT) = list_next_entry((VAR), FIELD)); \ + (VAR) = (NEXT)) + +#endif /* _LINUX_LIST_H_ */ Added: head/sys/contrib/vchiq/interface/compat/vchi_bsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/vchiq/interface/compat/vchi_bsd.c Thu Feb 5 19:54:03 2015 (r278277) @@ -0,0 +1,532 @@ +/*- + * Copyright (c) 2010 Max Khon + * All rights reserved. + * + * This software was developed by Max Khon under sponsorship from + * the FreeBSD Foundation and Ethon Technologies GmbH. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: bsd-compat.c 9253 2010-09-02 10:12:09Z fjoe $ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "mbox_if.h" + +#include + +MALLOC_DEFINE(M_VCHI, "VCHI", "VCHI"); + +/* + * Timer API + */ +static void +run_timer(void *arg) +{ + struct timer_list *t = (struct timer_list *) arg; + void (*function)(unsigned long); + + mtx_lock_spin(&t->mtx); + if (callout_pending(&t->callout)) { + /* callout was reset */ + mtx_unlock_spin(&t->mtx); + return; + } + if (!callout_active(&t->callout)) { + /* callout was stopped */ + mtx_unlock_spin(&t->mtx); + return; + } + callout_deactivate(&t->callout); + + function = t->function; + mtx_unlock_spin(&t->mtx); + + function(t->data); +} + +void +init_timer(struct timer_list *t) +{ + mtx_init(&t->mtx, "dahdi timer lock", NULL, MTX_SPIN); + callout_init(&t->callout, CALLOUT_MPSAFE); + t->expires = 0; + /* + * function and data are not initialized intentionally: + * they are not initialized by Linux implementation too + */ +} + +void +setup_timer(struct timer_list *t, void (*function)(unsigned long), unsigned long data) +{ + t->function = function; + t->data = data; + init_timer(t); +} + +void +mod_timer(struct timer_list *t, unsigned long expires) +{ + mtx_lock_spin(&t->mtx); + callout_reset(&t->callout, expires - jiffies, run_timer, t); + mtx_unlock_spin(&t->mtx); +} + +void +add_timer(struct timer_list *t) +{ + mod_timer(t, t->expires); +} + +int +del_timer_sync(struct timer_list *t) +{ + mtx_lock_spin(&t->mtx); + callout_stop(&t->callout); + mtx_unlock_spin(&t->mtx); + + mtx_destroy(&t->mtx); + return 0; +} + +int +del_timer(struct timer_list *t) +{ + del_timer_sync(t); + return 0; +} + +/* + * Completion API + */ +void +init_completion(struct completion *c) +{ + cv_init(&c->cv, "VCHI completion cv"); + mtx_init(&c->lock, "VCHI completion lock", "condvar", MTX_DEF); + c->done = 0; +} + +void +destroy_completion(struct completion *c) +{ + cv_destroy(&c->cv); + mtx_destroy(&c->lock); +} + +void +complete(struct completion *c) +{ + mtx_lock(&c->lock); + + if (c->done >= 0) { + KASSERT(c->done < INT_MAX, ("c->done overflow")); /* XXX check */ + c->done++; + cv_signal(&c->cv); + } else { + KASSERT(c->done == -1, ("Invalid value of c->done: %d", c->done)); + } + + mtx_unlock(&c->lock); +} + +void +complete_all(struct completion *c) +{ + mtx_lock(&c->lock); + + if (c->done >= 0) { + KASSERT(c->done < INT_MAX, ("c->done overflow")); /* XXX check */ + c->done = -1; + cv_broadcast(&c->cv); + } else { + KASSERT(c->done == -1, ("Invalid value of c->done: %d", c->done)); + } + + mtx_unlock(&c->lock); +} + +void +INIT_COMPLETION_locked(struct completion *c) +{ + mtx_lock(&c->lock); + + c->done = 0; + + mtx_unlock(&c->lock); +} + +static void +_completion_claim(struct completion *c) +{ + + KASSERT(mtx_owned(&c->lock), + ("_completion_claim should be called with acquired lock")); + KASSERT(c->done != 0, ("_completion_claim on non-waited completion")); + if (c->done > 0) + c->done--; + else + KASSERT(c->done == -1, ("Invalid value of c->done: %d", c->done)); +} + +void +wait_for_completion(struct completion *c) +{ + mtx_lock(&c->lock); + if (!c->done) + cv_wait(&c->cv, &c->lock); + c->done--; + mtx_unlock(&c->lock); +} + +int +try_wait_for_completion(struct completion *c) +{ + int res = 0; + + mtx_lock(&c->lock); + if (!c->done) + res = 1; + else + c->done--; + mtx_unlock(&c->lock); + return res == 0; +} + +int +wait_for_completion_interruptible_timeout(struct completion *c, unsigned long timeout) +{ + int res = 0; + unsigned long start, now; + start = jiffies; + + mtx_lock(&c->lock); + while (c->done == 0) { + res = cv_timedwait_sig(&c->cv, &c->lock, timeout); + if (res) + goto out; + now = jiffies; + if (timeout < (now - start)) { + res = EWOULDBLOCK; + goto out; + } + + timeout -= (now - start); + start = now; + } + + _completion_claim(c); + res = 0; + +out: + mtx_unlock(&c->lock); + + if (res == EWOULDBLOCK) { + return 0; + } else if ((res == EINTR) || (res == ERESTART)) { + return -ERESTART; + } else { + KASSERT((res == 0), ("res = %d", res)); + return timeout; + } +} + +int +wait_for_completion_interruptible(struct completion *c) +{ + int res = 0; + + mtx_lock(&c->lock); + while (c->done == 0) { + res = cv_wait_sig(&c->cv, &c->lock); + if (res) + goto out; + } + + _completion_claim(c); + +out: + mtx_unlock(&c->lock); + + if ((res == EINTR) || (res == ERESTART)) + res = -ERESTART; + return res; +} + +int +wait_for_completion_killable(struct completion *c) +{ + + return wait_for_completion_interruptible(c); +} + +/* + * Semaphore API + */ + +void sema_sysinit(void *arg) +{ + struct semaphore *s = arg; + + printf("sema_sysinit\n"); + _sema_init(s, 1); +} + +void +_sema_init(struct semaphore *s, int value) +{ + bzero(s, sizeof(*s)); + mtx_init(&s->mtx, "sema lock", "VCHIQ sepmaphore backing lock", + MTX_DEF | MTX_NOWITNESS | MTX_QUIET); + cv_init(&s->cv, "sema cv"); + s->value = value; +} + +void +_sema_destroy(struct semaphore *s) +{ + mtx_destroy(&s->mtx); + cv_destroy(&s->cv); +} + +void +down(struct semaphore *s) +{ + + mtx_lock(&s->mtx); + while (s->value == 0) { + s->waiters++; + cv_wait(&s->cv, &s->mtx); + s->waiters--; + } + + s->value--; + mtx_unlock(&s->mtx); +} + +int +down_interruptible(struct semaphore *s) +{ + int ret ; + + ret = 0; + + mtx_lock(&s->mtx); + + while (s->value == 0) { + s->waiters++; + ret = cv_wait_sig(&s->cv, &s->mtx); + s->waiters--; + + if (ret == EINTR) { + mtx_unlock(&s->mtx); + return (-EINTR); + } + + if (ret == ERESTART) + continue; + } + + s->value--; + mtx_unlock(&s->mtx); + + return (0); +} + +int +down_trylock(struct semaphore *s) +{ + int ret; + + ret = 0; + + mtx_lock(&s->mtx); + + if (s->value > 0) { + /* Success. */ + s->value--; + ret = 0; + } else { + ret = -EAGAIN; + } + + mtx_unlock(&s->mtx); + + return (ret); +} + +void +up(struct semaphore *s) +{ + mtx_lock(&s->mtx); + s->value++; + if (s->waiters && s->value > 0) + cv_signal(&s->cv); + + mtx_unlock(&s->mtx); +} + +/* + * Logging API + */ +void +rlprintf(int pps, const char *fmt, ...) +{ + va_list ap; + static struct timeval last_printf; + static int count; + + if (ppsratecheck(&last_printf, &count, pps)) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + } +} + +void +device_rlprintf(int pps, device_t dev, const char *fmt, ...) +{ + va_list ap; + static struct timeval last_printf; + static int count; + + if (ppsratecheck(&last_printf, &count, pps)) { + va_start(ap, fmt); + device_print_prettyname(dev); + vprintf(fmt, ap); + va_end(ap); + } +} + +/* + * Signals API + */ + +void +flush_signals(VCHIQ_THREAD_T thr) +{ + printf("Implement ME: %s\n", __func__); +} + +int +fatal_signal_pending(VCHIQ_THREAD_T thr) +{ + printf("Implement ME: %s\n", __func__); + return (0); +} + +/* + * kthread API + */ + +/* + * This is a hack to avoid memory leak + */ +#define MAX_THREAD_DATA_SLOTS 32 +static int thread_data_slot = 0; + +struct thread_data { + void *data; + int (*threadfn)(void *); +}; + +static struct thread_data thread_slots[MAX_THREAD_DATA_SLOTS]; + +static void +kthread_wrapper(void *data) +{ + struct thread_data *slot; + + slot = data; + slot->threadfn(slot->data); +} + +VCHIQ_THREAD_T +vchiq_thread_create(int (*threadfn)(void *data), + void *data, + const char namefmt[], ...) +{ + VCHIQ_THREAD_T newp; + va_list ap; + char name[MAXCOMLEN+1]; + struct thread_data *slot; + + if (thread_data_slot >= MAX_THREAD_DATA_SLOTS) { + printf("kthread_create: out of thread data slots\n"); + return (NULL); + } + + slot = &thread_slots[thread_data_slot]; + slot->data = data; + slot->threadfn = threadfn; + + va_start(ap, namefmt); + vsnprintf(name, sizeof(name), namefmt, ap); + va_end(ap); + + newp = NULL; + if (kproc_create(kthread_wrapper, (void*)slot, &newp, 0, 0, + "%s", name) != 0) { + /* Just to be sure */ + newp = NULL; + } + else + thread_data_slot++; + + return newp; +} + +void +set_user_nice(VCHIQ_THREAD_T thr, int nice) +{ + /* NOOP */ +} + +void +wake_up_process(VCHIQ_THREAD_T thr) +{ + /* NOOP */ +} + +void +bcm_mbox_write(int channel, uint32_t data) +{ + device_t mbox; + + mbox = devclass_get_device(devclass_find("mbox"), 0); + + if (mbox) + MBOX_WRITE(mbox, channel, data); +} Added: head/sys/contrib/vchiq/interface/compat/vchi_bsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/vchiq/interface/compat/vchi_bsd.h Thu Feb 5 19:54:03 2015 (r278277) @@ -0,0 +1,434 @@ +/*- + * Copyright (c) 2010 Max Khon + * Copyright (c) 2012 Oleksandr Tymoshenko + * Copyright (c) 2013 Jared D. McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef __VCHI_BSD_H__ +#define __VCHI_BSD_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Copy from/to user API + */ +#define copy_from_user(to, from, n) copyin((from), (to), (n)) +#define copy_to_user(to, from, n) copyout((from), (to), (n)) + +/* + * Bit API + */ + +static __inline int +test_and_set_bit(int nr, volatile void *addr) +{ + int val; + + do { + val = *(volatile int *) addr; + } while (atomic_cmpset_int(addr, val, val | (1 << nr)) == 0); + return (val & (1 << nr)); +} + +static __inline__ +int test_and_clear_bit(int nr, volatile void *addr) +{ + int val; + + do { + val = *(volatile int *) addr; + } while (atomic_cmpset_int(addr, val, val & ~(1 << nr)) == 0); + return (val & (1 << nr)); +} + +/* + * Atomic API + */ +typedef volatile unsigned atomic_t; + +#define atomic_set(p, v) (*(p) = (v)) +#define atomic_read(p) (*(p)) +#define atomic_inc(p) atomic_add_int(p, 1) +#define atomic_dec(p) atomic_subtract_int(p, 1) +#define atomic_dec_and_test(p) (atomic_fetchadd_int(p, -1) == 1) +#define atomic_inc_return(v) atomic_add_return(1, (v)) +#define atomic_dec_return(v) atomic_sub_return(1, (v)) +#define atomic_add(v, p) atomic_add_int(p, v) +#define atomic_sub(v, p) atomic_subtract_int(p, v) + +#define ATOMIC_INIT(v) (v) + +static inline int +atomic_add_return(int i, atomic_t *v) +{ + return i + atomic_fetchadd_int(v, i); +} + +static inline int +atomic_sub_return(int i, atomic_t *v) +{ + return atomic_fetchadd_int(v, -i) - i; +} + +static inline int +atomic_cmpxchg(atomic_t *v, int oldv, int newv) +{ + if (atomic_cmpset_rel_int(v, oldv, newv)) + return newv; + else + return *v; +} + +static inline int +atomic_xchg(atomic_t *v, int newv) +{ + int oldv; + if (newv == 0) + return atomic_readandclear_int(v); + else { + do { + oldv = atomic_load_acq_int(v); + } while (!atomic_cmpset_rel_int(v, oldv, newv)); + } + + return (oldv); +} + +/* + * Spinlock API + */ +typedef struct mtx spinlock_t; + +#define DEFINE_SPINLOCK(name) \ + struct mtx name +#define spin_lock_init(lock) mtx_init(lock, "VCHI spinlock " # lock, NULL, MTX_DEF) +#define spin_lock_destroy(lock) mtx_destroy(lock) +#define spin_lock(lock) mtx_lock(lock) +#define spin_unlock(lock) mtx_unlock(lock) +#define spin_lock_bh(lock) spin_lock(lock) +#define spin_unlock_bh(lock) spin_unlock(lock) + +/* + * Mutex API + */ +struct mutex { + struct mtx mtx; +}; + +#define lmutex_init(lock) mtx_init(&(lock)->mtx, #lock, NULL, MTX_DEF) +#define lmutex_lock(lock) mtx_lock(&(lock)->mtx) +#define lmutex_lock_interruptible(lock) (mtx_lock(&(lock)->mtx),0) +#define lmutex_unlock(lock) mtx_unlock(&(lock)->mtx) +#define lmutex_destroy(lock) mtx_destroy(&(lock)->mtx) + +/* + * Rwlock API + */ +typedef struct sx rwlock_t; + +#if defined(SX_ADAPTIVESPIN) && !defined(SX_NOADAPTIVE) +#define SX_NOADAPTIVE SX_ADAPTIVESPIN +#endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:01:14 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 298D02BC; Thu, 5 Feb 2015 20:01:14 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02D641F1; Thu, 5 Feb 2015 20:01:14 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1F78AB976; Thu, 5 Feb 2015 15:01:12 -0500 (EST) From: John Baldwin To: Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 05 Feb 2015 15:01:10 -0500 Message-ID: <2975222.EGG18CXR9S@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502051138.t15BcUlj070663@svn.freebsd.org> References: <201502051138.t15BcUlj070663@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Feb 2015 15:01:12 -0500 (EST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:01:14 -0000 On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: > Author: ngie > Date: Thu Feb 5 11:38:29 2015 > New Revision: 278249 > URL: https://svnweb.freebsd.org/changeset/base/278249 > > Log: > Honor the following flags with the following rc.d scripts for services > that can be easily decoupled from the boot process without disrupting other > services > > - MK_APM && MK_ACPI: powerd > - MK_BOOTPARAMD: bootparams > - MK_FTP: ftpd > - MK_INETD: inetd > - MK_LEGACY_CONSOLE: moused, syscons > - MK_MAIL: othermta > - MK_NS_CACHING: nscd > - MK_NTP: ntpd (ntpdate is required by other services and can't be easily > conditionalized -- yet..) > - MK_ROUTED: routed > - MK_SENDMAIL: sendmail > - MK_TIMED: timed > - MK_VI: virecover > > MFC after: 3 weeks > Sponsored by: EMC / Isilon Storage Division > > Modified: head/etc/rc.d/Makefile > ============================================================================ > == --- head/etc/rc.d/Makefile Thu Feb 5 11:37:07 2015 (r278248) > +++ head/etc/rc.d/Makefile Thu Feb 5 11:38:29 2015 (r278249) > > +.if ${MK_INETD} != "no" > +_inetd= inetd > +.endif > + This no longer installs /etc/rc.d/inetd even if inetd is enabled. I think you meant to do 'FILES+= inetd' here instead. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:11:45 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AAC57804 for ; Thu, 5 Feb 2015 20:11:45 +0000 (UTC) Received: from nm18-vm0.bullet.mail.bf1.yahoo.com (nm18-vm0.bullet.mail.bf1.yahoo.com [98.139.213.138]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B722344 for ; Thu, 5 Feb 2015 20:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1423167101; bh=B9HOald4ptvqllbqp+z/tuKHqAobDe1Wm0GXYxWw58A=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=ha0yd8L+LCCWgTuFQweHyWODanb2cxT4+9+ko+OClILcUb/JksFOr/CUzSwtpto5MWiyvMf7XdVFmOdRbcxjwXcei3fRTSGHYaGiA/1nqppf4/39p/v1vEhcORMVqf4Vi0TBBbvlfIy1rFoKTrocAh795yogj3GaHHT5kc0BtSHw1FcqFdhld36QEI3rxICWvbbn5STBzqyeJA3ii+BP5UT+apTixDHloshbgpLw0aZFPugSlhBdhfrJSpCaxwUKkrL1Vp8rNSoenQQVI6N7hhxvagjDMyfkhD2je9b7irzCIoReszquqNJ3a5wM/bBMOLxsw/NT/sVa84WRPUdQpQ== Received: from [98.139.215.142] by nm18.bullet.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 Received: from [98.139.211.198] by tm13.bullet.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 Received: from [127.0.0.1] by smtp207.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 X-Yahoo-Newman-Id: 623293.68205.bm@smtp207.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: YN5zpFIVM1nqGBeiKT._5ARvmG1RbOieP1.rJk0JllRz33J _CyrV79GVp4zZ8hZIICJApcgCv_UM8iCPDJuZDzbNlTQhQPQp.wqTadpzCBx 3dMmnS5j9T4B4SB1yN3n0Q_MQHgfixlr6NecNO07N0NQ39cRiYXeCiDTkcz7 53lNmz971CPBummvXJANqaKbY9M95KRwml0XfPE60UwnnFewwhb3yXBU9egl t0.tKTRymnipR.YLamUvkv01Kb0W30hxHXMF7.AsQq73sbDsoAdunw7QllEp QtfhhTH0e5kQJ5Fn16wGzUo4KX1d5k2Kl6YTX1dfruJNLJOo10YytZup3U.x 548WL.vsbNo_S.SsE36yr6dl6eepQbn0UmaG47iqCyC128D5HGyon2TdzvLq KOaO1V_vqXXB_DFAftNkdnk7yj1OKmXYwZO_3WGe4.Iww6zkh6lQKLhGPTK4 apMHYd8L9YVx9sWLZTC3i5ZgHiTGwexHuO0f1tC7T9hj6FUuOiY0tIig7UM3 NlNh7Y_fehYJ_n8HKCK.qx2ZEZZ5edBLi X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <54D3CE82.2050204@FreeBSD.org> Date: Thu, 05 Feb 2015 15:11:46 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Luigi Rizzo , Xin LI Subject: Re: lost change 272451 - CAP_EVENT for tcpdump (Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump References: In-Reply-To: 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:11:45 -0000 On 02/05/15 13:30, Luigi Rizzo wrote: > Hi, > the update to tcpdump 4.6.2 also lost svn272451 and 272653 (addition of > CAP_EVENT to the capabilities given to tcpdump). > > Given this and the other bug fixed in 277638, I am not sure if there > are other local changes that have been lost in the merge. > Also I wonder whether there is something we should have done > differently when applying local changes to code in contrib/ to make > sure that the merge from vendor does not overwrite them ? > > cheers > luigi FWIW, I think what happened here is that upstream merged our capsicum changes only partially and the corresponding clash made it difficult to understand what came from where. If our local changes are too big and upstream is very active, this complexity is unavoidable but it is always good to try to upstream all that we can, and the tcpdump maintainers have been rather open to taking changes. Cheers, Pedro. From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:23:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1DD7E6E; Thu, 5 Feb 2015 20:23:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD1BD683; Thu, 5 Feb 2015 20:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15KNbxG028294; Thu, 5 Feb 2015 20:23:37 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15KNbkt028288; Thu, 5 Feb 2015 20:23:37 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201502052023.t15KNbkt028288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Thu, 5 Feb 2015 20:23:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278280 - head/tools/tools/qrndtest 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:23:38 -0000 Author: jmg Date: Thu Feb 5 20:23:36 2015 New Revision: 278280 URL: https://svnweb.freebsd.org/changeset/base/278280 Log: add a quick testing program I wrote for adrian... Added: head/tools/tools/qrndtest/ head/tools/tools/qrndtest/Makefile (contents, props changed) head/tools/tools/qrndtest/README (contents, props changed) head/tools/tools/qrndtest/r.c (contents, props changed) Added: head/tools/tools/qrndtest/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/qrndtest/Makefile Thu Feb 5 20:23:36 2015 (r278280) @@ -0,0 +1,11 @@ +# +# $FreeBSD$ +# + +PROG = qrndtest + +SRCS = r.c + +NO_MAN= + +.include Added: head/tools/tools/qrndtest/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/qrndtest/README Thu Feb 5 20:23:36 2015 (r278280) @@ -0,0 +1,4 @@ +This is a really quick random testing that I wrote for adrian. + +If you want a real randomness tester, look at dieharder that has a much +larger battery of tests and will tell you if your PRNG is good or not. Added: head/tools/tools/qrndtest/r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/qrndtest/r.c Thu Feb 5 20:23:36 2015 (r278280) @@ -0,0 +1,81 @@ +/*- + * Copyright 2015 John-Mark Gurney. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + */ + +#include +#include +#include +#include + +typedef uint32_t (*rndfun_t)(); + +uint32_t +randomwrap() +{ + return random(); +} + +struct { + const char *name; + rndfun_t rndfun; +} rndfuns[] = { + { "random", randomwrap }, + { "arc4random", arc4random }, + { NULL, NULL }, +}; + +int +main(int argc, char *argv[]) +{ + uint64_t vals[4] = {}; + uint64_t avg; + unsigned int i; + rndfun_t f; + + if (argc == 1) + f = rndfuns[0].rndfun; + else { + for (i = 0; rndfuns[i].name != NULL; i++) { + if (strcasecmp(rndfuns[i].name, argv[1]) == 0) + break; + } + if (rndfuns[i].name == NULL) + return 1; + f = rndfuns[i].rndfun; + } + + for (;;) { + vals[f() % 4]++; + if (((i++) % (4*1024*1024)) == 0) { + avg = vals[0] + vals[1] + vals[2] + vals[3]; + avg /= 4; + printf("%d: %ld %ld %ld %ld\n", i, vals[0] - avg, vals[1] - avg, vals[2] - avg, vals[3] - avg); + } + } + return 0; +} From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:45:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED8A0535; Thu, 5 Feb 2015 20:45:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9CFF92A; Thu, 5 Feb 2015 20:45:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15KjoPh038264; Thu, 5 Feb 2015 20:45:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15KjoLa038263; Thu, 5 Feb 2015 20:45:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502052045.t15KjoLa038263@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 20:45:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278282 - head/etc/rc.d 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:45:51 -0000 Author: ngie Date: Thu Feb 5 20:45:50 2015 New Revision: 278282 URL: https://svnweb.freebsd.org/changeset/base/278282 Log: Use FILES+= idiom instead of _inetd when referencing inetd rc.d script This was a discrepancy between ^/projects/building-blocks and ^/head that I didn't resolve before committing the change to ^/head Pointyhat to: me Reported by: jhb MFC after: 20 days X-MFC with: r278249 Sponsored by: EMC / Isilon Storage Division Modified: head/etc/rc.d/Makefile Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Thu Feb 5 20:34:53 2015 (r278281) +++ head/etc/rc.d/Makefile Thu Feb 5 20:45:50 2015 (r278282) @@ -194,7 +194,7 @@ FILES+= hastd .endif .if ${MK_INETD} != "no" -_inetd= inetd +FILES+= inetd .endif .if ${MK_ISCSI} != "no" From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:46:33 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF508675; Thu, 5 Feb 2015 20:46:32 +0000 (UTC) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B7853937; Thu, 5 Feb 2015 20:46:32 +0000 (UTC) Received: by mail-pa0-f54.google.com with SMTP id eu11so12153707pac.13; Thu, 05 Feb 2015 12:46:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=dlJPE1AYQiyFER9wzooZVXNCQKHO49cJgDozPozQJX4=; b=tTQ+e6emOVT3RdMe9BSG5Xyiz5YZaTjhi6Xg7buqmH5q7tq7g0Np/7Ffg09mv/mLSN fMMOHoEzrhZA/SEeHfeqg3NbtZjMZBdw8lt7gP/P4mHmjmSHigN6eFTrlkJByLT88L/y mitgreGJEERdbKGnHcIXwBSEFFHNB+PNUm31/25dpUwqv+mYHYJgnnOYl2yjqCo85TA/ Y0nvw37l2nCfoftAzBASj+xUbbRSIp05pYpgQQzeDiGZVyRYMeDCr7P19OVMQAa5zicF 7UG+Acmeo+svhah3buHil2Wr5UuIKllGG6CNKnYN30cCstRIL0DvlbFBeyNPSN6XZZKP ij2w== X-Received: by 10.68.168.101 with SMTP id zv5mr53095pbb.104.1423169192269; Thu, 05 Feb 2015 12:46:32 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:49d2:a216:2eb0:7f17? ([2601:8:ab80:7d6:49d2:a216:2eb0:7f17]) by mx.google.com with ESMTPSA id p2sm5917987pdm.57.2015.02.05.12.46.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Feb 2015 12:46:26 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_08E379E8-7446-4171-890C-40D5947B3181"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278249 - head/etc/rc.d From: Garrett Cooper In-Reply-To: <2975222.EGG18CXR9S@ralph.baldwin.cx> Date: Thu, 5 Feb 2015 12:46:25 -0800 Message-Id: <5365DDE2-BBE6-4EFC-9E6E-0CE102C6B1DD@gmail.com> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <2975222.EGG18CXR9S@ralph.baldwin.cx> To: John Baldwin X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:46:33 -0000 --Apple-Mail=_08E379E8-7446-4171-890C-40D5947B3181 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 5, 2015, at 12:01, John Baldwin wrote: > On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: >> Author: ngie >> Date: Thu Feb 5 11:38:29 2015 >> New Revision: 278249 >> URL: https://svnweb.freebsd.org/changeset/base/278249 >>=20 >> Log: >> Honor the following flags with the following rc.d scripts for = services >> that can be easily decoupled from the boot process without disrupting = other >> services >>=20 >> - MK_APM && MK_ACPI: powerd >> - MK_BOOTPARAMD: bootparams >> - MK_FTP: ftpd >> - MK_INETD: inetd >> - MK_LEGACY_CONSOLE: moused, syscons >> - MK_MAIL: othermta >> - MK_NS_CACHING: nscd >> - MK_NTP: ntpd (ntpdate is required by other services and can't be = easily >> conditionalized -- yet..) >> - MK_ROUTED: routed >> - MK_SENDMAIL: sendmail >> - MK_TIMED: timed >> - MK_VI: virecover >>=20 >> MFC after: 3 weeks >> Sponsored by: EMC / Isilon Storage Division >>=20 >> Modified: head/etc/rc.d/Makefile >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/etc/rc.d/Makefile Thu Feb 5 11:37:07 2015 = (r278248) >> +++ head/etc/rc.d/Makefile Thu Feb 5 11:38:29 2015 = (r278249) >>=20 >> +.if ${MK_INETD} !=3D "no" >> +_inetd=3D inetd >> +.endif >> + >=20 > This no longer installs /etc/rc.d/inetd even if inetd is enabled. I = think you=20 > meant to do 'FILES+=3D inetd' here instead. Yup =97 I did. Fixed in r278282. Thanks! --Apple-Mail=_08E379E8-7446-4171-890C-40D5947B3181 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU09ahAAoJEMZr5QU6S73ernwH/AhSOJWujp00sPA4dYJybv4p GMIliQQpPxWoNcyCsDzqxruMI3mMO9loDk8B+OqdQaftcA7LtIEIJkpA9isJmG9i Lem9oo3fAqq3hNZXhc6sVmse9MQ91B2Qx66kIHUlAhc5EkznwJVHB8b6lomgPhsZ CBFmO20jFy98oBA/UEfMxl5kebLuqh54WMFC598GJBKfAi8cwDWBfBxE1Uf4EaSF eRY8nQzrifYkWlA7aSseCHcwHuIE6BKt9M4LaSJCu5OwMivSRKEaEo54Q5BeRZuA NGyfE9gWDZSy0oBQQq9G8OeXVQeywRvCSfgUf3mr7F2IrrTo+Uu1iedNzDzm/U8= =kRBK -----END PGP SIGNATURE----- --Apple-Mail=_08E379E8-7446-4171-890C-40D5947B3181-- From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:48:03 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1726D8E8 for ; Thu, 5 Feb 2015 20:48:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E86EB956 for ; Thu, 5 Feb 2015 20:48:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Km27F033266 for ; Thu, 5 Feb 2015 20:48:02 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t15Km2X7033263 for svn-src-head@freebsd.org; Thu, 5 Feb 2015 20:48:02 GMT (envelope-from bdrewery) Received: (qmail 76325 invoked from network); 5 Feb 2015 14:47:58 -0600 Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139) by sweb.xzibition.com with ESMTPA; 5 Feb 2015 14:47:58 -0600 Message-ID: <54D3D703.7020405@FreeBSD.org> Date: Thu, 05 Feb 2015 14:48:03 -0600 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Pedro Giffuni , Luigi Rizzo , Xin LI Subject: Re: lost change 272451 - CAP_EVENT for tcpdump (Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump References: <54D3CE82.2050204@FreeBSD.org> In-Reply-To: <54D3CE82.2050204@FreeBSD.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7nDBmtWcjCl8qesb10bInepqjvnEH8VCo" 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:48:03 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2/5/2015 2:11 PM, Pedro Giffuni wrote: >=20 > On 02/05/15 13:30, Luigi Rizzo wrote: >> Hi, >> the update to tcpdump 4.6.2 also lost svn272451 and 272653 (addition o= f >> CAP_EVENT to the capabilities given to tcpdump). >> >> Given this and the other bug fixed in 277638, I am not sure if there >> are other local changes that have been lost in the merge. >> Also I wonder whether there is something we should have done >> differently when applying local changes to code in contrib/ to make >> sure that the merge from vendor does not overwrite them ? >> >> cheers >> luigi >=20 > FWIW, I think what happened here is that upstream merged > our capsicum changes only partially and the corresponding clash > made it difficult to understand what came from where. >=20 > If our local changes are too big and upstream is very active, > this complexity is unavoidable but it is always good to try to > upstream all that we can, and the tcpdump maintainers have > been rather open to taking changes. >=20 > Cheers, >=20 > Pedro. I've been sitting on a change for a while that I don't think upstream can take. https://people.freebsd.org/~bdrewery/patches/tcpdump-pflog-uid.diff is a version of the patch. I'm not sure if it was my final one. I would need to test again before committing. The problem is that pf is implemented differently on FreeBSD and OpenBSD for pid/uid tracking. The code would be overly complex to support both and I gave up on that. Even getting it to work on FreeBSD required the _KERNEL define hack for UID_MAX, which our pf uses to note 'no uid value'= =2E I was considering committing this, but was not sure on the proper way to note our changes. #if __FreeBSD__ was my guess. --=20 Regards, Bryan Drewery --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJU09cDAAoJEDXXcbtuRpfPceIH/RoWKyUkWIc6nwG4o6L/sIxH ceQLrN9PKObZ2DQfWKKL069xk2J0XZZrxfjHaR+fdWWRcfT+TYIAOiOijpGmp9D7 O28dbZL0byPeVye/6ySlbV7VtL6i98v6dEUiTpHebeYYuGWmmZQCFLVIe+AVRlc7 wgU0svS0v0psg5YVsfTHz2mqm6SAimJWmCi37dViKkjWEXmo75X+/cm5s2cLCU1+ u7CGBMoLRleRX330+d92jHrvzH0SL0u930q4s/X/Oj8LZTeAk3pBt/4dU9RGYF76 BG1IlaJMjtoYAdXduSRTm+fFbK0nKvgCX6f2P5cYVfx5upagxDuzij57NDPl7Bw= =9T/E -----END PGP SIGNATURE----- --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo-- From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 20:51:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71BADC18; Thu, 5 Feb 2015 20:51:43 +0000 (UTC) Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43153A12; Thu, 5 Feb 2015 20:51:43 +0000 (UTC) Received: by pdjy10 with SMTP id y10so9953693pdj.7; Thu, 05 Feb 2015 12:51:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=Qx1zoSk8Pvx1NhtqUvdA/l5VTSMdL6pgKwirDCQUMag=; b=Mbuqw10RMKakOoK68u8/6+xRust4PYO4Od160jZSuqkLpAWSL0zrPo9/s+TJU+oUsR bfiJdLzDy9Rc1f5i+D5m4+Xox9p5PH/QCUFYYZMSIVPkJ049I4RWHj92S6y+U3nHCLJr jvYSkYNrdbTUS4onrd/qGeysOfrQzM9javURsxv9G9winV9+T+uzwFvbXapSpPFDyeGK ke8q19t05GWuk3vwa2ZEHkjKxeSC0wpxtSlnJsMyB40+WmQSfAeiq5bR9A/qOwOtIBZA iTlArrhmChqglxI5z8M3p4BkTNutqzDZKP+2YGu6IxcS4SVwkfZq6YcztYQuHNwiAqW4 apKA== X-Received: by 10.68.241.102 with SMTP id wh6mr118028pbc.18.1423169502557; Thu, 05 Feb 2015 12:51:42 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:49d2:a216:2eb0:7f17? ([2601:8:ab80:7d6:49d2:a216:2eb0:7f17]) by mx.google.com with ESMTPSA id a4sm5958347pdk.2.2015.02.05.12.51.41 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Feb 2015 12:51:41 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_D78CA3FE-9DE0-4784-9DBE-ECB6E337E7C1"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278249 - head/etc/rc.d From: Garrett Cooper In-Reply-To: <1724492.FMbRRniWv7@ralph.baldwin.cx> Date: Thu, 5 Feb 2015 12:51:41 -0800 Message-Id: References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> To: John Baldwin X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:51:43 -0000 --Apple-Mail=_D78CA3FE-9DE0-4784-9DBE-ECB6E337E7C1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 5, 2015, at 5:04, John Baldwin wrote: > On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: >> Author: ngie >> Date: Thu Feb 5 11:38:29 2015 >> New Revision: 278249 >> URL: https://svnweb.freebsd.org/changeset/base/278249 >>=20 >> Log: >> Honor the following flags with the following rc.d scripts for = services >> that can be easily decoupled from the boot process without disrupting = other >> services >>=20 >> - MK_APM && MK_ACPI: powerd >> - MK_BOOTPARAMD: bootparams >> - MK_FTP: ftpd >> - MK_INETD: inetd >> - MK_LEGACY_CONSOLE: moused, syscons >=20 > I'm using moused with vt(4). It is not syscons-specific. Unfortunately it is LEGACY_CONSOLE specific right now: 183242 sam # XXX MK_SYSCONS 183242 sam .if ${MK_LEGACY_CONSOLE} !=3D "no" 212525 imp SUBDIR+=3D kbdcontrol 212525 imp SUBDIR+=3D kbdmap 212525 imp SUBDIR+=3D moused 212525 imp SUBDIR+=3D vidcontrol 183242 sam .endif This will probably need to change to be inclusive of MK_VT, but I need = to doublecheck the sources to make sure there aren=92t any assumptions = lurking in moused that explicitly require syscons in order to = function... --Apple-Mail=_D78CA3FE-9DE0-4784-9DBE-ECB6E337E7C1 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU09fdAAoJEMZr5QU6S73eg9EH/R/GeGm2z9jZpyXT6Tcshhsb 7r8QG4HjX1J83N1yHGM6EmZ9KHn0u0eUzUqjEebenwOlI5o/c/tEW5Gv8ZKd72xD jA3zSV2xY/RX79VelVlNsBajgiPEZvGsWMBu9Cpara3KtKdbJMht2C7UrFQjQ4th Kr/xL892rXAUn3F68VCmodmi6Ocj6+NsDV1j82DxGmoiNhq2gEx0R0xfzleN/Oik /3QYkobNE5DHeX5G1wMIIr/yfdmnoImHHB0UoMyMIFC8f//Lnh4WlmuqqRqHCe2T WYnBjdKhX8xhNx8m9Mdcu7S0+PxBRVREnhcmGdNgh357SAPthLSsJiPvF+QRyfE= =fQZY -----END PGP SIGNATURE----- --Apple-Mail=_D78CA3FE-9DE0-4784-9DBE-ECB6E337E7C1-- From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:19:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D454AE27; Thu, 5 Feb 2015 21:19:02 +0000 (UTC) Received: from mail-qc0-x233.google.com (mail-qc0-x233.google.com [IPv6:2607:f8b0:400d:c01::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8AE0BD30; Thu, 5 Feb 2015 21:19:02 +0000 (UTC) Received: by mail-qc0-f179.google.com with SMTP id w7so8582529qcr.10; Thu, 05 Feb 2015 13:19:01 -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:from:date:message-id :subject:to:cc:content-type; bh=0cLiewztgUkaE7jRapwsU0gJ6Mfxohen1YJ0HK1lhmU=; b=DoFUWez6GMJrRxJzA4obVO6a/dyZoLRnQExoHng8T0yWroAAunD7qcwuYJ34VMbJoW ky8SS1Mgv6DXZXhnHhWQzsurm4IOjbsshZFtES8J1XisOUh1B0CDnPS3ZDyMpMs5HkoV hK3n3ftaSLNtgEdHEnystYCb2UNlcJxb7IZH2PauQY8LGjs+1Kzm7nggzRmy0ZMr9JWg bUAPd61SJo9xsRae3A+jcrt6pP6yiRuZyX1u9udqJeVhaX/GCJOZy6vALqGXZtIN4yB6 Gt3j9eX/NhhJAaFrtEiUvWU/HTkagnFQo//R5RIgRYAuLu1Ry5d4aG/can5lTVnPNDqU j0lw== X-Received: by 10.224.120.10 with SMTP id b10mr340832qar.19.1423171140769; Thu, 05 Feb 2015 13:19:00 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.140.39.209 with HTTP; Thu, 5 Feb 2015 13:18:39 -0800 (PST) In-Reply-To: References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> From: Ed Maste Date: Thu, 5 Feb 2015 16:18:39 -0500 X-Google-Sender-Auth: vk51_uYVXwdco2xi-nIgRBWxitE Message-ID: Subject: Re: svn commit: r278249 - head/etc/rc.d To: Garrett Cooper Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , John Baldwin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:19:03 -0000 On 5 February 2015 at 15:51, Garrett Cooper wrote: > > Unfortunately it is LEGACY_CONSOLE specific right now: I'm not sure what was considered a non-legacy console when the LEGACY_CONSOLE change went in, but the tools it controls are useful for both syscons(4) and vt(4). Note that LEGACY_CONSOLE is a default yes option. From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:38:13 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E15E93C; Thu, 5 Feb 2015 21:38:13 +0000 (UTC) Received: from mail-pa0-x232.google.com (mail-pa0-x232.google.com [IPv6:2607:f8b0:400e:c03::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 16A38F93; Thu, 5 Feb 2015 21:38:13 +0000 (UTC) Received: by mail-pa0-f50.google.com with SMTP id rd3so12466756pab.9; Thu, 05 Feb 2015 13:38:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:from:subject:date:to; bh=vZMRmSipkT/4AdYVAmSvlK4pZZ1fnascJZpyL/g8cWs=; b=WbdQ7uJXj2f0AR30MySwV7uSNZ/9Ltu68ptQ/JKuadqj8z56Z+EQCzkrKHW47SPwTd 2Wms5hMopSMKxilSlfxeiOhM1J9rWtGEHPtQNs5SdAGbShlZa7FMHDc2DfV+XBCfo8R+ YUPKkTpx9P0fNt3FjiqmG7DDFJ31+zPbcY9JL3oGeXZuMpboFSVnMyMR631aPvRCxepE 52NR4GV8i/cmy7mL+5Uj/qoofgNByeqVoamimj78LY0l/JCfk/jxU2reN50VLrdkwl82 mHpU/RNebX5gF8ol2/Jn4pas8MzVAwelIc3UlwLMB4Wwr81FTwFo16tRi7zKHx067IiM AWug== X-Received: by 10.66.222.135 with SMTP id qm7mr389354pac.38.1423172292648; Thu, 05 Feb 2015 13:38:12 -0800 (PST) Received: from [10.43.51.241] ([166.170.40.47]) by mx.google.com with ESMTPSA id x5sm5955959pbt.66.2015.02.05.13.38.11 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Feb 2015 13:38:12 -0800 (PST) References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> Mime-Version: 1.0 (1.0) In-Reply-To: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <94B8D116-75C0-4325-8E01-CACDCE784070@gmail.com> X-Mailer: iPhone Mail (12B466) From: Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 5 Feb 2015 13:38:10 -0800 To: Ed Maste Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , John Baldwin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:38:13 -0000 > On Feb 5, 2015, at 13:18, Ed Maste wrote: >=20 >> On 5 February 2015 at 15:51, Garrett Cooper wrote= : >>=20 >> Unfortunately it is LEGACY_CONSOLE specific right now: >=20 > I'm not sure what was considered a non-legacy console when the > LEGACY_CONSOLE change went in, but the tools it controls are useful > for both syscons(4) and vt(4). Note that LEGACY_CONSOLE is a default > yes option. Agreed for the general FreeBSD case (x86 platforms, arm embedded, etc). Outside of the general case, are there any instances where it wouldn't make s= ense to install these tools? I find moused to be a less helpful tool on my text only console VMs, but my u= se case seems likes the minority, not the majority. The other tools seem really useful though when dealing with fun terminal emu= lation issues, but does it make sense to install these tools on a device lik= e a tablet for instance where the user interface is X11? Thanks!= From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:39:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A799B33; Thu, 5 Feb 2015 21:39:58 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4800FB1; Thu, 5 Feb 2015 21:39:57 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1337CB915; Thu, 5 Feb 2015 16:39:56 -0500 (EST) From: John Baldwin To: Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 05 Feb 2015 16:39:48 -0500 Message-ID: <22331387.X8ihv2sqVO@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Feb 2015 16:39:56 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:39:58 -0000 On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: > On Feb 5, 2015, at 5:04, John Baldwin wrote: > > On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: > >> Author: ngie > >> Date: Thu Feb 5 11:38:29 2015 > >> New Revision: 278249 > >> URL: https://svnweb.freebsd.org/changeset/base/278249 > >>=20 > >> Log: > >> Honor the following flags with the following rc.d scripts for ser= vices > >>=20 > >> that can be easily decoupled from the boot process without disrupt= ing > >> other > >> services > >>=20 > >> - MK_APM && MK_ACPI: powerd > >> - MK_BOOTPARAMD: bootparams > >> - MK_FTP: ftpd > >> - MK_INETD: inetd > >> - MK_LEGACY_CONSOLE: moused, syscons > >=20 > > I'm using moused with vt(4). It is not syscons-specific. >=20 > Unfortunately it is LEGACY_CONSOLE specific right now: >=20 > 183242 sam # XXX MK_SYSCONS > 183242 sam .if ${MK_LEGACY_CONSOLE} !=3D "no" > 212525 imp SUBDIR+=3D kbdcontrol > 212525 imp SUBDIR+=3D kbdmap > 212525 imp SUBDIR+=3D moused > 212525 imp SUBDIR+=3D vidcontrol > 183242 sam .endif >=20 > This will probably need to change to be inclusive of MK_VT, but I nee= d to > doublecheck the sources to make sure there aren=E2=80=99t any assumpt= ions lurking > in moused that explicitly require syscons in order to function... Eh, which part of "I'm running moused for a trackpad on my Thinkpad tha= t I use with vt(4) both in and out of X" doesn't =3D=3D "it works with vt(4= ), not just sc(4)"? :) --=20 John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:46:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 622DFD6A; Thu, 5 Feb 2015 21:46:01 +0000 (UTC) Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E5D510A; Thu, 5 Feb 2015 21:46:00 +0000 (UTC) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 4C6C61FE023; Thu, 5 Feb 2015 22:45:57 +0100 (CET) Message-ID: <54D3E4C7.5070803@selasky.org> Date: Thu, 05 Feb 2015 22:46:47 +0100 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: John Baldwin , Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> <22331387.X8ihv2sqVO@ralph.baldwin.cx> In-Reply-To: <22331387.X8ihv2sqVO@ralph.baldwin.cx> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:46:01 -0000 On 02/05/15 22:39, John Baldwin wrote: > On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: >> On Feb 5, 2015, at 5:04, John Baldwin wrote: >>> On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: >>>> Author: ngie >>>> Date: Thu Feb 5 11:38:29 2015 >>>> New Revision: 278249 >>>> URL: https://svnweb.freebsd.org/changeset/base/278249 >>>> >>>> Log: >>>> Honor the following flags with the following rc.d scripts for services >>>> >>>> that can be easily decoupled from the boot process without disrupting >>>> other >>>> services >>>> >>>> - MK_APM && MK_ACPI: powerd >>>> - MK_BOOTPARAMD: bootparams >>>> - MK_FTP: ftpd >>>> - MK_INETD: inetd >>>> - MK_LEGACY_CONSOLE: moused, syscons >>> >>> I'm using moused with vt(4). It is not syscons-specific. >> >> Unfortunately it is LEGACY_CONSOLE specific right now: >> >> 183242 sam # XXX MK_SYSCONS >> 183242 sam .if ${MK_LEGACY_CONSOLE} != "no" >> 212525 imp SUBDIR+= kbdcontrol >> 212525 imp SUBDIR+= kbdmap >> 212525 imp SUBDIR+= moused >> 212525 imp SUBDIR+= vidcontrol >> 183242 sam .endif >> >> This will probably need to change to be inclusive of MK_VT, but I need to >> doublecheck the sources to make sure there aren’t any assumptions lurking >> in moused that explicitly require syscons in order to function... > > Eh, which part of "I'm running moused for a trackpad on my Thinkpad that I > use with vt(4) both in and out of X" doesn't == "it works with vt(4), not > just sc(4)"? :) > Hi, Here is patch to make X work without moused among other stuff: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196678 --HPS From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:50:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC9C115D; Thu, 5 Feb 2015 21:50:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96D871F4; Thu, 5 Feb 2015 21:50:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15LoqPA071455; Thu, 5 Feb 2015 21:50:52 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15LoqNO071454; Thu, 5 Feb 2015 21:50:52 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502052150.t15LoqNO071454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 5 Feb 2015 21:50:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278292 - head/sys/dev/uart 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:50:52 -0000 Author: jhb Date: Thu Feb 5 21:50:51 2015 New Revision: 278292 URL: https://svnweb.freebsd.org/changeset/base/278292 Log: Add the device ID for the AMT serial port on my Thinkpad T400. MFC after: 1 week Modified: head/sys/dev/uart/uart_bus_pci.c Modified: head/sys/dev/uart/uart_bus_pci.c ============================================================================== --- head/sys/dev/uart/uart_bus_pci.c Thu Feb 5 21:37:59 2015 (r278291) +++ head/sys/dev/uart/uart_bus_pci.c Thu Feb 5 21:50:51 2015 (r278292) @@ -121,6 +121,7 @@ static const struct pci_id pci_ns8250_id { 0x8086, 0x1c3d, 0xffff, 0, "Intel AMT - KT Controller", 0x10 }, { 0x8086, 0x1d3d, 0xffff, 0, "Intel C600/X79 Series Chipset KT Controller", 0x10 }, { 0x8086, 0x2a07, 0xffff, 0, "Intel AMT - PM965/GM965 KT Controller", 0x10 }, +{ 0x8086, 0x2a47, 0xffff, 0, "Mobile 4 Series Chipset KT Controller", 0x10 }, { 0x8086, 0x2e17, 0xffff, 0, "4 Series Chipset Serial KT Controller", 0x10 }, { 0x8086, 0x3b67, 0xffff, 0, "5 Series/3400 Series Chipset KT Controller", 0x10 }, From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 21:56:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AC9C4E5; Thu, 5 Feb 2015 21:56:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46DF3254; Thu, 5 Feb 2015 21:56:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15LuOdL072761; Thu, 5 Feb 2015 21:56:24 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15LuOfb072760; Thu, 5 Feb 2015 21:56:24 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201502052156.t15LuOfb072760@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Thu, 5 Feb 2015 21:56:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278294 - head/tools/tools/qrndtest 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 21:56:24 -0000 Author: jmg Date: Thu Feb 5 21:56:23 2015 New Revision: 278294 URL: https://svnweb.freebsd.org/changeset/base/278294 Log: apparently MAN was misspelled, fix.. Submitted by: ngie Modified: head/tools/tools/qrndtest/Makefile Modified: head/tools/tools/qrndtest/Makefile ============================================================================== --- head/tools/tools/qrndtest/Makefile Thu Feb 5 21:53:41 2015 (r278293) +++ head/tools/tools/qrndtest/Makefile Thu Feb 5 21:56:23 2015 (r278294) @@ -6,6 +6,6 @@ PROG = qrndtest SRCS = r.c -NO_MAN= +MAN= .include From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:00:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4995466E; Thu, 5 Feb 2015 22:00:02 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 204A0282; Thu, 5 Feb 2015 22:00:02 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 2A050B953; Thu, 5 Feb 2015 17:00:01 -0500 (EST) From: John Baldwin To: Hans Petter Selasky Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 05 Feb 2015 16:59:56 -0500 Message-ID: <2710446.umAevmagdU@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <54D3E4C7.5070803@selasky.org> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <22331387.X8ihv2sqVO@ralph.baldwin.cx> <54D3E4C7.5070803@selasky.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Feb 2015 17:00:01 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:00:02 -0000 On Thursday, February 05, 2015 10:46:47 PM Hans Petter Selasky wrote: > On 02/05/15 22:39, John Baldwin wrote: > > On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: > >> On Feb 5, 2015, at 5:04, John Baldwin wrote: > >>> On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: > >>>> Author: ngie > >>>> Date: Thu Feb 5 11:38:29 2015 > >>>> New Revision: 278249 > >>>> URL: https://svnweb.freebsd.org/changeset/base/278249 > >>>>=20 > >>>> Log: > >>>> Honor the following flags with the following rc.d scripts for > >>>> services > >>>>=20 > >>>> that can be easily decoupled from the boot process without disru= pting > >>>> other > >>>> services > >>>>=20 > >>>> - MK_APM && MK_ACPI: powerd > >>>> - MK_BOOTPARAMD: bootparams > >>>> - MK_FTP: ftpd > >>>> - MK_INETD: inetd > >>>> - MK_LEGACY_CONSOLE: moused, syscons > >>>=20 > >>> I'm using moused with vt(4). It is not syscons-specific. > >>=20 > >> Unfortunately it is LEGACY_CONSOLE specific right now: > >>=20 > >> 183242 sam # XXX MK_SYSCONS > >> 183242 sam .if ${MK_LEGACY_CONSOLE} !=3D "no" > >> 212525 imp SUBDIR+=3D kbdcontrol > >> 212525 imp SUBDIR+=3D kbdmap > >> 212525 imp SUBDIR+=3D moused > >> 212525 imp SUBDIR+=3D vidcontrol > >> 183242 sam .endif > >>=20 > >> This will probably need to change to be inclusive of MK_VT, but I = need to > >> doublecheck the sources to make sure there aren=E2=80=99t any assu= mptions lurking > >> in moused that explicitly require syscons in order to function... > >=20 > > Eh, which part of "I'm running moused for a trackpad on my Thinkpad= that I > > use with vt(4) both in and out of X" doesn't =3D=3D "it works with = vt(4), not > > just sc(4)"? :) >=20 > Hi, >=20 > Here is patch to make X work without moused among other stuff: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D196678 I _like_ moused. I can hotplug USB mice while in X and it works just f= ine=20 (works fine on the console as well). Has worked for over a decade (whe= reas=20 hal can't seem to tie its own shoes much less properly deal with hotplu= g). --=20 John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:09:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D1B6B2D; Thu, 5 Feb 2015 22:09:27 +0000 (UTC) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B7583B8; Thu, 5 Feb 2015 22:09:27 +0000 (UTC) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 745FA1FE023; Thu, 5 Feb 2015 23:09:24 +0100 (CET) Message-ID: <54D3EA24.9070501@selasky.org> Date: Thu, 05 Feb 2015 23:09:40 +0100 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: John Baldwin Subject: Re: svn commit: r278249 - head/etc/rc.d References: <201502051138.t15BcUlj070663@svn.freebsd.org> <22331387.X8ihv2sqVO@ralph.baldwin.cx> <54D3E4C7.5070803@selasky.org> <2710446.umAevmagdU@ralph.baldwin.cx> In-Reply-To: <2710446.umAevmagdU@ralph.baldwin.cx> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:09:27 -0000 On 02/05/15 22:59, John Baldwin wrote: > On Thursday, February 05, 2015 10:46:47 PM Hans Petter Selasky wrote: >> On 02/05/15 22:39, John Baldwin wrote: >>> On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: >>>> On Feb 5, 2015, at 5:04, John Baldwin wrote: >>>>> On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: >>>>>> Author: ngie >>>>>> Date: Thu Feb 5 11:38:29 2015 >>>>>> New Revision: 278249 >>>>>> URL: https://svnweb.freebsd.org/changeset/base/278249 >>>>>> >>>>>> Log: >>>>>> Honor the following flags with the following rc.d scripts for >>>>>> services >>>>>> >>>>>> that can be easily decoupled from the boot process without disrupting >>>>>> other >>>>>> services >>>>>> >>>>>> - MK_APM && MK_ACPI: powerd >>>>>> - MK_BOOTPARAMD: bootparams >>>>>> - MK_FTP: ftpd >>>>>> - MK_INETD: inetd >>>>>> - MK_LEGACY_CONSOLE: moused, syscons >>>>> >>>>> I'm using moused with vt(4). It is not syscons-specific. >>>> >>>> Unfortunately it is LEGACY_CONSOLE specific right now: >>>> >>>> 183242 sam # XXX MK_SYSCONS >>>> 183242 sam .if ${MK_LEGACY_CONSOLE} != "no" >>>> 212525 imp SUBDIR+= kbdcontrol >>>> 212525 imp SUBDIR+= kbdmap >>>> 212525 imp SUBDIR+= moused >>>> 212525 imp SUBDIR+= vidcontrol >>>> 183242 sam .endif >>>> >>>> This will probably need to change to be inclusive of MK_VT, but I need to >>>> doublecheck the sources to make sure there aren’t any assumptions lurking >>>> in moused that explicitly require syscons in order to function... >>> >>> Eh, which part of "I'm running moused for a trackpad on my Thinkpad that I >>> use with vt(4) both in and out of X" doesn't == "it works with vt(4), not >>> just sc(4)"? :) >> >> Hi, >> >> Here is patch to make X work without moused among other stuff: >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196678 > > I _like_ moused. I can hotplug USB mice while in X and it works just fine > (works fine on the console as well). Has worked for over a decade (whereas > hal can't seem to tie its own shoes much less properly deal with hotplug). > Hi John, We are trying to move away from HAL and to devd :-) And I'm not trying to get rid of moused. Actually there is a race currently if moused or Xorg grabs the /dev/umsX first .... Is there a simple way to detect moused_enable="YES" in /etc/rc.conf . Then Xorg should not try to grab /dev/umsX . Only if moused_enable!="YES". --HPS From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:24:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F283AA3; Thu, 5 Feb 2015 22:24:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF0D27F6; Thu, 5 Feb 2015 22:24:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15MOMgY086970; Thu, 5 Feb 2015 22:24:22 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15MOMCR086969; Thu, 5 Feb 2015 22:24:22 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502052224.t15MOMCR086969@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 5 Feb 2015 22:24:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278296 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:24:23 -0000 Author: jhb Date: Thu Feb 5 22:24:22 2015 New Revision: 278296 URL: https://svnweb.freebsd.org/changeset/base/278296 Log: Set and clear the DF_SUSPENDED flag on the child device being manipulated rather than on the parent. Modified: head/sys/kern/subr_bus.c Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Thu Feb 5 22:03:12 2015 (r278295) +++ head/sys/kern/subr_bus.c Thu Feb 5 22:24:22 2015 (r278296) @@ -3653,7 +3653,7 @@ bus_generic_suspend_child(device_t dev, error = DEVICE_SUSPEND(child); if (error == 0) - dev->flags |= DF_SUSPENDED; + child->flags |= DF_SUSPENDED; return (error); } @@ -3668,7 +3668,7 @@ bus_generic_resume_child(device_t dev, d { DEVICE_RESUME(child); - dev->flags &= ~DF_SUSPENDED; + child->flags &= ~DF_SUSPENDED; return (0); } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:28:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D953207; Thu, 5 Feb 2015 22:28:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 39E60814; Thu, 5 Feb 2015 22:28:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15MS1oq087466; Thu, 5 Feb 2015 22:28:01 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15MS1or087464; Thu, 5 Feb 2015 22:28:01 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502052228.t15MS1or087464@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 5 Feb 2015 22:28:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278297 - head/usr.sbin/syslogd 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:28:01 -0000 Author: dim Date: Thu Feb 5 22:28:00 2015 New Revision: 278297 URL: https://svnweb.freebsd.org/changeset/base/278297 Log: Fix two clang 3.6.0 warnings in usr.sbin/syslogd: usr.sbin/syslogd/syslogd.c:1023:10: error: address of array 'f->f_prevline' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] f->f_prevline && !strcmp(msg, f->f_prevline) && ~~~^~~~~~~~~~ usr.sbin/syslogd/syslogd.c:1178:16: error: address of array 'f->f_prevline' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] } else if (f->f_prevline) { ~~ ~~~^~~~~~~~~~ In both cases, the f_prevline field of struct filed is a char array, so it can never be null. Remove the checks. Reviewed by: jilles MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D1716 Modified: head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Thu Feb 5 22:24:22 2015 (r278296) +++ head/usr.sbin/syslogd/syslogd.c Thu Feb 5 22:28:00 2015 (r278297) @@ -1020,7 +1020,7 @@ logmsg(int pri, const char *msg, const c */ if (no_compress - (f->f_type != F_PIPE) < 1 && (flags & MARK) == 0 && msglen == f->f_prevlen && - f->f_prevline && !strcmp(msg, f->f_prevline) && + !strcmp(msg, f->f_prevline) && !strcasecmp(from, f->f_prevhost)) { (void)strlcpy(f->f_lasttime, timestamp, sizeof(f->f_lasttime)); @@ -1175,11 +1175,9 @@ fprintlog(struct filed *f, int flags, co v->iov_base = repbuf; v->iov_len = snprintf(repbuf, sizeof repbuf, "last message repeated %d times", f->f_prevcount); - } else if (f->f_prevline) { + } else { v->iov_base = f->f_prevline; v->iov_len = f->f_prevlen; - } else { - return; } v++; From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:32:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5FD0380; Thu, 5 Feb 2015 22:32:04 +0000 (UTC) Received: from hammer.pct.niksun.com (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx2.freebsd.org (Postfix) with ESMTP id 2E4111A2D; Thu, 5 Feb 2015 22:32:04 +0000 (UTC) Message-ID: <54D3EF63.4030300@FreeBSD.org> Date: Thu, 05 Feb 2015 17:32:03 -0500 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Hans Petter Selasky , John Baldwin Subject: Re: svn commit: r278249 - head/etc/rc.d References: <201502051138.t15BcUlj070663@svn.freebsd.org> <22331387.X8ihv2sqVO@ralph.baldwin.cx> <54D3E4C7.5070803@selasky.org> <2710446.umAevmagdU@ralph.baldwin.cx> <54D3EA24.9070501@selasky.org> In-Reply-To: <54D3EA24.9070501@selasky.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:32:05 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 02/05/2015 17:09, Hans Petter Selasky wrote: > On 02/05/15 22:59, John Baldwin wrote: >> On Thursday, February 05, 2015 10:46:47 PM Hans Petter Selasky >> wrote: >>> On 02/05/15 22:39, John Baldwin wrote: >>>> On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper >>>> wrote: >>>>> On Feb 5, 2015, at 5:04, John Baldwin >>>>> wrote: >>>>>> On Thursday, February 05, 2015 11:38:30 AM Garrett >>>>>> Cooper wrote: >>>>>>> Author: ngie Date: Thu Feb 5 11:38:29 2015 New >>>>>>> Revision: 278249 URL: >>>>>>> https://svnweb.freebsd.org/changeset/base/278249 >>>>>>> >>>>>>> Log: Honor the following flags with the following rc.d >>>>>>> scripts for services >>>>>>> >>>>>>> that can be easily decoupled from the boot process >>>>>>> without disrupting other services >>>>>>> >>>>>>> - MK_APM && MK_ACPI: powerd - MK_BOOTPARAMD: bootparams >>>>>>> - MK_FTP: ftpd - MK_INETD: inetd - MK_LEGACY_CONSOLE: >>>>>>> moused, syscons >>>>>> >>>>>> I'm using moused with vt(4). It is not >>>>>> syscons-specific. >>>>> >>>>> Unfortunately it is LEGACY_CONSOLE specific right now: >>>>> >>>>> 183242 sam # XXX MK_SYSCONS 183242 sam .if >>>>> ${MK_LEGACY_CONSOLE} != "no" 212525 imp SUBDIR+= >>>>> kbdcontrol 212525 imp SUBDIR+= kbdmap 212525 >>>>> imp SUBDIR+= moused 212525 imp SUBDIR+= >>>>> vidcontrol 183242 sam .endif >>>>> >>>>> This will probably need to change to be inclusive of >>>>> MK_VT, but I need to doublecheck the sources to make sure >>>>> there aren’t any assumptions lurking in moused that >>>>> explicitly require syscons in order to function... >>>> >>>> Eh, which part of "I'm running moused for a trackpad on my >>>> Thinkpad that I use with vt(4) both in and out of X" doesn't >>>> == "it works with vt(4), not just sc(4)"? :) >>> >>> Hi, >>> >>> Here is patch to make X work without moused among other stuff: >>> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196678 >> >> I _like_ moused. I can hotplug USB mice while in X and it works >> just fine (works fine on the console as well). Has worked for >> over a decade (whereas hal can't seem to tie its own shoes much >> less properly deal with hotplug). >> > > Hi John, > > We are trying to move away from HAL and to devd :-) > > And I'm not trying to get rid of moused. Actually there is a race > currently if moused or Xorg grabs the /dev/umsX first .... Is > there a simple way to detect moused_enable="YES" in /etc/rc.conf . > Then Xorg should not try to grab /dev/umsX . Only if > moused_enable!="YES". I think what you're looking for is moused_nondefault_enable="NO". Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJU0+9jAAoJEHyflib82/FGVQoH/iCgBglGAl2W43gIh+9SNxJN Nph/YgT9G+nw9UTN6sWJfUPO8xO2Xbrx6ohW6XS5tPfFR0aFYcI1iNoE4278kL8U g0hKZo9zspoxpAHVtPTLG4gCwZUADrI2McY+jgWcu1rML3ubEw39pe7YN7LfcdtC aPYyvFKVmURO+X7J669a3be8cIwUJd74Jmgi/4SJvLdmlDOP9WlIYsFzFaNtSdKM eiiofFY6kL5/FaMCgIWLAZ7BtWoW6HohrH9Z6RLiOdXqfFYQOP6SNSf7HdlZEF/1 FFO7AiGNkbS3RDtlpO+BTE9s/zGDTAHZyqyLa8kIk8moECK4kB+1G19DmN9NDEk= =Cauh -----END PGP SIGNATURE----- From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:42:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2BCA985; Thu, 5 Feb 2015 22:42:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DE3FA04; Thu, 5 Feb 2015 22:42:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Mgk7J096533; Thu, 5 Feb 2015 22:42:46 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15MgjAE096524; Thu, 5 Feb 2015 22:42:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502052242.t15MgjAE096524@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 5 Feb 2015 22:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278299 - in head: lib/libdevinfo sys/kern sys/sys usr.sbin/devinfo 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:42:46 -0000 Author: jhb Date: Thu Feb 5 22:42:44 2015 New Revision: 278299 URL: https://svnweb.freebsd.org/changeset/base/278299 Log: Expose the constants for internal new-bus device flags to userland. The flag value is already exposed via dv_flags, just not the meaning of the flags themselves. Use these constants to annotate devices that are disabled or suspended in devinfo output. Modified: head/lib/libdevinfo/devinfo.h head/sys/kern/subr_bus.c head/sys/sys/bus.h head/usr.sbin/devinfo/devinfo.c Modified: head/lib/libdevinfo/devinfo.h ============================================================================== --- head/lib/libdevinfo/devinfo.h Thu Feb 5 22:34:29 2015 (r278298) +++ head/lib/libdevinfo/devinfo.h Thu Feb 5 22:42:44 2015 (r278299) @@ -50,7 +50,7 @@ struct devinfo_dev { char *dd_location; /* Where bus thinks dev at */ uint32_t dd_devflags; /* API flags */ uint16_t dd_flags; /* internal dev flags */ - devinfo_state_t dd_state; /* attacement state of dev */ + devinfo_state_t dd_state; /* attachment state of dev */ }; struct devinfo_rman { Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Thu Feb 5 22:34:29 2015 (r278298) +++ head/sys/kern/subr_bus.c Thu Feb 5 22:42:44 2015 (r278299) @@ -128,15 +128,6 @@ struct device { device_state_t state; /**< current device state */ uint32_t devflags; /**< api level flags for device_get_flags() */ u_int flags; /**< internal device flags */ -#define DF_ENABLED 0x01 /* device should be probed/attached */ -#define DF_FIXEDCLASS 0x02 /* devclass specified at create time */ -#define DF_WILDCARD 0x04 /* unit was originally wildcard */ -#define DF_DESCMALLOCED 0x08 /* description was malloced */ -#define DF_QUIET 0x10 /* don't print verbose attach message */ -#define DF_DONENOMATCH 0x20 /* don't execute DEVICE_NOMATCH again */ -#define DF_EXTERNALSOFTC 0x40 /* softc not allocated by us */ -#define DF_REBID 0x80 /* Can rebid after attach */ -#define DF_SUSPENDED 0x100 /* Device is suspended. */ u_int order; /**< order from device_add_child_ordered() */ void *ivars; /**< instance variables */ void *softc; /**< current driver's variables */ Modified: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Thu Feb 5 22:34:29 2015 (r278298) +++ head/sys/sys/bus.h Thu Feb 5 22:42:44 2015 (r278299) @@ -70,11 +70,22 @@ struct u_device { char dv_pnpinfo[128]; /**< @brief Plug and play info */ char dv_location[128]; /**< @brief Where is the device? */ uint32_t dv_devflags; /**< @brief API Flags for device */ - uint16_t dv_flags; /**< @brief flags for dev date */ + uint16_t dv_flags; /**< @brief flags for dev state */ device_state_t dv_state; /**< @brief State of attachment */ /* XXX more driver info? */ }; +/* Flags exported via dv_flags. */ +#define DF_ENABLED 0x01 /* device should be probed/attached */ +#define DF_FIXEDCLASS 0x02 /* devclass specified at create time */ +#define DF_WILDCARD 0x04 /* unit was originally wildcard */ +#define DF_DESCMALLOCED 0x08 /* description was malloced */ +#define DF_QUIET 0x10 /* don't print verbose attach message */ +#define DF_DONENOMATCH 0x20 /* don't execute DEVICE_NOMATCH again */ +#define DF_EXTERNALSOFTC 0x40 /* softc not allocated by us */ +#define DF_REBID 0x80 /* Can rebid after attach */ +#define DF_SUSPENDED 0x100 /* Device is suspended. */ + #ifdef _KERNEL #include Modified: head/usr.sbin/devinfo/devinfo.c ============================================================================== --- head/usr.sbin/devinfo/devinfo.c Thu Feb 5 22:34:29 2015 (r278298) +++ head/usr.sbin/devinfo/devinfo.c Thu Feb 5 22:42:44 2015 (r278299) @@ -146,6 +146,10 @@ print_device(struct devinfo_dev *dev, vo printf(" pnpinfo %s", dev->dd_pnpinfo); if (vflag && *dev->dd_location) printf(" at %s", dev->dd_location); + if (!(dev->dd_flags & DF_ENABLED)) + printf(" (disabled)"); + else if (dev->dd_flags & DF_SUSPENDED) + printf(" (suspended)"); printf("\n"); if (rflag) { ia.indent = indent + 4; From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 22:54:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 377E0E3E; Thu, 5 Feb 2015 22:54:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B78BB24; Thu, 5 Feb 2015 22:54:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15MsVX2003121; Thu, 5 Feb 2015 22:54:31 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15MsVMZ003120; Thu, 5 Feb 2015 22:54:31 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502052254.t15MsVMZ003120@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 5 Feb 2015 22:54:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278300 - head/lib/libc/gen 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 22:54:32 -0000 Author: pfg Date: Thu Feb 5 22:54:31 2015 New Revision: 278300 URL: https://svnweb.freebsd.org/changeset/base/278300 Log: getdiskbyname(): plug resource leak Variable cq going out of scope leaks the storage it points to. CID: 270511 Phabric: D1775 Reviewed by: imp Obtained from: NetBSD (CVS rev. 1.34) MFC after: 2 weeks Modified: head/lib/libc/gen/disklabel.c Modified: head/lib/libc/gen/disklabel.c ============================================================================== --- head/lib/libc/gen/disklabel.c Thu Feb 5 22:42:44 2015 (r278299) +++ head/lib/libc/gen/disklabel.c Thu Feb 5 22:54:31 2015 (r278300) @@ -85,10 +85,13 @@ getdiskbyname(const char *name) cq++, cp++; *cq = '\0'; - if (cgetstr(buf, "ty", &cq) > 0 && strcmp(cq, "removable") == 0) - dp->d_flags |= D_REMOVABLE; - else if (cq && strcmp(cq, "simulated") == 0) - dp->d_flags |= D_RAMDISK; + if (cgetstr(buf, "ty", &cq) > 0) { + if (strcmp(cq, "removable") == 0) + dp->d_flags |= D_REMOVABLE; + else if (cq && strcmp(cq, "simulated") == 0) + dp->d_flags |= D_RAMDISK; + free(cq); + } if (cgetcap(buf, "sf", ':') != NULL) dp->d_flags |= D_BADSECT; @@ -100,9 +103,10 @@ getdiskbyname(const char *name) getnumdflt(dp->d_nsectors, "ns", 0); getnumdflt(dp->d_ncylinders, "nc", 0); - if (cgetstr(buf, "dt", &cq) > 0) + if (cgetstr(buf, "dt", &cq) > 0) { dp->d_type = gettype(cq, dktypenames); - else + free(cq); + } else getnumdflt(dp->d_type, "dt", 0); getnumdflt(dp->d_secpercyl, "sc", dp->d_nsectors * dp->d_ntracks); getnumdflt(dp->d_secperunit, "su", dp->d_secpercyl * dp->d_ncylinders); @@ -140,8 +144,11 @@ getdiskbyname(const char *name) pp->p_frag = 8; } getnumdflt(pp->p_fstype, ptype, 0); - if (pp->p_fstype == 0 && cgetstr(buf, ptype, &cq) > 0) - pp->p_fstype = gettype(cq, fstypenames); + if (pp->p_fstype == 0) + if (cgetstr(buf, ptype, &cq) >= 0) { + pp->p_fstype = gettype(cq, fstypenames); + free(cq); + } max = p; } } @@ -155,5 +162,6 @@ getdiskbyname(const char *name) dp->d_magic = DISKMAGIC; dp->d_magic2 = DISKMAGIC; free(buf); + (void)cgetclose(); return (dp); } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 23:02:44 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 455FE367; Thu, 5 Feb 2015 23:02:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 316ABC6B; Thu, 5 Feb 2015 23:02:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15N2i9O008784; Thu, 5 Feb 2015 23:02:44 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15N2hU0008783; Thu, 5 Feb 2015 23:02:43 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502052302.t15N2hU0008783@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 5 Feb 2015 23:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278301 - head/lib/libc/stdlib 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 23:02:44 -0000 Author: pfg Date: Thu Feb 5 23:02:43 2015 New Revision: 278301 URL: https://svnweb.freebsd.org/changeset/base/278301 Log: tdelete(3): don't delete the node we are about to return. CID: 272528 Obtained from: NetBSD (CVS rev. 1.4) MFC after: 2 weeks Modified: head/lib/libc/stdlib/tdelete.c Modified: head/lib/libc/stdlib/tdelete.c ============================================================================== --- head/lib/libc/stdlib/tdelete.c Thu Feb 5 22:54:31 2015 (r278300) +++ head/lib/libc/stdlib/tdelete.c Thu Feb 5 23:02:43 2015 (r278301) @@ -65,7 +65,8 @@ tdelete(const void * __restrict vkey, vo q->rlink = (*rootp)->rlink; } } - free(*rootp); /* D4: Free node */ + if (p != *rootp) + free(*rootp); /* D4: Free node */ *rootp = q; /* link parent to new node */ return p; } From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 23:26:06 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08E68760; Thu, 5 Feb 2015 23:26:06 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2E7BE38; Thu, 5 Feb 2015 23:26:05 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 5AC54B949; Thu, 5 Feb 2015 18:26:04 -0500 (EST) From: John Baldwin To: Hans Petter Selasky Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Thu, 05 Feb 2015 18:26:02 -0500 Message-ID: <4420090.M6QKUcdgdg@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <54D3EA24.9070501@selasky.org> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <2710446.umAevmagdU@ralph.baldwin.cx> <54D3EA24.9070501@selasky.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Feb 2015 18:26:04 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 23:26:06 -0000 On Thursday, February 05, 2015 11:09:40 PM Hans Petter Selasky wrote: > On 02/05/15 22:59, John Baldwin wrote: > > On Thursday, February 05, 2015 10:46:47 PM Hans Petter Selasky wrot= e: > >> On 02/05/15 22:39, John Baldwin wrote: > >>> On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: > >>>> On Feb 5, 2015, at 5:04, John Baldwin wrote: > >>>>> On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote= : > >>>>>> Author: ngie > >>>>>> Date: Thu Feb 5 11:38:29 2015 > >>>>>> New Revision: 278249 > >>>>>> URL: https://svnweb.freebsd.org/changeset/base/278249 > >>>>>>=20 > >>>>>> Log: > >>>>>> Honor the following flags with the following rc.d scripts f= or > >>>>>> services > >>>>>>=20 > >>>>>> that can be easily decoupled from the boot process without dis= rupting > >>>>>> other > >>>>>> services > >>>>>>=20 > >>>>>> - MK_APM && MK_ACPI: powerd > >>>>>> - MK_BOOTPARAMD: bootparams > >>>>>> - MK_FTP: ftpd > >>>>>> - MK_INETD: inetd > >>>>>> - MK_LEGACY_CONSOLE: moused, syscons > >>>>>=20 > >>>>> I'm using moused with vt(4). It is not syscons-specific. > >>>>=20 > >>>> Unfortunately it is LEGACY_CONSOLE specific right now: > >>>>=20 > >>>> 183242 sam # XXX MK_SYSCONS > >>>> 183242 sam .if ${MK_LEGACY_CONSOLE} !=3D "no" > >>>> 212525 imp SUBDIR+=3D kbdcontrol > >>>> 212525 imp SUBDIR+=3D kbdmap > >>>> 212525 imp SUBDIR+=3D moused > >>>> 212525 imp SUBDIR+=3D vidcontrol > >>>> 183242 sam .endif > >>>>=20 > >>>> This will probably need to change to be inclusive of MK_VT, but = I need > >>>> to > >>>> doublecheck the sources to make sure there aren=E2=80=99t any as= sumptions > >>>> lurking > >>>> in moused that explicitly require syscons in order to function..= . > >>>=20 > >>> Eh, which part of "I'm running moused for a trackpad on my Thinkp= ad that > >>> I > >>> use with vt(4) both in and out of X" doesn't =3D=3D "it works wit= h vt(4), > >>> not > >>> just sc(4)"? :) > >>=20 > >> Hi, > >>=20 > >> Here is patch to make X work without moused among other stuff: > >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D196678 > >=20 > > I _like_ moused. I can hotplug USB mice while in X and it works ju= st fine > > (works fine on the console as well). Has worked for over a decade > > (whereas > > hal can't seem to tie its own shoes much less properly deal with ho= tplug). >=20 > Hi John, >=20 > We are trying to move away from HAL and to devd :-) >=20 > And I'm not trying to get rid of moused. Actually there is a race > currently if moused or Xorg grabs the /dev/umsX first .... Is there a= > simple way to detect moused_enable=3D"YES" in /etc/rc.conf . Then Xor= g > should not try to grab /dev/umsX . Only if moused_enable!=3D"YES". USB mice get moused instances via devd which checks a different variabl= e as=20 jkim@ noted. moused_enable only controls the PS/2 moused (on x86). --=20 John Baldwin From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 23:32:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08B058F1; Thu, 5 Feb 2015 23:32:17 +0000 (UTC) Received: from mail-ig0-x22b.google.com (mail-ig0-x22b.google.com [IPv6:2607:f8b0:4001:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7A3FEDE; Thu, 5 Feb 2015 23:32:16 +0000 (UTC) Received: by mail-ig0-f171.google.com with SMTP id h15so2808276igd.4; Thu, 05 Feb 2015 15:32:16 -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:content-transfer-encoding; bh=tECctuvCUZhvM6S1b5cb6bSYtNWd/ggn/zvB4qRUcmQ=; b=u5RFbrtaN49bx2w5bbGeQffKoQA862i/+r0f+Ox7DZ3n3LiXJjdrPrfvwf8ls4vlIB 8zlDo4137oHLh6Qyc5Sfcl1l1T5PPuwF2JhKBqfW8Nt2I319krt53zJEqLRrjFb6Dbqy 2qH/zGHEckcyqOSeIbAKJBwZQSvHwOC6+5+02Xl4cRb3BhjNVCrMHfZiHsVPKMoLUBK+ 6ro82boIpaFWvSB+Pul1Abze6zAnupLPIfGnGmbUybaZTFeH+F5oHvk5SZzdCaSr8ukr VjNkmjuDtmFXOT4PU9KnoRVScabF/cnzbmCbKdtjunI6UycRlt0Us+GPgQ9hSaeP3Udd 9IUQ== MIME-Version: 1.0 X-Received: by 10.43.131.5 with SMTP id ho5mr9832863icc.82.1423179136053; Thu, 05 Feb 2015 15:32:16 -0800 (PST) Received: by 10.50.182.233 with HTTP; Thu, 5 Feb 2015 15:32:15 -0800 (PST) In-Reply-To: <22331387.X8ihv2sqVO@ralph.baldwin.cx> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> <22331387.X8ihv2sqVO@ralph.baldwin.cx> Date: Thu, 5 Feb 2015 15:32:15 -0800 Message-ID: Subject: Re: svn commit: r278249 - head/etc/rc.d From: NGie Cooper To: John Baldwin Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 23:32:17 -0000 On Thu, Feb 5, 2015 at 1:39 PM, John Baldwin wrote: > On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper wrote: >> On Feb 5, 2015, at 5:04, John Baldwin wrote: >> > On Thursday, February 05, 2015 11:38:30 AM Garrett Cooper wrote: >> >> Author: ngie >> >> Date: Thu Feb 5 11:38:29 2015 >> >> New Revision: 278249 >> >> URL: https://svnweb.freebsd.org/changeset/base/278249 >> >> >> >> Log: >> >> Honor the following flags with the following rc.d scripts for servic= es >> >> >> >> that can be easily decoupled from the boot process without disrupting >> >> other >> >> services >> >> >> >> - MK_APM && MK_ACPI: powerd >> >> - MK_BOOTPARAMD: bootparams >> >> - MK_FTP: ftpd >> >> - MK_INETD: inetd >> >> - MK_LEGACY_CONSOLE: moused, syscons >> > >> > I'm using moused with vt(4). It is not syscons-specific. >> >> Unfortunately it is LEGACY_CONSOLE specific right now: >> >> 183242 sam # XXX MK_SYSCONS >> 183242 sam .if ${MK_LEGACY_CONSOLE} !=3D "no" >> 212525 imp SUBDIR+=3D kbdcontrol >> 212525 imp SUBDIR+=3D kbdmap >> 212525 imp SUBDIR+=3D moused >> 212525 imp SUBDIR+=3D vidcontrol >> 183242 sam .endif >> >> This will probably need to change to be inclusive of MK_VT, but I need t= o >> doublecheck the sources to make sure there aren=E2=80=99t any assumption= s lurking >> in moused that explicitly require syscons in order to function... > > Eh, which part of "I'm running moused for a trackpad on my Thinkpad that = I > use with vt(4) both in and out of X" doesn't =3D=3D "it works with vt(4),= not > just sc(4)"? :) I guess I was just propagating around the original assumption that using moused is tied to just syscons(4). You and emaste are right though -- these tools should build and install when MK_LEGACY_CONSOLE !=3D no || MK_VT !=3D no (or invent a different build knob to make the intent of the tools clearer instead of copy-pasting that pattern around the tree). Thanks :)! From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 00:02:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 484D1D66; Fri, 6 Feb 2015 00:02:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3458B1F6; Fri, 6 Feb 2015 00:02:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16021g0037317; Fri, 6 Feb 2015 00:02:01 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16021kY037316; Fri, 6 Feb 2015 00:02:01 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502060002.t16021kY037316@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Fri, 6 Feb 2015 00:02:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278302 - head/etc/rc.d 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 00:02:01 -0000 Author: rpaulo Date: Fri Feb 6 00:02:00 2015 New Revision: 278302 URL: https://svnweb.freebsd.org/changeset/base/278302 Log: Don't add static IPv6 routes when to all FIBs when net.add_addr_allfibs is 0. This avoids a bunch of boot time warnings when rc.d/routing runs. MFC after: 1 week Modified: head/etc/rc.d/routing Modified: head/etc/rc.d/routing ============================================================================== --- head/etc/rc.d/routing Thu Feb 5 23:02:43 2015 (r278301) +++ head/etc/rc.d/routing Fri Feb 6 00:02:00 2015 (r278302) @@ -165,13 +165,14 @@ static_inet() static_inet6() { - local _action _if _skip fibmod fibs + local _action _if _skip fibmod fibs allfibs _action=$1 _if=$2 # get the number of FIBs supported. fibs=$((`${SYSCTL_N} net.fibs` - 1)) - if [ "$fibs" -gt 0 ]; then + allfibs=`${SYSCTL_N} net.add_addr_allfibs` + if [ "$fibs" -gt 0 ] && [ "$allfibs" -ne 0 ]; then fibmod="-fib 0-$fibs" else fibmod= From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 00:25:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32D0B306; Fri, 6 Feb 2015 00:25:19 +0000 (UTC) Received: from hammer.pct.niksun.com (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx2.freebsd.org (Postfix) with ESMTP id 8E67E2649; Fri, 6 Feb 2015 00:25:18 +0000 (UTC) Message-ID: <54D409EE.4060803@FreeBSD.org> Date: Thu, 05 Feb 2015 19:25:18 -0500 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: John Baldwin , Hans Petter Selasky Subject: Re: svn commit: r278249 - head/etc/rc.d References: <201502051138.t15BcUlj070663@svn.freebsd.org> <2710446.umAevmagdU@ralph.baldwin.cx> <54D3EA24.9070501@selasky.org> <4420090.M6QKUcdgdg@ralph.baldwin.cx> In-Reply-To: <4420090.M6QKUcdgdg@ralph.baldwin.cx> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 00:25:19 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 02/05/2015 18:26, John Baldwin wrote: > On Thursday, February 05, 2015 11:09:40 PM Hans Petter Selasky > wrote: >> On 02/05/15 22:59, John Baldwin wrote: >>> On Thursday, February 05, 2015 10:46:47 PM Hans Petter Selasky >>> wrote: >>>> On 02/05/15 22:39, John Baldwin wrote: >>>>> On Thursday, February 05, 2015 12:51:41 PM Garrett Cooper >>>>> wrote: >>>>>> On Feb 5, 2015, at 5:04, John Baldwin >>>>>> wrote: >>>>>>> On Thursday, February 05, 2015 11:38:30 AM Garrett >>>>>>> Cooper wrote: >>>>>>>> Author: ngie Date: Thu Feb 5 11:38:29 2015 New >>>>>>>> Revision: 278249 URL: >>>>>>>> https://svnweb.freebsd.org/changeset/base/278249 >>>>>>>> >>>>>>>> Log: Honor the following flags with the following >>>>>>>> rc.d scripts for services >>>>>>>> >>>>>>>> that can be easily decoupled from the boot process >>>>>>>> without disrupting other services >>>>>>>> >>>>>>>> - MK_APM && MK_ACPI: powerd - MK_BOOTPARAMD: >>>>>>>> bootparams - MK_FTP: ftpd - MK_INETD: inetd - >>>>>>>> MK_LEGACY_CONSOLE: moused, syscons >>>>>>> >>>>>>> I'm using moused with vt(4). It is not >>>>>>> syscons-specific. >>>>>> >>>>>> Unfortunately it is LEGACY_CONSOLE specific right now: >>>>>> >>>>>> 183242 sam # XXX MK_SYSCONS 183242 sam .if >>>>>> ${MK_LEGACY_CONSOLE} != "no" 212525 imp SUBDIR+= >>>>>> kbdcontrol 212525 imp SUBDIR+= kbdmap 212525 >>>>>> imp SUBDIR+= moused 212525 imp SUBDIR+= >>>>>> vidcontrol 183242 sam .endif >>>>>> >>>>>> This will probably need to change to be inclusive of >>>>>> MK_VT, but I need to doublecheck the sources to make sure >>>>>> there aren’t any assumptions lurking in moused that >>>>>> explicitly require syscons in order to function... >>>>> >>>>> Eh, which part of "I'm running moused for a trackpad on my >>>>> Thinkpad that I use with vt(4) both in and out of X" >>>>> doesn't == "it works with vt(4), not just sc(4)"? :) >>>> >>>> Hi, >>>> >>>> Here is patch to make X work without moused among other >>>> stuff: >>>> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196678 >>> >>> I _like_ moused. I can hotplug USB mice while in X and it >>> works just fine (works fine on the console as well). Has >>> worked for over a decade (whereas hal can't seem to tie its own >>> shoes much less properly deal with hotplug). >> >> Hi John, >> >> We are trying to move away from HAL and to devd :-) >> >> And I'm not trying to get rid of moused. Actually there is a >> race currently if moused or Xorg grabs the /dev/umsX first .... >> Is there a simple way to detect moused_enable="YES" in >> /etc/rc.conf . Then Xorg should not try to grab /dev/umsX . Only >> if moused_enable!="YES". > > USB mice get moused instances via devd which checks a different > variable as jkim@ noted. moused_enable only controls the PS/2 > moused (on x86). Actually, default moused can work with any device, e.g, moused_enable="YES" moused_nondefault_enable="NO" moused_port="/dev/ums0" Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJU1AnoAAoJEHyflib82/FGM8QH/i6P93ylRTkuhyuzyGmbvtMo 4IQG3B2EEmWjdrmX4rRFV8Mh8g8renDhp77VrYG8DD1dO519WCYtHJZfvFGECVkA 6EV2luqdOwioYWV9AbPoju2LDE241wkC0d4b3nocjqMDdUSmitIMQiC/lMx0o7A+ YAPYY/tq+ZU7rJXHmUTol89zD6M1b+MFK6nfKbnTP1ciJwzHWxq2gsmsL5GHQqnU rSFs3p+dgrg0HTzaq6elr+yt4xcEQN0V6rQGsZ+R7C9W0MEjNc+eJNiRpM6O8GrG mFsH8Bvp6P+Qr0akY4SKGTZjyijC7pEA4vNNM5boEme/+lA+leJcvw14VRTw9nw= =aWI+ -----END PGP SIGNATURE----- From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 01:10:06 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 915697E7; Fri, 6 Feb 2015 01:10:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CE949B0; Fri, 6 Feb 2015 01:10:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t161A60O067360; Fri, 6 Feb 2015 01:10:06 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t161A58m067355; Fri, 6 Feb 2015 01:10:05 GMT (envelope-from np@FreeBSD.org) Message-Id: <201502060110.t161A58m067355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 6 Feb 2015 01:10:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278303 - in head/sys: dev/cxgbe modules/cxgbe modules/cxgbe/if_cxl 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 01:10:06 -0000 Author: np Date: Fri Feb 6 01:10:04 2015 New Revision: 278303 URL: https://svnweb.freebsd.org/changeset/base/278303 Log: cxgbe(4): Add a minimal if_cxl module that pulls in the real driver as a dependency. This ensures "ifconfig cxl ..." does the right thing even when it's run with no driver loaded. if_cxl.ko is the tiniest module in /boot/kernel. MFC after: 2 weeks Added: head/sys/dev/cxgbe/if_cxl.c (contents, props changed) head/sys/modules/cxgbe/if_cxl/ head/sys/modules/cxgbe/if_cxl/Makefile (contents, props changed) Modified: head/sys/modules/cxgbe/Makefile Added: head/sys/dev/cxgbe/if_cxl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/cxgbe/if_cxl.c Fri Feb 6 01:10:04 2015 (r278303) @@ -0,0 +1,44 @@ +/*- + * Copyright (c) 2015 Chelsio Communications, Inc. + * All rights reserved. + * Written by: Navdeep Parhar + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +static int +mod_event(module_t mod, int cmd, void *arg) +{ + + return (0); +} +static moduledata_t if_cxl_mod = {"if_cxl", mod_event}; +DECLARE_MODULE(if_cxl, if_cxl_mod, SI_SUB_EXEC, SI_ORDER_ANY); +MODULE_VERSION(if_cxl, 1); +MODULE_DEPEND(if_cxl, cxl, 1, 1, 1); Modified: head/sys/modules/cxgbe/Makefile ============================================================================== --- head/sys/modules/cxgbe/Makefile Fri Feb 6 00:02:00 2015 (r278302) +++ head/sys/modules/cxgbe/Makefile Fri Feb 6 01:10:04 2015 (r278303) @@ -6,6 +6,7 @@ SYSDIR?=${.CURDIR}/../.. .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= if_cxgbe +SUBDIR+= if_cxl SUBDIR+= t4_firmware SUBDIR+= t5_firmware SUBDIR+= ${_tom} Added: head/sys/modules/cxgbe/if_cxl/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/cxgbe/if_cxl/Makefile Fri Feb 6 01:10:04 2015 (r278303) @@ -0,0 +1,11 @@ +# +# $FreeBSD$ +# + +CXGBE= ${.CURDIR}/../../../dev/cxgbe +.PATH: ${CXGBE} + +KMOD= if_cxl +SRCS= if_cxl.c + +.include From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 01:33:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C2B7B8E; Fri, 6 Feb 2015 01:33:37 +0000 (UTC) Received: from mail-ig0-x22f.google.com (mail-ig0-x22f.google.com [IPv6:2607:f8b0:4001:c05::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 424C7C2E; Fri, 6 Feb 2015 01:33:37 +0000 (UTC) Received: by mail-ig0-f175.google.com with SMTP id hn18so3959063igb.2; Thu, 05 Feb 2015 17:33:36 -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=vOG1g7y0Gnq1OX91n42q3WoopzRp3bWroDa0hLC1GG4=; b=mWgHgjop/aKEC/wjXAgyas2+rTKKUiRIn5pfJhzkN/feWt6f64v6dFhu5CX0WYnX4F a/Ri23weudSW0MNDdrqkp4LmEkYHHY8cE7B7ll3a7J42WXuwNOzzVKGADq1eQSXJAjED AebvtiP4fHmOjG4JTV4Y9r534YNMu9B+bG2PUKziJneKUjV0e9NjRXTvnvQvHbosXcA0 aPt9L0WGmz1kkSSJtCJJwuof/jNb5w3gzL/lE7nTGYkqPDwCi7CXBJFCRIQ8JBjJQhBQ fid3KYQk6yUAwVBBHQHtFx6a5ofyxDynSjvD40oCpqKeCtfa6EsXgGPJpy9k/FEGh/cv LT3g== MIME-Version: 1.0 X-Received: by 10.107.12.196 with SMTP id 65mr7233462iom.71.1423186416687; Thu, 05 Feb 2015 17:33:36 -0800 (PST) Received: by 10.50.182.233 with HTTP; Thu, 5 Feb 2015 17:33:36 -0800 (PST) In-Reply-To: <201502060110.t161A58m067355@svn.freebsd.org> References: <201502060110.t161A58m067355@svn.freebsd.org> Date: Thu, 5 Feb 2015 17:33:36 -0800 Message-ID: Subject: Re: svn commit: r278303 - in head/sys: dev/cxgbe modules/cxgbe modules/cxgbe/if_cxl From: NGie Cooper To: Navdeep Parhar 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 01:33:37 -0000 On Thu, Feb 5, 2015 at 5:10 PM, Navdeep Parhar wrote: > Author: np > Date: Fri Feb 6 01:10:04 2015 > New Revision: 278303 > URL: https://svnweb.freebsd.org/changeset/base/278303 > > Log: > cxgbe(4): Add a minimal if_cxl module that pulls in the real driver as > a dependency. This ensures "ifconfig cxl ..." does the right thing > even when it's run with no driver loaded. > > if_cxl.ko is the tiniest module in /boot/kernel. A couple things: 1. cxl(4) doesn't have a manpage: $ man 4 cxl No manual entry for cxl $ man 4 if_cxl No manual entry for if_cxl 2. This could have been done with hardlinks to avoid creating an additional driver (and on the plus side it saves disk space): $ git diff Makefile diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index 32347f4..b00ee0a 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -25,5 +25,7 @@ SRCS+= t4_tracer.c CFLAGS+= -I${CXGBE} +LINKS+= ${KMOD}.ko if_cxl.ko + .include CFLAGS+= ${GCC_MS_EXTENSIONS} This is basically what I'm going to set out and do to fix this PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=186449 (it's another item that irritates me with misnamed drivers, like ixgbe.ko used to be...). Using hardlinks instead of renaming the driver is preferred because it makes MFCing possible without breaking loader.conf for sysadmins. In general, major version steps (CURRENT) should use if_ consistently. Thanks! From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 01:42:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0A89A0; Fri, 6 Feb 2015 01:42:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81C41D0A; Fri, 6 Feb 2015 01:42:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t161gI0e084603; Fri, 6 Feb 2015 01:42:18 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t161gHdU084601; Fri, 6 Feb 2015 01:42:17 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502060142.t161gHdU084601@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Fri, 6 Feb 2015 01:42:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278304 - head/sys/boot/amd64/boot1.efi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 01:42:18 -0000 Author: rpaulo Date: Fri Feb 6 01:42:17 2015 New Revision: 278304 URL: https://svnweb.freebsd.org/changeset/base/278304 Log: Add a FAT label to the EFI boot1 partition. MFC after: 1 week Modified: head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu head/sys/boot/amd64/boot1.efi/generate-fat.sh Modified: head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu ============================================================================== --- head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu Fri Feb 6 01:10:04 2015 (r278303) +++ head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu Fri Feb 6 01:42:17 2015 (r278304) @@ -2,20 +2,19 @@ FAT template boot filesystem created by DO NOT EDIT $FreeBSD$ begin 644 fat.tmpl.bz2 -M0EIH.3%!62936=AO?&0`&J9____[ZZKJJ_^N_ZO^Z_^[OO_\`5`(0!0&#$D" -M0$)$2&(H:`81HT#)D!H-#U`T#31IH-&(``R8$9_I)6[MY/, -M(H=/()+4&!(3V0"20C3J5$L5@2`219,"T6JI,@0"2*2\=LAD6=>N6(8QSW'U+N42P^'5X@7X``23=EA``#Z,O)^-VTX@ -M`+E!=,&6PV11C:*D8K#^<%FTG-%!@PR72@\ZU0BF1Y] -MF-FPGL2L>4QCU&O/>89^#H$6^<;&WKC9W52KUX."CM6+GD;(=1!MUD,,?Y[] -MTLAG0];,:B^]M%BH0J1":_C-*2I9R3AS#,&0>$RCY'T/R?HR!?'5$MILQ:!" -M+;10A*!&^<(_/8>D8I-DTU,)ZAZ0VA-!M0T'J`>H#"9 +M'I#0-H&HQI&0&3&FH>H>*`JHHU3V]1%/4/2``T#0`!H``#0`````#1H,@``6 +M'1&G'&@?$6[T#A)?X8$A160"20BO#")0J4TB1*4GXF$B4I,&>43+=_?K=#3* +M6]R"ZNKJZI,9*68E8*E2Q +M4J5*E3'(1830A"$(12A-"<(0A#]VD)H0A"$,>I0FA"$(0I\>P^=F5:M6K5JU +M:DI3:64UN;[7%5B]Y-^\]@_K@B:N\/,5F%&H<\G#IXQXAEFC&D?![6%0'6MR +MX1@@%FC"FD`M7,/SXFNG:2`'-0<-C$8^+$N.7M1B,^6)9,DV9,0A\OL<:C"L +ML1V&,<\9YRB>XV#BG")'6NKRK^("UF2XO?_L!#29">MGDF$R3).!PX&%E,4C +M''=(FL1.`_3?CN@-IB2PI3!FF\<8X.X@D,>CA90I)#M$XRPNDFJELL<3=1?8 +M2B7\5Z64,!7Z;EEBW-MXN-4IJ@W$462]-*\YCR,-B,5[W?=3&L/U>SX,WV#\ +M\B`:I"'0Z)5"$1B.E)(K[5I4RS`%R$>Y\D0NR*,;<9CZ:^V3P(I?D Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 873D34C5; Fri, 6 Feb 2015 01:58:27 +0000 (UTC) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5914AE1A; Fri, 6 Feb 2015 01:58:26 +0000 (UTC) Received: by pdbfl12 with SMTP id fl12so11414481pdb.6; Thu, 05 Feb 2015 17:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=BWchRWKD0T9Wok6IdlRYBeofq2c7Ju+fGEoEBSEpZis=; b=nVNlfI7GwqZ5rL9Waw0qO3YSgM5y8Snli9jq14+atWJZtojCYInJwj3QTWHSsZT4V1 Mlc+mV5b23I8JsQZKzAJ5WHNSF7MrGeQjFgjrGq57rePym/5zEn7EqV5cH08khiVd1oJ P1a9bAn3/1yFX3lfCSonq4gyCHb9V/vORNLeWdpbRJxJxm7ojya90MM810Da5fyexEhw 3E9p2GpjqPBEuqNIdJi49V1A1ZkhB/NBRjYlrPGsQsJugNbiidB5Qu5k9OuUU1d1IRJ9 eCZPnhG+IEe6fByN7kavQ5KVOyaL8ATGDMJm6Qxdr38e/b9Q04F7eDE6IsISGowNFEO9 SMSg== X-Received: by 10.68.221.165 with SMTP id qf5mr1746248pbc.101.1423187906214; Thu, 05 Feb 2015 17:58:26 -0800 (PST) Received: from [10.192.166.0] (stargate.chelsio.com. [67.207.112.58]) by mx.google.com with ESMTPSA id t10sm6275534pdr.75.2015.02.05.17.58.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Feb 2015 17:58:24 -0800 (PST) Sender: Navdeep Parhar Message-ID: <54D41FBE.60204@FreeBSD.org> Date: Thu, 05 Feb 2015 17:58:22 -0800 From: Navdeep Parhar User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: NGie Cooper Subject: Re: svn commit: r278303 - in head/sys: dev/cxgbe modules/cxgbe modules/cxgbe/if_cxl References: <201502060110.t161A58m067355@svn.freebsd.org> In-Reply-To: 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 01:58:27 -0000 On 02/05/15 17:33, NGie Cooper wrote: > On Thu, Feb 5, 2015 at 5:10 PM, Navdeep Parhar wrote: >> Author: np >> Date: Fri Feb 6 01:10:04 2015 >> New Revision: 278303 >> URL: https://svnweb.freebsd.org/changeset/base/278303 >> >> Log: >> cxgbe(4): Add a minimal if_cxl module that pulls in the real driver as >> a dependency. This ensures "ifconfig cxl ..." does the right thing >> even when it's run with no driver loaded. >> >> if_cxl.ko is the tiniest module in /boot/kernel. > > A couple things: > > 1. cxl(4) doesn't have a manpage: cxgbe(4) is the man page, cxl(4) should probably link to that. > > $ man 4 cxl > No manual entry for cxl > $ man 4 if_cxl > No manual entry for if_cxl > > 2. This could have been done with hardlinks to avoid creating an > additional driver (and on the plus side it saves disk space): What is the collective wisdom on hard links vs. dummy module? I'm open to either of them. In this particular case the end is more important than the means. About 4KB worth of disk space is involved. > ... > > This is basically what I'm going to set out and do to fix this PR: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=186449 (it's another > item that irritates me with misnamed drivers, like ixgbe.ko used to > be...). It was the bugzilla email to freebsd-net with your grab of 186449 that reminded me that I needed to fix "ifconfig cxl" for cxgbe. :-) > Using hardlinks instead of renaming the driver is preferred because it > makes MFCing possible without breaking loader.conf for sysadmins. In > general, major version steps (CURRENT) should use if_ > consistently. My change doesn't break any loader.conf. if_cxgbe_load in loader.conf will continue to work exactly as before. if_cxl_load will never be required, but won't do any harm either. Regards, Navdeep From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 01:59:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id B5BB76AF; Fri, 6 Feb 2015 01:59:35 +0000 (UTC) Date: Fri, 6 Feb 2015 01:59:35 +0000 From: Alexey Dokuchaev To: John Baldwin Subject: Re: svn commit: r278249 - head/etc/rc.d Message-ID: <20150206015935.GA58529@FreeBSD.org> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <22331387.X8ihv2sqVO@ralph.baldwin.cx> <54D3E4C7.5070803@selasky.org> <2710446.umAevmagdU@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2710446.umAevmagdU@ralph.baldwin.cx> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Hans Petter Selasky , src-committers@freebsd.org, svn-src-all@freebsd.org, Garrett Cooper , svn-src-head@freebsd.org, Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 01:59:35 -0000 On Thu, Feb 05, 2015 at 04:59:56PM -0500, John Baldwin wrote: > I _like_ moused. I can hotplug USB mice while in X and it works just fine > (works fine on the console as well). Has worked for over a decade (whereas > hal can't seem to tie its own shoes much less properly deal with hotplug). Big +1. Never had problems with multiple mice etc. under console and/or X, never had to use any crapware like HAL et al. Things like moused(8) are part of what makes FreeBSD so more sane compared to some other OSes. ./danfe From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 02:35:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2831FFD0; Fri, 6 Feb 2015 02:35:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1404821A; Fri, 6 Feb 2015 02:35:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t162ZT1q008454; Fri, 6 Feb 2015 02:35:29 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t162ZTqB008453; Fri, 6 Feb 2015 02:35:29 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201502060235.t162ZTqB008453@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 6 Feb 2015 02:35:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278305 - head/lib/csu/powerpc64 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 02:35:30 -0000 Author: jhibbits Date: Fri Feb 6 02:35:29 2015 New Revision: 278305 URL: https://svnweb.freebsd.org/changeset/base/278305 Log: Add a comment explaining why gcc is needed. X-MFC-With: 278231 MFC after: 2 weeks Modified: head/lib/csu/powerpc64/Makefile Modified: head/lib/csu/powerpc64/Makefile ============================================================================== --- head/lib/csu/powerpc64/Makefile Fri Feb 6 01:42:17 2015 (r278304) +++ head/lib/csu/powerpc64/Makefile Fri Feb 6 02:35:29 2015 (r278305) @@ -9,6 +9,10 @@ CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include \ -mlongcall +# XXX: See the log for r232932 as to why the above -mlongcall is needed. Since +# clang doesn't support -mlongcall, and testing shows a clang linked with a +# clang-built csu segfaults, this must currently be compiled with gcc. Once +# clang supports -mlongcall, or we get a fixed ld, this can be revisited. CC:= gcc COMPILER_TYPE:= gcc From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 03:49:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1E684AE; Fri, 6 Feb 2015 03:49:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DE09C2C; Fri, 6 Feb 2015 03:49:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t163nWRS042367; Fri, 6 Feb 2015 03:49:32 GMT (envelope-from davide@FreeBSD.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t163nWma042366; Fri, 6 Feb 2015 03:49:32 GMT (envelope-from davide@FreeBSD.org) Message-Id: <201502060349.t163nWma042366@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davide set sender to davide@FreeBSD.org using -f From: Davide Italiano Date: Fri, 6 Feb 2015 03:49:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278306 - head/sys/conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 03:49:32 -0000 Author: davide Date: Fri Feb 6 03:49:31 2015 New Revision: 278306 URL: https://svnweb.freebsd.org/changeset/base/278306 Log: Always prefer double dashes for GNU LD long options. I discovered this while working on llvm/lld and realized export-dynamic only supported --. Although upstream will eventually grow to support both - and --, switch this in our build system, because GNU ld supports both modes, and because there's some hope lld will become the default linker for FreeBSD in the future. Discussed with: emaste, rdivacky Modified: head/sys/conf/kern.pre.mk Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Fri Feb 6 02:35:29 2015 (r278305) +++ head/sys/conf/kern.pre.mk Fri Feb 6 03:49:31 2015 (r278306) @@ -174,7 +174,7 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} --no-warn-mismatch \ - -warn-common -export-dynamic -dynamic-linker /red/herring \ + --warn-common --export-dynamic --dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 03:50:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04C586FB; Fri, 6 Feb 2015 03:50:08 +0000 (UTC) Received: from mail-qc0-x232.google.com (mail-qc0-x232.google.com [IPv6:2607:f8b0:400d:c01::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE949C31; Fri, 6 Feb 2015 03:50:07 +0000 (UTC) Received: by mail-qc0-f178.google.com with SMTP id b13so9992020qcw.9; Thu, 05 Feb 2015 19:50:06 -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:from:date:message-id :subject:to:cc:content-type; bh=cJyo3ORdG57h2q6bqCWK76JH8OqSaas3JcWejzBl29E=; b=xm6r+0X6ysgZl05CTBgIBKxEepAX3xak7MlYW73L0z5TyXGIFtKUn9AIyUDkqJcady QwLhuqjOxPqjY1wYgj9BHV9UDA1wWVKY0sEOeMSER84AA9QOYacA7KcmvrK5T5WHa8+r qg230smRy4SznQrHChYkmtWrBoatcoBzg2TPQ+J7oeuJcDqnEtqEoqm2IOfJyNenbrrI fxoZnJMVQ5mAuJqehPjbndM3CKLne+xR3lF+sPv7z5mAgphhe0J1PEB8yklAuj8ulbPQ nyiAao7ZBQCI5vC239CpoLVRxr5oh8AzheDWlIpK/BdS/0Vcdzm+SclK/BfTbGc6DZco 3ZrQ== X-Received: by 10.140.81.208 with SMTP id f74mr3756935qgd.94.1423194606783; Thu, 05 Feb 2015 19:50:06 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.140.39.209 with HTTP; Thu, 5 Feb 2015 19:49:45 -0800 (PST) In-Reply-To: References: <201502051138.t15BcUlj070663@svn.freebsd.org> <1724492.FMbRRniWv7@ralph.baldwin.cx> <22331387.X8ihv2sqVO@ralph.baldwin.cx> From: Ed Maste Date: Thu, 5 Feb 2015 22:49:45 -0500 X-Google-Sender-Auth: JDMtRAWBlT1rKHk8dYWGgPUGMe4 Message-ID: Subject: Re: svn commit: r278249 - head/etc/rc.d To: NGie Cooper Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , John Baldwin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 03:50:08 -0000 On 5 February 2015 at 18:32, NGie Cooper wrote: > > I guess I was just propagating around the original assumption that > using moused is tied to just syscons(4). You and emaste are right > though -- these tools should build and install when MK_LEGACY_CONSOLE > != no || MK_VT != no (or invent a different build knob to make the > intent of the tools clearer instead of copy-pasting that pattern > around the tree). We already have a knob to control these tools -- LEGACY_CONSOLE. The three related console knobs are: LEGACY_CONSOLE - kbdcontrol, moused, etc. which support both syscons(4) and vt(4) SYSCONS - key maps, fonts, etc. for syscons(4) VT - key maps, fonts, etc. for vt(4) LEGACY_CONSOLE may be poorly named, but just adding || MK_VT != no isn't correct. Eliminating it, and using MK_SYSCONS != no || MK_VT != no might be. From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 06:21:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FBF42AB; Fri, 6 Feb 2015 06:21:39 +0000 (UTC) Received: from st11p02mm-asmtp002.mac.com (st11p02mm-asmtpout002.mac.com [17.172.220.237]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43760C53; Fri, 6 Feb 2015 06:21:38 +0000 (UTC) Received: from fukuyama.hsd1.ca.comcast.net (unknown [73.162.13.215]) by st11p02mm-asmtp002.mac.com (Oracle Communications Messaging Server 7.0.5.35.0 64bit (built Dec 4 2014)) with ESMTPSA id <0NJC000FM6Y6GQ40@st11p02mm-asmtp002.mac.com>; Fri, 06 Feb 2015 06:20:32 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-02-06_03:2015-02-06,2015-02-06,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1412110000 definitions=main-1502060065 Content-type: text/plain; charset=us-ascii MIME-version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Subject: Re: svn commit: r278268 - head/sys/netinet6 From: Rui Paulo In-reply-to: <201502051629.t15GTRl1010011@svn.freebsd.org> Date: Thu, 05 Feb 2015 22:20:29 -0800 Content-transfer-encoding: quoted-printable Message-id: <2E377435-5669-4E97-A212-5E30909773F8@me.com> References: <201502051629.t15GTRl1010011@svn.freebsd.org> To: "Andrey V. Elsukov" X-Mailer: Apple Mail (2.2070.6) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 06:21:39 -0000 On Feb 5, 2015, at 08:29, Andrey V. Elsukov wrote: >=20 > Author: ae > Date: Thu Feb 5 16:29:26 2015 > New Revision: 278268 > URL: https://svnweb.freebsd.org/changeset/base/278268 >=20 > Log: > Print IPv6 address in log message instead of address of pointer. Just a side note: Ideally we should get rid of all non-debug %p printfs in the kernel as = they can be used to bypass address space layout randomisation. -- Rui Paulo From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 09:41:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01DBCE62; Fri, 6 Feb 2015 09:41:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC15E27F; Fri, 6 Feb 2015 09:41:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t169fHaJ006297; Fri, 6 Feb 2015 09:41:17 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t169fHGg006296; Fri, 6 Feb 2015 09:41:17 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502060941.t169fHGg006296@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 6 Feb 2015 09:41:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278311 - head/lib/libnetgraph 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 09:41:18 -0000 Author: mav Date: Fri Feb 6 09:41:16 2015 New Revision: 278311 URL: https://svnweb.freebsd.org/changeset/base/278311 Log: Some NetGraph debug polishing. Submitted by: Dmitry Luhtionov MFC after: 2 weeks Modified: head/lib/libnetgraph/debug.c Modified: head/lib/libnetgraph/debug.c ============================================================================== --- head/lib/libnetgraph/debug.c Fri Feb 6 09:02:10 2015 (r278310) +++ head/lib/libnetgraph/debug.c Fri Feb 6 09:41:16 2015 (r278311) @@ -62,12 +62,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include #include #include #include +#include #include #include #include @@ -81,15 +84,20 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include +#include #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -129,12 +137,15 @@ static const struct ng_cookie cookies[] COOKIE(ATMLLC), COOKIE(BPF), COOKIE(BRIDGE), + COOKIE(CAR), COOKIE(CISCO), + COOKIE(DEFLATE), COOKIE(DEVICE), COOKIE(ECHO), COOKIE(EIFACE), COOKIE(ETF), COOKIE(ETHER), + COOKIE(ETHER_ECHO), COOKIE(FRAMERELAY), COOKIE(GIF), COOKIE(GIF_DEMUX), @@ -149,15 +160,20 @@ static const struct ng_cookie cookies[] COOKIE(LMI), COOKIE(MPPC), COOKIE(NAT), + COOKIE(NETFLOW), COOKIE(ONE2MANY), + COOKIE(PATCH), + COOKIE(PIPE), COOKIE(PPP), COOKIE(PPPOE), COOKIE(PPTPGRE), + COOKIE(PRED1), COOKIE(RFC1490), COOKIE(SOCKET), COOKIE(SOURCE), COOKIE(SPLIT), COOKIE(SPPP), + COOKIE(TAG), COOKIE(TCPMSS), COOKIE(TEE), COOKIE(TTY), @@ -181,9 +197,8 @@ NgSetDebug(int level) { int old = _gNgDebugLevel; - if (level < 0) - level = old; - _gNgDebugLevel = level; + if (level >= 0) + _gNgDebugLevel = level; return (old); } @@ -225,10 +240,10 @@ _NgDebugMsg(const struct ng_mesg *msg, c /* Display header stuff */ NGLOGX("NG_MESG :"); NGLOGX(" vers %d", msg->header.version); - NGLOGX(" arglen %d", msg->header.arglen); - NGLOGX(" flags %ld", msg->header.flags); - NGLOGX(" token %lu", (u_long)msg->header.token); - NGLOGX(" cookie %s (%d)", + NGLOGX(" arglen %u", msg->header.arglen); + NGLOGX(" flags %x", msg->header.flags); + NGLOGX(" token %u", msg->header.token); + NGLOGX(" cookie %s (%u)", NgCookie(msg->header.typecookie), msg->header.typecookie); /* At lower debugging levels, skip ASCII translation */ From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 12:18:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 503EF21D; Fri, 6 Feb 2015 12:18:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C81E930; Fri, 6 Feb 2015 12:18:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16CIdht081812; Fri, 6 Feb 2015 12:18:39 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16CIdrW081811; Fri, 6 Feb 2015 12:18:39 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502061218.t16CIdrW081811@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 6 Feb 2015 12:18:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278313 - head/lib/libthr/thread 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 12:18:39 -0000 Author: kib Date: Fri Feb 6 12:18:38 2015 New Revision: 278313 URL: https://svnweb.freebsd.org/changeset/base/278313 Log: Fully initialize allocated memory for the new barrier. The b_destroying member was left uninitialized, which caused spurious EBUSY. PR: 197365 Noted by: Florent Guiliani Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/lib/libthr/thread/thr_barrier.c Modified: head/lib/libthr/thread/thr_barrier.c ============================================================================== --- head/lib/libthr/thread/thr_barrier.c Fri Feb 6 10:10:57 2015 (r278312) +++ head/lib/libthr/thread/thr_barrier.c Fri Feb 6 12:18:38 2015 (r278313) @@ -86,16 +86,13 @@ _pthread_barrier_init(pthread_barrier_t if (barrier == NULL || count <= 0) return (EINVAL); - bar = malloc(sizeof(struct pthread_barrier)); + bar = calloc(1, sizeof(struct pthread_barrier)); if (bar == NULL) return (ENOMEM); _thr_umutex_init(&bar->b_lock); _thr_ucond_init(&bar->b_cv); - bar->b_cycle = 0; - bar->b_waiters = 0; bar->b_count = count; - bar->b_refcount = 0; *barrier = bar; return (0); From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 14:07:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07F574BE; Fri, 6 Feb 2015 14:07:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E84777CD; Fri, 6 Feb 2015 14:07:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16E71ZQ034467; Fri, 6 Feb 2015 14:07:01 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16E71x9034466; Fri, 6 Feb 2015 14:07:01 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502061407.t16E71x9034466@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 6 Feb 2015 14:07:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278314 - head/lib/libc/gen 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 14:07:02 -0000 Author: pfg Date: Fri Feb 6 14:07:01 2015 New Revision: 278314 URL: https://svnweb.freebsd.org/changeset/base/278314 Log: Drop cgetclose() from getdiskbyname(). This was a local addition to the original change from NetBSD. Being this libc there is some chance for it to interfere with user's cget*() functions usage. The memory leak was finely plugged by r278300. Pointed out by: ache Modified: head/lib/libc/gen/disklabel.c Modified: head/lib/libc/gen/disklabel.c ============================================================================== --- head/lib/libc/gen/disklabel.c Fri Feb 6 12:18:38 2015 (r278313) +++ head/lib/libc/gen/disklabel.c Fri Feb 6 14:07:01 2015 (r278314) @@ -162,6 +162,5 @@ getdiskbyname(const char *name) dp->d_magic = DISKMAGIC; dp->d_magic2 = DISKMAGIC; free(buf); - (void)cgetclose(); return (dp); } From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 14:22:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6DB0931; Fri, 6 Feb 2015 14:22:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9306B9A5; Fri, 6 Feb 2015 14:22:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16EM1Xp043413; Fri, 6 Feb 2015 14:22:01 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16EM11A043411; Fri, 6 Feb 2015 14:22:01 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502061422.t16EM11A043411@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 6 Feb 2015 14:22:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278315 - head/lib/libc/stdlib 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 14:22:01 -0000 Author: pfg Date: Fri Feb 6 14:22:00 2015 New Revision: 278315 URL: https://svnweb.freebsd.org/changeset/base/278315 Log: Update comment and NetBSD ID tag. The NetBSD revisions correspond to changes we have already done like __P() removal and ANSI-fication of definitions. Modified: head/lib/libc/stdlib/tdelete.c Modified: head/lib/libc/stdlib/tdelete.c ============================================================================== --- head/lib/libc/stdlib/tdelete.c Fri Feb 6 14:07:01 2015 (r278314) +++ head/lib/libc/stdlib/tdelete.c Fri Feb 6 14:22:00 2015 (r278315) @@ -14,7 +14,7 @@ #include #if 0 #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $"); +__RCSID("$NetBSD: tdelete.c,v 1.6 2012/06/25 22:32:45 abs Exp $"); #endif /* LIBC_SCCS and not lint */ #endif __FBSDID("$FreeBSD$"); @@ -25,9 +25,9 @@ __FBSDID("$FreeBSD$"); /* - * delete node with given key + * find a node with given key * - * vkey: key to be deleted + * vkey: key to be found * vrootp: address of the root of the tree * compar: function to carry out node comparisons */ From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 14:44:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D58D6CB5; Fri, 6 Feb 2015 14:44:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0F2FBE6; Fri, 6 Feb 2015 14:44:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16EiUYc052966; Fri, 6 Feb 2015 14:44:30 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16EiUiN052965; Fri, 6 Feb 2015 14:44:30 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502061444.t16EiUiN052965@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Fri, 6 Feb 2015 14:44:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278316 - head/usr.sbin/ctladm 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 14:44:30 -0000 Author: trasz Date: Fri Feb 6 14:44:29 2015 New Revision: 278316 URL: https://svnweb.freebsd.org/changeset/base/278316 Log: Make "ctladm islist" ignore unknown elements, so the old version continues to work with newer kernel. Other ctladm(8) "*list" subcommands seem to already handle it in a reasonable way. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/ctladm/ctladm.c Modified: head/usr.sbin/ctladm/ctladm.c ============================================================================== --- head/usr.sbin/ctladm/ctladm.c Fri Feb 6 14:22:00 2015 (r278315) +++ head/usr.sbin/ctladm/ctladm.c Fri Feb 6 14:44:29 2015 (r278316) @@ -3559,8 +3559,12 @@ cctl_islist_end_element(void *user_data, } else if (strcmp(name, "connection") == 0) { islist->cur_conn = NULL; } else if (strcmp(name, "ctlislist") == 0) { - } else - errx(1, "unknown element %s", name); + /* Nothing. */ + } else { + /* + * Unknown element; ignore it for forward compatiblity. + */ + } free(str); } From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:02:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF2B1FC5; Fri, 6 Feb 2015 15:02:12 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3F2CDC8; Fri, 6 Feb 2015 15:02:12 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 17EA3B91F; Fri, 6 Feb 2015 10:02:11 -0500 (EST) From: John Baldwin To: Ed Maste Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Fri, 06 Feb 2015 10:01:50 -0500 Message-ID: <15908040.5vEeS6v7ok@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: References: <201502051138.t15BcUlj070663@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 10:02:11 -0500 (EST) Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , NGie Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:02:13 -0000 On Thursday, February 05, 2015 10:49:45 PM Ed Maste wrote: > On 5 February 2015 at 18:32, NGie Cooper wrote: > > I guess I was just propagating around the original assumption that > > using moused is tied to just syscons(4). You and emaste are right > > though -- these tools should build and install when MK_LEGACY_CONSOLE > > != no || MK_VT != no (or invent a different build knob to make the > > intent of the tools clearer instead of copy-pasting that pattern > > around the tree). > > We already have a knob to control these tools -- LEGACY_CONSOLE. The > three related console knobs are: > > LEGACY_CONSOLE - kbdcontrol, moused, etc. which support both > syscons(4) and vt(4) > SYSCONS - key maps, fonts, etc. for syscons(4) > VT - key maps, fonts, etc. for vt(4) > > LEGACY_CONSOLE may be poorly named, but just adding || MK_VT != no > isn't correct. Eliminating it, and using MK_SYSCONS != no || MK_VT != > no might be. Using "legacy" for the brand new console driver we haven't even shipped as on- by-default in a release yet certainly seems a misnomer. Perhaps you mean something like VIDCONSOLE (to borrow loader's name), VIDEO_CONSOLE, or GRAPHICS_CONSOLE? -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:07:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AFEA566; Fri, 6 Feb 2015 15:07:12 +0000 (UTC) Received: from butcher-nb.yandex.net (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) by mx2.freebsd.org (Postfix) with ESMTP id 50E15255; Fri, 6 Feb 2015 15:07:09 +0000 (UTC) Message-ID: <54D4D874.4090702@FreeBSD.org> Date: Fri, 06 Feb 2015 18:06:28 +0300 From: "Andrey V. Elsukov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Rui Paulo Subject: Re: svn commit: r278268 - head/sys/netinet6 References: <201502051629.t15GTRl1010011@svn.freebsd.org> <2E377435-5669-4E97-A212-5E30909773F8@me.com> In-Reply-To: <2E377435-5669-4E97-A212-5E30909773F8@me.com> Content-Type: text/plain; charset=windows-1252 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:07:12 -0000 On 06.02.2015 09:20, Rui Paulo wrote: >> Log: Print IPv6 address in log message instead of address of >> pointer. > > Just a side note: > > Ideally we should get rid of all non-debug %p printfs in the kernel > as they can be used to bypass address space layout randomisation. A good example on which we need to think :) # sysctl kern.geom.confxml -- WBR, Andrey V. Elsukov From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:34:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24C9BB08; Fri, 6 Feb 2015 15:34:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10DD315F; Fri, 6 Feb 2015 15:34:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16FYAOF076651; Fri, 6 Feb 2015 15:34:10 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16FYAvh076650; Fri, 6 Feb 2015 15:34:10 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201502061534.t16FYAvh076650@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 6 Feb 2015 15:34:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278317 - head/tools/tools/makeroot 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:34:11 -0000 Author: emaste Date: Fri Feb 6 15:34:10 2015 New Revision: 278317 URL: https://svnweb.freebsd.org/changeset/base/278317 Log: Handle invocation with neither of -e / -f Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D1780 Modified: head/tools/tools/makeroot/makeroot.sh Modified: head/tools/tools/makeroot/makeroot.sh ============================================================================== --- head/tools/tools/makeroot/makeroot.sh Fri Feb 6 14:44:29 2015 (r278316) +++ head/tools/tools/makeroot/makeroot.sh Fri Feb 6 15:34:10 2015 (r278317) @@ -165,13 +165,15 @@ if [ -n "${FILELIST}" ]; then awk ' !/ type=/ { file = $1 } / type=/ { if ($1 == file) {print} }' >> ${manifest} -else +elif [ -n "${EXTRAS}" ]; then # Start with all the files in BSDROOT/METALOG except those in # one of the EXTRAS manifests. grep -h type=file ${EXTRAS} | cut -d' ' -f1 | \ sort -u ${BSDROOT}/METALOG - | awk ' !/ type=/ { file = $1 } / type=/ { if ($1 != file) {print} }' >> ${manifest} +else + sort -u ${BSDROOT}/METALOG >> ${manifest} fi # For each extras file, add contents keys relative to the directory the From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:38:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8528E94; Fri, 6 Feb 2015 15:38:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79E4A1B0; Fri, 6 Feb 2015 15:38:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16FcCSj077520; Fri, 6 Feb 2015 15:38:12 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16FcCJm077518; Fri, 6 Feb 2015 15:38:12 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201502061538.t16FcCJm077518@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 6 Feb 2015 15:38:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278318 - head/tools/tools/makeroot 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:38:12 -0000 Author: emaste Date: Fri Feb 6 15:38:11 2015 New Revision: 278318 URL: https://svnweb.freebsd.org/changeset/base/278318 Log: makeroot: Add -l option to set file system volume label Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D1782 Modified: head/tools/tools/makeroot/makeroot.8 head/tools/tools/makeroot/makeroot.sh Modified: head/tools/tools/makeroot/makeroot.8 ============================================================================== --- head/tools/tools/makeroot/makeroot.8 Fri Feb 6 15:34:10 2015 (r278317) +++ head/tools/tools/makeroot/makeroot.8 Fri Feb 6 15:38:11 2015 (r278318) @@ -41,6 +41,7 @@ .Op Fl e Ar extras-manifest .Op Fl f Ar filelist .Op Fl k Ar keydir Op Fl K Ar user +.Op Fl l Ar label .Op Fl p Ar master.passwd Op Fl g Ar group .Op Fl s Ar size .Ar image-file @@ -94,6 +95,8 @@ If no .Fl K argument is supplied then the files will be installed in the root user's directory. +.It Fl l Ar label +Set the file system volume label. .It Fl p Ar master.passwd Op Fl g Ar group Install an alternate .Ar master.passwd Modified: head/tools/tools/makeroot/makeroot.sh ============================================================================== --- head/tools/tools/makeroot/makeroot.sh Fri Feb 6 15:34:10 2015 (r278317) +++ head/tools/tools/makeroot/makeroot.sh Fri Feb 6 15:38:11 2015 (r278318) @@ -75,7 +75,7 @@ KEYDIR= KEYUSERS= PASSWD= -while getopts "B:de:f:g:K:k:p:s:" opt; do +while getopts "B:de:f:g:K:k:l:p:s:" opt; do case "$opt" in B) BFLAG="-B ${OPTARG}" ;; d) DEBUG=1 ;; @@ -84,6 +84,7 @@ while getopts "B:de:f:g:K:k:p:s:" opt; d g) GROUP="${OPTARG}" ;; K) KEYUSERS="${KEYUSERS} ${OPTARG}" ;; k) KEYDIR="${OPTARG}" ;; + l) LABEL="${OPTARG}" ;; p) PASSWD="${OPTARG}" ;; s) SIZE="${OPTARG}" ;; *) usage ;; @@ -230,9 +231,12 @@ if [ -n "${KEYDIR}" ]; then done fi +if [ -n "${LABEL}" ]; then +LABELFLAG="-o label=${LABEL}" +fi if [ -n "${SIZE}" ]; then SIZEFLAG="-s ${SIZE}" fi cd ${BSDROOT}; makefs ${DUPFLAG} -N ${DBDIR} ${SIZEFLAG} ${BFLAG} \ - -t ffs -f 256 ${IMGFILE} ${manifest} + -t ffs ${LABELFLAG} -f 256 ${IMGFILE} ${manifest} From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:44:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1A4A207; Fri, 6 Feb 2015 15:44:38 +0000 (UTC) Received: from mail-qa0-x22c.google.com (mail-qa0-x22c.google.com [IPv6:2607:f8b0:400d:c00::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 971712BB; Fri, 6 Feb 2015 15:44:38 +0000 (UTC) Received: by mail-qa0-f44.google.com with SMTP id w8so11352274qac.3; Fri, 06 Feb 2015 07:44:37 -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:from:date:message-id :subject:to:cc:content-type; bh=i7SU8cjebEjdNpKDx+y5saGPCAUS/ky/RJKctTj0g6g=; b=bmMSd7RazwynPZY682iXQPaHkToCFa6q25+yLZhhwuKkFaPpcBj+YhSvrB2s4iNga3 +gRSddUQC2fT8n7ET8OqYGmVC/W1Zn1P8gAiLjgNxll8qf0ftvOZXYvl5YEa0ixVwiM0 anfioF6xEDX8NBaXUHz48aFOVH7T+/oTSHIep/cyOG3eaUGvnPfJ/EhulNdXtVA5AVE+ ZIGttDTIGUYE5cxiBGMZ/avkIyYeC1ELhw9TFQGTzjwNBJKehfcA25VQdTfi7eM5s1QM 9OH7ft/5BqFFBWVBIZjRk5soKAzE/Hn5jL8VAQt8+oTr55QmgAmyJmekf0i8htxvHGYG gBiA== X-Received: by 10.140.94.6 with SMTP id f6mr8966177qge.38.1423237477743; Fri, 06 Feb 2015 07:44:37 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.140.39.209 with HTTP; Fri, 6 Feb 2015 07:44:17 -0800 (PST) In-Reply-To: <15908040.5vEeS6v7ok@ralph.baldwin.cx> References: <201502051138.t15BcUlj070663@svn.freebsd.org> <15908040.5vEeS6v7ok@ralph.baldwin.cx> From: Ed Maste Date: Fri, 6 Feb 2015 10:44:17 -0500 X-Google-Sender-Auth: eozybiX-A4JqUrFIi9lCvAFm3Hg Message-ID: Subject: Re: svn commit: r278249 - head/etc/rc.d To: John Baldwin Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , NGie Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:44:39 -0000 On 6 February 2015 at 10:01, John Baldwin wrote: > > Using "legacy" for the brand new console driver we haven't even shipped as on- > by-default in a release yet certainly seems a misnomer. Perhaps you mean > something like VIDCONSOLE (to borrow loader's name), VIDEO_CONSOLE, or > GRAPHICS_CONSOLE. I'm not sure why it was named LEGACY_CONSOLE. It was introduced prior to the vt(4) work when syscons(4) was the only console. We should probably just eliminate it and build kbdcontrol, moused, etc. if either MK_SYSCONS or MK_VT is set. From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 15:51:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D7FA3BF; Fri, 6 Feb 2015 15:51:21 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E696C391; Fri, 6 Feb 2015 15:51:20 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A2E57B91F; Fri, 6 Feb 2015 10:51:19 -0500 (EST) From: John Baldwin To: NGie Cooper Subject: Re: svn commit: r278303 - in head/sys: dev/cxgbe modules/cxgbe modules/cxgbe/if_cxl Date: Fri, 06 Feb 2015 10:51:08 -0500 Message-ID: <2608873.KEiTQF7Lcd@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: References: <201502060110.t161A58m067355@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 10:51:19 -0500 (EST) Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Navdeep Parhar X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 15:51:21 -0000 On Thursday, February 05, 2015 05:33:36 PM NGie Cooper wrote: > On Thu, Feb 5, 2015 at 5:10 PM, Navdeep Parhar wrote: > > Author: np > > Date: Fri Feb 6 01:10:04 2015 > > New Revision: 278303 > > URL: https://svnweb.freebsd.org/changeset/base/278303 > > > > Log: > > cxgbe(4): Add a minimal if_cxl module that pulls in the real driver as > > a dependency. This ensures "ifconfig cxl ..." does the right thing > > even when it's run with no driver loaded. > > > > if_cxl.ko is the tiniest module in /boot/kernel. > > A couple things: > > 1. cxl(4) doesn't have a manpage: > > $ man 4 cxl > No manual entry for cxl > $ man 4 if_cxl > No manual entry for if_cxl An MLINK (along with updating cxgbe.4 to reference both names) should suffice for that. > 2. This could have been done with hardlinks to avoid creating an > additional driver (and on the plus side it saves disk space): > > $ git diff Makefile > diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile > b/sys/modules/cxgbe/if_cxgbe/Makefile > index 32347f4..b00ee0a 100644 > --- a/sys/modules/cxgbe/if_cxgbe/Makefile > +++ b/sys/modules/cxgbe/if_cxgbe/Makefile > @@ -25,5 +25,7 @@ SRCS+= t4_tracer.c > > CFLAGS+= -I${CXGBE} > > +LINKS+= ${KMOD}.ko if_cxl.ko > + > .include > CFLAGS+= ${GCC_MS_EXTENSIONS} > > This is basically what I'm going to set out and do to fix this PR: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=186449 (it's another > item that irritates me with misnamed drivers, like ixgbe.ko used to > be...). > > Using hardlinks instead of renaming the driver is preferred because it > makes MFCing possible without breaking loader.conf for sysadmins. In > general, major version steps (CURRENT) should use if_ > consistently. Hardlinks won't work alone. You need an actual module named 'cxl' or 'if_cxl' (with an optional bus prefix) for ifmaybeload() to not try a spurious kldload as it depends on module names, not kld names (it depends on the kldname once it goes to load something, but uses the module name to decide whether or not it needs to try to load something). You can either stuff that module into if_cxgbe.c and use a hard link or create a dummy module. Also, the code for this in ifconfig seems to be using strlcpy to complicated. It also doesn't allow for numbers anywhere in a driver name (like in the original Intel 40GB driver name) since it stops at the first digit instead of walking backwards to find the first non-digit. I didn't try to fix the latter, but this seems more sane: Index: ifconfig.c =================================================================== --- ifconfig.c (revision 278285) +++ ifconfig.c (working copy) @@ -1261,7 +1261,6 @@ print_vhid(const struct ifaddrs *ifa, const char * void ifmaybeload(const char *name) { -#define MOD_PREFIX_LEN 3 /* "if_" */ struct module_stat mstat; int fileid, modid; char ifkind[IFNAMSIZ + MOD_PREFIX_LEN], ifname[IFNAMSIZ], *dp; @@ -1280,9 +1279,8 @@ ifmaybeload(const char *name) } /* turn interface and unit into module name */ - strcpy(ifkind, "if_"); - strlcpy(ifkind + MOD_PREFIX_LEN, ifname, - sizeof(ifkind) - MOD_PREFIX_LEN); + strlcpy(ifkind, "if_", sizeof(ifkind)); + strlcat(ifkind, ifname, sizeof(ifkind)); /* scan files in kernel */ mstat.version = sizeof(struct module_stat); @@ -1299,8 +1297,8 @@ ifmaybeload(const char *name) cp = mstat.name; } /* already loaded? */ - if (strncmp(ifname, cp, strlen(ifname) + 1) == 0 || - strncmp(ifkind, cp, strlen(ifkind) + 1) == 0) + if (strcmp(ifname, cp) == 0 || + strcmp(ifkind, cp) == 0) return; } } -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 16:09:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A503AAEC; Fri, 6 Feb 2015 16:09:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E0A66EC; Fri, 6 Feb 2015 16:09:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16G95Z1091866; Fri, 6 Feb 2015 16:09:05 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16G92rn091851; Fri, 6 Feb 2015 16:09:02 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502061609.t16G92rn091851@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Feb 2015 16:09:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 16:09:05 -0000 Author: jhb Date: Fri Feb 6 16:09:01 2015 New Revision: 278320 URL: https://svnweb.freebsd.org/changeset/base/278320 Log: Add a new device control utility for new-bus devices called devctl. This allows the user to request administrative changes to individual devices such as attach or detaching drivers or disabling and re-enabling devices. - Add a new /dev/devctl2 character device which uses ioctls for device requests. The ioctls use a common 'struct devreq' which is somewhat similar to 'struct ifreq'. - The ioctls identify the device to operate on via a string. This string can either by the device's name, or it can be a bus-specific address. (For unattached devices, a bus address is the only way to locate a device.) Bus drivers register an eventhandler to claim unrecognized device names that the driver recognizes as a valid address. Two buses currently support addresses: ACPI recognizes any device in the ACPI namespace via its full path starting with "\" and the PCI bus driver recognizes an address specification of 'pci[:]::' (identical to the PCI selector strings supported by pciconf). - To make it easier to cut and paste, change the PnP location string in the PCI bus driver to output a full PCI selector string rather than 'slot= function='. - Add a devctl(3) interface in libdevctl which provides a wrapper around the ioctls and is the preferred interface for other userland code. - Add a devctl(8) program which is a simple wrapper around the requests supported by devctl(3). - Add a device_is_suspended() function to check DF_SUSPENDED. - Add a resource_unset_value() function that can be used to remove a hint from the kernel environment. This is used to clear a hint...disabled hint when re-enabling a boot-time disabled device. Reviewed by: imp (parts) Requested by: imp (changing PCI location string) Relnotes: yes Added: head/lib/libdevctl/ head/lib/libdevctl/Makefile (contents, props changed) head/lib/libdevctl/devctl.3 (contents, props changed) head/lib/libdevctl/devctl.c (contents, props changed) head/lib/libdevctl/devctl.h (contents, props changed) head/usr.sbin/devctl/ head/usr.sbin/devctl/Makefile (contents, props changed) head/usr.sbin/devctl/devctl.8 (contents, props changed) head/usr.sbin/devctl/devctl.c (contents, props changed) Modified: head/contrib/mdocml/lib.in head/lib/Makefile head/share/mk/bsd.libnames.mk head/share/mk/src.libnames.mk head/sys/dev/acpica/acpi.c head/sys/dev/pci/pci.c head/sys/kern/subr_bus.c head/sys/kern/subr_hints.c head/sys/sys/bus.h head/usr.sbin/Makefile Modified: head/contrib/mdocml/lib.in ============================================================================== --- head/contrib/mdocml/lib.in Fri Feb 6 15:53:13 2015 (r278319) +++ head/contrib/mdocml/lib.in Fri Feb 6 16:09:01 2015 (r278320) @@ -41,6 +41,7 @@ LINE("libcrypt", "Crypt Library (libcryp LINE("libcurses", "Curses Library (libcurses, \\-lcurses)") LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)") LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)") +LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)") LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)") LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)") LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)") Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Fri Feb 6 15:53:13 2015 (r278319) +++ head/lib/Makefile Fri Feb 6 16:09:01 2015 (r278320) @@ -41,6 +41,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libcom_err} \ libcompat \ libcrypt \ + libdevctl \ libdevinfo \ libdevstat \ libdpv \ Added: head/lib/libdevctl/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libdevctl/Makefile Fri Feb 6 16:09:01 2015 (r278320) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +LIB= devctl +SRCS= devctl.c +INCS= devctl.h +MAN= devctl.3 + +.include Added: head/lib/libdevctl/devctl.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libdevctl/devctl.3 Fri Feb 6 16:09:01 2015 (r278320) @@ -0,0 +1,295 @@ +.\" +.\" Copyright (c) 2014 John Baldwin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd December 26, 2014 +.Dt DEVCTL 3 +.Os +.Sh NAME +.Nm devctl , +.Nm devctl_attach , +.Nm devctl_detach , +.Nm devctl_disable , +.Nm devctl_enable , +.Nm devctl_resume , +.Nm devctl_suspend +.Nd device control library +.Sh LIBRARY +.Lb libdevctl +.Sh SYNOPSIS +.In devctl.h +.Ft int +.Fn devctl_attach "const char *device" +.Ft int +.Fn devctl_detach "const char *device" "bool force" +.Ft int +.Fn devctl_disable "const char *device" "bool force_detach" +.Ft int +.Fn devctl_enable "const char *device" +.Ft int +.Fn devctl_resume "const char *device" +.Ft int +.Fn devctl_suspend "const char *device" +.Ft int +.Fn devctl_set_driver "const char *device" "const char *driver" "bool force" +.Sh DESCRIPTION +The +.Nm +library adjusts the state of devices in the kernel's internal device +hierarchy. +Each control operation accepts a +.Fa device +argument that identifies the device to adjust. +The +.Fa device +may be specified as either the name of an existing device or as a +bus-specific address. +The following bus-specific address formats are currently supported: +.Bl -tag -offset indent +.It Sy pci Ns Fa domain Ns : Ns Fa bus Ns : Ns Fa slot Ns : Ns Fa function +A PCI device with the specified +.Fa domain , +.Fa bus , +.Fa slot , +and +.Fa function . +.It Sy pci Ns Fa bus Ns : Ns Fa slot Ns : Ns Fa function +A PCI device in domain zero with the specified +.Fa bus , +.Fa slot , +and +.Fa function . +.It Fa handle +A device with an ACPI handle of +.Fa handle . +The handle must be specified as an absolute path and must begin with a +.Dq \e . +.El +.Pp +The +.Fn devctl_attach +function probes a device and attaches a suitable device driver if one is +found. +.Pp +The +.Fn devctl_detach +function detaches a device from its current device driver. +The device is left detached until either a new driver for its parent +bus is loaded or the device is explicitly probed via +.Fn devctl_attach . +If +.Fa force +is true, +the current device driver will be detached even if the device is busy. +.Pp +The +.Fn devctl_disable +function disables a device. +If the device is currently attached to a device driver, +the device driver will be detached from the device, +but the device will retain its current name. +If +.Fa force_detach +is true, +the current device driver will be detached even if the device is busy. +The device will remain disabled and detached until it is explicitly enabled +via +.Fn devctl_enable . +.Pp +The +.Fn devctl_enable +function re-enables a disabled device. +The device will probe and attach if a suitable device driver is found. +.Pp +The +.Fn devctl_suspend +function suspends a device. +This may include placing the device in a reduced power state, +but any device driver currently attached to the device will remain attached. +.Pp +The +.Fn devctl_resume +function resumes a suspended device to a fully working state. +.Pp +The +.Fn devctl_set_driver +function attaches a device driver named +.Fa driver +to a device. +If the device is already attached and +.Fa force +is false, +the request will fail. +If the device is already attached and +.Fa force +is true, +the device will be detached from its current device driver before it is +attached to the new device driver. +.Sh RETURN VALUES +.Rv -std devctl_attach devctl_detach devctl_disable devctl_enable \ +devctl_suspend devctl_resume devctl_set_driver +.Sh ERRORS +In addition to specific errors noted below, +all of the +.Nm +functions may fail for any of the errors described in +.Xr open 2 +as well as: +.Bl -tag -width Er +.It Bq Er EINVAL +The device name is too long. +.It Bq Er ENOENT +No existing device matches the specified name or location. +.It Bq Er EPERM +The current process is not permitted to adjust the state of +.Fa device . +.El +.Pp +The +.Fn devctl_attach +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The device is already attached. +.It Bq Er ENOMEM +An internal memory allocation request failed. +.It Bq Er ENXIO +The device is disabled. +.It Bq Er ENXIO +No suitable driver for the device could be found, +or the driver failed to attach. +.El +.Pp +The +.Fn devctl_detach +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The current device driver for +.Fa device +is busy and cannot detach at this time. +Note that some drivers may return this even if +.Fa force +is true. +.It Bq Er ENXIO +The device is not attached to a driver. +.It Bq Er ENXIO +The current device driver for +.Fa device +does not support detaching. +.El +.Pp +The +.Fn devctl_enable +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The device is already enabled. +.It Bq Er ENOMEM +An internal memory allocation request failed. +.It Bq Er ENXIO +No suitable driver for the device could be found, +or the driver failed to attach. +.El +.Pp +The +.Fn devctl_disable +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The current device driver for +.Fa device +is busy and cannot detach at this time. +Note that some drivers may return this even if +.Fa force_detach +is true. +.It Bq Er ENXIO +The device is already disabled. +.It Bq Er ENXIO +The current device driver for +.Fa device +does not support detaching. +.El +.Pp +The +.Fn devctl_suspend +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The device is already suspended. +.It Bq Er EINVAL +The device to be suspended is the root bus device. +.El +.Pp +The +.Fn devctl_resume +function may fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The device is not suspended. +.It Bq Er EINVAL +The device to be resumed is the root bus device. +.El +.Pp +The +.Fn devctl_set_driver +function may fail if: +.Bl -tag -width Er +.It Bq Er EBUSY +The device is currently attached to a device driver and +.Fa force +is false. +.It Bq Er EBUSY +The current device driver for +.Fa device +is busy and cannot detach at this time. +.It Bq Er EFAULT +The +.Fa driver +argument points outside the process' allocated address space. +.It Bq Er ENOENT +No device driver with the requested name exists. +.It Bq Er ENOMEM +An internal memory allocation request failed. +.It Bq Er ENXIO +The device is disabled. +.It Bq Er ENXIO +The new device driver failed to attach. +.El +.Sh SEE ALSO +.Xr devinfo 3 , +.Xr devstat 3 , +.Xr devctl 8 +.Sh HISTORY +The +.Nm +library first appeared in +.Fx 11.0 . +.Sh BUGS +If a device is suspended individually via +.Fn devctl_suspend +and the entire machine is subsequently suspended, +the device will be resumed when the machine resumes. Added: head/lib/libdevctl/devctl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libdevctl/devctl.c Fri Feb 6 16:09:01 2015 (r278320) @@ -0,0 +1,124 @@ +/*- + * Copyright (c) 2014 John Baldwin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include "devctl.h" + +static int +devctl_request(u_long cmd, struct devreq *req) +{ + static int devctl2_fd = -1; + + if (devctl2_fd == -1) { + devctl2_fd = open("/dev/devctl2", O_RDONLY); + if (devctl2_fd == -1) + return (-1); + } + return (ioctl(devctl2_fd, cmd, req)); +} + +static int +devctl_simple_request(u_long cmd, const char *name, int flags) +{ + struct devreq req; + + memset(&req, 0, sizeof(req)); + if (strlcpy(req.dr_name, name, sizeof(req.dr_name)) >= + sizeof(req.dr_name)) { + errno = EINVAL; + return (-1); + } + req.dr_flags = flags; + return (devctl_request(cmd, &req)); +} + +int +devctl_attach(const char *device) +{ + + return (devctl_simple_request(DEV_ATTACH, device, 0)); +} + +int +devctl_detach(const char *device, bool force) +{ + + return (devctl_simple_request(DEV_DETACH, device, force ? + DEVF_FORCE_DETACH : 0)); +} + +int +devctl_enable(const char *device) +{ + + return (devctl_simple_request(DEV_ENABLE, device, 0)); +} + +int +devctl_disable(const char *device, bool force_detach) +{ + + return (devctl_simple_request(DEV_DISABLE, device, force_detach ? + DEVF_FORCE_DETACH : 0)); +} + +int +devctl_suspend(const char *device) +{ + + return (devctl_simple_request(DEV_SUSPEND, device, 0)); +} + +int +devctl_resume(const char *device) +{ + + return (devctl_simple_request(DEV_RESUME, device, 0)); +} + +int +devctl_set_driver(const char *device, const char *driver, bool force) +{ + struct devreq req; + + memset(&req, 0, sizeof(req)); + if (strlcpy(req.dr_name, device, sizeof(req.dr_name)) >= + sizeof(req.dr_name)) { + errno = EINVAL; + return (-1); + } + req.dr_data = __DECONST(char *, driver); + if (force) + req.dr_flags |= DEVF_SET_DRIVER_DETACH; + return (devctl_request(DEV_SET_DRIVER, &req)); +} Added: head/lib/libdevctl/devctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libdevctl/devctl.h Fri Feb 6 16:09:01 2015 (r278320) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2014 John Baldwin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef __DEVCTL_H__ +#define __DEVCTL_H__ + +#include + +int devctl_attach(const char *device); +int devctl_detach(const char *device, bool force); +int devctl_enable(const char *device); +int devctl_disable(const char *device, bool force_detach); +int devctl_suspend(const char *device); +int devctl_resume(const char *device); +int devctl_set_driver(const char *device, const char *driver, bool force); + +#endif /* !__DEVCTL_H__ */ Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Fri Feb 6 15:53:13 2015 (r278319) +++ head/share/mk/bsd.libnames.mk Fri Feb 6 16:09:01 2015 (r278320) @@ -39,6 +39,7 @@ LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt. LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a +LIBDEVCTL?= ${DESTDIR}${LIBDIR}/libdevctl.a LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Fri Feb 6 15:53:13 2015 (r278319) +++ head/share/mk/src.libnames.mk Fri Feb 6 16:09:01 2015 (r278320) @@ -72,6 +72,7 @@ _LIBRARIES= \ ctf \ cuse \ cxxrt \ + devctl \ devinfo \ devstat \ dialog \ Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Fri Feb 6 15:53:13 2015 (r278319) +++ head/sys/dev/acpica/acpi.c Fri Feb 6 16:09:01 2015 (r278320) @@ -101,6 +101,7 @@ int acpi_quirks; /* Supported sleep states. */ static BOOLEAN acpi_sleep_states[ACPI_S_STATE_COUNT]; +static void acpi_lookup(void *arg, const char *name, device_t *dev); static int acpi_modevent(struct module *mod, int event, void *junk); static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); @@ -671,8 +672,10 @@ acpi_attach(device_t dev) /* Register ACPI again to pass the correct argument of pm_func. */ power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc); - if (!acpi_disabled("bus")) + if (!acpi_disabled("bus")) { + EVENTHANDLER_REGISTER(dev_lookup, acpi_lookup, NULL, 1000); acpi_probe_children(dev); + } /* Update all GPEs and enable runtime GPEs. */ status = AcpiUpdateAllGpes(); @@ -3401,6 +3404,31 @@ acpi_disabled(char *subsys) return (0); } +static void +acpi_lookup(void *arg, const char *name, device_t *dev) +{ + ACPI_HANDLE handle; + + if (*dev != NULL) + return; + + /* + * Allow any handle name that is specified as an absolute path and + * starts with '\'. We could restrict this to \_SB and friends, + * but see acpi_probe_children() for notes on why we scan the entire + * namespace for devices. + * + * XXX: The pathname argument to AcpiGetHandle() should be fixed to + * be const. + */ + if (name[0] != '\\') + return; + if (ACPI_FAILURE(AcpiGetHandle(ACPI_ROOT_OBJECT, __DECONST(char *, name), + &handle))) + return; + *dev = acpi_get_device(handle); +} + /* * Control interface. * Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Fri Feb 6 15:53:13 2015 (r278319) +++ head/sys/dev/pci/pci.c Fri Feb 6 16:09:01 2015 (r278320) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -4824,8 +4825,8 @@ pci_child_location_str_method(device_t d size_t buflen) { - snprintf(buf, buflen, "slot=%d function=%d", pci_get_slot(child), - pci_get_function(child)); + snprintf(buf, buflen, "pci%d:%d:%d:%d", pci_get_domain(child), + pci_get_bus(child), pci_get_slot(child), pci_get_function(child)); return (0); } @@ -4855,10 +4856,60 @@ pci_assign_interrupt_method(device_t dev cfg->intpin)); } +static void +pci_lookup(void *arg, const char *name, device_t *dev) +{ + long val; + char *end; + int domain, bus, slot, func; + + if (*dev != NULL) + return; + + /* + * Accept pciconf-style selectors of either pciD:B:S:F or + * pciB:S:F. In the latter case, the domain is assumed to + * be zero. + */ + if (strncmp(name, "pci", 3) != 0) + return; + val = strtol(name + 3, &end, 10); + if (val < 0 || val > INT_MAX || *end != ':') + return; + domain = val; + val = strtol(end + 1, &end, 10); + if (val < 0 || val > INT_MAX || *end != ':') + return; + bus = val; + val = strtol(end + 1, &end, 10); + if (val < 0 || val > INT_MAX) + return; + slot = val; + if (*end == ':') { + val = strtol(end + 1, &end, 10); + if (val < 0 || val > INT_MAX || *end != '\0') + return; + func = val; + } else if (*end == '\0') { + func = slot; + slot = bus; + bus = domain; + domain = 0; + } else + return; + + if (domain > PCI_DOMAINMAX || bus > PCI_BUSMAX || slot > PCI_SLOTMAX || + func > PCIE_ARI_FUNCMAX || (slot != 0 && func > PCI_FUNCMAX)) + return; + + *dev = pci_find_dbsf(domain, bus, slot, func); +} + static int pci_modevent(module_t mod, int what, void *arg) { static struct cdev *pci_cdev; + static eventhandler_tag tag; switch (what) { case MOD_LOAD: @@ -4867,9 +4918,13 @@ pci_modevent(module_t mod, int what, voi pci_cdev = make_dev(&pcicdev, 0, UID_ROOT, GID_WHEEL, 0644, "pci"); pci_load_vendor_data(); + tag = EVENTHANDLER_REGISTER(dev_lookup, pci_lookup, NULL, + 1000); break; case MOD_UNLOAD: + if (tag != NULL) + EVENTHANDLER_DEREGISTER(dev_lookup, tag); destroy_dev(pci_cdev); break; } Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Fri Feb 6 15:53:13 2015 (r278319) +++ head/sys/kern/subr_bus.c Fri Feb 6 16:09:01 2015 (r278320) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -139,6 +140,8 @@ struct device { static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc"); +static void devctl2_init(void); + #ifdef BUS_DEBUG static int bus_debug = 1; @@ -423,6 +426,7 @@ devinit(void) cv_init(&devsoftc.cv, "dev cv"); TAILQ_INIT(&devsoftc.devq); knlist_init_mtx(&devsoftc.sel.si_note, &devsoftc.mtx); + devctl2_init(); } static int @@ -2639,6 +2643,15 @@ device_is_attached(device_t dev) } /** + * @brief Return non-zero if the device is currently suspended. + */ +int +device_is_suspended(device_t dev) +{ + return ((dev->flags & DF_SUSPENDED) != 0); +} + +/** * @brief Set the devclass of a device * @see devclass_add_device(). */ @@ -5022,3 +5035,253 @@ bus_free_resource(device_t dev, int type return (0); return (bus_release_resource(dev, type, rman_get_rid(r), r)); } + +/* + * /dev/devctl2 implementation. The existing /dev/devctl device has + * implicit semantics on open, so it could not be reused for this. + * Another option would be to call this /dev/bus? + */ +static int +find_device(struct devreq *req, device_t *devp) +{ + device_t dev; + + /* + * First, ensure that the name is nul terminated. + */ + if (memchr(req->dr_name, '\0', sizeof(req->dr_name)) == NULL) + return (EINVAL); + + /* + * Second, try to find an attached device whose name matches + * 'name'. + */ + TAILQ_FOREACH(dev, &bus_data_devices, devlink) { + if (dev->nameunit != NULL && + strcmp(dev->nameunit, req->dr_name) == 0) { + *devp = dev; + return (0); + } + } + + /* Finally, give device enumerators a chance. */ + dev = NULL; + EVENTHANDLER_INVOKE(dev_lookup, req->dr_name, &dev); + if (dev == NULL) + return (ENOENT); + *devp = dev; + return (0); +} + +static bool +driver_exists(struct device *bus, const char *driver) +{ + devclass_t dc; + + for (dc = bus->devclass; dc != NULL; dc = dc->parent) { + if (devclass_find_driver_internal(dc, driver) != NULL) + return (true); + } + return (false); +} + +static int +devctl2_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, + struct thread *td) +{ + struct devreq *req; + device_t dev; + int error, old; + + /* Locate the device to control. */ + mtx_lock(&Giant); + req = (struct devreq *)data; + switch (cmd) { + case DEV_ATTACH: + case DEV_DETACH: + case DEV_ENABLE: + case DEV_DISABLE: + case DEV_SUSPEND: + case DEV_RESUME: + case DEV_SET_DRIVER: + error = priv_check(td, PRIV_DRIVER); + if (error == 0) + error = find_device(req, &dev); + break; + default: + error = ENOTTY; + break; + } + if (error) { + mtx_unlock(&Giant); + return (error); + } + + /* Perform the requested operation. */ + switch (cmd) { + case DEV_ATTACH: + if (device_is_attached(dev) && (dev->flags & DF_REBID) == 0) + error = EBUSY; + else if (!device_is_enabled(dev)) + error = ENXIO; + else + error = device_probe_and_attach(dev); + break; + case DEV_DETACH: + if (!device_is_attached(dev)) { + error = ENXIO; + break; + } + if (!(req->dr_flags & DEVF_FORCE_DETACH)) { + error = device_quiesce(dev); + if (error) + break; + } + error = device_detach(dev); + break; + case DEV_ENABLE: + if (device_is_enabled(dev)) { + error = EBUSY; + break; + } + + /* + * If the device has been probed but not attached (e.g. + * when it has been disabled by a loader hint), just + * attach the device rather than doing a full probe. + */ + device_enable(dev); + if (device_is_alive(dev)) { + /* + * If the device was disabled via a hint, clear + * the hint. + */ + if (resource_disabled(dev->driver->name, dev->unit)) + resource_unset_value(dev->driver->name, + dev->unit, "disabled"); + error = device_attach(dev); + } else + error = device_probe_and_attach(dev); + break; + case DEV_DISABLE: + if (!device_is_enabled(dev)) { + error = ENXIO; + break; + } + + if (!(req->dr_flags & DEVF_FORCE_DETACH)) { + error = device_quiesce(dev); + if (error) + break; + } + + /* + * Force DF_FIXEDCLASS on around detach to preserve + * the existing name. + */ + old = dev->flags; + dev->flags |= DF_FIXEDCLASS; + error = device_detach(dev); + if (!(old & DF_FIXEDCLASS)) + dev->flags &= ~DF_FIXEDCLASS; + if (error == 0) + device_disable(dev); + break; + case DEV_SUSPEND: + if (device_is_suspended(dev)) { + error = EBUSY; + break; + } + if (device_get_parent(dev) == NULL) { + error = EINVAL; + break; + } + error = BUS_SUSPEND_CHILD(device_get_parent(dev), dev); + break; + case DEV_RESUME: + if (!device_is_suspended(dev)) { + error = EINVAL; + break; + } + if (device_get_parent(dev) == NULL) { + error = EINVAL; + break; + } + error = BUS_RESUME_CHILD(device_get_parent(dev), dev); + break; + case DEV_SET_DRIVER: { + devclass_t dc; + char driver[128]; + + error = copyinstr(req->dr_data, driver, sizeof(driver), NULL); + if (error) + break; + if (driver[0] == '\0') { + error = EINVAL; + break; + } + if (dev->devclass != NULL && + strcmp(driver, dev->devclass->name) == 0) + /* XXX: Could possibly force DF_FIXEDCLASS on? */ + break; + + /* + * Scan drivers for this device's bus looking for at + * least one matching driver. + */ + if (dev->parent == NULL) { + error = EINVAL; + break; + } + if (!driver_exists(dev->parent, driver)) { + error = ENOENT; + break; + } + dc = devclass_create(driver); + if (dc == NULL) { + error = ENOMEM; + break; + } + + /* Detach device if necessary. */ + if (device_is_attached(dev)) { + if (req->dr_flags & DEVF_SET_DRIVER_DETACH) + error = device_detach(dev); + else + error = EBUSY; + if (error) + break; + } + + /* Clear any previously-fixed device class and unit. */ + if (dev->flags & DF_FIXEDCLASS) + devclass_delete_device(dev->devclass, dev); + dev->flags |= DF_WILDCARD; + dev->unit = -1; + + /* Force the new device class. */ + error = devclass_add_device(dc, dev); + if (error) + break; + dev->flags |= DF_FIXEDCLASS; + error = device_probe_and_attach(dev); + break; + } + } + mtx_unlock(&Giant); + return (error); +} + +static struct cdevsw devctl2_cdevsw = { + .d_version = D_VERSION, + .d_ioctl = devctl2_ioctl, + .d_name = "devctl2", +}; + +static void +devctl2_init(void) +{ + + make_dev_credf(MAKEDEV_ETERNAL, &devctl2_cdevsw, 0, NULL, + UID_ROOT, GID_WHEEL, 0600, "devctl2"); +} Modified: head/sys/kern/subr_hints.c ============================================================================== --- head/sys/kern/subr_hints.c Fri Feb 6 15:53:13 2015 (r278319) +++ head/sys/kern/subr_hints.c Fri Feb 6 16:09:01 2015 (r278320) @@ -461,3 +461,31 @@ resource_disabled(const char *name, int return (0); return (value); } + +/* + * Clear a value associated with a device by removing it from + * the kernel environment. This only removes a hint for an + * exact unit. + */ +int +resource_unset_value(const char *name, int unit, const char *resname) +{ + char varname[128]; + const char *retname, *retvalue; + int error, line; + size_t len; + + line = 0; + error = resource_find(&line, NULL, name, &unit, resname, NULL, + &retname, NULL, NULL, NULL, NULL, &retvalue); + if (error) + return (error); + + retname -= strlen("hint."); + len = retvalue - retname - 1; + if (len > sizeof(varname) - 1) + return (ENAMETOOLONG); + memcpy(varname, retname, len); + varname[len] = '\0'; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 16:45:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49FA87C9; Fri, 6 Feb 2015 16:45:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34C29BA0; Fri, 6 Feb 2015 16:45:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16GjCSw010259; Fri, 6 Feb 2015 16:45:12 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16GjBHI010251; Fri, 6 Feb 2015 16:45:11 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502061645.t16GjBHI010251@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Feb 2015 16:45:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278321 - head/sys/dev/ipmi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 16:45:12 -0000 Author: jhb Date: Fri Feb 6 16:45:10 2015 New Revision: 278321 URL: https://svnweb.freebsd.org/changeset/base/278321 Log: Use direct hardware access for internal requests for KCS and SMIC. In particular, updates to the watchdog should no longer sleep. - Add a new IPMI_IO_LOCK for low-level I/O access. Use this for kcs_polled_request() and smic_polled_request(). - Add a new backend callback "ipmi_driver_request" to handle a driver request. The new callback performs the request sychronously for KCS and SMIC. SSIF still defers the work to the worker thread since the worker thread sleeps during request processing anyway. - Allocate driver requests on the stack rather than using malloc(). Differential Revision: https://reviews.freebsd.org/D1723 Tested by: scottl MFC after: 2 weeks Modified: head/sys/dev/ipmi/ipmi.c head/sys/dev/ipmi/ipmi_kcs.c head/sys/dev/ipmi/ipmi_smic.c head/sys/dev/ipmi/ipmi_ssif.c head/sys/dev/ipmi/ipmivars.h Modified: head/sys/dev/ipmi/ipmi.c ============================================================================== --- head/sys/dev/ipmi/ipmi.c Fri Feb 6 16:09:01 2015 (r278320) +++ head/sys/dev/ipmi/ipmi.c Fri Feb 6 16:45:10 2015 (r278321) @@ -49,6 +49,23 @@ __FBSDID("$FreeBSD$"); #include #endif +/* + * Driver request structures are allocated on the stack via alloca() to + * avoid calling malloc(), especially for the watchdog handler. + * To avoid too much stack growth, a previously allocated structure can + * be reused via IPMI_INIT_DRIVER_REQUEST(), but the caller should ensure + * that there is adequate reply/request space in the original allocation. + */ +#define IPMI_INIT_DRIVER_REQUEST(req, addr, cmd, reqlen, replylen) \ + bzero((req), sizeof(struct ipmi_request)); \ + ipmi_init_request((req), NULL, 0, (addr), (cmd), (reqlen), (replylen)) + +#define IPMI_ALLOC_DRIVER_REQUEST(req, addr, cmd, reqlen, replylen) \ + (req) = __builtin_alloca(sizeof(struct ipmi_request) + \ + (reqlen) + (replylen)); \ + IPMI_INIT_DRIVER_REQUEST((req), (addr), (cmd), (reqlen), \ + (replylen)) + #ifdef IPMB static int ipmi_ipmb_checksum(u_char, int); static int ipmi_ipmb_send_message(device_t, u_char, u_char, u_char, @@ -181,8 +198,8 @@ ipmi_dtor(void *arg) */ dev->ipmi_closing = 1; while (dev->ipmi_requests > 0) { - msleep(&dev->ipmi_requests, &sc->ipmi_lock, PWAIT, - "ipmidrain", 0); + msleep(&dev->ipmi_requests, &sc->ipmi_requests_lock, + PWAIT, "ipmidrain", 0); ipmi_purge_completed_requests(dev); } } @@ -215,7 +232,7 @@ ipmi_ipmb_send_message(device_t dev, u_c u_char slave_addr = 0x52; int error; - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_SEND_MSG, data_len + 8, 0); req->ir_request[0] = channel; req->ir_request[1] = slave_addr; @@ -231,7 +248,6 @@ ipmi_ipmb_send_message(device_t dev, u_c ipmi_submit_driver_request(sc, req); error = req->ir_error; - ipmi_free_request(req); return (error); } @@ -243,7 +259,7 @@ ipmi_handle_attn(struct ipmi_softc *sc) int error; device_printf(sc->ipmi_dev, "BMC has a message\n"); - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_GET_MSG_FLAGS, 0, 1); ipmi_submit_driver_request(sc, req); @@ -257,9 +273,7 @@ ipmi_handle_attn(struct ipmi_softc *sc) "watchdog about to go off"); } if (req->ir_reply[0] & IPMI_MSG_AVAILABLE) { - ipmi_free_request(req); - - req = ipmi_alloc_driver_request( + IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_GET_MSG, 0, 16); @@ -268,7 +282,6 @@ ipmi_handle_attn(struct ipmi_softc *sc) } } error = req->ir_error; - ipmi_free_request(req); return (error); } @@ -478,15 +491,11 @@ ipmi_ioctl(struct cdev *cdev, u_long cmd * Request management. */ -/* Allocate a new request with request and reply buffers. */ -struct ipmi_request * -ipmi_alloc_request(struct ipmi_device *dev, long msgid, uint8_t addr, - uint8_t command, size_t requestlen, size_t replylen) +static __inline void +ipmi_init_request(struct ipmi_request *req, struct ipmi_device *dev, long msgid, + uint8_t addr, uint8_t command, size_t requestlen, size_t replylen) { - struct ipmi_request *req; - req = malloc(sizeof(struct ipmi_request) + requestlen + replylen, - M_IPMI, M_WAITOK | M_ZERO); req->ir_owner = dev; req->ir_msgid = msgid; req->ir_addr = addr; @@ -499,6 +508,18 @@ ipmi_alloc_request(struct ipmi_device *d req->ir_reply = (char *)&req[1] + requestlen; req->ir_replybuflen = replylen; } +} + +/* Allocate a new request with request and reply buffers. */ +struct ipmi_request * +ipmi_alloc_request(struct ipmi_device *dev, long msgid, uint8_t addr, + uint8_t command, size_t requestlen, size_t replylen) +{ + struct ipmi_request *req; + + req = malloc(sizeof(struct ipmi_request) + requestlen + replylen, + M_IPMI, M_WAITOK | M_ZERO); + ipmi_init_request(req, dev, msgid, addr, command, requestlen, replylen); return (req); } @@ -533,21 +554,13 @@ ipmi_complete_request(struct ipmi_softc } } -/* Enqueue an internal driver request and wait until it is completed. */ +/* Perform an internal driver request. */ int ipmi_submit_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo) { - int error; - IPMI_LOCK(sc); - error = sc->ipmi_enqueue_request(sc, req); - if (error == 0) - error = msleep(req, &sc->ipmi_lock, 0, "ipmireq", timo); - if (error == 0) - error = req->ir_error; - IPMI_UNLOCK(sc); - return (error); + return (sc->ipmi_driver_request(sc, req, timo)); } /* @@ -564,7 +577,7 @@ ipmi_dequeue_request(struct ipmi_softc * IPMI_LOCK_ASSERT(sc); while (!sc->ipmi_detaching && TAILQ_EMPTY(&sc->ipmi_pending_requests)) - cv_wait(&sc->ipmi_request_added, &sc->ipmi_lock); + cv_wait(&sc->ipmi_request_added, &sc->ipmi_requests_lock); if (sc->ipmi_detaching) return (NULL); @@ -598,7 +611,7 @@ ipmi_set_watchdog(struct ipmi_softc *sc, if (sec > 0xffff / 10) return (EINVAL); - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_SET_WDOG, 6, 0); if (sec) { @@ -622,9 +635,7 @@ ipmi_set_watchdog(struct ipmi_softc *sc, if (error) device_printf(sc->ipmi_dev, "Failed to set watchdog\n"); else if (sec) { - ipmi_free_request(req); - - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_RESET_WDOG, 0, 0); error = ipmi_submit_driver_request(sc, req, 0); @@ -633,7 +644,6 @@ ipmi_set_watchdog(struct ipmi_softc *sc, "Failed to reset watchdog\n"); } - ipmi_free_request(req); return (error); /* dump_watchdog(sc); @@ -680,7 +690,8 @@ ipmi_startup(void *arg) dev = sc->ipmi_dev; /* Initialize interface-independent state. */ - mtx_init(&sc->ipmi_lock, device_get_nameunit(dev), "ipmi", MTX_DEF); + mtx_init(&sc->ipmi_requests_lock, "ipmi requests", NULL, MTX_DEF); + mtx_init(&sc->ipmi_io_lock, "ipmi io", NULL, MTX_DEF); cv_init(&sc->ipmi_request_added, "ipmireq"); TAILQ_INIT(&sc->ipmi_pending_requests); @@ -693,28 +704,24 @@ ipmi_startup(void *arg) } /* Send a GET_DEVICE_ID request. */ - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_GET_DEVICE_ID, 0, 15); error = ipmi_submit_driver_request(sc, req, MAX_TIMEOUT); if (error == EWOULDBLOCK) { device_printf(dev, "Timed out waiting for GET_DEVICE_ID\n"); - ipmi_free_request(req); return; } else if (error) { device_printf(dev, "Failed GET_DEVICE_ID: %d\n", error); - ipmi_free_request(req); return; } else if (req->ir_compcode != 0) { device_printf(dev, "Bad completion code for GET_DEVICE_ID: %d\n", req->ir_compcode); - ipmi_free_request(req); return; } else if (req->ir_replylen < 5) { device_printf(dev, "Short reply for GET_DEVICE_ID: %d\n", req->ir_replylen); - ipmi_free_request(req); return; } @@ -724,9 +731,7 @@ ipmi_startup(void *arg) req->ir_reply[2] & 0x7f, req->ir_reply[3] >> 4, req->ir_reply[3] & 0x0f, req->ir_reply[4] & 0x0f, req->ir_reply[4] >> 4); - ipmi_free_request(req); - - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_CLEAR_FLAGS, 1, 0); ipmi_submit_driver_request(sc, req, 0); @@ -738,25 +743,21 @@ ipmi_startup(void *arg) if (req->ir_compcode == 0xc1) { device_printf(dev, "Clear flags illegal\n"); } - ipmi_free_request(req); for (i = 0; i < 8; i++) { - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_GET_CHANNEL_INFO, 1, 0); req->ir_request[0] = i; ipmi_submit_driver_request(sc, req, 0); - if (req->ir_compcode != 0) { - ipmi_free_request(req); + if (req->ir_compcode != 0) break; - } - ipmi_free_request(req); } device_printf(dev, "Number of channels %d\n", i); /* probe for watchdog */ - req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0), + IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0), IPMI_GET_WDOG, 0, 0); ipmi_submit_driver_request(sc, req, 0); @@ -767,7 +768,6 @@ ipmi_startup(void *arg) sc->ipmi_watchdog_tag = EVENTHANDLER_REGISTER(watchdog_list, ipmi_wd_event, sc, 0); } - ipmi_free_request(req); sc->ipmi_cdev = make_dev(&ipmi_cdevsw, device_get_unit(dev), UID_ROOT, GID_OPERATOR, 0660, "ipmi%d", device_get_unit(dev)); @@ -834,14 +834,16 @@ ipmi_detach(device_t dev) sc->ipmi_detaching = 1; if (sc->ipmi_kthread) { cv_broadcast(&sc->ipmi_request_added); - msleep(sc->ipmi_kthread, &sc->ipmi_lock, 0, "ipmi_wait", 0); + msleep(sc->ipmi_kthread, &sc->ipmi_requests_lock, 0, + "ipmi_wait", 0); } IPMI_UNLOCK(sc); if (sc->ipmi_irq) bus_teardown_intr(dev, sc->ipmi_irq_res, sc->ipmi_irq); ipmi_release_resources(dev); - mtx_destroy(&sc->ipmi_lock); + mtx_destroy(&sc->ipmi_io_lock); + mtx_destroy(&sc->ipmi_requests_lock); return (0); } Modified: head/sys/dev/ipmi/ipmi_kcs.c ============================================================================== --- head/sys/dev/ipmi/ipmi_kcs.c Fri Feb 6 16:09:01 2015 (r278320) +++ head/sys/dev/ipmi/ipmi_kcs.c Fri Feb 6 16:45:10 2015 (r278321) @@ -321,6 +321,8 @@ kcs_polled_request(struct ipmi_softc *sc u_char *cp, data; int i, state; + IPMI_IO_LOCK(sc); + /* Send the request. */ if (!kcs_start_write(sc)) { device_printf(sc->ipmi_dev, "KCS: Failed to start write\n"); @@ -444,6 +446,7 @@ kcs_polled_request(struct ipmi_softc *sc } i++; } + IPMI_IO_UNLOCK(sc); req->ir_replylen = i; #ifdef KCS_DEBUG device_printf(sc->ipmi_dev, "KCS: READ finished (%d bytes)\n", i); @@ -457,6 +460,7 @@ kcs_polled_request(struct ipmi_softc *sc return (1); fail: kcs_error(sc); + IPMI_IO_UNLOCK(sc); return (0); } @@ -492,6 +496,21 @@ kcs_startup(struct ipmi_softc *sc) device_get_nameunit(sc->ipmi_dev))); } +static int +kcs_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo) +{ + int i, ok; + + ok = 0; + for (i = 0; i < 3 && !ok; i++) + ok = kcs_polled_request(sc, req); + if (ok) + req->ir_error = 0; + else + req->ir_error = EIO; + return (req->ir_error); +} + int ipmi_kcs_attach(struct ipmi_softc *sc) { @@ -500,6 +519,7 @@ ipmi_kcs_attach(struct ipmi_softc *sc) /* Setup function pointers. */ sc->ipmi_startup = kcs_startup; sc->ipmi_enqueue_request = ipmi_polled_enqueue_request; + sc->ipmi_driver_request = kcs_driver_request; /* See if we can talk to the controller. */ status = INB(sc, KCS_CTL_STS); Modified: head/sys/dev/ipmi/ipmi_smic.c ============================================================================== --- head/sys/dev/ipmi/ipmi_smic.c Fri Feb 6 16:09:01 2015 (r278320) +++ head/sys/dev/ipmi/ipmi_smic.c Fri Feb 6 16:45:10 2015 (r278321) @@ -364,8 +364,11 @@ smic_loop(void *arg) while ((req = ipmi_dequeue_request(sc)) != NULL) { IPMI_UNLOCK(sc); ok = 0; - for (i = 0; i < 3 && !ok; i++) + for (i = 0; i < 3 && !ok; i++) { + IPMI_IO_LOCK(sc); ok = smic_polled_request(sc, req); + IPMI_IO_UNLOCK(sc); + } if (ok) req->ir_error = 0; else @@ -385,6 +388,24 @@ smic_startup(struct ipmi_softc *sc) "%s: smic", device_get_nameunit(sc->ipmi_dev))); } +static int +smic_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo) +{ + int i, ok; + + ok = 0; + for (i = 0; i < 3 && !ok; i++) { + IPMI_IO_LOCK(sc); + ok = smic_polled_request(sc, req); + IPMI_IO_UNLOCK(sc); + } + if (ok) + req->ir_error = 0; + else + req->ir_error = EIO; + return (req->ir_error); +} + int ipmi_smic_attach(struct ipmi_softc *sc) { @@ -393,6 +414,7 @@ ipmi_smic_attach(struct ipmi_softc *sc) /* Setup function pointers. */ sc->ipmi_startup = smic_startup; sc->ipmi_enqueue_request = ipmi_polled_enqueue_request; + sc->ipmi_driver_request = smic_driver_request; /* See if we can talk to the controller. */ flags = INB(sc, SMIC_FLAGS); Modified: head/sys/dev/ipmi/ipmi_ssif.c ============================================================================== --- head/sys/dev/ipmi/ipmi_ssif.c Fri Feb 6 16:09:01 2015 (r278320) +++ head/sys/dev/ipmi/ipmi_ssif.c Fri Feb 6 16:45:10 2015 (r278321) @@ -359,6 +359,22 @@ ssif_startup(struct ipmi_softc *sc) "%s: ssif", device_get_nameunit(sc->ipmi_dev))); } +static int +ssif_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo) +{ + int error; + + IPMI_LOCK(sc); + error = ipmi_polled_enqueue_request(sc, req); + if (error == 0) + error = msleep(req, &sc->ipmi_requests_lock, 0, "ipmireq", + timo); + if (error == 0) + error = req->ir_error; + IPMI_UNLOCK(sc); + return (error); +} + int ipmi_ssif_attach(struct ipmi_softc *sc, device_t smbus, int smbus_address) { @@ -370,6 +386,7 @@ ipmi_ssif_attach(struct ipmi_softc *sc, /* Setup function pointers. */ sc->ipmi_startup = ssif_startup; sc->ipmi_enqueue_request = ipmi_polled_enqueue_request; + sc->ipmi_driver_request = ssif_driver_request; return (0); } Modified: head/sys/dev/ipmi/ipmivars.h ============================================================================== --- head/sys/dev/ipmi/ipmivars.h Fri Feb 6 16:09:01 2015 (r278320) +++ head/sys/dev/ipmi/ipmivars.h Fri Feb 6 16:45:10 2015 (r278321) @@ -95,6 +95,7 @@ struct ipmi_softc { } _iface; int ipmi_io_rid; int ipmi_io_type; + struct mtx ipmi_io_lock; struct resource *ipmi_io_res[MAX_RES]; int ipmi_io_spacing; int ipmi_irq_rid; @@ -107,12 +108,13 @@ struct ipmi_softc { eventhandler_tag ipmi_watchdog_tag; int ipmi_watchdog_active; struct intr_config_hook ipmi_ich; - struct mtx ipmi_lock; + struct mtx ipmi_requests_lock; struct cv ipmi_request_added; struct proc *ipmi_kthread; driver_intr_t *ipmi_intr; int (*ipmi_startup)(struct ipmi_softc *); int (*ipmi_enqueue_request)(struct ipmi_softc *, struct ipmi_request *); + int (*ipmi_driver_request)(struct ipmi_softc *, struct ipmi_request *, int); }; #define ipmi_ssif_smbus_address _iface.ssif.smbus_address @@ -183,12 +185,13 @@ struct ipmi_ipmb { #define IPMI_ADDR(netfn, lun) ((netfn) << 2 | (lun)) #define IPMI_REPLY_ADDR(addr) ((addr) + 0x4) -#define IPMI_LOCK(sc) mtx_lock(&(sc)->ipmi_lock) -#define IPMI_UNLOCK(sc) mtx_unlock(&(sc)->ipmi_lock) -#define IPMI_LOCK_ASSERT(sc) mtx_assert(&(sc)->ipmi_lock, MA_OWNED) - -#define ipmi_alloc_driver_request(addr, cmd, reqlen, replylen) \ - ipmi_alloc_request(NULL, 0, (addr), (cmd), (reqlen), (replylen)) +#define IPMI_LOCK(sc) mtx_lock(&(sc)->ipmi_requests_lock) +#define IPMI_UNLOCK(sc) mtx_unlock(&(sc)->ipmi_requests_lock) +#define IPMI_LOCK_ASSERT(sc) mtx_assert(&(sc)->ipmi_requests_lock, MA_OWNED) + +#define IPMI_IO_LOCK(sc) mtx_lock(&(sc)->ipmi_io_lock) +#define IPMI_IO_UNLOCK(sc) mtx_unlock(&(sc)->ipmi_io_lock) +#define IPMI_IO_LOCK_ASSERT(sc) mtx_assert(&(sc)->ipmi_io_lock, MA_OWNED) #if __FreeBSD_version < 601105 #define bus_read_1(r, o) \ From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 17:01:53 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DAEFD95; Fri, 6 Feb 2015 17:01:53 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53E35DC6; Fri, 6 Feb 2015 17:01:53 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 15AEBB93A; Fri, 6 Feb 2015 12:01:52 -0500 (EST) From: John Baldwin To: src-committers@freebsd.org Subject: Re: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl Date: Fri, 06 Feb 2015 11:58:19 -0500 Message-ID: <61974401.Fd0kRqNeQd@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502061609.t16G92rn091851@svn.freebsd.org> References: <201502061609.t16G92rn091851@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 12:01:52 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 17:01:53 -0000 On Friday, February 06, 2015 04:09:02 PM John Baldwin wrote: > Author: jhb > Date: Fri Feb 6 16:09:01 2015 > New Revision: 278320 > URL: https://svnweb.freebsd.org/changeset/base/278320 > > Log: > Add a new device control utility for new-bus devices called devctl. This > allows the user to request administrative changes to individual devices > such as attach or detaching drivers or disabling and re-enabling devices. For now I would consider this somewhat experimental. Some bus drivers may not take kindly to device_detach/device_probe_and_attach being called (Hans mentioned USB as a likely candidate). Also, in theory you can use 'devctl suspend' to power off PCI devices you don't need, but most drivers probably don't expect to have to deal with user requests while suspended (e.g. I tested this by suspending hdac0 on a laptop, but I didn't try playing a sound to see if that blew up.. it would not surprise me if it did). There are also some other rough edges such as: 1) An administratively suspended device will resume if you do a system-wide suspend and resume. 2) There is no nice way for a driver to reject an administrative suspend request. It could fail its device_suspend method perhaps, but the driver can't easily tell if a suspend request is administrative or due to a system suspend. Perhaps we could re-use device_quiesce for this? Some other commands that might be nice to add would be "reset" (to do a bus- level reset of a device like PCI-e FLR), "rescan" (rescan the devices on a bus where that makes sense, e.g. on an individual PCI bus), and possibly "delete" (e.g. you could delete a PCI device and rescan the parent PCI bus to force PCI to re-probe from scratch.. useful if you are reprogramming an FPGA and need to change the BAR sizes, etc.) -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 17:01:54 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D22DD96; Fri, 6 Feb 2015 17:01:54 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1141CDC9; Fri, 6 Feb 2015 17:01:54 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 099B4B995; Fri, 6 Feb 2015 12:01:53 -0500 (EST) From: John Baldwin To: Ed Maste Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Fri, 06 Feb 2015 11:46:25 -0500 Message-ID: <2682030.eenkz7NQQh@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: References: <201502051138.t15BcUlj070663@svn.freebsd.org> <15908040.5vEeS6v7ok@ralph.baldwin.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 12:01:53 -0500 (EST) Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Garrett Cooper , NGie Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 17:01:54 -0000 On Friday, February 06, 2015 10:44:17 AM Ed Maste wrote: > On 6 February 2015 at 10:01, John Baldwin wrote: > > Using "legacy" for the brand new console driver we haven't even shipped as > > on- by-default in a release yet certainly seems a misnomer. Perhaps you > > mean something like VIDCONSOLE (to borrow loader's name), VIDEO_CONSOLE, > > or GRAPHICS_CONSOLE. > > I'm not sure why it was named LEGACY_CONSOLE. It was introduced prior > to the vt(4) work when syscons(4) was the only console. > > We should probably just eliminate it and build kbdcontrol, moused, > etc. if either MK_SYSCONS or MK_VT is set. Works for me. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 17:01:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B37F5EAE; Fri, 6 Feb 2015 17:01:56 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EA48DC7; Fri, 6 Feb 2015 17:01:53 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 75E49B91F; Fri, 6 Feb 2015 12:01:51 -0500 (EST) From: John Baldwin To: src-committers@freebsd.org Subject: Re: svn commit: r278321 - head/sys/dev/ipmi Date: Fri, 06 Feb 2015 12:00:02 -0500 Message-ID: <1747329.Lge6tErVCv@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502061645.t16GjBHI010251@svn.freebsd.org> References: <201502061645.t16GjBHI010251@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 12:01:51 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, wca@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 17:01:56 -0000 On Friday, February 06, 2015 04:45:11 PM John Baldwin wrote: > Author: jhb > Date: Fri Feb 6 16:45:10 2015 > New Revision: 278321 > URL: https://svnweb.freebsd.org/changeset/base/278321 > > Log: > Use direct hardware access for internal requests for KCS and SMIC. In > particular, updates to the watchdog should no longer sleep. > - Add a new IPMI_IO_LOCK for low-level I/O access. Use this for > kcs_polled_request() and smic_polled_request(). > - Add a new backend callback "ipmi_driver_request" to handle a driver > request. The new callback performs the request sychronously for KCS > and SMIC. SSIF still defers the work to the worker thread since the > worker thread sleeps during request processing anyway. > - Allocate driver requests on the stack rather than using malloc(). > > Differential Revision: https://reviews.freebsd.org/D1723 > Tested by: scottl > MFC after: 2 weeks I think we should further change this to only allow the watchdog to be used with KCS and SMIC so that watchdog requests never sleep. I think that we could then revert r272366 as to my knowledge this was the only watchdog driver that could sleep? -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 17:43:16 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D9B2D38; Fri, 6 Feb 2015 17:43:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 386552E4; Fri, 6 Feb 2015 17:43:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16HhGBj037913; Fri, 6 Feb 2015 17:43:16 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16HhEwf037906; Fri, 6 Feb 2015 17:43:14 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502061743.t16HhEwf037906@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 6 Feb 2015 17:43:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278322 - head/usr.sbin/ctld 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 17:43:16 -0000 Author: mav Date: Fri Feb 6 17:43:13 2015 New Revision: 278322 URL: https://svnweb.freebsd.org/changeset/base/278322 Log: Add support for multiple portal groups per target. This change allows multiple "portal-group" options to be specified per target. Each of them may include new optional auth-group name parameter to override per-target auth parameters for specific portal group. Kernel side support was added earlier at r278161. MFC after: 2 weeks Sponsored by: iXsystems, Inc. Modified: head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/discovery.c head/usr.sbin/ctld/kernel.c head/usr.sbin/ctld/login.c head/usr.sbin/ctld/parse.y Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/ctl.conf.5 Fri Feb 6 17:43:13 2015 (r278322) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 1, 2015 +.Dd February 6, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -66,7 +66,7 @@ file is: .No target Ar name { .Dl auth-group Ar name -.Dl portal-group Ar name +.Dl portal-group Ar name Op Ar agname .Dl lun Ar number Ar name .Dl lun Ar number No { .Dl path Ar path @@ -310,12 +310,15 @@ This clause is mutually exclusive with .Sy auth-group ; one cannot use both in a single target. -.It Ic portal-group Ar name +.It Ic portal-group Ar name Op Ar agname Assign a previously defined portal group to the target. The default portal group is .Qq Ar default , which makes the target available on TCP port 3260 on all configured IPv4 and IPv6 addresses. +Optional second argument specifies auth group name for connections +to this specific portal group. +If second argument is not specified, target auth group is used. .It Ic redirect Aq Ar address IPv4 or IPv6 address to redirect initiators to. When configured, all initiators attempting to connect to this target Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/ctld.c Fri Feb 6 17:43:13 2015 (r278322) @@ -91,6 +91,7 @@ conf_new(void) TAILQ_INIT(&conf->conf_luns); TAILQ_INIT(&conf->conf_targets); TAILQ_INIT(&conf->conf_auth_groups); + TAILQ_INIT(&conf->conf_ports); TAILQ_INIT(&conf->conf_portal_groups); TAILQ_INIT(&conf->conf_isns); @@ -124,6 +125,7 @@ conf_delete(struct conf *conf) portal_group_delete(pg); TAILQ_FOREACH_SAFE(is, &conf->conf_isns, i_next, istmp) isns_delete(is); + assert(TAILQ_EMPTY(&conf->conf_ports)); free(conf->conf_pidfile_path); free(conf); } @@ -609,6 +611,7 @@ portal_group_new(struct conf *conf, cons log_err(1, "calloc"); pg->pg_name = checked_strdup(name); TAILQ_INIT(&pg->pg_portals); + TAILQ_INIT(&pg->pg_ports); pg->pg_conf = conf; pg->pg_tag = 0; /* Assigned later in conf_apply(). */ TAILQ_INSERT_TAIL(&conf->conf_portal_groups, pg, pg_next); @@ -620,7 +623,10 @@ void portal_group_delete(struct portal_group *pg) { struct portal *portal, *tmp; + struct port *port, *tport; + TAILQ_FOREACH_SAFE(port, &pg->pg_ports, p_pgs, tport) + port_delete(port); TAILQ_REMOVE(&pg->pg_conf->conf_portal_groups, pg, pg_next); TAILQ_FOREACH_SAFE(portal, &pg->pg_portals, p_next, tmp) @@ -784,6 +790,7 @@ isns_do_register(struct isns *isns, int struct target *target; struct portal *portal; struct portal_group *pg; + struct port *port; struct isns_req *req; int res = 0; uint32_t error; @@ -807,11 +814,14 @@ isns_do_register(struct isns *isns, int isns_req_add_32(req, 33, 1); /* 1 -- Target*/ if (target->t_alias != NULL) isns_req_add_str(req, 34, target->t_alias); - pg = target->t_portal_group; - isns_req_add_32(req, 51, pg->pg_tag); - TAILQ_FOREACH(portal, &pg->pg_portals, p_next) { - isns_req_add_addr(req, 49, portal->p_ai); - isns_req_add_port(req, 50, portal->p_ai); + TAILQ_FOREACH(port, &target->t_ports, p_ts) { + if ((pg = port->p_portal_group) == NULL) + continue; + isns_req_add_32(req, 51, pg->pg_tag); + TAILQ_FOREACH(portal, &pg->pg_portals, p_next) { + isns_req_add_addr(req, 49, portal->p_ai); + isns_req_add_port(req, 50, portal->p_ai); + } } } res = isns_req_send(s, req); @@ -1123,6 +1133,68 @@ valid_iscsi_name(const char *name) return (true); } +struct port * +port_new(struct conf *conf, struct target *target, struct portal_group *pg) +{ + struct port *port; + + port = calloc(1, sizeof(*port)); + if (port == NULL) + log_err(1, "calloc"); + asprintf(&port->p_name, "%s-%s", pg->pg_name, target->t_name); + if (port_find(conf, port->p_name) != NULL) { + log_warnx("duplicate port \"%s\"", port->p_name); + free(port); + return (NULL); + } + port->p_conf = conf; + TAILQ_INSERT_TAIL(&conf->conf_ports, port, p_next); + TAILQ_INSERT_TAIL(&target->t_ports, port, p_ts); + port->p_target = target; + TAILQ_INSERT_TAIL(&pg->pg_ports, port, p_pgs); + port->p_portal_group = pg; + return (port); +} + +struct port * +port_find(const struct conf *conf, const char *name) +{ + struct port *port; + + TAILQ_FOREACH(port, &conf->conf_ports, p_next) { + if (strcasecmp(port->p_name, name) == 0) + return (port); + } + + return (NULL); +} + +struct port * +port_find_in_pg(const struct portal_group *pg, const char *target) +{ + struct port *port; + + TAILQ_FOREACH(port, &pg->pg_ports, p_pgs) { + if (strcasecmp(port->p_target->t_name, target) == 0) + return (port); + } + + return (NULL); +} + +void +port_delete(struct port *port) +{ + + if (port->p_portal_group) + TAILQ_REMOVE(&port->p_portal_group->pg_ports, port, p_pgs); + if (port->p_target) + TAILQ_REMOVE(&port->p_target->t_ports, port, p_ts); + TAILQ_REMOVE(&port->p_conf->conf_ports, port, p_next); + free(port->p_name); + free(port); +} + struct target * target_new(struct conf *conf, const char *name) { @@ -1151,6 +1223,7 @@ target_new(struct conf *conf, const char targ->t_name[i] = tolower(targ->t_name[i]); targ->t_conf = conf; + TAILQ_INIT(&targ->t_ports); TAILQ_INSERT_TAIL(&conf->conf_targets, targ, t_next); return (targ); @@ -1159,7 +1232,10 @@ target_new(struct conf *conf, const char void target_delete(struct target *targ) { + struct port *port, *tport; + TAILQ_FOREACH_SAFE(port, &targ->t_ports, p_ts, tport) + port_delete(port); TAILQ_REMOVE(&targ->t_conf->conf_targets, targ, t_next); free(targ->t_name); @@ -1196,13 +1272,6 @@ target_set_redirection(struct target *ta return (0); } -void -target_set_ctl_port(struct target *target, uint32_t value) -{ - - target->t_ctl_port = value; -} - struct lun * lun_new(struct conf *conf, const char *name) { @@ -1508,6 +1577,7 @@ conf_verify(struct conf *conf) { struct auth_group *ag; struct portal_group *pg; + struct port *port; struct target *targ; struct lun *lun; bool found; @@ -1527,10 +1597,10 @@ conf_verify(struct conf *conf) "default"); assert(targ->t_auth_group != NULL); } - if (targ->t_portal_group == NULL) { - targ->t_portal_group = portal_group_find(conf, - "default"); - assert(targ->t_portal_group != NULL); + if (TAILQ_EMPTY(&targ->t_ports)) { + pg = portal_group_find(conf, "default"); + assert(pg != NULL); + port_new(conf, targ, pg); } found = false; for (i = 0; i < MAX_LUNS; i++) { @@ -1558,20 +1628,14 @@ conf_verify(struct conf *conf) if (pg->pg_discovery_filter == PG_FILTER_UNKNOWN) pg->pg_discovery_filter = PG_FILTER_NONE; - TAILQ_FOREACH(targ, &conf->conf_targets, t_next) { - if (targ->t_portal_group == pg) - break; - } - if (pg->pg_redirection != NULL) { - if (targ != NULL) { + if (!TAILQ_EMPTY(&pg->pg_ports)) { + if (pg->pg_redirection != NULL) { log_debugx("portal-group \"%s\" assigned " - "to target \"%s\", but configured " + "to target, but configured " "for redirection", - pg->pg_name, targ->t_name); + pg->pg_name); } pg->pg_unassigned = false; - } else if (targ != NULL) { - pg->pg_unassigned = false; } else { if (strcmp(pg->pg_name, "default") != 0) log_warnx("portal-group \"%s\" not assigned " @@ -1592,6 +1656,12 @@ conf_verify(struct conf *conf) break; } } + TAILQ_FOREACH(port, &conf->conf_ports, p_next) { + if (port->p_auth_group == ag) { + found = true; + break; + } + } TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) { if (pg->pg_discovery_auth_group == ag) { found = true; @@ -1613,10 +1683,10 @@ conf_verify(struct conf *conf) static int conf_apply(struct conf *oldconf, struct conf *newconf) { - struct target *oldtarg, *newtarg, *tmptarg; struct lun *oldlun, *newlun, *tmplun; struct portal_group *oldpg, *newpg; struct portal *oldp, *newp; + struct port *oldport, *newport, *tmpport; struct isns *oldns, *newns; pid_t otherpid; int changed, cumulated_error = 0, error, sockbuf; @@ -1684,17 +1754,17 @@ conf_apply(struct conf *oldconf, struct * really happen, so leave it as it is for now. */ /* - * First, remove any targets present in the old configuration + * First, remove any ports present in the old configuration * and missing in the new one. */ - TAILQ_FOREACH_SAFE(oldtarg, &oldconf->conf_targets, t_next, tmptarg) { - newtarg = target_find(newconf, oldtarg->t_name); - if (newtarg != NULL) + TAILQ_FOREACH_SAFE(oldport, &oldconf->conf_ports, p_next, tmpport) { + newport = port_find(newconf, oldport->p_name); + if (newport != NULL) continue; - error = kernel_port_remove(oldtarg); + error = kernel_port_remove(oldport); if (error != 0) { - log_warnx("failed to remove target %s", - oldtarg->t_name); + log_warnx("failed to remove port %s", + oldport->p_name); /* * XXX: Uncomment after fixing the root cause. * @@ -1809,21 +1879,21 @@ conf_apply(struct conf *oldconf, struct } /* - * Now add new targets or modify existing ones. + * Now add new ports or modify existing ones. */ - TAILQ_FOREACH(newtarg, &newconf->conf_targets, t_next) { - oldtarg = target_find(oldconf, newtarg->t_name); + TAILQ_FOREACH(newport, &newconf->conf_ports, p_next) { + oldport = port_find(oldconf, newport->p_name); - if (oldtarg == NULL) - error = kernel_port_add(newtarg); - else { - target_set_ctl_port(newtarg, oldtarg->t_ctl_port); - error = kernel_port_update(newtarg); + if (oldport == NULL) { + error = kernel_port_add(newport); + } else { + newport->p_ctl_port = oldport->p_ctl_port; + error = kernel_port_update(newport); } if (error != 0) { - log_warnx("failed to %s target %s", - (oldtarg == NULL) ? "add" : "update", - newtarg->t_name); + log_warnx("failed to %s port %s", + (oldport == NULL) ? "add" : "update", + newport->p_name); /* * XXX: Uncomment after fixing the root cause. * Modified: head/usr.sbin/ctld/ctld.h ============================================================================== --- head/usr.sbin/ctld/ctld.h Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/ctld.h Fri Feb 6 17:43:13 2015 (r278322) @@ -119,11 +119,25 @@ struct portal_group { int pg_discovery_filter; bool pg_unassigned; TAILQ_HEAD(, portal) pg_portals; + TAILQ_HEAD(, port) pg_ports; char *pg_redirection; uint16_t pg_tag; }; +struct port { + TAILQ_ENTRY(port) p_next; + TAILQ_ENTRY(port) p_pgs; + TAILQ_ENTRY(port) p_ts; + struct conf *p_conf; + char *p_name; + struct auth_group *p_auth_group; + struct portal_group *p_portal_group; + struct target *p_target; + + uint32_t p_ctl_port; +}; + struct lun_option { TAILQ_ENTRY(lun_option) lo_next; struct lun *lo_lun; @@ -152,12 +166,10 @@ struct target { struct conf *t_conf; struct lun *t_luns[MAX_LUNS]; struct auth_group *t_auth_group; - struct portal_group *t_portal_group; + TAILQ_HEAD(, port) t_ports; char *t_name; char *t_alias; char *t_redirection; - - uint32_t t_ctl_port; }; struct isns { @@ -172,6 +184,7 @@ struct conf { TAILQ_HEAD(, lun) conf_luns; TAILQ_HEAD(, target) conf_targets; TAILQ_HEAD(, auth_group) conf_auth_groups; + TAILQ_HEAD(, port) conf_ports; TAILQ_HEAD(, portal_group) conf_portal_groups; TAILQ_HEAD(, isns) conf_isns; int conf_isns_period; @@ -199,6 +212,7 @@ struct conf { struct connection { struct portal *conn_portal; + struct port *conn_port; struct target *conn_target; int conn_socket; int conn_session_type; @@ -317,14 +331,19 @@ void isns_register(struct isns *isns, void isns_check(struct isns *isns); void isns_deregister(struct isns *isns); +struct port *port_new(struct conf *conf, struct target *target, + struct portal_group *pg); +struct port *port_find(const struct conf *conf, const char *name); +struct port *port_find_in_pg(const struct portal_group *pg, + const char *target); +void port_delete(struct port *port); + struct target *target_new(struct conf *conf, const char *name); void target_delete(struct target *target); struct target *target_find(struct conf *conf, const char *name); int target_set_redirection(struct target *target, const char *addr); -void target_set_ctl_port(struct target *target, - uint32_t value); struct lun *lun_new(struct conf *conf, const char *name); void lun_delete(struct lun *lun); @@ -351,9 +370,9 @@ int kernel_lun_add(struct lun *lun); int kernel_lun_resize(struct lun *lun); int kernel_lun_remove(struct lun *lun); void kernel_handoff(struct connection *conn); -int kernel_port_add(struct target *targ); -int kernel_port_update(struct target *targ); -int kernel_port_remove(struct target *targ); +int kernel_port_add(struct port *port); +int kernel_port_update(struct port *port); +int kernel_port_remove(struct port *port); void kernel_capsicate(void); #ifdef ICL_KERNEL_PROXY Modified: head/usr.sbin/ctld/discovery.c ============================================================================== --- head/usr.sbin/ctld/discovery.c Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/discovery.c Fri Feb 6 17:43:13 2015 (r278322) @@ -162,6 +162,7 @@ logout_new_response(struct pdu *request) static void discovery_add_target(struct keys *response_keys, const struct target *targ) { + struct port *port; struct portal *portal; char *buf; char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; @@ -169,7 +170,10 @@ discovery_add_target(struct keys *respon int ret; keys_add(response_keys, "TargetName", targ->t_name); - TAILQ_FOREACH(portal, &targ->t_portal_group->pg_portals, p_next) { + TAILQ_FOREACH(port, &targ->t_ports, p_ts) { + if (port->p_portal_group == NULL) + continue; + TAILQ_FOREACH(portal, &port->p_portal_group->pg_portals, p_next) { ai = portal->p_ai; ret = getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), @@ -183,13 +187,13 @@ discovery_add_target(struct keys *respon if (strcmp(hbuf, "0.0.0.0") == 0) continue; ret = asprintf(&buf, "%s:%s,%d", hbuf, sbuf, - targ->t_portal_group->pg_tag); + port->p_portal_group->pg_tag); break; case AF_INET6: if (strcmp(hbuf, "::") == 0) continue; ret = asprintf(&buf, "[%s]:%s,%d", hbuf, sbuf, - targ->t_portal_group->pg_tag); + port->p_portal_group->pg_tag); break; default: continue; @@ -198,19 +202,24 @@ discovery_add_target(struct keys *respon log_err(1, "asprintf"); keys_add(response_keys, "TargetAddress", buf); free(buf); + } } } static bool discovery_target_filtered_out(const struct connection *conn, - const struct target *targ) + const struct port *port) { const struct auth_group *ag; const struct portal_group *pg; + const struct target *targ; const struct auth *auth; int error; - ag = targ->t_auth_group; + targ = port->p_target; + ag = port->p_auth_group; + if (ag == NULL) + ag = targ->t_auth_group; pg = conn->conn_portal->p_portal_group; assert(pg->pg_discovery_auth_group != PG_FILTER_UNKNOWN); @@ -265,8 +274,8 @@ discovery(struct connection *conn) { struct pdu *request, *response; struct keys *request_keys, *response_keys; + const struct port *port; const struct portal_group *pg; - const struct target *targ; const char *send_targets; pg = conn->conn_portal->p_portal_group; @@ -284,29 +293,23 @@ discovery(struct connection *conn) response_keys = keys_new(); if (strcmp(send_targets, "All") == 0) { - TAILQ_FOREACH(targ, &pg->pg_conf->conf_targets, t_next) { - if (targ->t_portal_group != pg) { - log_debugx("not returning target \"%s\"; " - "belongs to a different portal group", - targ->t_name); - continue; - } - if (discovery_target_filtered_out(conn, targ)) { + TAILQ_FOREACH(port, &pg->pg_ports, p_pgs) { + if (discovery_target_filtered_out(conn, port)) { /* Ignore this target. */ continue; } - discovery_add_target(response_keys, targ); + discovery_add_target(response_keys, port->p_target); } } else { - targ = target_find(pg->pg_conf, send_targets); - if (targ == NULL) { + port = port_find_in_pg(pg, send_targets); + if (port == NULL) { log_debugx("initiator requested information on unknown " "target \"%s\"; returning nothing", send_targets); } else { - if (discovery_target_filtered_out(conn, targ)) { + if (discovery_target_filtered_out(conn, port)) { /* Ignore this target. */ } else { - discovery_add_target(response_keys, targ); + discovery_add_target(response_keys, port->p_target); } } } Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/kernel.c Fri Feb 6 17:43:13 2015 (r278322) @@ -121,9 +121,10 @@ struct cctl_lun { struct cctl_port { uint32_t port_id; - int cfiscsi_status; + int cfiscsi_state; char *cfiscsi_target; uint16_t cfiscsi_portal_group_tag; + char *ctld_portal_group_name; STAILQ_HEAD(,cctl_lun_nv) attr_list; STAILQ_ENTRY(cctl_port) links; }; @@ -332,10 +333,13 @@ cctl_end_pelement(void *user_data, const if (strcmp(name, "cfiscsi_target") == 0) { cur_port->cfiscsi_target = str; str = NULL; - } else if (strcmp(name, "cfiscsi_status") == 0) { - cur_port->cfiscsi_status = strtoul(str, NULL, 0); + } else if (strcmp(name, "cfiscsi_state") == 0) { + cur_port->cfiscsi_state = strtoul(str, NULL, 0); } else if (strcmp(name, "cfiscsi_portal_group_tag") == 0) { cur_port->cfiscsi_portal_group_tag = strtoul(str, NULL, 0); + } else if (strcmp(name, "ctld_portal_group_name") == 0) { + cur_port->ctld_portal_group_name = str; + str = NULL; } else if (strcmp(name, "targ_port") == 0) { devlist->cur_port = NULL; } else if (strcmp(name, "ctlportlist") == 0) { @@ -373,6 +377,8 @@ conf_new_from_kernel(void) { struct conf *conf = NULL; struct target *targ; + struct portal_group *pg; + struct port *cp; struct lun *cl; struct lun_option *lo; struct ctl_lun_list list; @@ -496,9 +502,9 @@ retry_port: "ignoring", (uintmax_t)port->port_id); continue; } - if (port->cfiscsi_status != 1) { + if (port->cfiscsi_state != 1) { log_debugx("CTL port %ju is not active (%d); ignoring", - (uintmax_t)port->port_id, port->cfiscsi_status); + (uintmax_t)port->port_id, port->cfiscsi_state); continue; } @@ -514,6 +520,28 @@ retry_port: continue; } } + + if (port->ctld_portal_group_name == NULL) + continue; + pg = portal_group_find(conf, port->ctld_portal_group_name); + if (pg == NULL) { +#if 0 + log_debugx("found new kernel portal group %s for CTL port %ld", + port->ctld_portal_group_name, port->port_id); +#endif + pg = portal_group_new(conf, port->ctld_portal_group_name); + if (pg == NULL) { + log_warnx("portal_group_new failed"); + continue; + } + } + pg->pg_tag = port->cfiscsi_portal_group_tag; + cp = port_new(conf, targ, pg); + if (cp == NULL) { + log_warnx("port_new failed"); + continue; + } + cp->p_ctl_port = port->port_id; } STAILQ_FOREACH(lun, &devlist.lun_list, links) { @@ -804,32 +832,34 @@ kernel_handoff(struct connection *conn) } int -kernel_port_add(struct target *targ) +kernel_port_add(struct port *port) { struct ctl_port_entry entry; struct ctl_req req; struct ctl_lun_map lm; + struct target *targ = port->p_target; + struct portal_group *pg = port->p_portal_group; char tagstr[16]; - int error, i; + int error, i, n; /* Create iSCSI port. */ bzero(&req, sizeof(req)); strlcpy(req.driver, "iscsi", sizeof(req.driver)); req.reqtype = CTL_REQ_CREATE; - req.num_args = 4; req.args = malloc(req.num_args * sizeof(*req.args)); - req.args[0].namelen = sizeof("port_id"); - req.args[0].name = __DECONST(char *, "port_id"); - req.args[0].vallen = sizeof(targ->t_ctl_port); - req.args[0].value = &targ->t_ctl_port; - req.args[0].flags = CTL_BEARG_WR; - str_arg(&req.args[1], "cfiscsi_target", targ->t_name); - snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag); - str_arg(&req.args[2], "cfiscsi_portal_group_tag", tagstr); + n = 0; + req.args[n].namelen = sizeof("port_id"); + req.args[n].name = __DECONST(char *, "port_id"); + req.args[n].vallen = sizeof(port->p_ctl_port); + req.args[n].value = &port->p_ctl_port; + req.args[n++].flags = CTL_BEARG_WR; + str_arg(&req.args[n++], "cfiscsi_target", targ->t_name); + snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); + str_arg(&req.args[n++], "cfiscsi_portal_group_tag", tagstr); if (targ->t_alias) - str_arg(&req.args[3], "cfiscsi_target_alias", targ->t_alias); - else - req.num_args--; + str_arg(&req.args[n++], "cfiscsi_target_alias", targ->t_alias); + str_arg(&req.args[n++], "ctld_portal_group_name", pg->pg_name); + req.num_args = n; error = ioctl(ctl_fd, CTL_PORT_REQ, &req); free(req.args); if (error != 0) { @@ -848,7 +878,7 @@ kernel_port_add(struct target *targ) } /* Explicitly enable mapping to block any access except allowed. */ - lm.port = targ->t_ctl_port; + lm.port = port->p_ctl_port; lm.plun = UINT32_MAX; lm.lun = 0; error = ioctl(ctl_fd, CTL_LUN_MAP, &lm); @@ -859,7 +889,7 @@ kernel_port_add(struct target *targ) for (i = 0; i < MAX_LUNS; i++) { if (targ->t_luns[i] == NULL) continue; - lm.port = targ->t_ctl_port; + lm.port = port->p_ctl_port; lm.plun = i; lm.lun = targ->t_luns[i]->l_ctl_lun; error = ioctl(ctl_fd, CTL_LUN_MAP, &lm); @@ -869,7 +899,7 @@ kernel_port_add(struct target *targ) /* Enable port */ bzero(&entry, sizeof(entry)); - entry.targ_port = targ->t_ctl_port; + entry.targ_port = port->p_ctl_port; error = ioctl(ctl_fd, CTL_ENABLE_PORT, &entry); if (error != 0) { log_warn("CTL_ENABLE_PORT ioctl failed"); @@ -880,14 +910,15 @@ kernel_port_add(struct target *targ) } int -kernel_port_update(struct target *targ) +kernel_port_update(struct port *port) { struct ctl_lun_map lm; + struct target *targ = port->p_target; int error, i; /* Map configured LUNs and unmap others */ for (i = 0; i < MAX_LUNS; i++) { - lm.port = targ->t_ctl_port; + lm.port = port->p_ctl_port; lm.plun = i; if (targ->t_luns[i] == NULL) lm.lun = UINT32_MAX; @@ -901,10 +932,12 @@ kernel_port_update(struct target *targ) } int -kernel_port_remove(struct target *targ) +kernel_port_remove(struct port *port) { struct ctl_req req; char tagstr[16]; + struct target *targ = port->p_target; + struct portal_group *pg = port->p_portal_group; int error; bzero(&req, sizeof(req)); @@ -913,7 +946,7 @@ kernel_port_remove(struct target *targ) req.num_args = 2; req.args = malloc(req.num_args * sizeof(*req.args)); str_arg(&req.args[0], "cfiscsi_target", targ->t_name); - snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag); + snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr); error = ioctl(ctl_fd, CTL_PORT_REQ, &req); Modified: head/usr.sbin/ctld/login.c ============================================================================== --- head/usr.sbin/ctld/login.c Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/login.c Fri Feb 6 17:43:13 2015 (r278322) @@ -827,19 +827,22 @@ login(struct connection *conn) log_errx(1, "received Login PDU without TargetName"); } - conn->conn_target = target_find(pg->pg_conf, target_name); - if (conn->conn_target == NULL) { + conn->conn_port = port_find_in_pg(pg, target_name); + if (conn->conn_port == NULL) { login_send_error(request, 0x02, 0x03); log_errx(1, "requested target \"%s\" not found", target_name); } + conn->conn_target = conn->conn_port->p_target; } /* * At this point we know what kind of authentication we need. */ if (conn->conn_session_type == CONN_SESSION_TYPE_NORMAL) { - ag = conn->conn_target->t_auth_group; + ag = conn->conn_port->p_auth_group; + if (ag == NULL) + ag = conn->conn_target->t_auth_group; if (ag->ag_name != NULL) { log_debugx("initiator requests to connect " "to target \"%s\"; auth-group \"%s\"", Modified: head/usr.sbin/ctld/parse.y ============================================================================== --- head/usr.sbin/ctld/parse.y Fri Feb 6 16:45:10 2015 (r278321) +++ head/usr.sbin/ctld/parse.y Fri Feb 6 17:43:13 2015 (r278322) @@ -652,21 +652,58 @@ target_initiator_portal: INITIATOR_PORTA } ; -target_portal_group: PORTAL_GROUP STR +target_portal_group: PORTAL_GROUP STR STR { - if (target->t_portal_group != NULL) { - log_warnx("portal-group for target \"%s\" " - "specified more than once", target->t_name); + struct portal_group *tpg; + struct auth_group *tag; + struct port *tp; + + tpg = portal_group_find(conf, $2); + if (tpg == NULL) { + log_warnx("unknown portal-group \"%s\" for target " + "\"%s\"", $2, target->t_name); free($2); + free($3); return (1); } - target->t_portal_group = portal_group_find(conf, $2); - if (target->t_portal_group == NULL) { + tag = auth_group_find(conf, $3); + if (tag == NULL) { + log_warnx("unknown auth-group \"%s\" for target " + "\"%s\"", $3, target->t_name); + free($2); + free($3); + return (1); + } + tp = port_new(conf, target, tpg); + if (tp == NULL) { + log_warnx("can't link portal-group \"%s\" to target " + "\"%s\"", $2, target->t_name); + free($2); + return (1); + } + tp->p_auth_group = tag; + free($2); + free($3); + } + | PORTAL_GROUP STR + { + struct portal_group *tpg; + struct port *tp; + + tpg = portal_group_find(conf, $2); + if (tpg == NULL) { log_warnx("unknown portal-group \"%s\" for target " "\"%s\"", $2, target->t_name); free($2); return (1); } + tp = port_new(conf, target, tpg); + if (tp == NULL) { + log_warnx("can't link portal-group \"%s\" to target " + "\"%s\"", $2, target->t_name); + free($2); + return (1); + } free($2); } ; From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 17:54:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CA3C35E; Fri, 6 Feb 2015 17:54:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1A27634; Fri, 6 Feb 2015 17:54:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16HstWc042760; Fri, 6 Feb 2015 17:54:55 GMT (envelope-from jamie@FreeBSD.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16HssXU042750; Fri, 6 Feb 2015 17:54:54 GMT (envelope-from jamie@FreeBSD.org) Message-Id: <201502061754.t16HssXU042750@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jamie set sender to jamie@FreeBSD.org using -f From: Jamie Gritton Date: Fri, 6 Feb 2015 17:54:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 17:54:56 -0000 Author: jamie Date: Fri Feb 6 17:54:53 2015 New Revision: 278323 URL: https://svnweb.freebsd.org/changeset/base/278323 Log: Add mount.procfs jail parameter, so procfs can be mounted when a prison's root is in its fstab. Also fix a typo while I'm at it. PR: 197237 197066 MFC after: 3 days Modified: head/etc/rc.d/jail head/usr.sbin/jail/command.c head/usr.sbin/jail/config.c head/usr.sbin/jail/jail.8 head/usr.sbin/jail/jail.c head/usr.sbin/jail/jailp.h Modified: head/etc/rc.d/jail ============================================================================== --- head/etc/rc.d/jail Fri Feb 6 17:43:13 2015 (r278322) +++ head/etc/rc.d/jail Fri Feb 6 17:54:53 2015 (r278323) @@ -28,7 +28,7 @@ extra_commands="config console status" need_dad_wait= -# extact_var jail name param num defval +# extract_var jail name param num defval # Extract value from ${jail_$jail_$name} or ${jail_$name} and # set it to $param. If not defined, $defval is used. # When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and @@ -233,8 +233,7 @@ parse_options() fi eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} if checkyesno jail_${_j}_procfs_enable; then - echo " mount += " \ - "\"procfs ${_rootdir%/}/proc procfs rw 0 0\";" + echo " mount.procfs;" fi eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}} Modified: head/usr.sbin/jail/command.c ============================================================================== --- head/usr.sbin/jail/command.c Fri Feb 6 17:43:13 2015 (r278322) +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 (r278323) @@ -112,6 +112,12 @@ next_command(struct cfjail *j) if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) continue; j->comstring = &dummystring; + break; + case IP_MOUNT_PROCFS: + if (!bool_param(j->intparams[IP_MOUNT_PROCFS])) + continue; + j->comstring = &dummystring; + break; case IP__OP: case IP_STOP_TIMEOUT: j->comstring = &dummystring; @@ -528,6 +534,32 @@ run_command(struct cfjail *j) } break; + case IP_MOUNT_PROCFS: + argv = alloca(7 * sizeof(char *)); + path = string_param(j->intparams[KP_PATH]); + if (path == NULL) { + jail_warnx(j, "mount.procfs: no path"); + return -1; + } + devpath = alloca(strlen(path) + 6); + sprintf(devpath, "%s/proc", path); + if (check_path(j, "mount.procfs", devpath, 0, + down ? "procfs" : NULL) < 0) + return -1; + if (down) { + argv[0] = "/sbin/umount"; + argv[1] = devpath; + argv[2] = NULL; + } else { + argv[0] = _PATH_MOUNT; + argv[1] = "-t"; + argv[2] = "procfs"; + argv[3] = "."; + argv[4] = devpath; + argv[5] = NULL; + } + break; + case IP_COMMAND: if (j->name != NULL) goto default_command; Modified: head/usr.sbin/jail/config.c ============================================================================== --- head/usr.sbin/jail/config.c Fri Feb 6 17:43:13 2015 (r278322) +++ head/usr.sbin/jail/config.c Fri Feb 6 17:54:53 2015 (r278323) @@ -84,6 +84,7 @@ static const struct ipspec intparams[] = [IP_MOUNT] = {"mount", PF_INTERNAL | PF_REV}, [IP_MOUNT_DEVFS] = {"mount.devfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_FDESCFS] = {"mount.fdescfs", PF_INTERNAL | PF_BOOL}, + [IP_MOUNT_PROCFS] = {"mount.procfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL}, [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT}, [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, Modified: head/usr.sbin/jail/jail.8 ============================================================================== --- head/usr.sbin/jail/jail.8 Fri Feb 6 17:43:13 2015 (r278322) +++ head/usr.sbin/jail/jail.8 Fri Feb 6 17:54:53 2015 (r278323) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 28, 2015 +.Dd February 6, 2015 .Dt JAIL 8 .Os .Sh NAME @@ -753,6 +753,12 @@ Mount a filesystem on the chrooted .Pa /dev/fd directory. +.It Va mount.procfs +Mount a +.Xr procfs 5 +filesystem on the chrooted +.Pa /proc +directory. .It Va allow.dying Allow making changes to a .Va dying @@ -1207,6 +1213,7 @@ environment of the first jail. .Xr jls 8 , .Xr mount 8 , .Xr named 8 , +.Xr procfs 5 , .Xr reboot 8 , .Xr rpcbind 8 , .Xr sendmail 8 , Modified: head/usr.sbin/jail/jail.c ============================================================================== --- head/usr.sbin/jail/jail.c Fri Feb 6 17:43:13 2015 (r278322) +++ head/usr.sbin/jail/jail.c Fri Feb 6 17:54:53 2015 (r278323) @@ -93,6 +93,7 @@ static const enum intparam startcommands IP__MOUNT_FROM_FSTAB, IP_MOUNT_DEVFS, IP_MOUNT_FDESCFS, + IP_MOUNT_PROCFS, IP_EXEC_PRESTART, IP__OP, IP_VNET_INTERFACE, @@ -109,6 +110,7 @@ static const enum intparam stopcommands[ IP_STOP_TIMEOUT, IP__OP, IP_EXEC_POSTSTOP, + IP_MOUNT_PROCFS, IP_MOUNT_FDESCFS, IP_MOUNT_DEVFS, IP__MOUNT_FROM_FSTAB, Modified: head/usr.sbin/jail/jailp.h ============================================================================== --- head/usr.sbin/jail/jailp.h Fri Feb 6 17:43:13 2015 (r278322) +++ head/usr.sbin/jail/jailp.h Fri Feb 6 17:54:53 2015 (r278323) @@ -96,6 +96,7 @@ enum intparam { IP_MOUNT, /* Mount points in fstab(5) form */ IP_MOUNT_DEVFS, /* Mount /dev under prison root */ IP_MOUNT_FDESCFS, /* Mount /dev/fd under prison root */ + IP_MOUNT_PROCFS, /* Mount /proc under prison root */ IP_MOUNT_FSTAB, /* A standard fstab(5) file */ IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */ IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 18:20:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D90AA61; Fri, 6 Feb 2015 18:20:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38CFB8B5; Fri, 6 Feb 2015 18:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16IK1vW052953; Fri, 6 Feb 2015 18:20:01 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16IK0w7052945; Fri, 6 Feb 2015 18:20:00 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502061820.t16IK0w7052945@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Feb 2015 18:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278325 - in head/sys: amd64/amd64 i386/i386 x86/x86 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 18:20:01 -0000 Author: jhb Date: Fri Feb 6 18:19:59 2015 New Revision: 278325 URL: https://svnweb.freebsd.org/changeset/base/278325 Log: Revert the IPI startup sequence to match what is described in the Intel Multiprocessor Specification v1.4. The Intel SDM claims that the INIT IPIs here are invalid, but other systems follow the MP spec instead. While here, fix the IPI wait routine to accept a timeout in microseconds instead of a raw spin count, and don't spin forever during AP startup. Instead, panic if a STARTUP IPI is not delivered after 20 us. PR: 196542 Differential Revision: https://reviews.freebsd.org/D1719 MFC after: 2 weeks Modified: head/sys/amd64/amd64/mp_machdep.c head/sys/i386/i386/mp_machdep.c head/sys/x86/x86/local_apic.c Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Fri Feb 6 18:13:29 2015 (r278324) +++ head/sys/amd64/amd64/mp_machdep.c Fri Feb 6 18:19:59 2015 (r278325) @@ -1065,14 +1065,27 @@ ipi_startup(int apic_id, int vector) { /* + * This attempts to follow the algorithm described in the + * Intel Multiprocessor Specification v1.4 in section B.4. + * For each IPI, we allow the local APIC ~20us to deliver the + * IPI. If that times out, we panic. + */ + + /* * first we do an INIT IPI: this INIT IPI might be run, resetting * and running the target CPU. OR this INIT IPI might be latched (P5 * bug), CPU waiting for STARTUP IPI. OR this INIT IPI might be * ignored. */ - lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_LEVEL | APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); - lapic_ipi_wait(-1); + lapic_ipi_wait(20); + + /* Explicitly deassert the INIT IPI. */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, + apic_id); + DELAY(10000); /* wait ~10mS */ /* @@ -1084,9 +1097,11 @@ ipi_startup(int apic_id, int vector) * will run. */ lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | - APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | vector, apic_id); - lapic_ipi_wait(-1); + if (!lapic_ipi_wait(20)) + panic("Failed to deliver first STARTUP IPI to APIC %d", + apic_id); DELAY(200); /* wait ~200uS */ /* @@ -1096,9 +1111,12 @@ ipi_startup(int apic_id, int vector) * recognized after hardware RESET or INIT IPI. */ lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | - APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | vector, apic_id); - lapic_ipi_wait(-1); + if (!lapic_ipi_wait(20)) + panic("Failed to deliver second STARTUP IPI to APIC %d", + apic_id); + DELAY(200); /* wait ~200uS */ } Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Fri Feb 6 18:13:29 2015 (r278324) +++ head/sys/i386/i386/mp_machdep.c Fri Feb 6 18:19:59 2015 (r278325) @@ -1138,14 +1138,27 @@ ipi_startup(int apic_id, int vector) { /* + * This attempts to follow the algorithm described in the + * Intel Multiprocessor Specification v1.4 in section B.4. + * For each IPI, we allow the local APIC ~20us to deliver the + * IPI. If that times out, we panic. + */ + + /* * first we do an INIT IPI: this INIT IPI might be run, resetting * and running the target CPU. OR this INIT IPI might be latched (P5 * bug), CPU waiting for STARTUP IPI. OR this INIT IPI might be * ignored. */ - lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_LEVEL | APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); - lapic_ipi_wait(-1); + lapic_ipi_wait(20); + + /* Explicitly deassert the INIT IPI. */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, + apic_id); + DELAY(10000); /* wait ~10mS */ /* @@ -1157,9 +1170,11 @@ ipi_startup(int apic_id, int vector) * will run. */ lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | - APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | vector, apic_id); - lapic_ipi_wait(-1); + if (!lapic_ipi_wait(20)) + panic("Failed to deliver first STARTUP IPI to APIC %d", + apic_id); DELAY(200); /* wait ~200uS */ /* @@ -1169,9 +1184,12 @@ ipi_startup(int apic_id, int vector) * recognized after hardware RESET or INIT IPI. */ lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | - APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | vector, apic_id); - lapic_ipi_wait(-1); + if (!lapic_ipi_wait(20)) + panic("Failed to deliver second STARTUP IPI to APIC %d", + apic_id); + DELAY(200); /* wait ~200uS */ } Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Fri Feb 6 18:13:29 2015 (r278324) +++ head/sys/x86/x86/local_apic.c Fri Feb 6 18:19:59 2015 (r278325) @@ -1452,22 +1452,22 @@ SYSINIT(apic_setup_io, SI_SUB_INTR, SI_O static int native_lapic_ipi_wait(int delay) { - int x, incr; + int x; /* - * Wait delay loops for IPI to be sent. This is highly bogus - * since this is sensitive to CPU clock speed. If delay is + * Wait delay microseconds for IPI to be sent. If delay is * -1, we wait forever. */ if (delay == -1) { - incr = 0; - delay = 1; - } else - incr = 1; - for (x = 0; x < delay; x += incr) { + while ((lapic->icr_lo & APIC_DELSTAT_MASK) != APIC_DELSTAT_IDLE) + ia32_pause(); + return (1); + } + + for (x = 0; x < delay; x += 5) { if ((lapic->icr_lo & APIC_DELSTAT_MASK) == APIC_DELSTAT_IDLE) return (1); - ia32_pause(); + DELAY(5); } return (0); } @@ -1501,9 +1501,9 @@ native_lapic_ipi_raw(register_t icrlo, u intr_restore(saveintr); } -#define BEFORE_SPIN 1000000 +#define BEFORE_SPIN 50000 #ifdef DETECT_DEADLOCK -#define AFTER_SPIN 1000 +#define AFTER_SPIN 50 #endif static void @@ -1514,7 +1514,7 @@ native_lapic_ipi_vectored(u_int vector, KASSERT((vector & ~APIC_VECTOR_MASK) == 0, ("%s: invalid vector %d", __func__, vector)); - icrlo = APIC_DESTMODE_PHY | APIC_TRIGMOD_EDGE; + icrlo = APIC_DESTMODE_PHY | APIC_TRIGMOD_EDGE | APIC_LEVEL_ASSERT; /* * IPI_STOP_HARD is just a "fake" vector used to send a NMI. @@ -1522,9 +1522,9 @@ native_lapic_ipi_vectored(u_int vector, * the vector. */ if (vector == IPI_STOP_HARD) - icrlo |= APIC_DELMODE_NMI | APIC_LEVEL_ASSERT; + icrlo |= APIC_DELMODE_NMI; else - icrlo |= vector | APIC_DELMODE_FIXED | APIC_LEVEL_DEASSERT; + icrlo |= vector | APIC_DELMODE_FIXED; destfield = 0; switch (dest) { case APIC_IPI_DEST_SELF: From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 19:29:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1631ADEF; Fri, 6 Feb 2015 19:29:24 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E44ABF8A; Fri, 6 Feb 2015 19:29:23 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 066A0B93A; Fri, 6 Feb 2015 14:29:23 -0500 (EST) From: John Baldwin To: src-committers@freebsd.org Subject: Re: svn commit: r278325 - in head/sys: amd64/amd64 i386/i386 x86/x86 Date: Fri, 06 Feb 2015 13:23:34 -0500 Message-ID: <3474953.fuLVXbEtbd@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502061820.t16IK0w7052945@svn.freebsd.org> References: <201502061820.t16IK0w7052945@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 14:29:23 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 19:29:24 -0000 On Friday, February 06, 2015 06:20:00 PM John Baldwin wrote: > Author: jhb > Date: Fri Feb 6 18:19:59 2015 > New Revision: 278325 > URL: https://svnweb.freebsd.org/changeset/base/278325 > > Log: > Revert the IPI startup sequence to match what is described in the > Intel Multiprocessor Specification v1.4. The Intel SDM claims that > the INIT IPIs here are invalid, but other systems follow the MP > spec instead. All of the breakage here is my fault. The original IPIs present in FreeBSD 3 and 4 followed the MP spec. However, the Intel SDM claims that some of the IPIs involved are invalid on modern hardware and doesn't use level trigger or a de-assert INIT in the reference code in the SDM. The SDM is what led me to change the initial INIT to edge trigger. One SDMism I did adopt here was to always set the interrupt asserted bit except in the special case of the INIT de-assert. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 19:41:24 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8B3C217; Fri, 6 Feb 2015 19:41:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 947501D7; Fri, 6 Feb 2015 19:41:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16JfO4h093989; Fri, 6 Feb 2015 19:41:24 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16JfO2f093985; Fri, 6 Feb 2015 19:41:24 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201502061941.t16JfO2f093985@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Feb 2015 19:41:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278327 - head/usr.bin/ktrdump 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 19:41:24 -0000 Author: jhb Date: Fri Feb 6 19:41:23 2015 New Revision: 278327 URL: https://svnweb.freebsd.org/changeset/base/278327 Log: Change ktrdump to use the more standard -M/-N flags to specify the path to a crash dump and kernel, respectively. The existing -m/-e flags are still supported for backwards compatiblity but are no longer documented. Requested by: np MFC after: 2 weeks Modified: head/usr.bin/ktrdump/ktrdump.8 head/usr.bin/ktrdump/ktrdump.c Modified: head/usr.bin/ktrdump/ktrdump.8 ============================================================================== --- head/usr.bin/ktrdump/ktrdump.8 Fri Feb 6 18:41:57 2015 (r278326) +++ head/usr.bin/ktrdump/ktrdump.8 Fri Feb 6 19:41:23 2015 (r278327) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2005 +.Dd February 6, 2015 .Dt KTRDUMP 8 .Os .Sh NAME @@ -34,9 +34,9 @@ .Sh SYNOPSIS .Nm .Op Fl cfqrtH -.Op Fl e Ar execfile .Op Fl i Ar ktrfile -.Op Fl m Ar corefile +.Op Fl M Ar core +.Op Fl N Ar system .Op Fl o Ar outfile .Sh DESCRIPTION The @@ -44,7 +44,7 @@ The utility is used to dump the contents of the kernel ktr trace buffer. .Pp The following options are available: -.Bl -tag -width ".Fl e Ar execfile" +.Bl -tag -width ".Fl i Ar ktrfile" .It Fl c Print the CPU number that each entry was logged from. .It Fl f @@ -61,11 +61,11 @@ Print the thread ID for each entry. File containing saved ktr trace events; for more information see the .Xr ktr 4 manual page. -.It Fl e Ar execfile +.It Fl N Ar system The kernel image to resolve symbols from. The default is the value returned via .Xr getbootfile 3 . -.It Fl m Ar corefile +.It Fl M Ar core The core file or memory image to read from. The default is .Pa /dev/mem . Modified: head/usr.bin/ktrdump/ktrdump.c ============================================================================== --- head/usr.bin/ktrdump/ktrdump.c Fri Feb 6 18:41:57 2015 (r278326) +++ head/usr.bin/ktrdump/ktrdump.c Fri Feb 6 19:41:23 2015 (r278327) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #define SBUFLEN 128 #define USAGE \ - "usage: ktrdump [-cfqrtH] [-e execfile] [-i ktrfile] [-m corefile] [-o outfile]\n" + "usage: ktrdump [-cfqrtH] [-i ktrfile] [-M core] [-N system] [-o outfile]\n" static void usage(void); @@ -59,9 +59,9 @@ static struct nlist nl[] = { }; static int cflag; -static int eflag; static int fflag; -static int mflag; +static int Mflag; +static int Nflag; static int qflag; static int rflag; static int tflag; @@ -103,16 +103,17 @@ main(int ac, char **av) * Parse commandline arguments. */ out = stdout; - while ((c = getopt(ac, av, "cfqrtHe:i:m:o:")) != -1) + while ((c = getopt(ac, av, "cfqrtHe:i:m:M:N:o:")) != -1) switch (c) { case 'c': cflag = 1; break; + case 'N': case 'e': if (strlcpy(execfile, optarg, sizeof(execfile)) >= sizeof(execfile)) errx(1, "%s: File name too long", optarg); - eflag = 1; + Nflag = 1; break; case 'f': fflag = 1; @@ -122,11 +123,12 @@ main(int ac, char **av) if ((in = open(optarg, O_RDONLY)) == -1) err(1, "%s", optarg); break; + case 'M': case 'm': if (strlcpy(corefile, optarg, sizeof(corefile)) >= sizeof(corefile)) errx(1, "%s: File name too long", optarg); - mflag = 1; + Mflag = 1; break; case 'o': if ((out = fopen(optarg, "w")) == NULL) @@ -157,8 +159,8 @@ main(int ac, char **av) * Open our execfile and corefile, resolve needed symbols and read in * the trace buffer. */ - if ((kd = kvm_openfiles(eflag ? execfile : NULL, - mflag ? corefile : NULL, NULL, O_RDONLY, errbuf)) == NULL) + if ((kd = kvm_openfiles(Nflag ? execfile : NULL, + Mflag ? corefile : NULL, NULL, O_RDONLY, errbuf)) == NULL) errx(1, "%s", errbuf); if (kvm_nlist(kd, nl) != 0 || kvm_read(kd, nl[0].n_value, &version, sizeof(version)) == -1) From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 20:20:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E0A8E2; Fri, 6 Feb 2015 20:20:21 +0000 (UTC) Received: from frv25.fwdcdn.com (frv25.fwdcdn.com [212.42.77.25]) by mx1.freebsd.org (Postfix) with ESMTP id DEFDC7D4; Fri, 6 Feb 2015 20:20:20 +0000 (UTC) Received: from [10.10.14.27] (helo=frv27.fwdcdn.com) by frv25.fwdcdn.com QID:1YJp2i-0000T3-Cr/RC:4; Fri, 06 Feb 2015 21:58:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=LvQ5WHgbI0KVNYwNNFmeeDv7wVroz7JCe/W01GUzIT4=; b=Gr4xlytFaqr3MO4cecZX5NJXsaMOwLIOy3QS0ulTplto6g0PEDiWcD8bL0FDnTtOW15HXK0xpGoFQ7btiulWCV4uhNXn4nxy2De8GOaGsWOJXkxUwG9NzmgSrYJgSipTAqKukZKGwJf3gbAer3/fZack3f3KCpqDQ9kTQR/DgKU=; Received: from [178.137.225.182] (helo=nonamehost.local) by frv27.fwdcdn.com with esmtpsa ID 1YJp2Z-000E4K-N5 ; Fri, 06 Feb 2015 21:58:11 +0200 Date: Fri, 6 Feb 2015 21:58:10 +0200 From: Ivan Klymenko To: John Baldwin Subject: Re: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl Message-ID: <20150206215810.532ce926@nonamehost.local> In-Reply-To: <201502061609.t16G92rn091851@svn.freebsd.org> References: <201502061609.t16G92rn091851@svn.freebsd.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=178.137.225.182; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net X-Ukrnet-Yellow: 0 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 20:20:21 -0000 =D0=92 Fri, 6 Feb 2015 16:09:02 +0000 (UTC) John Baldwin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Author: jhb > Date: Fri Feb 6 16:09:01 2015 > New Revision: 278320 > URL: https://svnweb.freebsd.org/changeset/base/278320 >=20 > Log: > Add a new device control utility for new-bus devices called > devctl. This allows the user to request administrative changes to > individual devices such as attach or detaching drivers or disabling > and re-enabling devices. > - Add a new /dev/devctl2 character device which uses ioctls for > device requests. The ioctls use a common 'struct devreq' which is > somewhat similar to 'struct ifreq'. > - The ioctls identify the device to operate on via a string. This > string can either by the device's name, or it can be a > bus-specific address. (For unattached devices, a bus address is the > only way to locate a device.) Bus drivers register an eventhandler > to claim unrecognized device names that the driver recognizes as a > valid address. Two buses currently support addresses: ACPI recognizes > any device in the ACPI namespace via its full path starting with "\" > and the PCI bus driver recognizes an address specification of > 'pci[:]::' (identical to the PCI selector > strings supported by pciconf). > - To make it easier to cut and paste, change the PnP location string > in the PCI bus driver to output a full PCI selector string rather > than 'slot=3D function=3D'. > - Add a devctl(3) interface in libdevctl which provides a wrapper > around the ioctls and is the preferred interface for other userland > code. > - Add a devctl(8) program which is a simple wrapper around the > requests supported by devctl(3). > - Add a device_is_suspended() function to check DF_SUSPENDED. > - Add a resource_unset_value() function that can be used to remove a > hint from the kernel environment. This is used to clear a > hint...disabled hint when re-enabling a boot-time > disabled device. > =20 > Reviewed by: imp (parts) > Requested by: imp (changing PCI location string) > Relnotes: yes >=20 > Added: > head/lib/libdevctl/ > head/lib/libdevctl/Makefile (contents, props changed) > head/lib/libdevctl/devctl.3 (contents, props changed) > head/lib/libdevctl/devctl.c (contents, props changed) > head/lib/libdevctl/devctl.h (contents, props changed) > head/usr.sbin/devctl/ > head/usr.sbin/devctl/Makefile (contents, props changed) > head/usr.sbin/devctl/devctl.8 (contents, props changed) > head/usr.sbin/devctl/devctl.c (contents, props changed) > Modified: > head/contrib/mdocml/lib.in > head/lib/Makefile > head/share/mk/bsd.libnames.mk > head/share/mk/src.libnames.mk > head/sys/dev/acpica/acpi.c > head/sys/dev/pci/pci.c > head/sys/kern/subr_bus.c > head/sys/kern/subr_hints.c > head/sys/sys/bus.h > head/usr.sbin/Makefile >=20 > Modified: head/contrib/mdocml/lib.in ... --- alias_dummy.o --- /usr/local/libexec/ccache/world/cc -target x86_64-unknown-freebsd11.0 -O2 = -pipe -mmmx -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -mavx -mae= s -mpclmul -march=3Dnative -std=3Dgnu99 -fstack-protector -Wsystem-headers= -Werror -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused= -const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parenthese= s-equality -Wno-unused-function -Wno-enum-conversion -Wno-switch -Wno-switc= h-enum -Wno-knr-promoted-parameter -Wno-parentheses -Qunused-arguments -c /= usr/src/lib/libalias/modules/dummy/../../../../sys/netinet/libalias/alias_d= ummy.c -o alias_dummy.o --- libalias_dummy.so --- building shared library libalias_dummy.so --- all_subdir_libdevctl --- /usr/src/lib/libdevctl/devctl.c:38:35: error: declaration of 'struct devreq= ' will not be visible outside of this function [-Werror,-Wvisibility] devctl_request(u_long cmd, struct devreq *req) ^ /usr/src/lib/libdevctl/devctl.c:47:10: error: implicit declaration of funct= ion 'ioctl' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return (ioctl(devctl2_fd, cmd, req)); ^ /usr/src/lib/libdevctl/devctl.c:53:16: error: variable has incomplete type = 'struct devreq' struct devreq req; ^ /usr/src/lib/libdevctl/devctl.c:53:9: note: forward declaration of 'struct = devreq' struct devreq req; ^ /usr/src/lib/libdevctl/devctl.c:69:32: error: use of undeclared identifier = 'DEV_ATTACH' return (devctl_simple_request(DEV_ATTACH, device, 0)); ^ /usr/src/lib/libdevctl/devctl.c:76:32: error: use of undeclared identifier = 'DEV_DETACH' return (devctl_simple_request(DEV_DETACH, device, force ? ^ /usr/src/lib/libdevctl/devctl.c:77:6: error: use of undeclared identifier '= DEVF_FORCE_DETACH' DEVF_FORCE_DETACH : 0)); ^ /usr/src/lib/libdevctl/devctl.c:84:32: error: use of undeclared identifier = 'DEV_ENABLE' return (devctl_simple_request(DEV_ENABLE, device, 0)); ^ /usr/src/lib/libdevctl/devctl.c:91:32: error: use of undeclared identifier = 'DEV_DISABLE' return (devctl_simple_request(DEV_DISABLE, device, force_detach ? ^ /usr/src/lib/libdevctl/devctl.c:92:6: error: use of undeclared identifier '= DEVF_FORCE_DETACH' DEVF_FORCE_DETACH : 0)); ^ /usr/src/lib/libdevctl/devctl.c:99:32: error: use of undeclared identifier = 'DEV_SUSPEND' return (devctl_simple_request(DEV_SUSPEND, device, 0)); ^ /usr/src/lib/libdevctl/devctl.c:106:32: error: use of undeclared identifier= 'DEV_RESUME' return (devctl_simple_request(DEV_RESUME, device, 0)); ^ /usr/src/lib/libdevctl/devctl.c:112:16: error: variable has incomplete type= 'struct devreq' struct devreq req; ^ /usr/src/lib/libdevctl/devctl.c:112:9: note: forward declaration of 'struct= devreq' struct devreq req; ^ /usr/src/lib/libdevctl/devctl.c:122:19: error: use of undeclared identifier= 'DEVF_SET_DRIVER_DETACH' req.dr_flags |=3D DEVF_SET_DRIVER_DETACH; ^ /usr/src/lib/libdevctl/devctl.c:123:25: error: use of undeclared identifier= 'DEV_SET_DRIVER' return (devctl_request(DEV_SET_DRIVER, &req)); ^ 14 errors generated. *** [devctl.So] Error code 1 make[5]: stopped in /usr/src/lib/libdevctl 1 error make[5]: stopped in /usr/src/lib/libdevctl *** [all_subdir_libdevctl] Error code 2 make[4]: stopped in /usr/src/lib --- all_subdir_libcompat --- A failure has been detected in another branch of the parallel make make[5]: stopped in /usr/src/lib/libcompat *** [all_subdir_libcompat] Error code 2 make[4]: stopped in /usr/src/lib --- all_subdir_libalias --- A failure has been detected in another branch of the parallel make make[7]: stopped in /usr/src/lib/libalias/modules/dummy *** [_sub.all] Error code 2 make[6]: stopped in /usr/src/lib/libalias/modules 1 error make[6]: stopped in /usr/src/lib/libalias/modules *** [_sub.all] Error code 2 make[5]: stopped in /usr/src/lib/libalias 1 error make[5]: stopped in /usr/src/lib/libalias *** [all_subdir_libalias] Error code 2 make[4]: stopped in /usr/src/lib --- all_subdir_libbsm --- A failure has been detected in another branch of the parallel make make[5]: stopped in /usr/src/lib/libbsm *** [all_subdir_libbsm] Error code 2 make[4]: stopped in /usr/src/lib 4 errors make[4]: stopped in /usr/src/lib A failure has been detected in another branch of the parallel make make[3]: stopped in /usr/src *** [libraries] Error code 2 make[2]: stopped in /usr/src 1 error make[2]: stopped in /usr/src *** [_libraries] Error code 2 make[1]: stopped in /usr/src 1 error make[1]: stopped in /usr/src *** [buildworld] Error code 2 make: stopped in /usr/src 1 error make: stopped in /usr/src root@nonamehost:/usr/src #=20 From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 20:31:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCD3936F; Fri, 6 Feb 2015 20:31:17 +0000 (UTC) Received: from mail-pa0-x235.google.com (mail-pa0-x235.google.com [IPv6:2607:f8b0:400e:c03::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85F2E966; Fri, 6 Feb 2015 20:31:17 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id lf10so11949470pab.12; Fri, 06 Feb 2015 12:31:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:from:subject:date:to; bh=101a08xnIKsfXTjF6rcW/4w7VJM0s04PZnwEYoIJrCw=; b=aLb2RIknEjkUDYehrTmgD8mRZVpNHgwy2ICp+CGBpvzHrnYCpTUMOqUOywJNQKt1kB eBSL15JAEe+/cllOSZiMDh4T062v8eGSR74znmFW0VXelZy29erl0Hf/+cvQ4kPDw4NL kimauzDq/7+3S6vwuqF3rQzllGS26ZS/RpwbaD+s0ExDaQFheOCjzzfi6sOJH1UaeCnr YG75og9bRw/1uUgOvarj28l1gbjPKg48dYCiXxXw9ru2U8N3iJphPzziYHFUm7KT6Lue tXs9RMfdTCr8Pucgrhz2pnB42s8gBw0xkn4VHB2YvCAyIBqRmZlz3mB8l9vTVjPm9Yvm 5tMg== X-Received: by 10.69.1.7 with SMTP id bc7mr8491248pbd.121.1423254677134; Fri, 06 Feb 2015 12:31:17 -0800 (PST) Received: from [192.168.20.11] (c-98-247-240-204.hsd1.wa.comcast.net. [98.247.240.204]) by mx.google.com with ESMTPSA id s7sm8930573pdj.22.2015.02.06.12.31.13 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 12:31:16 -0800 (PST) References: <201502051138.t15BcUlj070663@svn.freebsd.org> <15908040.5vEeS6v7ok@ralph.baldwin.cx> <2682030.eenkz7NQQh@ralph.baldwin.cx> Mime-Version: 1.0 (1.0) In-Reply-To: <2682030.eenkz7NQQh@ralph.baldwin.cx> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: X-Mailer: iPhone Mail (12B466) From: Garrett Cooper Subject: Re: svn commit: r278249 - head/etc/rc.d Date: Fri, 6 Feb 2015 12:31:08 -0800 To: John Baldwin Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Ed Maste , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 20:31:17 -0000 > On Feb 6, 2015, at 08:46, John Baldwin wrote: >=20 >> On Friday, February 06, 2015 10:44:17 AM Ed Maste wrote: >>> On 6 February 2015 at 10:01, John Baldwin wrote: >>> Using "legacy" for the brand new console driver we haven't even shipped a= s >>> on- by-default in a release yet certainly seems a misnomer. Perhaps you= >>> mean something like VIDCONSOLE (to borrow loader's name), VIDEO_CONSOLE,= >>> or GRAPHICS_CONSOLE. >>=20 >> I'm not sure why it was named LEGACY_CONSOLE. It was introduced prior >> to the vt(4) work when syscons(4) was the only console. >>=20 >> We should probably just eliminate it and build kbdcontrol, moused, >> etc. if either MK_SYSCONS or MK_VT is set. >=20 > Works for me. I'll put a change out for CR that includes an UPDATING entry for clarity on t= he new naming scheme. Thanks for the input!= From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 20:46:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07DABA2A; Fri, 6 Feb 2015 20:46:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7E72AD9; Fri, 6 Feb 2015 20:46:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16KklZO023736; Fri, 6 Feb 2015 20:46:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16KklRW023735; Fri, 6 Feb 2015 20:46:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502062046.t16KklRW023735@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 6 Feb 2015 20:46:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278329 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 20:46:48 -0000 Author: ngie Date: Fri Feb 6 20:46:46 2015 New Revision: 278329 URL: https://svnweb.freebsd.org/changeset/base/278329 Log: Document WITNESS_COUNT and WITNESS_NO_VNODE Reviewed by: bcr, kib Differential Revision: D1789 MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/share/man/man4/witness.4 Modified: head/share/man/man4/witness.4 ============================================================================== --- head/share/man/man4/witness.4 Fri Feb 6 19:44:26 2015 (r278328) +++ head/share/man/man4/witness.4 Fri Feb 6 20:46:46 2015 (r278329) @@ -32,7 +32,9 @@ .Nd lock validation facility .Sh SYNOPSIS .Cd options WITNESS +.Cd options WITNESS_COUNT .Cd options WITNESS_KDB +.Cd options WITNESS_NO_VNODE .Cd options WITNESS_SKIPSPIN .Sh DESCRIPTION The @@ -56,6 +58,28 @@ does not recurse on a non-recursive lock or attempt an upgrade on a shared lock held by another thread. If any of these checks fail, then the kernel will panic. .Pp +The +.Dv WITNESS_COUNT +kernel option controls the maximum number of +.Xr witness 4 +entries that are tracked in the kernel. +The maximum number of entries can be queried via the +.Va debug.witness.count +sysctl. +It can also be set from the +.Xr loader 8 +via the +.Va debug.witness.count +environment variable. +.Pp +The +.Dv WITNESS_NO_VNODE +kernel option tells +.Xr witness 4 +to ignore locking issues between +.Xr vnode 9 +objects. +.Pp The flag that controls whether or not the kernel debugger is entered when a lock order violation is detected can be set in a variety of ways. By default, the flag is off, but if the From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 20:52:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75EE4CE5; Fri, 6 Feb 2015 20:52:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6218DC1E; Fri, 6 Feb 2015 20:52:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16Kq2GG027934; Fri, 6 Feb 2015 20:52:02 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16Kq2e1027933; Fri, 6 Feb 2015 20:52:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502062052.t16Kq2e1027933@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 6 Feb 2015 20:52:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278330 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 20:52:02 -0000 Author: ngie Date: Fri Feb 6 20:52:01 2015 New Revision: 278330 URL: https://svnweb.freebsd.org/changeset/base/278330 Log: Bump .Dd per r278329 Modified: head/share/man/man4/witness.4 Modified: head/share/man/man4/witness.4 ============================================================================== --- head/share/man/man4/witness.4 Fri Feb 6 20:46:46 2015 (r278329) +++ head/share/man/man4/witness.4 Fri Feb 6 20:52:01 2015 (r278330) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 30, 2012 +.Dd February 6, 2015 .Dt WITNESS 4 .Os .Sh NAME From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 21:03:29 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57B42D4; Fri, 6 Feb 2015 21:03:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42696D3A; Fri, 6 Feb 2015 21:03:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16L3TrE032945; Fri, 6 Feb 2015 21:03:29 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16L3Qke032931; Fri, 6 Feb 2015 21:03:26 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502062103.t16L3Qke032931@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Fri, 6 Feb 2015 21:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278331 - in head: sys/cam/ctl usr.sbin/ctladm usr.sbin/ctld 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 21:03:29 -0000 Author: trasz Date: Fri Feb 6 21:03:25 2015 New Revision: 278331 URL: https://svnweb.freebsd.org/changeset/base/278331 Log: Make it possible to set (via ctl.conf(5)) and query (via ctladm islist -v) target iSCSI offload. Add mechanism to query maximum receive data segment size supported by chosen hardware offload module, and use it in ctld(8) to determine the value to advertise to the other side. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_ioctl.h head/usr.sbin/ctladm/ctladm.c head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/kernel.c head/usr.sbin/ctld/login.c head/usr.sbin/ctld/parse.y head/usr.sbin/ctld/token.l Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Fri Feb 6 20:52:01 2015 (r278330) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Fri Feb 6 21:03:25 2015 (r278331) @@ -1222,7 +1222,7 @@ cfiscsi_session_unregister_initiator(str } static struct cfiscsi_session * -cfiscsi_session_new(struct cfiscsi_softc *softc) +cfiscsi_session_new(struct cfiscsi_softc *softc, const char *offload) { struct cfiscsi_session *cs; int error; @@ -1242,7 +1242,11 @@ cfiscsi_session_new(struct cfiscsi_softc cv_init(&cs->cs_login_cv, "cfiscsi_login"); #endif - cs->cs_conn = icl_new_conn(NULL, "cfiscsi", &cs->cs_lock); + cs->cs_conn = icl_new_conn(offload, "cfiscsi", &cs->cs_lock); + if (cs->cs_conn == NULL) { + free(cs, M_CFISCSI); + return (NULL); + } cs->cs_conn->ic_receive = cfiscsi_receive_callback; cs->cs_conn->ic_error = cfiscsi_error_callback; cs->cs_conn->ic_prv0 = cs; @@ -1325,7 +1329,7 @@ cfiscsi_accept(struct socket *so, struct { struct cfiscsi_session *cs; - cs = cfiscsi_session_new(&cfiscsi_softc); + cs = cfiscsi_session_new(&cfiscsi_softc, NULL); if (cs == NULL) { CFISCSI_WARN("failed to create session"); return; @@ -1469,7 +1473,7 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi * mtx_unlock(&cfiscsi_softc.lock); } else { #endif - cs = cfiscsi_session_new(softc); + cs = cfiscsi_session_new(softc, cihp->offload); if (cs == NULL) { ci->status = CTL_ISCSI_ERROR; snprintf(ci->error_str, sizeof(ci->error_str), @@ -1620,6 +1624,7 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) "%zd" "%d" "%d" + "%s" "\n", cs->cs_id, cs->cs_initiator_name, cs->cs_initiator_addr, cs->cs_initiator_alias, @@ -1629,7 +1634,8 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) cs->cs_conn->ic_data_crc32c ? "CRC32C" : "None", cs->cs_max_data_segment_length, cs->cs_immediate_data, - cs->cs_conn->ic_iser); + cs->cs_conn->ic_iser, + cs->cs_conn->ic_offload); if (error != 0) break; } @@ -1749,6 +1755,26 @@ cfiscsi_ioctl_logout(struct ctl_iscsi *c ci->status = CTL_ISCSI_OK; } +static void +cfiscsi_ioctl_limits(struct ctl_iscsi *ci) +{ + struct ctl_iscsi_limits_params *cilp; + int error; + + cilp = (struct ctl_iscsi_limits_params *)&(ci->data); + + error = icl_limits(cilp->offload, &cilp->data_segment_limit); + if (error != 0) { + ci->status = CTL_ISCSI_ERROR; + snprintf(ci->error_str, sizeof(ci->error_str), + "%s: icl_limits failed with error %d", + __func__, error); + return; + } + + ci->status = CTL_ISCSI_OK; +} + #ifdef ICL_KERNEL_PROXY static void cfiscsi_ioctl_listen(struct ctl_iscsi *ci) @@ -2176,6 +2202,9 @@ cfiscsi_ioctl(struct cdev *dev, case CTL_ISCSI_LOGOUT: cfiscsi_ioctl_logout(ci); break; + case CTL_ISCSI_LIMITS: + cfiscsi_ioctl_limits(ci); + break; #ifdef ICL_KERNEL_PROXY case CTL_ISCSI_LISTEN: cfiscsi_ioctl_listen(ci); Modified: head/sys/cam/ctl/ctl_ioctl.h ============================================================================== --- head/sys/cam/ctl/ctl_ioctl.h Fri Feb 6 20:52:01 2015 (r278330) +++ head/sys/cam/ctl/ctl_ioctl.h Fri Feb 6 21:03:25 2015 (r278331) @@ -657,6 +657,7 @@ typedef enum { CTL_ISCSI_LIST, CTL_ISCSI_LOGOUT, CTL_ISCSI_TERMINATE, + CTL_ISCSI_LIMITS, #if defined(ICL_KERNEL_PROXY) || 1 /* * We actually need those in all cases, but leave the ICL_KERNEL_PROXY, @@ -677,6 +678,7 @@ typedef enum { #define CTL_ISCSI_NAME_LEN 224 /* 223 bytes, by RFC 3720, + '\0' */ #define CTL_ISCSI_ADDR_LEN 47 /* INET6_ADDRSTRLEN + '\0' */ #define CTL_ISCSI_ALIAS_LEN 128 /* Arbitrary. */ +#define CTL_ISCSI_OFFLOAD_LEN 8 /* Arbitrary. */ struct ctl_iscsi_handoff_params { char initiator_name[CTL_ISCSI_NAME_LEN]; @@ -698,11 +700,12 @@ struct ctl_iscsi_handoff_params { uint32_t max_burst_length; uint32_t first_burst_length; uint32_t immediate_data; + char offload[CTL_ISCSI_OFFLOAD_LEN]; #ifdef ICL_KERNEL_PROXY int connection_id; - int spare[3]; + int spare[1]; #else - int spare[4]; + int spare[2]; #endif }; @@ -733,6 +736,14 @@ struct ctl_iscsi_terminate_params { int spare[4]; }; +struct ctl_iscsi_limits_params { + char offload[CTL_ISCSI_OFFLOAD_LEN]; + /* passed to kernel */ + size_t data_segment_limit; + /* passed to userland */ + int spare[4]; +}; + #ifdef ICL_KERNEL_PROXY struct ctl_iscsi_listen_params { int iser; @@ -780,6 +791,7 @@ union ctl_iscsi_data { struct ctl_iscsi_list_params list; struct ctl_iscsi_logout_params logout; struct ctl_iscsi_terminate_params terminate; + struct ctl_iscsi_limits_params limits; #ifdef ICL_KERNEL_PROXY struct ctl_iscsi_listen_params listen; struct ctl_iscsi_accept_params accept; Modified: head/usr.sbin/ctladm/ctladm.c ============================================================================== --- head/usr.sbin/ctladm/ctladm.c Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctladm/ctladm.c Fri Feb 6 21:03:25 2015 (r278331) @@ -3439,6 +3439,7 @@ struct cctl_islist_conn { char *header_digest; char *data_digest; char *max_data_segment_length;; + char *offload;; int immediate_data; int iser; STAILQ_ENTRY(cctl_islist_conn) links; @@ -3552,6 +3553,9 @@ cctl_islist_end_element(void *user_data, } else if (strcmp(name, "max_data_segment_length") == 0) { cur_conn->max_data_segment_length = str; str = NULL; + } else if (strcmp(name, "offload") == 0) { + cur_conn->offload = str; + str = NULL; } else if (strcmp(name, "immediate_data") == 0) { cur_conn->immediate_data = atoi(str); } else if (strcmp(name, "iser") == 0) { @@ -3672,6 +3676,7 @@ retry: printf("DataSegmentLen: %s\n", conn->max_data_segment_length); printf("ImmediateData: %s\n", conn->immediate_data ? "Yes" : "No"); printf("iSER (RDMA): %s\n", conn->iser ? "Yes" : "No"); + printf("Offload driver: %s\n", conn->offload); printf("\n"); } } else { Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/ctl.conf.5 Fri Feb 6 21:03:25 2015 (r278331) @@ -310,6 +310,8 @@ This clause is mutually exclusive with .Sy auth-group ; one cannot use both in a single target. +.It Ic offload Ar driver +Define iSCSI hardware offload driver to use for this target. .It Ic portal-group Ar name Op Ar agname Assign a previously defined portal group to the target. The default portal group is Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/ctld.c Fri Feb 6 21:03:25 2015 (r278331) @@ -1272,6 +1272,22 @@ target_set_redirection(struct target *ta return (0); } +int +target_set_offload(struct target *target, const char *offload) +{ + + if (target->t_offload != NULL) { + log_warnx("cannot set offload to \"%s\" for " + "target \"%s\"; already defined", + offload, target->t_name); + return (1); + } + + target->t_offload = checked_strdup(offload); + + return (0); +} + struct lun * lun_new(struct conf *conf, const char *name) { @@ -1514,6 +1530,8 @@ conf_print(struct conf *conf) fprintf(stderr, "target %s {\n", targ->t_name); if (targ->t_alias != NULL) fprintf(stderr, "\t alias %s\n", targ->t_alias); + if (targ->t_offload != NULL) + fprintf(stderr, "\t offload %s\n", targ->t_offload); fprintf(stderr, "}\n"); } } Modified: head/usr.sbin/ctld/ctld.h ============================================================================== --- head/usr.sbin/ctld/ctld.h Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/ctld.h Fri Feb 6 21:03:25 2015 (r278331) @@ -169,6 +169,7 @@ struct target { TAILQ_HEAD(, port) t_ports; char *t_name; char *t_alias; + char *t_offload; char *t_redirection; }; @@ -223,6 +224,7 @@ struct connection { struct sockaddr_storage conn_initiator_sa; uint32_t conn_cmdsn; uint32_t conn_statsn; + size_t conn_data_segment_limit; size_t conn_max_data_segment_length; size_t conn_max_burst_length; int conn_immediate_data; @@ -344,6 +346,8 @@ struct target *target_find(struct conf const char *name); int target_set_redirection(struct target *target, const char *addr); +int target_set_offload(struct target *target, + const char *offload); struct lun *lun_new(struct conf *conf, const char *name); void lun_delete(struct lun *lun); @@ -370,6 +374,8 @@ int kernel_lun_add(struct lun *lun); int kernel_lun_resize(struct lun *lun); int kernel_lun_remove(struct lun *lun); void kernel_handoff(struct connection *conn); +void kernel_limits(const char *offload, + size_t *max_data_segment_length); int kernel_port_add(struct port *port); int kernel_port_update(struct port *port); int kernel_port_remove(struct port *port); Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/kernel.c Fri Feb 6 21:03:25 2015 (r278331) @@ -799,6 +799,10 @@ kernel_handoff(struct connection *conn) sizeof(req.data.handoff.initiator_isid)); strlcpy(req.data.handoff.target_name, conn->conn_target->t_name, sizeof(req.data.handoff.target_name)); + if (conn->conn_target->t_offload != NULL) { + strlcpy(req.data.handoff.offload, + conn->conn_target->t_offload, sizeof(req.data.handoff.offload)); + } #ifdef ICL_KERNEL_PROXY if (proxy_mode) req.data.handoff.connection_id = conn->conn_socket; @@ -831,6 +835,39 @@ kernel_handoff(struct connection *conn) } } +void +kernel_limits(const char *offload, size_t *max_data_segment_length) +{ + struct ctl_iscsi req; + + bzero(&req, sizeof(req)); + + req.type = CTL_ISCSI_LIMITS; + if (offload != NULL) { + strlcpy(req.data.limits.offload, offload, + sizeof(req.data.limits.offload)); + } + + if (ioctl(ctl_fd, CTL_ISCSI, &req) == -1) { + log_err(1, "error issuing CTL_ISCSI ioctl; " + "dropping connection"); + } + + if (req.status != CTL_ISCSI_OK) { + log_errx(1, "error returned from CTL iSCSI limits request: " + "%s; dropping connection", req.error_str); + } + + *max_data_segment_length = req.data.limits.data_segment_limit; + if (offload != NULL) { + log_debugx("MaxRecvDataSegment kernel limit for offload " + "\"%s\" is %zd", offload, *max_data_segment_length); + } else { + log_debugx("MaxRecvDataSegment kernel limit is %zd", + *max_data_segment_length); + } +} + int kernel_port_add(struct port *port) { Modified: head/usr.sbin/ctld/login.c ============================================================================== --- head/usr.sbin/ctld/login.c Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/login.c Fri Feb 6 21:03:25 2015 (r278331) @@ -453,7 +453,8 @@ static void login_negotiate_key(struct pdu *request, const char *name, const char *value, bool skipped_security, struct keys *response_keys) { - int which, tmp; + int which; + size_t tmp; struct connection *conn; conn = request->pdu_connection; @@ -552,13 +553,13 @@ login_negotiate_key(struct pdu *request, log_errx(1, "received invalid " "MaxRecvDataSegmentLength"); } - if (tmp > MAX_DATA_SEGMENT_LENGTH) { + if (tmp > conn->conn_data_segment_limit) { log_debugx("capping MaxRecvDataSegmentLength " - "from %d to %d", tmp, MAX_DATA_SEGMENT_LENGTH); - tmp = MAX_DATA_SEGMENT_LENGTH; + "from %zd to %zd", tmp, conn->conn_data_segment_limit); + tmp = conn->conn_data_segment_limit; } conn->conn_max_data_segment_length = tmp; - keys_add_int(response_keys, name, MAX_DATA_SEGMENT_LENGTH); + keys_add_int(response_keys, name, tmp); } else if (strcmp(name, "MaxBurstLength") == 0) { tmp = strtoul(value, NULL, 10); if (tmp <= 0) { @@ -566,7 +567,7 @@ login_negotiate_key(struct pdu *request, log_errx(1, "received invalid MaxBurstLength"); } if (tmp > MAX_BURST_LENGTH) { - log_debugx("capping MaxBurstLength from %d to %d", + log_debugx("capping MaxBurstLength from %zd to %d", tmp, MAX_BURST_LENGTH); tmp = MAX_BURST_LENGTH; } @@ -579,10 +580,10 @@ login_negotiate_key(struct pdu *request, log_errx(1, "received invalid " "FirstBurstLength"); } - if (tmp > MAX_DATA_SEGMENT_LENGTH) { - log_debugx("capping FirstBurstLength from %d to %d", - tmp, MAX_DATA_SEGMENT_LENGTH); - tmp = MAX_DATA_SEGMENT_LENGTH; + if (tmp > conn->conn_data_segment_limit) { + log_debugx("capping FirstBurstLength from %zd to %zd", + tmp, conn->conn_data_segment_limit); + tmp = conn->conn_data_segment_limit; } /* * We don't pass the value to the kernel; it only enforces @@ -680,6 +681,18 @@ login_negotiate(struct connection *conn, int i; bool redirected, skipped_security; + if (conn->conn_session_type == CONN_SESSION_TYPE_NORMAL) { + /* + * Query the kernel for MaxDataSegmentLength it can handle. + * In case of offload, it depends on hardware capabilities. + */ + assert(conn->conn_target != NULL); + kernel_limits(conn->conn_target->t_offload, + &conn->conn_data_segment_limit); + } else { + conn->conn_data_segment_limit = MAX_DATA_SEGMENT_LENGTH; + } + if (request == NULL) { log_debugx("beginning operational parameter negotiation; " "waiting for Login PDU"); Modified: head/usr.sbin/ctld/parse.y ============================================================================== --- head/usr.sbin/ctld/parse.y Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/parse.y Fri Feb 6 21:03:25 2015 (r278331) @@ -60,7 +60,7 @@ extern void yyrestart(FILE *); %token ALIAS AUTH_GROUP AUTH_TYPE BACKEND BLOCKSIZE CHAP CHAP_MUTUAL %token CLOSING_BRACKET DEBUG DEVICE_ID DISCOVERY_AUTH_GROUP DISCOVERY_FILTER %token INITIATOR_NAME INITIATOR_PORTAL ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT -%token LISTEN LISTEN_ISER LUN MAXPROC OPENING_BRACKET OPTION +%token LISTEN LISTEN_ISER LUN MAXPROC OFFLOAD OPENING_BRACKET OPTION %token PATH PIDFILE PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR %token TARGET TIMEOUT @@ -463,6 +463,8 @@ target_entry: | target_initiator_portal | + target_offload + | target_portal_group | target_redirect @@ -652,6 +654,17 @@ target_initiator_portal: INITIATOR_PORTA } ; +target_offload: OFFLOAD STR + { + int error; + + error = target_set_offload(target, $2); + free($2); + if (error != 0) + return (1); + } + ; + target_portal_group: PORTAL_GROUP STR STR { struct portal_group *tpg; Modified: head/usr.sbin/ctld/token.l ============================================================================== --- head/usr.sbin/ctld/token.l Fri Feb 6 20:52:01 2015 (r278330) +++ head/usr.sbin/ctld/token.l Fri Feb 6 21:03:25 2015 (r278331) @@ -65,6 +65,7 @@ listen { return LISTEN; } listen-iser { return LISTEN_ISER; } lun { return LUN; } maxproc { return MAXPROC; } +offload { return OFFLOAD; } option { return OPTION; } path { return PATH; } pidfile { return PIDFILE; } From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 21:54:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FD78EBF; Fri, 6 Feb 2015 21:54:39 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BFE02D1; Fri, 6 Feb 2015 21:54:39 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 2690BB91E; Fri, 6 Feb 2015 16:54:38 -0500 (EST) From: John Baldwin To: Ivan Klymenko Subject: Re: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl Date: Fri, 06 Feb 2015 16:54:31 -0500 Message-ID: <2382517.uRm602S1Mu@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <20150206215810.532ce926@nonamehost.local> References: <201502061609.t16G92rn091851@svn.freebsd.org> <20150206215810.532ce926@nonamehost.local> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 16:54:38 -0500 (EST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 21:54:39 -0000 On Friday, February 06, 2015 09:58:10 PM Ivan Klymenko wrote: > =D0=92 Fri, 6 Feb 2015 16:09:02 +0000 (UTC) >=20 > John Baldwin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > Author: jhb > > Date: Fri Feb 6 16:09:01 2015 > > New Revision: 278320 > > URL: https://svnweb.freebsd.org/changeset/base/278320 > >=20 > > Log: > > Add a new device control utility for new-bus devices called > >=20 > > devctl. This allows the user to request administrative changes to > > individual devices such as attach or detaching drivers or disabling= > > and re-enabling devices. > >=20 > > - Add a new /dev/devctl2 character device which uses ioctls for > >=20 > > device requests. The ioctls use a common 'struct devreq' which is > > somewhat similar to 'struct ifreq'. > >=20 > > - The ioctls identify the device to operate on via a string. Thi= s > > =20 > > string can either by the device's name, or it can be a > >=20 > > bus-specific address. (For unattached devices, a bus address is th= e > > only way to locate a device.) Bus drivers register an eventhandler= > > to claim unrecognized device names that the driver recognizes as a > > valid address. Two buses currently support addresses: ACPI recogniz= es > > any device in the ACPI namespace via its full path starting with "\= " > > and the PCI bus driver recognizes an address specification of > >=20 > > 'pci[:]::' (identical to the PCI selec= tor > > strings supported by pciconf). > > =20 > > - To make it easier to cut and paste, change the PnP location str= ing > > =20 > > in the PCI bus driver to output a full PCI selector string rath= er > > than 'slot=3D function=3D'. > > =20 > > - Add a devctl(3) interface in libdevctl which provides a wrapper= > >=20 > > around the ioctls and is the preferred interface for other userland= > > code. > >=20 > > - Add a devctl(8) program which is a simple wrapper around the > >=20 > > requests supported by devctl(3). > >=20 > > - Add a device_is_suspended() function to check DF_SUSPENDED. > > - Add a resource_unset_value() function that can be used to remov= e a > > =20 > > hint from the kernel environment. This is used to clear a > > hint...disabled hint when re-enabling a boot-time= > > disabled device. > > =20 > > Reviewed by:=09imp (parts) > > Requested by:=09imp (changing PCI location string) > > Relnotes:=09yes > >=20 > > Added: > > head/lib/libdevctl/ > > head/lib/libdevctl/Makefile (contents, props changed) > > head/lib/libdevctl/devctl.3 (contents, props changed) > > head/lib/libdevctl/devctl.c (contents, props changed) > > head/lib/libdevctl/devctl.h (contents, props changed) > > head/usr.sbin/devctl/ > > head/usr.sbin/devctl/Makefile (contents, props changed) > > head/usr.sbin/devctl/devctl.8 (contents, props changed) > > head/usr.sbin/devctl/devctl.c (contents, props changed) > >=20 > > Modified: > > head/contrib/mdocml/lib.in > > head/lib/Makefile > > head/share/mk/bsd.libnames.mk > > head/share/mk/src.libnames.mk > > head/sys/dev/acpica/acpi.c > > head/sys/dev/pci/pci.c > > head/sys/kern/subr_bus.c > > head/sys/kern/subr_hints.c > > head/sys/sys/bus.h > > head/usr.sbin/Makefile > >=20 > > Modified: head/contrib/mdocml/lib.in >=20 > ... > --- alias_dummy.o --- > /usr/local/libexec/ccache/world/cc -target x86_64-unknown-freebsd11.0= -O2 > -pipe -mmmx -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -mav= x > -maes -mpclmul -march=3Dnative -std=3Dgnu99 -fstack-protector -Wsyst= em-headers > -Werror -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int > -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-valu= e > -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion > -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parenth= eses > -Qunused-arguments -c > /usr/src/lib/libalias/modules/dummy/../../../../sys/netinet/libalias/= alias_ > dummy.c -o alias_dummy.o --- libalias_dummy.so --- > building shared library libalias_dummy.so > --- all_subdir_libdevctl --- > /usr/src/lib/libdevctl/devctl.c:38:35: error: declaration of 'struct = devreq' > will not be visible outside of this function [-Werror,-Wvisibility] > devctl_request(u_long cmd, struct devreq *req) > ^ Your sys/sys/bus.h is not up to date. A build on a separate machine fr= om=20 where I committed this using a pristine tree worked fine, so I think th= is must=20 be a local issue? --=20 John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:19:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D15FECF0; Fri, 6 Feb 2015 23:19:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3227D99; Fri, 6 Feb 2015 23:19:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16NJId5097352; Fri, 6 Feb 2015 23:19:18 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16NJISs097347; Fri, 6 Feb 2015 23:19:18 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201502062319.t16NJISs097347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Fri, 6 Feb 2015 23:19:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278335 - head/sys/boot/forth 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:19:18 -0000 Author: dteske Date: Fri Feb 6 23:19:17 2015 New Revision: 278335 URL: https://svnweb.freebsd.org/changeset/base/278335 Log: Revert SVN r277693. Discussed on: src-committers Approved by: core (emaste) Modified: head/sys/boot/forth/beastie.4th head/sys/boot/forth/brand.4th Modified: head/sys/boot/forth/beastie.4th ============================================================================== --- head/sys/boot/forth/beastie.4th Fri Feb 6 22:25:21 2015 (r278334) +++ head/sys/boot/forth/beastie.4th Fri Feb 6 23:19:17 2015 (r278335) @@ -89,7 +89,7 @@ variable logoY 0 25 at-xy ; -: fbsdbw-logo ( x y -- ) \ "FreeBSD" logo in B/W (12 rows x 21 columns) +: fbsdbw-logo ( x y -- ) \ "FreeBSD" logo in B/W (13 rows x 21 columns) \ We used to use the beastie himself as our default... until the \ eventual complaint derided his reign of the advanced boot-menu. @@ -106,16 +106,17 @@ variable logoY 5 + swap 6 + swap 2dup at-xy ." ______" 1+ - 2dup at-xy ." | ____|" 1+ - 2dup at-xy ." | |__ _ __ ___ ___ " 1+ - 2dup at-xy ." | __|| '__/ _ \/ _ \" 1+ - 2dup at-xy ." | | | | | __/ __/" 1+ + 2dup at-xy ." | ____| __ ___ ___ " 1+ + 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+ + 2dup at-xy ." | __|| | | __/ __/" 1+ + 2dup at-xy ." | | | | | | |" 1+ 2dup at-xy ." |_| |_| \___|\___|" 1+ 2dup at-xy ." ____ _____ _____" 1+ 2dup at-xy ." | _ \ / ____| __ \" 1+ 2dup at-xy ." | |_) | (___ | | | |" 1+ 2dup at-xy ." | _ < \___ \| | | |" 1+ 2dup at-xy ." | |_) |____) | |__| |" 1+ + 2dup at-xy ." | | | |" 1+ at-xy ." |____/|_____/|_____/" \ Put the cursor back at the bottom Modified: head/sys/boot/forth/brand.4th ============================================================================== --- head/sys/boot/forth/brand.4th Fri Feb 6 22:25:21 2015 (r278334) +++ head/sys/boot/forth/brand.4th Fri Feb 6 23:19:17 2015 (r278335) @@ -33,13 +33,14 @@ variable brandY 2 brandX ! 1 brandY ! -: fbsd-logo ( x y -- ) \ "FreeBSD" [wide] logo in B/W (6 rows x 42 columns) +: fbsd-logo ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns) 2dup at-xy ." ______ ____ _____ _____ " 1+ 2dup at-xy ." | ____| | _ \ / ____| __ \ " 1+ 2dup at-xy ." | |___ _ __ ___ ___ | |_) | (___ | | | |" 1+ 2dup at-xy ." | ___| '__/ _ \/ _ \| _ < \___ \| | | |" 1+ 2dup at-xy ." | | | | | __/ __/| |_) |____) | |__| |" 1+ + 2dup at-xy ." | | | | | | || | | |" 1+ at-xy ." |_| |_| \___|\___||____/|_____/|_____/ " \ Put the cursor back at the bottom From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:30:15 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8D31D8; Fri, 6 Feb 2015 23:30:14 +0000 (UTC) Received: from gold.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gold.funkthat.com", Issuer "gold.funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id AC093EB5; Fri, 6 Feb 2015 23:30:14 +0000 (UTC) Received: from gold.funkthat.com (localhost [127.0.0.1]) by gold.funkthat.com (8.14.5/8.14.5) with ESMTP id t16NUDAi058299 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 6 Feb 2015 15:30:13 -0800 (PST) (envelope-from jmg@gold.funkthat.com) Received: (from jmg@localhost) by gold.funkthat.com (8.14.5/8.14.5/Submit) id t16NUDXV058298; Fri, 6 Feb 2015 15:30:13 -0800 (PST) (envelope-from jmg) Date: Fri, 6 Feb 2015 15:30:13 -0800 From: John-Mark Gurney To: John Baldwin Subject: Re: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl Message-ID: <20150206233012.GY32312@funkthat.com> References: <201502061609.t16G92rn091851@svn.freebsd.org> <61974401.Fd0kRqNeQd@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <61974401.Fd0kRqNeQd@ralph.baldwin.cx> X-Operating-System: FreeBSD 9.1-PRERELEASE amd64 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (gold.funkthat.com [127.0.0.1]); Fri, 06 Feb 2015 15:30:13 -0800 (PST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:30:15 -0000 John Baldwin wrote this message on Fri, Feb 06, 2015 at 11:58 -0500: > On Friday, February 06, 2015 04:09:02 PM John Baldwin wrote: > > Author: jhb > > Date: Fri Feb 6 16:09:01 2015 > > New Revision: 278320 > > URL: https://svnweb.freebsd.org/changeset/base/278320 > > > > Log: > > Add a new device control utility for new-bus devices called devctl. This > > allows the user to request administrative changes to individual devices > > such as attach or detaching drivers or disabling and re-enabling devices. > > For now I would consider this somewhat experimental. Some bus drivers may not > take kindly to device_detach/device_probe_and_attach being called (Hans > mentioned USB as a likely candidate). > > Also, in theory you can use 'devctl suspend' to power off PCI devices you > don't need, but most drivers probably don't expect to have to deal with user > requests while suspended (e.g. I tested this by suspending hdac0 on a laptop, > but I didn't try playing a sound to see if that blew up.. it would not > surprise me if it did). > > There are also some other rough edges such as: > > 1) An administratively suspended device will resume if you do a system-wide > suspend and resume. Could we add a flag for this? > 2) There is no nice way for a driver to reject an administrative suspend > request. It could fail its device_suspend method perhaps, but the driver > can't easily tell if a suspend request is administrative or due to a > system suspend. Perhaps we could re-use device_quiesce for this? We should look at expanding this... For the PCIe hot plug work, we definately want administrative suspention to work so that people can unplug their devices, or get notification that it is rejected (say, disk is still mounted)... Also, looks like quiesce will be rejected if the device is busy... That should be changed or at least clearer description of what device_busy is suppose to do to a device... The good news is that very few drivers make use of device_busy, so cleaning it up, or removing it won't be too hard... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:34:41 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AAB326B; Fri, 6 Feb 2015 23:34:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26B8AF6D; Fri, 6 Feb 2015 23:34:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16NYetM006396; Fri, 6 Feb 2015 23:34:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16NYeSf006395; Fri, 6 Feb 2015 23:34:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502062334.t16NYeSf006395@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 6 Feb 2015 23:34:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278336 - head/sys/conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:34:41 -0000 Author: ngie Date: Fri Feb 6 23:34:40 2015 New Revision: 278336 URL: https://svnweb.freebsd.org/changeset/base/278336 Log: Unbreak the build (memchr is explicitly required by devctl(9) after r278320) Submitted by: Michael Butler Reported by: O. Hartmann Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Feb 6 23:19:17 2015 (r278335) +++ head/sys/conf/files Fri Feb 6 23:34:40 2015 (r278336) @@ -3193,7 +3193,7 @@ libkern/jenkins_hash.c standard libkern/murmur3_32.c standard libkern/mcount.c optional profiling-routine libkern/memcchr.c standard -libkern/memchr.c optional fdt | gdb +libkern/memchr.c standard libkern/memcmp.c standard libkern/memmem.c optional gdb libkern/qsort.c standard From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:44:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BB2266D; Fri, 6 Feb 2015 23:44:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2353ED; Fri, 6 Feb 2015 23:44:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16NiH1x011012; Fri, 6 Feb 2015 23:44:17 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16NiHAY011011; Fri, 6 Feb 2015 23:44:17 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201502062344.t16NiHAY011011@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 6 Feb 2015 23:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278337 - head/usr.sbin/freebsd-update 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:44:18 -0000 Author: brooks Date: Fri Feb 6 23:44:16 2015 New Revision: 278337 URL: https://svnweb.freebsd.org/changeset/base/278337 Log: When upgrading, install the ELF runtime linkers before libraries. This is required to prevent problems with nss modules that use libthr when upgrading from releases prior to 10.1. PR: 197366 Sponsored by: DARPA, AFRL Differential Revision: D1790 Reviewed by: cperciva MFC after: 3 days Modified: head/usr.sbin/freebsd-update/freebsd-update.sh Modified: head/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- head/usr.sbin/freebsd-update/freebsd-update.sh Fri Feb 6 23:34:40 2015 (r278336) +++ head/usr.sbin/freebsd-update/freebsd-update.sh Fri Feb 6 23:44:16 2015 (r278337) @@ -2828,18 +2828,27 @@ Kernel updates have been installed. Ple grep -E '^[^|]+\|d\|' > INDEX-NEW install_from_index INDEX-NEW || return 1 + # Install new runtime linker + grep -vE '^/boot/' $1/INDEX-NEW | + grep -vE '^[^|]+\|d\|' | + grep -E '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' > INDEX-NEW + install_from_index INDEX-NEW || return 1 + # Install new shared libraries next grep -vE '^/boot/' $1/INDEX-NEW | grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW install_from_index INDEX-NEW || return 1 # Deal with everything else grep -vE '^/boot/' $1/INDEX-OLD | grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD grep -vE '^/boot/' $1/INDEX-NEW | grep -vE '^[^|]+\|d\|' | + grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' | grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW install_from_index INDEX-NEW || return 1 install_delete INDEX-OLD INDEX-NEW || return 1 From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:46:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85B8B7E5; Fri, 6 Feb 2015 23:46:19 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BB99106; Fri, 6 Feb 2015 23:46:19 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id CBA0EB962; Fri, 6 Feb 2015 18:46:17 -0500 (EST) From: John Baldwin To: John-Mark Gurney Subject: Re: svn commit: r278320 - in head: contrib/mdocml lib lib/libdevctl share/mk sys/dev/acpica sys/dev/pci sys/kern sys/sys usr.sbin usr.sbin/devctl Date: Fri, 06 Feb 2015 18:46:06 -0500 Message-ID: <4184164.aqiB2fMKGA@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <20150206233012.GY32312@funkthat.com> References: <201502061609.t16G92rn091851@svn.freebsd.org> <61974401.Fd0kRqNeQd@ralph.baldwin.cx> <20150206233012.GY32312@funkthat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 18:46:17 -0500 (EST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:46:19 -0000 On Friday, February 06, 2015 03:30:13 PM John-Mark Gurney wrote: > John Baldwin wrote this message on Fri, Feb 06, 2015 at 11:58 -0500: > > On Friday, February 06, 2015 04:09:02 PM John Baldwin wrote: > > > Author: jhb > > > Date: Fri Feb 6 16:09:01 2015 > > > New Revision: 278320 > > > URL: https://svnweb.freebsd.org/changeset/base/278320 > > > > > > Log: > > > Add a new device control utility for new-bus devices called devctl. > > > This > > > allows the user to request administrative changes to individual > > > devices > > > such as attach or detaching drivers or disabling and re-enabling > > > devices. > > > > For now I would consider this somewhat experimental. Some bus drivers may > > not take kindly to device_detach/device_probe_and_attach being called > > (Hans mentioned USB as a likely candidate). > > > > Also, in theory you can use 'devctl suspend' to power off PCI devices you > > don't need, but most drivers probably don't expect to have to deal with > > user requests while suspended (e.g. I tested this by suspending hdac0 on > > a laptop, but I didn't try playing a sound to see if that blew up.. it > > would not surprise me if it did). > > > > There are also some other rough edges such as: > > 1) An administratively suspended device will resume if you do a > > system-wide > > > > suspend and resume. > > Could we add a flag for this? Yes, it just isn't done as of yet. > > 2) There is no nice way for a driver to reject an administrative suspend > > > > request. It could fail its device_suspend method perhaps, but the > > driver > > can't easily tell if a suspend request is administrative or due to a > > system suspend. Perhaps we could re-use device_quiesce for this? > > We should look at expanding this... For the PCIe hot plug work, we > definately want administrative suspention to work so that people can > unplug their devices, or get notification that it is rejected (say, > disk is still mounted)... > > Also, looks like quiesce will be rejected if the device is busy... > That should be changed or at least clearer description of what > device_busy is suppose to do to a device... > > The good news is that very few drivers make use of device_busy, so > cleaning it up, or removing it won't be too hard... Drivers are free to define their own device_quiesce method. device_quiesce is what can reject a non forced (no -f) kldunload. So for detach the semantics are: device_quiesce fails if the device is busy, device_detach should be a best effort that should detach even if the device is busy. A "nice" detach request honors device_quiesce. A forced detach request ignores device_quiece and always invokes device_detach. I suspect reusing device_quiece to handle a "nice" vs forced suspend request will work just fine as the conditions for rejecting detaching are the same as for suspension. Also, for hotplug removal you want detach, not suspension anyway (which already uses device_quiesce and thus already supports this notion). -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Fri Feb 6 23:46:19 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E24657E6; Fri, 6 Feb 2015 23:46:19 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BADCB107; Fri, 6 Feb 2015 23:46:19 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 6AB50B965; Fri, 6 Feb 2015 18:46:18 -0500 (EST) From: John Baldwin To: Garrett Cooper Subject: Re: svn commit: r278336 - head/sys/conf Date: Fri, 06 Feb 2015 18:40:52 -0500 Message-ID: <2121763.z5bT22ehP6@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201502062334.t16NYeSf006395@svn.freebsd.org> References: <201502062334.t16NYeSf006395@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 06 Feb 2015 18:46:18 -0500 (EST) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 23:46:20 -0000 On Friday, February 06, 2015 11:34:40 PM Garrett Cooper wrote: > Author: ngie > Date: Fri Feb 6 23:34:40 2015 > New Revision: 278336 > URL: https://svnweb.freebsd.org/changeset/base/278336 > > Log: > Unbreak the build (memchr is explicitly required by devctl(9) after > r278320) > > Submitted by: Michael Butler > Reported by: O. Hartmann Thanks. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 00:05:14 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C887FCA8; Sat, 7 Feb 2015 00:05:14 +0000 (UTC) Received: from mail-pa0-x229.google.com (mail-pa0-x229.google.com [IPv6:2607:f8b0:400e:c03::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A1EE313; Sat, 7 Feb 2015 00:05:14 +0000 (UTC) Received: by mail-pa0-f41.google.com with SMTP id kq14so20528080pab.0; Fri, 06 Feb 2015 16:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=kjh3prQauOIOPP2bIyCGiFUGvEgFlXk96tvaH069k6A=; b=A9ChVkhqOR5RpEjVm4hrenW72+azgzl35RMxp5EohE0+wf5UEaryNwfZL621nSj17l BBeJG3RaZHJIzsNjYjXUUXBS0KVobB214/K8Zre1fI56XotUp0FzSiPua+oePznUXkCU vSox3kisQiJfLb8wtyJAkZPcW/9npr+Dyg9+Tip4i4n2STNQIEqh/9St6QSMtadioN3N ocdB8a0sLXOMjRThKkIeexFSj/T6ABTReTdpkqqZ7HC9rSY56NU83IH2KWD3TY7p2OrB Wijzs1fLtLWyvwEFAxtv1EpNKvePQ1J3ib5nz7TPWCmTHke00RrZz741lC8bVuueYyZE 63Iw== X-Received: by 10.68.221.165 with SMTP id qf5mr9547861pbc.101.1423267513892; Fri, 06 Feb 2015 16:05:13 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id z4sm9137967pdp.93.2015.02.06.16.05.12 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 16:05:13 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_6C043291-598C-46BC-953D-7B0DF425B42A"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278336 - head/sys/conf From: Garrett Cooper In-Reply-To: <2121763.z5bT22ehP6@ralph.baldwin.cx> Date: Fri, 6 Feb 2015 16:05:11 -0800 Message-Id: <0D0CEBC9-9450-42BB-A8F7-0B190A23191B@gmail.com> References: <201502062334.t16NYeSf006395@svn.freebsd.org> <2121763.z5bT22ehP6@ralph.baldwin.cx> To: John Baldwin X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Garrett Cooper X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 00:05:14 -0000 --Apple-Mail=_6C043291-598C-46BC-953D-7B0DF425B42A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 15:40, John Baldwin wrote: > On Friday, February 06, 2015 11:34:40 PM Garrett Cooper wrote: >> Author: ngie >> Date: Fri Feb 6 23:34:40 2015 >> New Revision: 278336 >> URL: https://svnweb.freebsd.org/changeset/base/278336 >>=20 >> Log: >> Unbreak the build (memchr is explicitly required by devctl(9) after >> r278320) >>=20 >> Submitted by: Michael Butler >> Reported by: O. Hartmann >=20 > Thanks. Np! The only misnomer in my commit message is that the = reporter/submitter was probably running a kernel without FDT/GDB support = enabled (an edgecase that Jenkins wouldn=92t have caught either). --Apple-Mail=_6C043291-598C-46BC-953D-7B0DF425B42A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1Va3AAoJEMZr5QU6S73e58wH/2NzmNQAhadIMLMptJGJGJ9T 4542B2Ye7knUEtqSCg65u21gcuvyfYu5zRPErNjsp9gsaZh3qHexGgjjYY4CSPSz qvfDTaIoXDRkNcpTm43CFtFm3HJ2cG5lYp4Fb9WXvrnBVmdEnEZqjiV1ORf3WlOF sIUBJaCN9I6F+E79HJnAyD6ow8kKtpeKSfhs9opNhvDUlwmSCRxjsIjFjsY70IAM MGJman/BWqXezOQjgJkGwD7F50MS6sVPkBllRk4Ym8kTwwNE/UUl5ytl/iubsnAI RsBuiYrT6fqoBp/MbwlKIVmjynwXVBdEsR1Y9D+N0mlFiED/Kth/Q9qpxW/9HJo= =VA2Q -----END PGP SIGNATURE----- --Apple-Mail=_6C043291-598C-46BC-953D-7B0DF425B42A-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 00:13:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6C5E104; Sat, 7 Feb 2015 00:13:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A299A5F3; Sat, 7 Feb 2015 00:13:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t170DbNn026219; Sat, 7 Feb 2015 00:13:37 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t170Dbkn026218; Sat, 7 Feb 2015 00:13:37 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201502070013.t170Dbkn026218@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 7 Feb 2015 00:13:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278338 - head/sys/modules/dtb/rpi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 00:13:37 -0000 Author: imp Date: Sat Feb 7 00:13:36 2015 New Revision: 278338 URL: https://svnweb.freebsd.org/changeset/base/278338 Log: Create a module to install the Raspberry Pi dtb files. Added: head/sys/modules/dtb/rpi/ head/sys/modules/dtb/rpi/Makefile (contents, props changed) Added: head/sys/modules/dtb/rpi/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/dtb/rpi/Makefile Sat Feb 7 00:13:36 2015 (r278338) @@ -0,0 +1,5 @@ +# $FreeBSD$ +# DTS files for the Raspberry Pi-B +DTS=rpi.dts + +.include From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 00:38:20 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 142F13E4; Sat, 7 Feb 2015 00:38:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 002D4813; Sat, 7 Feb 2015 00:38:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t170cJtN036164; Sat, 7 Feb 2015 00:38:19 GMT (envelope-from kargl@FreeBSD.org) Received: (from kargl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t170cJ8q036163; Sat, 7 Feb 2015 00:38:19 GMT (envelope-from kargl@FreeBSD.org) Message-Id: <201502070038.t170cJ8q036163@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kargl set sender to kargl@FreeBSD.org using -f From: Steve Kargl Date: Sat, 7 Feb 2015 00:38:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278339 - head/lib/msun/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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 00:38:20 -0000 Author: kargl Date: Sat Feb 7 00:38:18 2015 New Revision: 278339 URL: https://svnweb.freebsd.org/changeset/base/278339 Log: Truncate the exponent 'n' of type long to a domain contained within [INT_MIN, INT_MAX] where the magnitude of the lower and upper bounds are sufficiently large to span the range of scalbn[fl]. While here, remove the GNU style bug in the function declarations. Reviewed by: bde, pfg Modified: head/lib/msun/src/s_scalbln.c Modified: head/lib/msun/src/s_scalbln.c ============================================================================== --- head/lib/msun/src/s_scalbln.c Sat Feb 7 00:13:36 2015 (r278338) +++ head/lib/msun/src/s_scalbln.c Sat Feb 7 00:38:18 2015 (r278339) @@ -27,38 +27,28 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#define NMAX 65536 +#define NMIN -65536 + double -scalbln (double x, long n) +scalbln(double x, long n) { - int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; - return (scalbn(x, in)); + return (scalbn(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n)); } float -scalblnf (float x, long n) +scalblnf(float x, long n) { - int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; - return (scalbnf(x, in)); + return (scalbnf(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n)); } long double -scalblnl (long double x, long n) +scalblnl(long double x, long n) { - int in; - in = (int)n; - if (in != n) - in = (n > 0) ? INT_MAX: INT_MIN; - return (scalbnl(x, in)); + return (scalbnl(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n)); } From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 00:41:10 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F129F553; Sat, 7 Feb 2015 00:41:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD1378B9; Sat, 7 Feb 2015 00:41:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t170f90W037527; Sat, 7 Feb 2015 00:41:09 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t170f9wA037524; Sat, 7 Feb 2015 00:41:09 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201502070041.t170f9wA037524@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 7 Feb 2015 00:41:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278340 - in head/sys: arm/conf modules 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 00:41:10 -0000 Author: imp Date: Sat Feb 7 00:41:08 2015 New Revision: 278340 URL: https://svnweb.freebsd.org/changeset/base/278340 Log: Pull in the rpi.dts -> rpi.dtb module (dtb/rpi) and have it install rpi.dtb in /boot/dtb by default. Modified: head/sys/arm/conf/RPI-B head/sys/modules/Makefile Modified: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Sat Feb 7 00:38:18 2015 (r278339) +++ head/sys/arm/conf/RPI-B Sat Feb 7 00:41:08 2015 (r278340) @@ -134,4 +134,5 @@ options FDT # Configure using FDT/DTB # Note: DTB is normally loaded and modified by RPi boot loader, then # handed to kernel via U-Boot and ubldr. #options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=rpi.dts +#makeoptions FDT_DTS_FILE=rpi.dts +makeoptions MODULES_EXTRA=dtb/rpi Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sat Feb 7 00:38:18 2015 (r278339) +++ head/sys/modules/Makefile Sat Feb 7 00:41:08 2015 (r278340) @@ -735,6 +735,8 @@ _zfs= zfs .endif +SUBDIR+=${MODULES_EXTRA} + .for reject in ${WITHOUT_MODULES} SUBDIR:= ${SUBDIR:N${reject}} .endfor From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 01:03:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2EF47BA; Sat, 7 Feb 2015 01:03:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93CD4A6F; Sat, 7 Feb 2015 01:03:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1713kYC049747; Sat, 7 Feb 2015 01:03:46 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1713jl8049742; Sat, 7 Feb 2015 01:03:45 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201502070103.t1713jl8049742@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Sat, 7 Feb 2015 01:03:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278341 - in head/sys/arm: broadcom/bcm2835 conf 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 01:03:46 -0000 Author: gonzo Date: Sat Feb 7 01:03:45 2015 New Revision: 278341 URL: https://svnweb.freebsd.org/changeset/base/278341 Log: Make VCHI driver optional and add "device vchiq" to default RPI-B config Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835 head/sys/arm/conf/RPI-B Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- head/sys/arm/broadcom/bcm2835/files.bcm2835 Sat Feb 7 00:41:08 2015 (r278340) +++ head/sys/arm/broadcom/bcm2835/files.bcm2835 Sat Feb 7 01:03:45 2015 (r278341) @@ -29,21 +29,21 @@ dev/mbox/mbox_if.m standard dev/ofw/ofw_cpu.c standard # VideoCore driver -contrib/vchiq/interface/compat/vchi_bsd.c standard \ +contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c optional vchiq \ compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_arm.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_arm.c optional vchiq \ compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_connected.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_connected.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_core.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_core.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_shim.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_shim.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_util.c standard \ +contrib/vchiq/interface/vchiq_arm/vchiq_util.c optional vchiq \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" Modified: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Sat Feb 7 00:41:08 2015 (r278340) +++ head/sys/arm/conf/RPI-B Sat Feb 7 01:03:45 2015 (r278341) @@ -129,6 +129,8 @@ device smsc device spibus device bcm2835_spi +device vchiq + # Flattened Device Tree options FDT # Configure using FDT/DTB data # Note: DTB is normally loaded and modified by RPi boot loader, then From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 01:50:33 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA6B6F37; Sat, 7 Feb 2015 01:50:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A66F7EB3; Sat, 7 Feb 2015 01:50:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t171oXAK070617; Sat, 7 Feb 2015 01:50:33 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t171oXg6070616; Sat, 7 Feb 2015 01:50:33 GMT (envelope-from np@FreeBSD.org) Message-Id: <201502070150.t171oXg6070616@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 7 Feb 2015 01:50:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278342 - head/sys/dev/cxgbe 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 01:50:33 -0000 Author: np Date: Sat Feb 7 01:50:32 2015 New Revision: 278342 URL: https://svnweb.freebsd.org/changeset/base/278342 Log: cxgbe(4): fix a test made while enabling TOE. MFC after: 1 week Modified: head/sys/dev/cxgbe/t4_main.c Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Sat Feb 7 01:03:45 2015 (r278341) +++ head/sys/dev/cxgbe/t4_main.c Sat Feb 7 01:50:32 2015 (r278342) @@ -8215,7 +8215,12 @@ toe_capability(struct port_info *pi, int return (ENODEV); if (enable) { - if (!(sc->flags & FULL_INIT_DONE)) { + /* + * We need the port's queues around so that we're able to send + * and receive CPLs to/from the TOE even if the ifnet for this + * port has never been UP'd administratively. + */ + if (!(pi->flags & PORT_INIT_DONE)) { rc = cxgbe_init_synchronized(pi); if (rc) return (rc); From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 02:23:50 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 233E2428; Sat, 7 Feb 2015 02:23:50 +0000 (UTC) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E72731D0; Sat, 7 Feb 2015 02:23:49 +0000 (UTC) Received: by pdbnh10 with SMTP id nh10so15796531pdb.12; Fri, 06 Feb 2015 18:23:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=CEBDv7sSoSxcKIJpc3VAhrQFlWJtzOZv0UKT/D6YdyM=; b=xZO9qSaJCpJ8M6e9+u7pq3s2qwFEh83scJK+l4qT11kNKOj+iiYy3x5KzZpmxPpAwr C3RwzWz+yetfUmO/qVdVgCGAukmXyFY/aYLGRecSAR6WdU1gBCtaj+wlq+PyYbPzN5y4 +XS0JJLneXKGZ5qjuwlVuDHaypHkYBgr8qljFP+jCTN3aZ1JKWDmeoFoUVc1mAAvqhOi BHbHLC0x2YPdLj1ennv5LfrXnUxLa9ezmyEmG6dVjY9q9A+RZxmVYXgQaqPTukzbMgCn IQ3j54v/a/hmzPdASdLxvzfk82E3a93uGu3XRF8MS0CYP3KbBvkq1IWqmBPyHBGzcJ9D LGZg== X-Received: by 10.66.190.2 with SMTP id gm2mr10495743pac.100.1423275822801; Fri, 06 Feb 2015 18:23:42 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id ev2sm9309692pbb.69.2015.02.06.18.23.41 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 18:23:42 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_57172387-00E9-4F8A-BB26-E2FDC0E9D16C"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: <201502061754.t16HssXU042750@svn.freebsd.org> Date: Fri, 6 Feb 2015 18:23:40 -0800 Message-Id: <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> References: <201502061754.t16HssXU042750@svn.freebsd.org> To: Jamie Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 02:23:50 -0000 --Apple-Mail=_57172387-00E9-4F8A-BB26-E2FDC0E9D16C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Feb 6, 2015, at 9:54, Jamie Gritton wrote: > Author: jamie > Date: Fri Feb 6 17:54:53 2015 > New Revision: 278323 > URL: https://svnweb.freebsd.org/changeset/base/278323 >=20 > Log: > Add mount.procfs jail parameter, so procfs can be mounted when a = prison's > root is in its fstab. >=20 > Also fix a typo while I'm at it. >=20 > PR: 197237 197066 > MFC after: 3 days >=20 > Modified: > head/etc/rc.d/jail > head/usr.sbin/jail/command.c > head/usr.sbin/jail/config.c > head/usr.sbin/jail/jail.8 > head/usr.sbin/jail/jail.c > head/usr.sbin/jail/jailp.h I think you broke the Jenkins tests runs, and potentially jail support = in some edgecases: = https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/651/ --Apple-Mail=_57172387-00E9-4F8A-BB26-E2FDC0E9D16C Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1XcsAAoJEMZr5QU6S73ertQH+wV+wSVyU21PmLg0lHPEXUwx jJmeMQQhsNYgHB4yB1q4pgd71xDdLKUFr11reF+KhhGY+YY3eBWI8Vlp4bpvmpzv iVajOXJ0PpxC48xLvCgP1etDuq5MQRbvMqBt1aH0L23K7cvwT8xmtYW4mKaWG44t 8vasDYzyZGwsRu+B5KHtiv8+p4SBYB0TybX78qVfcTxlL0jUbJRa1mRBOxtSkB6a To328+uQ0vGpUGw+s2PhE1u3DbTLSn5arWG+DIUHLTcIai1YVkuWhyTlGGISEWiN rDwbZpHgqy7o1PnbsD20rKTPD3gUClDibokADfCXa3DEW/2vnxLdI8TAV3YwdRI= =MEI4 -----END PGP SIGNATURE----- --Apple-Mail=_57172387-00E9-4F8A-BB26-E2FDC0E9D16C-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 02:38:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47D8E7C4; Sat, 7 Feb 2015 02:38:40 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F3EE303; Sat, 7 Feb 2015 02:38:39 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) by m2.gritton.org (8.14.9/8.14.9) with ESMTP id t172cWDJ077678; Fri, 6 Feb 2015 19:38:32 -0700 (MST) (envelope-from jamie@freebsd.org) Received: (from www@localhost) by m2.gritton.org (8.14.9/8.14.9/Submit) id t172cWR5077677; Fri, 6 Feb 2015 19:38:32 -0700 (MST) (envelope-from jamie@freebsd.org) X-Authentication-Warning: gritton.org: www set sender to jamie@freebsd.org using -f To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 06 Feb 2015 19:38:32 -0700 From: James Gritton In-Reply-To: <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> References: <201502061754.t16HssXU042750@svn.freebsd.org> <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> Message-ID: X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.0.3 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 02:38:40 -0000 On 2015-02-06 19:23, Garrett Cooper wrote: > On Feb 6, 2015, at 9:54, Jamie Gritton wrote: > >> Author: jamie >> Date: Fri Feb 6 17:54:53 2015 >> New Revision: 278323 >> URL: https://svnweb.freebsd.org/changeset/base/278323 >> >> Log: >> Add mount.procfs jail parameter, so procfs can be mounted when a >> prison's >> root is in its fstab. >> >> Also fix a typo while I'm at it. >> >> PR: 197237 197066 >> MFC after: 3 days >> >> Modified: >> head/etc/rc.d/jail >> head/usr.sbin/jail/command.c >> head/usr.sbin/jail/config.c >> head/usr.sbin/jail/jail.8 >> head/usr.sbin/jail/jail.c >> head/usr.sbin/jail/jailp.h > > I think you broke the Jenkins tests runs, and potentially jail support > in some edgecases: > https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/651/ Where do I go from here? There error you refer to certainly seems jail-related, which leads me to guess at something disconnected between the matching rc.d/jail and jail(8) change (i.e. using the new rc file with the old jail program). But that's really just a wild guess. Is there somewhere I look for more information? For example, where does Jenkins actually do its thing? Sorry for being so stupid in this - Jenkins has only been on the very edge of my awareness until now. - Jamie From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:02:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EAA7C6F; Sat, 7 Feb 2015 05:02:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6BBE65E; Sat, 7 Feb 2015 05:02:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1752Bke060612; Sat, 7 Feb 2015 05:02:11 GMT (envelope-from jamie@FreeBSD.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1752Bxo060611; Sat, 7 Feb 2015 05:02:11 GMT (envelope-from jamie@FreeBSD.org) Message-Id: <201502070502.t1752Bxo060611@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jamie set sender to jamie@FreeBSD.org using -f From: Jamie Gritton Date: Sat, 7 Feb 2015 05:02:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278343 - head/etc/rc.d 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:02:12 -0000 Author: jamie Date: Sat Feb 7 05:02:10 2015 New Revision: 278343 URL: https://svnweb.freebsd.org/changeset/base/278343 Log: Revert the rc part of r278323 until I can figure out what Jenkins is doing. Modified: head/etc/rc.d/jail Modified: head/etc/rc.d/jail ============================================================================== --- head/etc/rc.d/jail Sat Feb 7 01:50:32 2015 (r278342) +++ head/etc/rc.d/jail Sat Feb 7 05:02:10 2015 (r278343) @@ -233,7 +233,8 @@ parse_options() fi eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} if checkyesno jail_${_j}_procfs_enable; then - echo " mount.procfs;" + echo " mount += " \ + "\"procfs ${_rootdir%/}/proc procfs rw 0 0\";" fi eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}} From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:19:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24408432; Sat, 7 Feb 2015 05:19:01 +0000 (UTC) Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [IPv6:2607:f8b0:400e:c03::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DED907B4; Sat, 7 Feb 2015 05:19:00 +0000 (UTC) Received: by mail-pa0-f48.google.com with SMTP id ey11so21578380pad.7; Fri, 06 Feb 2015 21:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=vcAWQDlBkn9QtMjOqui9dqG35hlAzXJs0XYzcxAXm8I=; b=IYTF6mai896G+ZqCKMWj/4OfrzmHReWvEZr7VXR54HLKuDlJVRNoIUOqPRS01s84dP vZyBJ/6HttDyxKeTo4h2D7FEzB+XZDj7M/UK2Mvh1RZW5LwaDkMSHnGHHEDg3tBjGhsT KJODeW2H8/ijDYeMYC+VxNz+dnqMhkDy+EeUAK2+okf1U5Bu5ZSJ9A5CA2ANtYJiFJZW xFUmz/ze+oBxrgwMyRcCyS0p8x+NCg3nRHIORcXiUodKmKiR+ynkgESPzN8xM7boMD4p hsYhwLSplu7dOOWgPS9x3ifseY3SWy1FUPuI46+m5FeaRNmOJoECMQNmZ9ZiosGY0G2c 315A== X-Received: by 10.66.249.39 with SMTP id yr7mr10915427pac.43.1423286340429; Fri, 06 Feb 2015 21:19:00 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id tn2sm9689534pbc.15.2015.02.06.21.18.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:18:59 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_5B8F74D2-0F6E-4589-B0BD-79FAE33C3A09"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: <201502061754.t16HssXU042750@svn.freebsd.org> Date: Fri, 6 Feb 2015 21:18:58 -0800 Message-Id: References: <201502061754.t16HssXU042750@svn.freebsd.org> To: Jamie Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:19:01 -0000 --Apple-Mail=_5B8F74D2-0F6E-4589-B0BD-79FAE33C3A09 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Feb 6, 2015, at 9:54, Jamie Gritton wrote: > Author: jamie > Date: Fri Feb 6 17:54:53 2015 > New Revision: 278323 > URL: https://svnweb.freebsd.org/changeset/base/278323 >=20 > Log: > Add mount.procfs jail parameter, so procfs can be mounted when a = prison's > root is in its fstab. >=20 > Also fix a typo while I'm at it. >=20 > PR: 197237 197066 > MFC after: 3 days >=20 > Modified: > head/etc/rc.d/jail > head/usr.sbin/jail/command.c > head/usr.sbin/jail/config.c > head/usr.sbin/jail/jail.8 > head/usr.sbin/jail/jail.c > head/usr.sbin/jail/jailp.h >=20 > Modified: head/etc/rc.d/jail > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/etc/rc.d/jail Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/etc/rc.d/jail Fri Feb 6 17:54:53 2015 = (r278323) > @@ -28,7 +28,7 @@ extra_commands=3D"config console status" >=20 > need_dad_wait=3D >=20 > -# extact_var jail name param num defval > +# extract_var jail name param num defval > # Extract value from ${jail_$jail_$name} or ${jail_$name} and > # set it to $param. If not defined, $defval is used. > # When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and > @@ -233,8 +233,7 @@ parse_options() > fi > eval : = \${jail_${_j}_procfs_enable:=3D${jail_procfs_enable:-NO}} > if checkyesno jail_${_j}_procfs_enable; then > - echo " mount +=3D " \ > - "\"procfs ${_rootdir%/}/proc procfs rw 0 = 0\";" > + echo " mount.procfs;" > fi >=20 > eval : = \${jail_${_j}_mount_enable:=3D${jail_mount_enable:-NO}} >=20 > Modified: head/usr.sbin/jail/command.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/jail/command.c Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 = (r278323) > @@ -112,6 +112,12 @@ next_command(struct cfjail *j) > if = (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) > continue; > j->comstring =3D &dummystring; > + break; > + case IP_MOUNT_PROCFS: > + if = (!bool_param(j->intparams[IP_MOUNT_PROCFS])) > + continue; > + j->comstring =3D &dummystring; > + break; Did you intend on adding another break? The code would previously fall = through to the next case statement... > case IP__OP: > case IP_STOP_TIMEOUT: > j->comstring =3D &dummystring; > @@ -528,6 +534,32 @@ run_command(struct cfjail *j) > } > break; >=20 > + case IP_MOUNT_PROCFS: > + argv =3D alloca(7 * sizeof(char *)); > + path =3D string_param(j->intparams[KP_PATH]); > + if (path =3D=3D NULL) { > + jail_warnx(j, "mount.procfs: no path"); > + return -1; > + } > + devpath =3D alloca(strlen(path) + 6); > + sprintf(devpath, "%s/proc", path); > + if (check_path(j, "mount.procfs", devpath, 0, > + down ? "procfs" : NULL) < 0) > + return -1; > + if (down) { > + argv[0] =3D "/sbin/umount"; > + argv[1] =3D devpath; > + argv[2] =3D NULL; > + } else { > + argv[0] =3D _PATH_MOUNT; > + argv[1] =3D "-t"; > + argv[2] =3D "procfs"; > + argv[3] =3D "."; > + argv[4] =3D devpath; > + argv[5] =3D NULL; > + } > + break; > + > case IP_COMMAND: > if (j->name !=3D NULL) > goto default_command; >=20 > Modified: head/usr.sbin/jail/config.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/jail/config.c Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/usr.sbin/jail/config.c Fri Feb 6 17:54:53 2015 = (r278323) > @@ -84,6 +84,7 @@ static const struct ipspec intparams[] =3D > [IP_MOUNT] =3D {"mount", PF_INTERNAL | = PF_REV}, > [IP_MOUNT_DEVFS] =3D {"mount.devfs", = PF_INTERNAL | PF_BOOL}, > [IP_MOUNT_FDESCFS] =3D {"mount.fdescfs", PF_INTERNAL | = PF_BOOL}, > + [IP_MOUNT_PROCFS] =3D {"mount.procfs", = PF_INTERNAL | PF_BOOL}, > [IP_MOUNT_FSTAB] =3D {"mount.fstab", = PF_INTERNAL}, > [IP_STOP_TIMEOUT] =3D {"stop.timeout", = PF_INTERNAL | PF_INT}, > [IP_VNET_INTERFACE] =3D {"vnet.interface", PF_INTERNAL}, >=20 > Modified: head/usr.sbin/jail/jail.8 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/jail/jail.8 Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/usr.sbin/jail/jail.8 Fri Feb 6 17:54:53 2015 = (r278323) > @@ -25,7 +25,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd January 28, 2015 > +.Dd February 6, 2015 > .Dt JAIL 8 > .Os > .Sh NAME > @@ -753,6 +753,12 @@ Mount a > filesystem on the chrooted > .Pa /dev/fd > directory. > +.It Va mount.procfs > +Mount a > +.Xr procfs 5 > +filesystem on the chrooted > +.Pa /proc > +directory. > .It Va allow.dying > Allow making changes to a > .Va dying > @@ -1207,6 +1213,7 @@ environment of the first jail. > .Xr jls 8 , > .Xr mount 8 , > .Xr named 8 , > +.Xr procfs 5 , > .Xr reboot 8 , > .Xr rpcbind 8 , > .Xr sendmail 8 , >=20 > Modified: head/usr.sbin/jail/jail.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/jail/jail.c Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/usr.sbin/jail/jail.c Fri Feb 6 17:54:53 2015 = (r278323) > @@ -93,6 +93,7 @@ static const enum intparam startcommands > IP__MOUNT_FROM_FSTAB, > IP_MOUNT_DEVFS, > IP_MOUNT_FDESCFS, > + IP_MOUNT_PROCFS, > IP_EXEC_PRESTART,=20 > IP__OP, > IP_VNET_INTERFACE, > @@ -109,6 +110,7 @@ static const enum intparam stopcommands[ > IP_STOP_TIMEOUT, > IP__OP, > IP_EXEC_POSTSTOP, > + IP_MOUNT_PROCFS, > IP_MOUNT_FDESCFS, > IP_MOUNT_DEVFS, > IP__MOUNT_FROM_FSTAB, >=20 > Modified: head/usr.sbin/jail/jailp.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/jail/jailp.h Fri Feb 6 17:43:13 2015 = (r278322) > +++ head/usr.sbin/jail/jailp.h Fri Feb 6 17:54:53 2015 = (r278323) > @@ -96,6 +96,7 @@ enum intparam { > IP_MOUNT, /* Mount points in fstab(5) form */ > IP_MOUNT_DEVFS, /* Mount /dev under prison root */ > IP_MOUNT_FDESCFS, /* Mount /dev/fd under prison root */ > + IP_MOUNT_PROCFS, /* Mount /proc under prison root */ > IP_MOUNT_FSTAB, /* A standard fstab(5) file */ > IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */ > IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ >=20 --Apple-Mail=_5B8F74D2-0F6E-4589-B0BD-79FAE33C3A09 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aBCAAoJEMZr5QU6S73e/oUH/iuXGJqEFbVXVaBRyaej41LA l4H31ffEFZ0GEh0v/Ukio64E1j0Et2BL6++kv8Y50IatJpsE0MoulXNgHjQiWffV ajj+tHIjFNch5ux/xpJ2gMGZ3crFHt4lXKsF60NKZh8kwejG0RQoo7k/S4zWX20Y vNf5xTBdG3VlJZ7fIGnHScdtIN1m6s0fC7wtmJwp7pmnq8dFKdeVfKL/46fwpYtS tZ5/u+16FV/LzxhtC8rB9ah4I+hdo5iSqBAiNAWDRWcpb7J+rB7a+mEsqvJMe/XI 7nosd3zdCdzm5u/yqH1ZswGasS+qslfEt9ZSeZlaYIFwH1khM962jh+uB+EEcjU= =EYsH -----END PGP SIGNATURE----- --Apple-Mail=_5B8F74D2-0F6E-4589-B0BD-79FAE33C3A09-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:23:49 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B5AC59A; Sat, 7 Feb 2015 05:23:49 +0000 (UTC) Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [IPv6:2607:f8b0:400e:c03::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 510D5859; Sat, 7 Feb 2015 05:23:49 +0000 (UTC) Received: by mail-pa0-f48.google.com with SMTP id ey11so21594905pad.7; Fri, 06 Feb 2015 21:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=2IK82kPHd0ImURt1advKpEq3nSZNQCNhPTSUs0eQ+r4=; b=XKcg168lXo394Tfts/czyDJCSjaPwgOkrTVMEr4lZZaaJHOaI4e3ALmyBBQ/5og0zv fMriTA6LWs6YuHQBV7xeOIJs2kH96Ob6KIzm4MyfsB8XNmSSqA09k90lBWxFhuqXLlvV 4dt3loPfPlyQ5AMCdKcSNoCyUp3SYFcOc1I+/vu99nb8bzIS6uUsU1a65GS3+CsflebE OgRzqbIT+5do4PBBNFL7gAXQKkrv6anMhJGZe1Zoi5n28TL3Ic2WDUY9HLCeWYYwNX0D oxyVN+L9pdERhXPe9bNrJ98ktmf0M9gE0oRj4Ne0xbGg9Dr/l198R+LtWKlkB9Zl03R3 bgVw== X-Received: by 10.70.45.108 with SMTP id l12mr11147662pdm.112.1423286628827; Fri, 06 Feb 2015 21:23:48 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id uy8sm9694106pbc.31.2015.02.06.21.23.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:23:48 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_BBABA529-F1EE-44BE-A4C1-84BFD08D3E25"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: Date: Fri, 6 Feb 2015 21:23:47 -0800 Message-Id: References: <201502061754.t16HssXU042750@svn.freebsd.org> <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> To: James Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:23:49 -0000 --Apple-Mail=_BBABA529-F1EE-44BE-A4C1-84BFD08D3E25 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 18:38, James Gritton wrote: > On 2015-02-06 19:23, Garrett Cooper wrote: >> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>> Author: jamie >>> Date: Fri Feb 6 17:54:53 2015 >>> New Revision: 278323 >>> URL: https://svnweb.freebsd.org/changeset/base/278323 >>> Log: >>> Add mount.procfs jail parameter, so procfs can be mounted when a = prison's >>> root is in its fstab. >>> Also fix a typo while I'm at it. >>> PR: 197237 197066 >>> MFC after: 3 days >>> Modified: >>> head/etc/rc.d/jail >>> head/usr.sbin/jail/command.c >>> head/usr.sbin/jail/config.c >>> head/usr.sbin/jail/jail.8 >>> head/usr.sbin/jail/jail.c >>> head/usr.sbin/jail/jailp.h >> I think you broke the Jenkins tests runs, and potentially jail = support >> in some edgecases: >> https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/651/ >=20 > Where do I go from here? There error you refer to certainly seems = jail-related, which leads me to guess at something disconnected between = the matching rc.d/jail and jail(8) change (i.e. using the new rc file = with the old jail program). But that's really just a wild guess. Is = there somewhere I look for more information? For example, where does = Jenkins actually do its thing? >=20 > Sorry for being so stupid in this - Jenkins has only been on the very = edge of my awareness until now. I honestly don=92t think it=92s Jenkins because Jenkins runs in bhyve. I = think you accidentally broke option handling in the jail configuration = (please see my other reply about added =93break;=94 statements). pgrep uses /proc to determine whether or not a process is running. If = it=92s not properly mounted or the jail isn=92t started properly, that = could cause the issues seen here. I know because I=92ve tried running = these tests before in an attempt to fix them, and this was one of the = things I ran into. You can verify your changes by doing: % (cd /usr/tests/bin/pkill; sudo kyua test) Cheers! --Apple-Mail=_BBABA529-F1EE-44BE-A4C1-84BFD08D3E25 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aFjAAoJEMZr5QU6S73eXuIH/0ed5GkSgmfhXVqhi6at1hv6 F2g+49WPImwt7ZHIGhbwcyzaRC9SLRzwQp87c/NqjWhUcAoK8JUl5mQ+pmzjD1B9 UajjttxhRDCCvGTt+RYfGNCoiMexXZdOmrdaLJ4PoKQEJSK0lSKgDImHz7KmTqdH uCDrHYciLbUQA1evOf6Tu0YussW7V82lYZopBa0vICNiWunAw6A1yZlYiZNZZfgT eu6u3Yqfomtb/56K8waSYJOptaMyEsgKtNHyKD3Wk7ZgVnGtnMZp32vyLzUJ+vIE dl7XySLjvFuXiTw6PAmRoseKuZfT0HOqak7UqC++4S5EDH++lKsYb5sVXxqWXRE= =JYG/ -----END PGP SIGNATURE----- --Apple-Mail=_BBABA529-F1EE-44BE-A4C1-84BFD08D3E25-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:24:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62EDF6D2; Sat, 7 Feb 2015 05:24:17 +0000 (UTC) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2792C85D; Sat, 7 Feb 2015 05:24:17 +0000 (UTC) Received: by mail-pa0-f54.google.com with SMTP id kx10so6483991pab.13; Fri, 06 Feb 2015 21:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=bXwrEcWZSdNrZuNX+rUWbF4KyfFqVa+uD8IesLXIt9g=; b=dVSrkD2uMt+f7xc3ICvXYGmbRBpRfJ9k7QDLb4koSXlmzA1NNT3gHm5N08PGNIAjCo QhsIeB7VFww2NY5gapKSTgH0IowvF5OpPyYDN4WxvP+5HtQ7fnuh8kAmncxbAtM1Gklz f/V6Q8SlBaJH16dq2OBx/A+FoaGe3ylobpfeMKM/xBjPmA0eZrGRgzW9B5IQyie+xg8B ey3VFtklnWpMkPGYqZ3WOM2iCqdfKghtiLX8+bry6/ETDFyyWc16dgLO8ijinmH8VaJO gA4SHyx5qRoYwbzKyrHX7oGoxL01AtjogvYBvf7U1QbE0Bnzf/6J5RLGOjepYtkzPepF duEw== X-Received: by 10.70.130.205 with SMTP id og13mr11082258pdb.72.1423286656732; Fri, 06 Feb 2015 21:24:16 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id uy8sm9694106pbc.31.2015.02.06.21.24.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:24:16 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_16B5105D-4E35-4F8A-B353-041A12F8699A"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: Date: Fri, 6 Feb 2015 21:24:16 -0800 Message-Id: <101D5696-72F7-4B16-A19E-D2B55FDF7184@gmail.com> References: <201502061754.t16HssXU042750@svn.freebsd.org> <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> To: James Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:24:17 -0000 --Apple-Mail=_16B5105D-4E35-4F8A-B353-041A12F8699A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 21:23, Garrett Cooper wrote: > On Feb 6, 2015, at 18:38, James Gritton wrote: >=20 >> On 2015-02-06 19:23, Garrett Cooper wrote: >>> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>>> Author: jamie >>>> Date: Fri Feb 6 17:54:53 2015 >>>> New Revision: 278323 >>>> URL: https://svnweb.freebsd.org/changeset/base/278323 >>>> Log: >>>> Add mount.procfs jail parameter, so procfs can be mounted when a = prison's >>>> root is in its fstab. >>>> Also fix a typo while I'm at it. >>>> PR: 197237 197066 >>>> MFC after: 3 days >>>> Modified: >>>> head/etc/rc.d/jail >>>> head/usr.sbin/jail/command.c >>>> head/usr.sbin/jail/config.c >>>> head/usr.sbin/jail/jail.8 >>>> head/usr.sbin/jail/jail.c >>>> head/usr.sbin/jail/jailp.h >>> I think you broke the Jenkins tests runs, and potentially jail = support >>> in some edgecases: >>> https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/651/ >>=20 >> Where do I go from here? There error you refer to certainly seems = jail-related, which leads me to guess at something disconnected between = the matching rc.d/jail and jail(8) change (i.e. using the new rc file = with the old jail program). But that's really just a wild guess. Is = there somewhere I look for more information? For example, where does = Jenkins actually do its thing? >>=20 >> Sorry for being so stupid in this - Jenkins has only been on the very = edge of my awareness until now. >=20 > I honestly don=92t think it=92s Jenkins because Jenkins runs in bhyve. = I think you accidentally broke option handling in the jail configuration = (please see my other reply about added =93break;=94 statements). because Jenkins -> because the Jenkins kyua run --Apple-Mail=_16B5105D-4E35-4F8A-B353-041A12F8699A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aGAAAoJEMZr5QU6S73eGQkH/iqLF/FDNN/+ZC06ZiOY+Iqh k6Gqi/38w7KqHTmCQ4pOkfN8jeibrTfDcUx3VdoN233D6rSjqOqbPRddeXWet2pM NkaLHW/WpZ6/lskEoQnhG1/arN7ukvtwjAv5FkaPog7z/XW6E8AZYuV3d6j7SBAN aHW5kBOur2ZYWj43ZYbhN1ClzpwKE3x6PL0iuQ0QzDoSNMNe0/VKi16S4RLeNXDg uOmQMcRGlP/wYte4TIat06+y6sK7vybzq0wC3AsS9wZ4h9N6lCZvu9lxIVhOUyd3 jXxDB2A2UJFrBRnNvWwm8u9uzuyR5OtIDk+qOSKeOx6rhrg6gjWwuJl+/Vbupx8= =dURz -----END PGP SIGNATURE----- --Apple-Mail=_16B5105D-4E35-4F8A-B353-041A12F8699A-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:27:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6103B82F; Sat, 7 Feb 2015 05:27:04 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29D71872; Sat, 7 Feb 2015 05:27:03 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) by m2.gritton.org (8.14.9/8.14.9) with ESMTP id t175R2Ws078795; Fri, 6 Feb 2015 22:27:02 -0700 (MST) (envelope-from jamie@freebsd.org) Received: (from www@localhost) by m2.gritton.org (8.14.9/8.14.9/Submit) id t175R2c8078794; Fri, 6 Feb 2015 22:27:02 -0700 (MST) (envelope-from jamie@freebsd.org) X-Authentication-Warning: gritton.org: www set sender to jamie@freebsd.org using -f To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 06 Feb 2015 22:27:02 -0700 From: James Gritton In-Reply-To: References: <201502061754.t16HssXU042750@svn.freebsd.org> Message-ID: <609da07b7a80b4a59fce8655370b045e@gritton.org> X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.0.3 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:27:04 -0000 On 2015-02-06 22:18, Garrett Cooper wrote: > On Feb 6, 2015, at 9:54, Jamie Gritton wrote: > >> Modified: head/usr.sbin/jail/command.c >> ============================================================================== >> --- head/usr.sbin/jail/command.c Fri Feb 6 17:43:13 2015 (r278322) >> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 (r278323) >> @@ -112,6 +112,12 @@ next_command(struct cfjail *j) >> if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) >> continue; >> j->comstring = &dummystring; >> + break; >> + case IP_MOUNT_PROCFS: >> + if (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >> + continue; >> + j->comstring = &dummystring; >> + break; > > Did you intend on adding another break? The code would previously fall > through to the next case statement... > >> case IP__OP: >> case IP_STOP_TIMEOUT: >> j->comstring = &dummystring; Yes. The code did indeed previously fall to the next case, but it was a no-op: the next case only had the same exact assignment that had just taken place (j->comstring = &dummystring). The lack of a break that had existed before was just some sloppy coding that I didn't notice at the time because it didn't actually change any behavior. Nonetheless it seemed worth correcting when I noticed it. - Jamie From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:31:57 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABDEF9AA; Sat, 7 Feb 2015 05:31:57 +0000 (UTC) Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7C0AE91B; Sat, 7 Feb 2015 05:31:57 +0000 (UTC) Received: by pdev10 with SMTP id v10so1677607pde.7; Fri, 06 Feb 2015 21:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=hc9SDEw477hFRT7nWunW0GekMkT10QOKVIzIsKMTpno=; b=O6kv1pTPABELvU7sDJLc4fjdDxo/D36qAoXnnZ9eK2E0K72n7/DabZ6gaWLZEqAWfL +45ZS/wXIdm9mqIm0NIvJPD+nEOwA254CJhPRA9r9lxp8eDL1RGJ3f6C2THqpOC8Lg+h fZMAua4KX9blWFb64koo05ho22apvYa8u/77QZncCLo4gcuOu053C5mngUDsCuD/d3/v J9OBZfYmcV+Oz3OVu6uWQIwuLduK00yPzcvjH2g9fnD9oYPvQ1SbZZ+CtwDdGMdaNxxg rXicnKbHIu2Q4jlr/m1lx//PVXRki/kPWCvmO3UXoUugdPJrlIiBXIlOn/lh5I5Klo08 cO1Q== X-Received: by 10.70.128.202 with SMTP id nq10mr11082463pdb.45.1423287116522; Fri, 06 Feb 2015 21:31:56 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id ys5sm9725564pbc.17.2015.02.06.21.31.55 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:31:56 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_99023C41-B0DF-443E-A458-5076B171C6F7"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: <609da07b7a80b4a59fce8655370b045e@gritton.org> Date: Fri, 6 Feb 2015 21:31:55 -0800 Message-Id: References: <201502061754.t16HssXU042750@svn.freebsd.org> <609da07b7a80b4a59fce8655370b045e@gritton.org> To: James Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:31:57 -0000 --Apple-Mail=_99023C41-B0DF-443E-A458-5076B171C6F7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 21:27, James Gritton wrote: > On 2015-02-06 22:18, Garrett Cooper wrote: >> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>> Modified: head/usr.sbin/jail/command.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/jail/command.c Fri Feb 6 17:43:13 2015 = (r278322) >>> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 = (r278323) >>> @@ -112,6 +112,12 @@ next_command(struct cfjail *j) >>> if = (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) >>> continue; >>> j->comstring =3D &dummystring; >>> + break; >>> + case IP_MOUNT_PROCFS: >>> + if = (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >>> + continue; >>> + j->comstring =3D &dummystring; >>> + break; >> Did you intend on adding another break? The code would previously = fall >> through to the next case statement... >>> case IP__OP: >>> case IP_STOP_TIMEOUT: >>> j->comstring =3D &dummystring; >=20 > Yes. The code did indeed previously fall to the next case, but it was = a no-op: the next case only had the same exact assignment that had just = taken place (j->comstring =3D &dummystring). The lack of a break that = had existed before was just some sloppy coding that I didn't notice at = the time because it didn't actually change any behavior. Nonetheless it = seemed worth correcting when I noticed it. True. I looked at the code afterwards and it looks ok. mount.procfs = doesn=92t exist in my environment. Is that command correct? $ which mount.procfs; echo $? 1 --Apple-Mail=_99023C41-B0DF-443E-A458-5076B171C6F7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aNLAAoJEMZr5QU6S73eJWoH/1d0mHer/sj8l48uf+qzX5EX OiKi+i6ScqMMcwUb43wPFkfv8ItCB9nmVW46y1++wOq+dbgUz91zU1/WyWER+YQv Z6NOjwMv3XwkV3l5VXR9h9e2pFYWx/ang7pR/o8pe8LFWCOLipEkZ0qyi2vg82bQ DyxYvzrlkqva7kH+2BY1+mji18oo7lb1IToYUj7Q+yZPwAwk6N8BdpIz/keCkU1d tJWCQU9r04wq+4nt1rjGRkWBi4z2wZrFiASuQIDZ/P22ZKsywq2HpZT1QvlhY/GQ HeoGs84r8lK0JgVNnfjNRFbHE+UffrPdSC2QbOKLltMooxfjTPFa9J1NQa6wrc4= =V7M3 -----END PGP SIGNATURE----- --Apple-Mail=_99023C41-B0DF-443E-A458-5076B171C6F7-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:33:44 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 214C4AF7; Sat, 7 Feb 2015 05:33:44 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7119927; Sat, 7 Feb 2015 05:33:43 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) by m2.gritton.org (8.14.9/8.14.9) with ESMTP id t175Xg0X078941; Fri, 6 Feb 2015 22:33:42 -0700 (MST) (envelope-from jamie@freebsd.org) Received: (from www@localhost) by m2.gritton.org (8.14.9/8.14.9/Submit) id t175XgXs078940; Fri, 6 Feb 2015 22:33:42 -0700 (MST) (envelope-from jamie@freebsd.org) X-Authentication-Warning: gritton.org: www set sender to jamie@freebsd.org using -f To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Fri, 06 Feb 2015 22:33:42 -0700 From: James Gritton In-Reply-To: References: <201502061754.t16HssXU042750@svn.freebsd.org> <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> Message-ID: <50b5af6dca2ee6fea17e716874d731e2@gritton.org> X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.0.3 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:33:44 -0000 On 2015-02-06 22:23, Garrett Cooper wrote: > On Feb 6, 2015, at 18:38, James Gritton wrote: > >> On 2015-02-06 19:23, Garrett Cooper wrote: >>> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>>> Author: jamie >>>> Date: Fri Feb 6 17:54:53 2015 >>>> New Revision: 278323 >>>> URL: https://svnweb.freebsd.org/changeset/base/278323 >>>> Log: >>>> Add mount.procfs jail parameter, so procfs can be mounted when a >>>> prison's >>>> root is in its fstab. >>>> Also fix a typo while I'm at it. >>>> PR: 197237 197066 >>>> MFC after: 3 days >>>> Modified: >>>> head/etc/rc.d/jail >>>> head/usr.sbin/jail/command.c >>>> head/usr.sbin/jail/config.c >>>> head/usr.sbin/jail/jail.8 >>>> head/usr.sbin/jail/jail.c >>>> head/usr.sbin/jail/jailp.h >>> I think you broke the Jenkins tests runs, and potentially jail >>> support >>> in some edgecases: >>> https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/651/ >> >> Where do I go from here? There error you refer to certainly seems >> jail-related, which leads me to guess at something disconnected >> between the matching rc.d/jail and jail(8) change (i.e. using the new >> rc file with the old jail program). But that's really just a wild >> guess. Is there somewhere I look for more information? For example, >> where does Jenkins actually do its thing? >> >> Sorry for being so stupid in this - Jenkins has only been on the very >> edge of my awareness until now. > > I honestly don’t think it’s Jenkins because Jenkins runs in bhyve. I > think you accidentally broke option handling in the jail configuration > (please see my other reply about added “break;” statements). Oh I figure I broke something, not blaming Jenkins or anything like that - merely voicing my ignorance of how it's all put together :-). My guess is that the jail(8) changes were good (I tested those), and for now I've reverted the rc script change so the old (untouched) jail options will be used. > pgrep uses /proc to determine whether or not a process is running. If > it’s not properly mounted or the jail isn’t started properly, that > could cause the issues seen here. I know because I’ve tried running > these tests before in an attempt to fix them, and this was one of the > things I ran into. > > You can verify your changes by doing: > > % (cd /usr/tests/bin/pkill; sudo kyua test) > > Cheers! OK, now I'm getting somewhere! I'll try that test. - Jamie From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:37:10 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 733F5C59; Sat, 7 Feb 2015 05:37:10 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20C7593C; Sat, 7 Feb 2015 05:37:10 +0000 (UTC) Received: from m2.gritton.org (gritton.org [63.246.134.121]) by m2.gritton.org (8.14.9/8.14.9) with ESMTP id t175b9BO079015; Fri, 6 Feb 2015 22:37:09 -0700 (MST) (envelope-from jamie@freebsd.org) Received: (from www@localhost) by m2.gritton.org (8.14.9/8.14.9/Submit) id t175b9ej079014; Fri, 6 Feb 2015 22:37:09 -0700 (MST) (envelope-from jamie@freebsd.org) X-Authentication-Warning: gritton.org: www set sender to jamie@freebsd.org using -f To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail X-PHP-Originating-Script: 0:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Fri, 06 Feb 2015 22:37:09 -0700 From: James Gritton In-Reply-To: References: <201502061754.t16HssXU042750@svn.freebsd.org> <609da07b7a80b4a59fce8655370b045e@gritton.org> Message-ID: <66d9c0b5cbced6ffa23ebd023a69a351@gritton.org> X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.0.3 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:37:10 -0000 On 2015-02-06 22:31, Garrett Cooper wrote: > On Feb 6, 2015, at 21:27, James Gritton wrote: > >> On 2015-02-06 22:18, Garrett Cooper wrote: >>> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>>> Modified: head/usr.sbin/jail/command.c >>>> ============================================================================== >>>> --- head/usr.sbin/jail/command.c Fri Feb 6 17:43:13 2015 (r278322) >>>> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 (r278323) >>>> @@ -112,6 +112,12 @@ next_command(struct cfjail *j) >>>> if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) >>>> continue; >>>> j->comstring = &dummystring; >>>> + break; >>>> + case IP_MOUNT_PROCFS: >>>> + if (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >>>> + continue; >>>> + j->comstring = &dummystring; >>>> + break; >>> Did you intend on adding another break? The code would previously >>> fall >>> through to the next case statement... >>>> case IP__OP: >>>> case IP_STOP_TIMEOUT: >>>> j->comstring = &dummystring; >> >> Yes. The code did indeed previously fall to the next case, but it was >> a no-op: the next case only had the same exact assignment that had >> just taken place (j->comstring = &dummystring). The lack of a break >> that had existed before was just some sloppy coding that I didn't >> notice at the time because it didn't actually change any behavior. >> Nonetheless it seemed worth correcting when I noticed it. > > True. I looked at the code afterwards and it looks ok. mount.procfs > doesn’t exist in my environment. Is that command correct? > > $ which mount.procfs; echo $? > 1 I added mount.procfs as a jail parameter, but it's not a command. Just like the existing mount.devfs and mount.fdescfs aren't commands either. The reason these jail parameters exist is to ease the backward compatibility with the old rc-based jail system. It should be a simple case of doing for procfs exactly what I did for the other two, but apparently it isn't. It's likely related to something I'm missing in the proper way of modifying rc scripts. - Jamie From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 05:37:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD1D5D90; Sat, 7 Feb 2015 05:37:21 +0000 (UTC) Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C347940; Sat, 7 Feb 2015 05:37:21 +0000 (UTC) Received: by pdbfl12 with SMTP id fl12so19052300pdb.6; Fri, 06 Feb 2015 21:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=Y2fpH0PwWsYa4hJ2xgRHKb6h3FYSHHRVjn3qCVtbIcA=; b=qiHRTzBPbyzxNSY6lA/K/i3gh8KDM6QNQbFvvXhV/zAmFaO0MkofctNAPutyAzhXSQ lIoflddKDtEtx4JYF4bam044k4rQKwPYsr41WGxBTaI3fyIphWEhzQz5ooWbkr+1mwzB 3bsK3J9IRjEwPITCYIcssN3MCKJE5RIQKdkhy7aLKysTiXLAXHuopqusNi+APNJgFlR9 HO41XOYqsSXuNFMYjvexla1EdevdUNi/fH1qIdQqACCa63mwnZ2gDNwie8GqbfAYYqYP 7PjTKL3lP1iMZ89lyZAR4sxBIw1oQU0+hXJeJYV7599X7HdcgIfzsyohqXr/+l12zukx 7hig== X-Received: by 10.70.129.75 with SMTP id nu11mr11154161pdb.151.1423287440907; Fri, 06 Feb 2015 21:37:20 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:e47d:5c02:fe5f:40fa? ([2601:8:ab80:7d6:e47d:5c02:fe5f:40fa]) by mx.google.com with ESMTPSA id dy3sm1336340pab.33.2015.02.06.21.37.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Feb 2015 21:37:20 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail From: Garrett Cooper In-Reply-To: Date: Fri, 6 Feb 2015 21:37:19 -0800 Message-Id: References: <201502061754.t16HssXU042750@svn.freebsd.org> <609da07b7a80b4a59fce8655370b045e@gritton.org> To: James Gritton X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 05:37:21 -0000 --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Feb 6, 2015, at 21:31, Garrett Cooper wrote: > On Feb 6, 2015, at 21:27, James Gritton wrote: >=20 >> On 2015-02-06 22:18, Garrett Cooper wrote: >>> On Feb 6, 2015, at 9:54, Jamie Gritton wrote: >>>> Modified: head/usr.sbin/jail/command.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/jail/command.c Fri Feb 6 17:43:13 2015 = (r278322) >>>> +++ head/usr.sbin/jail/command.c Fri Feb 6 17:54:53 2015 = (r278323) >>>> @@ -112,6 +112,12 @@ next_command(struct cfjail *j) >>>> if = (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) >>>> continue; >>>> j->comstring =3D &dummystring; >>>> + break; >>>> + case IP_MOUNT_PROCFS: >>>> + if = (!bool_param(j->intparams[IP_MOUNT_PROCFS])) >>>> + continue; >>>> + j->comstring =3D &dummystring; >>>> + break; >>> Did you intend on adding another break? The code would previously = fall >>> through to the next case statement... >>>> case IP__OP: >>>> case IP_STOP_TIMEOUT: >>>> j->comstring =3D &dummystring; >>=20 >> Yes. The code did indeed previously fall to the next case, but it = was a no-op: the next case only had the same exact assignment that had = just taken place (j->comstring =3D &dummystring). The lack of a break = that had existed before was just some sloppy coding that I didn't notice = at the time because it didn't actually change any behavior. Nonetheless = it seemed worth correcting when I noticed it. >=20 > True. I looked at the code afterwards and it looks ok. mount.procfs = doesn=92t exist in my environment. Is that command correct? >=20 > $ which mount.procfs; echo $? > 1 Nevermind =97 thinking Linux for a sec. I think I see the bug now. = etc/rc.d/jail before this change used to pass ${rootdir} if it was = defined, and the new code wasn=92t passing that=85 Might want to = doublecheck it, but adding the rootdir afterwards might fix that. --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJU1aSPAAoJEMZr5QU6S73ewiQH/jFaeq4Y6BdqhaaBoWwCAvtc 3R6uSGA3djPjNoxpAoUyy0rTn91Jc0d5ThomTaDnNBVYro7vPUVlfWdrQDBIx/CP 8s6Wwx2nRMqXno9Lb4VzmUt5mHtrvNJi0qXzC82b0TaccYnMzHrg5/aPXAO1qnlE XyK166PRwvW6CTWJgAJLjb/2qXAofG/Zw37WWwjrTcprRbiNDRQoYixXBtnAD385 Y47Jt0cqky+JHG9FDPK+HcdggFUc0MH3V/IquBtR7KPO6ImD5rRYihT4I9M+GxGc PPWf92E/UzW24GVZK7zel3e6uppTyulQ2EvRCDUCTglYZmjAG3UfPlsi2SG9ROI= =WPzD -----END PGP SIGNATURE----- --Apple-Mail=_6A344E64-558C-4053-8B91-947702389F67-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 08:10:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF89BD74; Sat, 7 Feb 2015 08:10:35 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7870A7E6; Sat, 7 Feb 2015 08:10:35 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t178APmg070170 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 7 Feb 2015 10:10:25 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t178APmg070170 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id t178APmK070168; Sat, 7 Feb 2015 10:10:25 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 7 Feb 2015 10:10:25 +0200 From: Konstantin Belousov To: Garrett Cooper Subject: Re: svn commit: r278323 - in head: etc/rc.d usr.sbin/jail Message-ID: <20150207081025.GT42409@kib.kiev.ua> References: <201502061754.t16HssXU042750@svn.freebsd.org> <343803A3-CFA3-4766-8294-139A6D8C0235@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) 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 autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , jenkins-admin@freebsd.org, James Gritton X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 08:10:36 -0000 On Fri, Feb 06, 2015 at 09:23:47PM -0800, Garrett Cooper wrote: > pgrep uses /proc to determine whether or not a process is running. If it?s not properly mounted or the jail isn?t started properly, that could cause the issues seen here. I know because I?ve tried running these tests before in an attempt to fix them, and this was one of the things I ran into. > pgrep does not use /proc. From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 12:20:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8481CAC; Sat, 7 Feb 2015 12:20:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A453FAD; Sat, 7 Feb 2015 12:20:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17CKYmW060915; Sat, 7 Feb 2015 12:20:34 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17CKYYs060914; Sat, 7 Feb 2015 12:20:34 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502071220.t17CKYYs060914@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 7 Feb 2015 12:20:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278348 - head/sys/contrib/dev/ath/ath_hal/ar9300 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 12:20:34 -0000 Author: dim Date: Sat Feb 7 12:20:33 2015 New Revision: 278348 URL: https://svnweb.freebsd.org/changeset/base/278348 Log: Fix a number of -Wcast-qual warnings in ath's ar9300_attach.c, by making the ia_array field of struct ar9300_ini_array const, and removing the const-dropping casts. No functional change. Reviewed by: adrian MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D1725 Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h ============================================================================== --- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h Sat Feb 7 08:47:15 2015 (r278347) +++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h Sat Feb 7 12:20:33 2015 (r278348) @@ -317,12 +317,12 @@ typedef struct { /* Support for multiple INIs */ struct ar9300_ini_array { - u_int32_t *ia_array; + const u_int32_t *ia_array; u_int32_t ia_rows; u_int32_t ia_columns; }; #define INIT_INI_ARRAY(iniarray, array, rows, columns) do { \ - (iniarray)->ia_array = (u_int32_t *)(array); \ + (iniarray)->ia_array = (const u_int32_t *)(array); \ (iniarray)->ia_rows = (rows); \ (iniarray)->ia_columns = (columns); \ } while (0) From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 12:50:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAE36364; Sat, 7 Feb 2015 12:50:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BAFD3405; Sat, 7 Feb 2015 12:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17CoYVP076537; Sat, 7 Feb 2015 12:50:34 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17CoY49076516; Sat, 7 Feb 2015 12:50:34 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502071250.t17CoY49076516@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 7 Feb 2015 12:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278349 - head/contrib/llvm/lib/Target/X86 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 12:50:35 -0000 Author: dim Date: Sat Feb 7 12:50:33 2015 New Revision: 278349 URL: https://svnweb.freebsd.org/changeset/base/278349 Log: Pull in r224884 from upstream llvm trunk (by Keno Fischer): [FastIsel][X86] Fix invalid register replacement for bool args Summary: Consider the following IR: %3 = load i8* undef %4 = trunc i8 %3 to i1 %5 = call %jl_value_t.0* @foo(..., i1 %4, ...) ret %jl_value_t.0* %5 Bools (that are the result of direct truncs) are lowered as whatever the argument to the trunc was and a "and 1", causing the part of the MBB responsible for this argument to look something like this: %vreg8 = AND8ri %vreg7, 1, %EFLAGS; GR8:%vreg8,%vreg7 Later, when the load is lowered, it will insert %vreg15 = MOV8rm %vreg14, 1, %noreg, 0, %noreg; mem:LD1[undef] GR8:%vreg15 GR64:%vreg14 but remember to (at the end of isel) replace vreg7 by vreg15. Now for the bug. In fast isel lowering, we mistakenly mark vreg8 as the result of the load instead of the trunc. This adds a fixup to have vreg8 replaced by whatever the result of the load is as well, so we end up with %vreg15 = AND8ri %vreg15, 1, %EFLAGS; GR8:%vreg15 which is an SSA violation and causes problems later down the road. This fixes PR21557. Test Plan: Test test case from PR21557 is added to the test suite. Reviewers: ributzka Reviewed By: ributzka Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D6245 This fixes a possible assertion failure when compiling toolbox.cxx from LibreOffice 4.3.5. Reported by: kwm Modified: head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Modified: head/contrib/llvm/lib/Target/X86/X86FastISel.cpp ============================================================================== --- head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Sat Feb 7 12:20:33 2015 (r278348) +++ head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Sat Feb 7 12:50:33 2015 (r278349) @@ -2699,6 +2699,9 @@ bool X86FastISel::FastLowerCall(CallLowe TM.Options.GuaranteedTailCallOpt)) return false; + SmallVector OutVTs; + SmallVector ArgRegs; + // If this is a constant i1/i8/i16 argument, promote to i32 to avoid an extra // instruction. This is safe because it is common to all FastISel supported // calling conventions on x86. @@ -2716,28 +2719,34 @@ bool X86FastISel::FastLowerCall(CallLowe // Passing bools around ends up doing a trunc to i1 and passing it. // Codegen this as an argument + "and 1". - if (auto *TI = dyn_cast(Val)) { - if (TI->getType()->isIntegerTy(1) && CLI.CS && - (TI->getParent() == CLI.CS->getInstruction()->getParent()) && - TI->hasOneUse()) { - Val = cast(Val)->getOperand(0); - unsigned ResultReg = getRegForValue(Val); + MVT VT; + auto *TI = dyn_cast(Val); + unsigned ResultReg; + if (TI && TI->getType()->isIntegerTy(1) && CLI.CS && + (TI->getParent() == CLI.CS->getInstruction()->getParent()) && + TI->hasOneUse()) { + Value *PrevVal = TI->getOperand(0); + ResultReg = getRegForValue(PrevVal); + + if (!ResultReg) + return false; - if (!ResultReg) - return false; + if (!isTypeLegal(PrevVal->getType(), VT)) + return false; - MVT ArgVT; - if (!isTypeLegal(Val->getType(), ArgVT)) - return false; + ResultReg = + FastEmit_ri(VT, VT, ISD::AND, ResultReg, hasTrivialKill(PrevVal), 1); - ResultReg = - FastEmit_ri(ArgVT, ArgVT, ISD::AND, ResultReg, Val->hasOneUse(), 1); - - if (!ResultReg) - return false; - UpdateValueMap(Val, ResultReg); - } + if (!ResultReg) + return false; + } else { + if (!isTypeLegal(Val->getType(), VT)) + return false; + ResultReg = getRegForValue(Val); } + + ArgRegs.push_back(ResultReg); + OutVTs.push_back(VT); } // Analyze operands of the call, assigning locations to each operand. @@ -2749,13 +2758,6 @@ bool X86FastISel::FastLowerCall(CallLowe if (IsWin64) CCInfo.AllocateStack(32, 8); - SmallVector OutVTs; - for (auto *Val : OutVals) { - MVT VT; - if (!isTypeLegal(Val->getType(), VT)) - return false; - OutVTs.push_back(VT); - } CCInfo.AnalyzeCallOperands(OutVTs, OutFlags, CC_X86); // Get a count of how many bytes are to be pushed on the stack. @@ -2777,9 +2779,7 @@ bool X86FastISel::FastLowerCall(CallLowe if (ArgVT == MVT::x86mmx) return false; - unsigned ArgReg = getRegForValue(ArgVal); - if (!ArgReg) - return false; + unsigned ArgReg = ArgRegs[VA.getValNo()]; // Promote the value if needed. switch (VA.getLocInfo()) { From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 12:52:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83C2A4B6; Sat, 7 Feb 2015 12:52:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 644C15F8; Sat, 7 Feb 2015 12:52:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17CqZXH078632; Sat, 7 Feb 2015 12:52:35 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17CqZDq078631; Sat, 7 Feb 2015 12:52:35 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502071252.t17CqZDq078631@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 7 Feb 2015 12:52:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278350 - head/contrib/llvm/patches 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 12:52:35 -0000 Author: dim Date: Sat Feb 7 12:52:34 2015 New Revision: 278350 URL: https://svnweb.freebsd.org/changeset/base/278350 Log: Add llvm patch corresponding to r278349. Added: head/contrib/llvm/patches/patch-32-llvm-r224884-invalid-reg-replacement.diff Added: head/contrib/llvm/patches/patch-32-llvm-r224884-invalid-reg-replacement.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/patches/patch-32-llvm-r224884-invalid-reg-replacement.diff Sat Feb 7 12:52:34 2015 (r278350) @@ -0,0 +1,164 @@ +Pull in r224884 from upstream llvm trunk (by Keno Fischer): + + [FastIsel][X86] Fix invalid register replacement for bool args + + Summary: + Consider the following IR: + + %3 = load i8* undef + %4 = trunc i8 %3 to i1 + %5 = call %jl_value_t.0* @foo(..., i1 %4, ...) + ret %jl_value_t.0* %5 + + Bools (that are the result of direct truncs) are lowered as whatever + the argument to the trunc was and a "and 1", causing the part of the + MBB responsible for this argument to look something like this: + + %vreg8 = AND8ri %vreg7, 1, %EFLAGS; GR8:%vreg8,%vreg7 + + Later, when the load is lowered, it will insert + + %vreg15 = MOV8rm %vreg14, 1, %noreg, 0, %noreg; mem:LD1[undef] GR8:%vreg15 GR64:%vreg14 + + but remember to (at the end of isel) replace vreg7 by vreg15. Now for + the bug. In fast isel lowering, we mistakenly mark vreg8 as the result + of the load instead of the trunc. This adds a fixup to have + vreg8 replaced by whatever the result of the load is as well, so + we end up with + + %vreg15 = AND8ri %vreg15, 1, %EFLAGS; GR8:%vreg15 + + which is an SSA violation and causes problems later down the road. + + This fixes PR21557. + + Test Plan: Test test case from PR21557 is added to the test suite. + + Reviewers: ributzka + + Reviewed By: ributzka + + Subscribers: llvm-commits + + Differential Revision: http://reviews.llvm.org/D6245 + +This fixes a possible assertion failure when compiling toolbox.cxx from +LibreOffice 4.3.5. + +Introduced here: http://svnweb.freebsd.org/changeset/base/278349 + +Index: lib/Target/X86/X86FastISel.cpp +=================================================================== +--- lib/Target/X86/X86FastISel.cpp ++++ lib/Target/X86/X86FastISel.cpp +@@ -2699,6 +2699,9 @@ bool X86FastISel::FastLowerCall(CallLoweringInfo & + TM.Options.GuaranteedTailCallOpt)) + return false; + ++ SmallVector OutVTs; ++ SmallVector ArgRegs; ++ + // If this is a constant i1/i8/i16 argument, promote to i32 to avoid an extra + // instruction. This is safe because it is common to all FastISel supported + // calling conventions on x86. +@@ -2716,28 +2719,34 @@ bool X86FastISel::FastLowerCall(CallLoweringInfo & + + // Passing bools around ends up doing a trunc to i1 and passing it. + // Codegen this as an argument + "and 1". +- if (auto *TI = dyn_cast(Val)) { +- if (TI->getType()->isIntegerTy(1) && CLI.CS && +- (TI->getParent() == CLI.CS->getInstruction()->getParent()) && +- TI->hasOneUse()) { +- Val = cast(Val)->getOperand(0); +- unsigned ResultReg = getRegForValue(Val); ++ MVT VT; ++ auto *TI = dyn_cast(Val); ++ unsigned ResultReg; ++ if (TI && TI->getType()->isIntegerTy(1) && CLI.CS && ++ (TI->getParent() == CLI.CS->getInstruction()->getParent()) && ++ TI->hasOneUse()) { ++ Value *PrevVal = TI->getOperand(0); ++ ResultReg = getRegForValue(PrevVal); + +- if (!ResultReg) +- return false; ++ if (!ResultReg) ++ return false; + +- MVT ArgVT; +- if (!isTypeLegal(Val->getType(), ArgVT)) +- return false; ++ if (!isTypeLegal(PrevVal->getType(), VT)) ++ return false; + +- ResultReg = +- FastEmit_ri(ArgVT, ArgVT, ISD::AND, ResultReg, Val->hasOneUse(), 1); ++ ResultReg = ++ FastEmit_ri(VT, VT, ISD::AND, ResultReg, hasTrivialKill(PrevVal), 1); + +- if (!ResultReg) +- return false; +- UpdateValueMap(Val, ResultReg); +- } ++ if (!ResultReg) ++ return false; ++ } else { ++ if (!isTypeLegal(Val->getType(), VT)) ++ return false; ++ ResultReg = getRegForValue(Val); + } ++ ++ ArgRegs.push_back(ResultReg); ++ OutVTs.push_back(VT); + } + + // Analyze operands of the call, assigning locations to each operand. +@@ -2749,13 +2758,6 @@ bool X86FastISel::FastLowerCall(CallLoweringInfo & + if (IsWin64) + CCInfo.AllocateStack(32, 8); + +- SmallVector OutVTs; +- for (auto *Val : OutVals) { +- MVT VT; +- if (!isTypeLegal(Val->getType(), VT)) +- return false; +- OutVTs.push_back(VT); +- } + CCInfo.AnalyzeCallOperands(OutVTs, OutFlags, CC_X86); + + // Get a count of how many bytes are to be pushed on the stack. +@@ -2777,9 +2779,7 @@ bool X86FastISel::FastLowerCall(CallLoweringInfo & + if (ArgVT == MVT::x86mmx) + return false; + +- unsigned ArgReg = getRegForValue(ArgVal); +- if (!ArgReg) +- return false; ++ unsigned ArgReg = ArgRegs[VA.getValNo()]; + + // Promote the value if needed. + switch (VA.getLocInfo()) { +Index: test/CodeGen/X86/fast-isel-call-bool.ll +=================================================================== +--- test/CodeGen/X86/fast-isel-call-bool.ll ++++ test/CodeGen/X86/fast-isel-call-bool.ll +@@ -0,0 +1,19 @@ ++; RUN: llc < %s -fast-isel -mcpu=core2 -O1 | FileCheck %s ++; See PR21557 ++ ++target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" ++target triple = "x86_64-apple-darwin14.0.0" ++ ++declare i64 @bar(i1) ++ ++define i64 @foo(i8* %arg) { ++; CHECK-LABEL: foo: ++top: ++ %0 = load i8* %arg ++; CHECK: movb ++ %1 = trunc i8 %0 to i1 ++; CHECK: andb $1, ++ %2 = call i64 @bar(i1 %1) ++; CHECK: callq ++ ret i64 %2 ++} From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 13:11:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E330D9CA; Sat, 7 Feb 2015 13:11:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEF197E5; Sat, 7 Feb 2015 13:11:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DBk5i088304; Sat, 7 Feb 2015 13:11:46 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DBkue088303; Sat, 7 Feb 2015 13:11:46 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502071311.t17DBkue088303@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 7 Feb 2015 13:11:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278352 - 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:11:47 -0000 Author: trasz Date: Sat Feb 7 13:11:45 2015 New Revision: 278352 URL: https://svnweb.freebsd.org/changeset/base/278352 Log: Remove useless comment. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/lib/libc/sys/setresuid.2 Modified: head/lib/libc/sys/setresuid.2 ============================================================================== --- head/lib/libc/sys/setresuid.2 Sat Feb 7 12:57:40 2015 (r278351) +++ head/lib/libc/sys/setresuid.2 Sat Feb 7 13:11:45 2015 (r278352) @@ -19,7 +19,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 13, 2001 +.Dd February 7, 2015 .Dt SETRESUID 2 .Os .Sh NAME @@ -90,10 +90,5 @@ was invalid. .Xr setregid 2 , .Xr setreuid 2 , .Xr setuid 2 -.Sh STANDARDS -These system calls are not available on many platforms. -They exist in -.Fx -to support Linux binaries linked against GNU libc2. .Sh HISTORY These functions first appeared in HP-UX. From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 13:19:06 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9102BC2A; Sat, 7 Feb 2015 13:19:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C0C0814; Sat, 7 Feb 2015 13:19:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17DJ6t2089269; Sat, 7 Feb 2015 13:19:06 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17DJ5Y3089256; Sat, 7 Feb 2015 13:19:05 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502071319.t17DJ5Y3089256@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 7 Feb 2015 13:19:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278354 - head/usr.sbin/ctld 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 13:19:06 -0000 Author: mav Date: Sat Feb 7 13:19:04 2015 New Revision: 278354 URL: https://svnweb.freebsd.org/changeset/base/278354 Log: Teach ctld(8) to control non-iSCSI CTL ports. This change introduces new target option "port", that assigns current target to specified CTL port. On config application ctld(8) will apply LUN mapping according to target configuration to specified port and bring the port up. On shutdown cltd(8) will remove the mapping and put the port down. This change allows to configure both iSCSI and FibreChannel targets in the same configuration file in alike way. Kernel side support was added earlier at r278037. MFC after: 2 weeks Relnotes: yes Sponsored by: iXsystems, Inc. Modified: head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/kernel.c head/usr.sbin/ctld/parse.y head/usr.sbin/ctld/token.l Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/ctl.conf.5 Sat Feb 7 13:19:04 2015 (r278354) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 6, 2015 +.Dd February 7, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -67,6 +67,7 @@ file is: .No target Ar name { .Dl auth-group Ar name .Dl portal-group Ar name Op Ar agname +.Dl port Ar name .Dl lun Ar number Ar name .Dl lun Ar number No { .Dl path Ar path @@ -321,6 +322,10 @@ on TCP port 3260 on all configured IPv4 Optional second argument specifies auth group name for connections to this specific portal group. If second argument is not specified, target auth group is used. +.It Ic port Ar name +Assign specified CTL port (such as "isp0") to the target. +On startup ctld configures LUN mapping and enables all assigned ports. +Each port can be assigned to only one target. .It Ic redirect Aq Ar address IPv4 or IPv6 address to redirect initiators to. When configured, all initiators attempting to connect to this target Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/ctld.c Sat Feb 7 13:19:04 2015 (r278354) @@ -93,6 +93,7 @@ conf_new(void) TAILQ_INIT(&conf->conf_auth_groups); TAILQ_INIT(&conf->conf_ports); TAILQ_INIT(&conf->conf_portal_groups); + TAILQ_INIT(&conf->conf_pports); TAILQ_INIT(&conf->conf_isns); conf->conf_isns_period = 900; @@ -111,6 +112,7 @@ conf_delete(struct conf *conf) struct target *targ, *tmp; struct auth_group *ag, *cagtmp; struct portal_group *pg, *cpgtmp; + struct pport *pp, *pptmp; struct isns *is, *istmp; assert(conf->conf_pidfh == NULL); @@ -123,6 +125,8 @@ conf_delete(struct conf *conf) auth_group_delete(ag); TAILQ_FOREACH_SAFE(pg, &conf->conf_portal_groups, pg_next, cpgtmp) portal_group_delete(pg); + TAILQ_FOREACH_SAFE(pp, &conf->conf_pports, pp_next, pptmp) + pport_delete(pp); TAILQ_FOREACH_SAFE(is, &conf->conf_isns, i_next, istmp) isns_delete(is); assert(TAILQ_EMPTY(&conf->conf_ports)); @@ -1133,21 +1137,72 @@ valid_iscsi_name(const char *name) return (true); } +struct pport * +pport_new(struct conf *conf, const char *name, uint32_t ctl_port) +{ + struct pport *pp; + + pp = calloc(1, sizeof(*pp)); + if (pp == NULL) + log_err(1, "calloc"); + pp->pp_conf = conf; + pp->pp_name = checked_strdup(name); + pp->pp_ctl_port = ctl_port; + TAILQ_INIT(&pp->pp_ports); + TAILQ_INSERT_TAIL(&conf->conf_pports, pp, pp_next); + return (pp); +} + +struct pport * +pport_find(const struct conf *conf, const char *name) +{ + struct pport *pp; + + TAILQ_FOREACH(pp, &conf->conf_pports, pp_next) { + if (strcasecmp(pp->pp_name, name) == 0) + return (pp); + } + return (NULL); +} + +struct pport * +pport_copy(struct pport *pp, struct conf *conf) +{ + struct pport *ppnew; + + ppnew = pport_new(conf, pp->pp_name, pp->pp_ctl_port); + return (ppnew); +} + +void +pport_delete(struct pport *pp) +{ + struct port *port, *tport; + + TAILQ_FOREACH_SAFE(port, &pp->pp_ports, p_ts, tport) + port_delete(port); + TAILQ_REMOVE(&pp->pp_conf->conf_pports, pp, pp_next); + free(pp->pp_name); + free(pp); +} + struct port * port_new(struct conf *conf, struct target *target, struct portal_group *pg) { struct port *port; + char *name; + asprintf(&name, "%s-%s", pg->pg_name, target->t_name); + if (port_find(conf, name) != NULL) { + log_warnx("duplicate port \"%s\"", name); + free(name); + return (NULL); + } port = calloc(1, sizeof(*port)); if (port == NULL) log_err(1, "calloc"); - asprintf(&port->p_name, "%s-%s", pg->pg_name, target->t_name); - if (port_find(conf, port->p_name) != NULL) { - log_warnx("duplicate port \"%s\"", port->p_name); - free(port); - return (NULL); - } port->p_conf = conf; + port->p_name = name; TAILQ_INSERT_TAIL(&conf->conf_ports, port, p_next); TAILQ_INSERT_TAIL(&target->t_ports, port, p_ts); port->p_target = target; @@ -1157,6 +1212,31 @@ port_new(struct conf *conf, struct targe } struct port * +port_new_pp(struct conf *conf, struct target *target, struct pport *pp) +{ + struct port *port; + char *name; + + asprintf(&name, "%s-%s", pp->pp_name, target->t_name); + if (port_find(conf, name) != NULL) { + log_warnx("duplicate port \"%s\"", name); + free(name); + return (NULL); + } + port = calloc(1, sizeof(*port)); + if (port == NULL) + log_err(1, "calloc"); + port->p_conf = conf; + port->p_name = name; + TAILQ_INSERT_TAIL(&conf->conf_ports, port, p_next); + TAILQ_INSERT_TAIL(&target->t_ports, port, p_ts); + port->p_target = target; + TAILQ_INSERT_TAIL(&pp->pp_ports, port, p_pps); + port->p_pport = pp; + return (port); +} + +struct port * port_find(const struct conf *conf, const char *name) { struct port *port; @@ -1188,6 +1268,8 @@ port_delete(struct port *port) if (port->p_portal_group) TAILQ_REMOVE(&port->p_portal_group->pg_ports, port, p_pgs); + if (port->p_pport) + TAILQ_REMOVE(&port->p_pport->pp_ports, port, p_pps); if (port->p_target) TAILQ_REMOVE(&port->p_target->t_ports, port, p_ts); TAILQ_REMOVE(&port->p_conf->conf_ports, port, p_next); @@ -1779,6 +1861,7 @@ conf_apply(struct conf *oldconf, struct newport = port_find(newconf, oldport->p_name); if (newport != NULL) continue; + log_debugx("removing port \"%s\"", oldport->p_name); error = kernel_port_remove(oldport); if (error != 0) { log_warnx("failed to remove port %s", @@ -1903,8 +1986,10 @@ conf_apply(struct conf *oldconf, struct oldport = port_find(oldconf, newport->p_name); if (oldport == NULL) { + log_debugx("adding port \"%s\"", newport->p_name); error = kernel_port_add(newport); } else { + log_debugx("updating port \"%s\"", newport->p_name); newport->p_ctl_port = oldport->p_ctl_port; error = kernel_port_update(newport); } @@ -2416,7 +2501,7 @@ main(int argc, char **argv) kernel_init(); oldconf = conf_new_from_kernel(); - newconf = conf_new_from_file(config_path); + newconf = conf_new_from_file(config_path, oldconf); if (newconf == NULL) log_errx(1, "configuration error; exiting"); if (debug > 0) { @@ -2451,7 +2536,7 @@ main(int argc, char **argv) if (sighup_received) { sighup_received = false; log_debugx("received SIGHUP, reloading configuration"); - tmpconf = conf_new_from_file(config_path); + tmpconf = conf_new_from_file(config_path, newconf); if (tmpconf == NULL) { log_warnx("configuration error, " "continuing with old configuration"); Modified: head/usr.sbin/ctld/ctld.h ============================================================================== --- head/usr.sbin/ctld/ctld.h Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/ctld.h Sat Feb 7 13:19:04 2015 (r278354) @@ -125,14 +125,25 @@ struct portal_group { uint16_t pg_tag; }; +struct pport { + TAILQ_ENTRY(pport) pp_next; + TAILQ_HEAD(, port) pp_ports; + struct conf *pp_conf; + char *pp_name; + + uint32_t pp_ctl_port; +}; + struct port { TAILQ_ENTRY(port) p_next; TAILQ_ENTRY(port) p_pgs; + TAILQ_ENTRY(port) p_pps; TAILQ_ENTRY(port) p_ts; struct conf *p_conf; char *p_name; struct auth_group *p_auth_group; struct portal_group *p_portal_group; + struct pport *p_pport; struct target *p_target; uint32_t p_ctl_port; @@ -187,6 +198,7 @@ struct conf { TAILQ_HEAD(, auth_group) conf_auth_groups; TAILQ_HEAD(, port) conf_ports; TAILQ_HEAD(, portal_group) conf_portal_groups; + TAILQ_HEAD(, pport) conf_pports; TAILQ_HEAD(, isns) conf_isns; int conf_isns_period; int conf_isns_timeout; @@ -280,7 +292,7 @@ char *rchap_get_response(struct rchap void rchap_delete(struct rchap *rchap); struct conf *conf_new(void); -struct conf *conf_new_from_file(const char *path); +struct conf *conf_new_from_file(const char *path, struct conf *old); struct conf *conf_new_from_kernel(void); void conf_delete(struct conf *conf); int conf_verify(struct conf *conf); @@ -333,8 +345,16 @@ void isns_register(struct isns *isns, void isns_check(struct isns *isns); void isns_deregister(struct isns *isns); +struct pport *pport_new(struct conf *conf, const char *name, + uint32_t ctl_port); +struct pport *pport_find(const struct conf *conf, const char *name); +struct pport *pport_copy(struct pport *pport, struct conf *conf); +void pport_delete(struct pport *pport); + struct port *port_new(struct conf *conf, struct target *target, struct portal_group *pg); +struct port *port_new_pp(struct conf *conf, struct target *target, + struct pport *pp); struct port *port_find(const struct conf *conf, const char *name); struct port *port_find_in_pg(const struct portal_group *pg, const char *target); Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/kernel.c Sat Feb 7 13:19:04 2015 (r278354) @@ -121,6 +121,7 @@ struct cctl_lun { struct cctl_port { uint32_t port_id; + char *port_name; int cfiscsi_state; char *cfiscsi_target; uint16_t cfiscsi_portal_group_tag; @@ -330,7 +331,10 @@ cctl_end_pelement(void *user_data, const devlist->cur_sb[devlist->level] = NULL; devlist->level--; - if (strcmp(name, "cfiscsi_target") == 0) { + if (strcmp(name, "port_name") == 0) { + cur_port->port_name = str; + str = NULL; + } else if (strcmp(name, "cfiscsi_target") == 0) { cur_port->cfiscsi_target = str; str = NULL; } else if (strcmp(name, "cfiscsi_state") == 0) { @@ -378,6 +382,7 @@ conf_new_from_kernel(void) struct conf *conf = NULL; struct target *targ; struct portal_group *pg; + struct pport *pp; struct port *cp; struct lun *cl; struct lun_option *lo; @@ -498,8 +503,20 @@ retry_port: STAILQ_FOREACH(port, &devlist.port_list, links) { if (port->cfiscsi_target == NULL) { - log_debugx("CTL port %ju wasn't managed by ctld; " - "ignoring", (uintmax_t)port->port_id); + log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ", + port->port_id, port->port_name); + pp = pport_find(conf, port->port_name); + if (pp == NULL) { +#if 0 + log_debugx("found new kernel port %u \"%s\"", + port->port_id, port->port_name); +#endif + pp = pport_new(conf, port->port_name, port->port_id); + if (pp == NULL) { + log_warnx("pport_new failed"); + continue; + } + } continue; } if (port->cfiscsi_state != 1) { @@ -880,39 +897,42 @@ kernel_port_add(struct port *port) int error, i, n; /* Create iSCSI port. */ - bzero(&req, sizeof(req)); - strlcpy(req.driver, "iscsi", sizeof(req.driver)); - req.reqtype = CTL_REQ_CREATE; - req.args = malloc(req.num_args * sizeof(*req.args)); - n = 0; - req.args[n].namelen = sizeof("port_id"); - req.args[n].name = __DECONST(char *, "port_id"); - req.args[n].vallen = sizeof(port->p_ctl_port); - req.args[n].value = &port->p_ctl_port; - req.args[n++].flags = CTL_BEARG_WR; - str_arg(&req.args[n++], "cfiscsi_target", targ->t_name); - snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); - str_arg(&req.args[n++], "cfiscsi_portal_group_tag", tagstr); - if (targ->t_alias) - str_arg(&req.args[n++], "cfiscsi_target_alias", targ->t_alias); - str_arg(&req.args[n++], "ctld_portal_group_name", pg->pg_name); - req.num_args = n; - error = ioctl(ctl_fd, CTL_PORT_REQ, &req); - free(req.args); - if (error != 0) { - log_warn("error issuing CTL_PORT_REQ ioctl"); - return (1); - } - if (req.status == CTL_LUN_ERROR) { - log_warnx("error returned from port creation request: %s", - req.error_str); - return (1); - } - if (req.status != CTL_LUN_OK) { - log_warnx("unknown port creation request status %d", - req.status); - return (1); - } + if (port->p_portal_group) { + bzero(&req, sizeof(req)); + strlcpy(req.driver, "iscsi", sizeof(req.driver)); + req.reqtype = CTL_REQ_CREATE; + req.args = malloc(req.num_args * sizeof(*req.args)); + n = 0; + req.args[n].namelen = sizeof("port_id"); + req.args[n].name = __DECONST(char *, "port_id"); + req.args[n].vallen = sizeof(port->p_ctl_port); + req.args[n].value = &port->p_ctl_port; + req.args[n++].flags = CTL_BEARG_WR; + str_arg(&req.args[n++], "cfiscsi_target", targ->t_name); + snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); + str_arg(&req.args[n++], "cfiscsi_portal_group_tag", tagstr); + if (targ->t_alias) + str_arg(&req.args[n++], "cfiscsi_target_alias", targ->t_alias); + str_arg(&req.args[n++], "ctld_portal_group_name", pg->pg_name); + req.num_args = n; + error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); + if (error != 0) { + log_warn("error issuing CTL_PORT_REQ ioctl"); + return (1); + } + if (req.status == CTL_LUN_ERROR) { + log_warnx("error returned from port creation request: %s", + req.error_str); + return (1); + } + if (req.status != CTL_LUN_OK) { + log_warnx("unknown port creation request status %d", + req.status); + return (1); + } + } else if (port->p_pport) + port->p_ctl_port = port->p_pport->pp_ctl_port; /* Explicitly enable mapping to block any access except allowed. */ lm.port = port->p_ctl_port; @@ -971,40 +991,58 @@ kernel_port_update(struct port *port) int kernel_port_remove(struct port *port) { + struct ctl_port_entry entry; + struct ctl_lun_map lm; struct ctl_req req; char tagstr[16]; struct target *targ = port->p_target; struct portal_group *pg = port->p_portal_group; int error; - bzero(&req, sizeof(req)); - strlcpy(req.driver, "iscsi", sizeof(req.driver)); - req.reqtype = CTL_REQ_REMOVE; - req.num_args = 2; - req.args = malloc(req.num_args * sizeof(*req.args)); - str_arg(&req.args[0], "cfiscsi_target", targ->t_name); - snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); - str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr); - - error = ioctl(ctl_fd, CTL_PORT_REQ, &req); - free(req.args); + /* Disable port */ + bzero(&entry, sizeof(entry)); + entry.targ_port = port->p_ctl_port; + error = ioctl(ctl_fd, CTL_DISABLE_PORT, &entry); if (error != 0) { - log_warn("error issuing CTL_PORT_REQ ioctl"); - return (1); - } - - if (req.status == CTL_LUN_ERROR) { - log_warnx("error returned from port removal request: %s", - req.error_str); - return (1); + log_warn("CTL_DISABLE_PORT ioctl failed"); + return (-1); } - if (req.status != CTL_LUN_OK) { - log_warnx("unknown port removal request status %d", - req.status); - return (1); + /* Remove iSCSI port. */ + if (port->p_portal_group) { + bzero(&req, sizeof(req)); + strlcpy(req.driver, "iscsi", sizeof(req.driver)); + req.reqtype = CTL_REQ_REMOVE; + req.num_args = 2; + req.args = malloc(req.num_args * sizeof(*req.args)); + str_arg(&req.args[0], "cfiscsi_target", targ->t_name); + snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag); + str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr); + error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); + if (error != 0) { + log_warn("error issuing CTL_PORT_REQ ioctl"); + return (1); + } + if (req.status == CTL_LUN_ERROR) { + log_warnx("error returned from port removal request: %s", + req.error_str); + return (1); + } + if (req.status != CTL_LUN_OK) { + log_warnx("unknown port removal request status %d", + req.status); + return (1); + } + } else { + /* Disable LUN mapping. */ + lm.port = port->p_ctl_port; + lm.plun = UINT32_MAX; + lm.lun = UINT32_MAX; + error = ioctl(ctl_fd, CTL_LUN_MAP, &lm); + if (error != 0) + log_warn("CTL_LUN_MAP ioctl failed"); } - return (0); } Modified: head/usr.sbin/ctld/parse.y ============================================================================== --- head/usr.sbin/ctld/parse.y Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/parse.y Sat Feb 7 13:19:04 2015 (r278354) @@ -61,7 +61,7 @@ extern void yyrestart(FILE *); %token CLOSING_BRACKET DEBUG DEVICE_ID DISCOVERY_AUTH_GROUP DISCOVERY_FILTER %token INITIATOR_NAME INITIATOR_PORTAL ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT %token LISTEN LISTEN_ISER LUN MAXPROC OFFLOAD OPENING_BRACKET OPTION -%token PATH PIDFILE PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR +%token PATH PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR %token TARGET TIMEOUT %union @@ -467,6 +467,8 @@ target_entry: | target_portal_group | + target_port + | target_redirect | target_lun @@ -721,6 +723,36 @@ target_portal_group: PORTAL_GROUP STR ST } ; +target_port: PORT STR + { + struct pport *pp; + struct port *tp; + + pp = pport_find(conf, $2); + if (pp == NULL) { + log_warnx("unknown port \"%s\" for target \"%s\"", + $2, target->t_name); + free($2); + return (1); + } + if (!TAILQ_EMPTY(&pp->pp_ports)) { + log_warnx("can't link port \"%s\" to target \"%s\", " + "port already linked to some target", + $2, target->t_name); + free($2); + return (1); + } + tp = port_new_pp(conf, target, pp); + if (tp == NULL) { + log_warnx("can't link port \"%s\" to target \"%s\"", + $2, target->t_name); + free($2); + return (1); + } + free($2); + } + ; + target_redirect: REDIRECT STR { int error; @@ -950,16 +982,20 @@ check_perms(const char *path) } struct conf * -conf_new_from_file(const char *path) +conf_new_from_file(const char *path, struct conf *oldconf) { struct auth_group *ag; struct portal_group *pg; + struct pport *pp; int error; log_debugx("obtaining configuration from %s", path); conf = conf_new(); + TAILQ_FOREACH(pp, &oldconf->conf_pports, pp_next) + pport_copy(pp, conf); + ag = auth_group_new(conf, "default"); assert(ag != NULL); Modified: head/usr.sbin/ctld/token.l ============================================================================== --- head/usr.sbin/ctld/token.l Sat Feb 7 13:18:32 2015 (r278353) +++ head/usr.sbin/ctld/token.l Sat Feb 7 13:19:04 2015 (r278354) @@ -72,6 +72,7 @@ pidfile { return PIDFILE; } isns-server { return ISNS_SERVER; } isns-period { return ISNS_PERIOD; } isns-timeout { return ISNS_TIMEOUT; } +port { return PORT; } portal-group { return PORTAL_GROUP; } redirect { return REDIRECT; } serial { return SERIAL; } From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 14:15:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 964846BC; Sat, 7 Feb 2015 14:15:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7798BCEE; Sat, 7 Feb 2015 14:15:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17EFIQQ016952; Sat, 7 Feb 2015 14:15:18 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17EFIN3016951; Sat, 7 Feb 2015 14:15:18 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502071415.t17EFIN3016951@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 7 Feb 2015 14:15:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278359 - head/sys/dev/iscsi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 14:15:18 -0000 Author: trasz Date: Sat Feb 7 14:15:17 2015 New Revision: 278359 URL: https://svnweb.freebsd.org/changeset/base/278359 Log: Tidy up; no functional changes. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/icl_soft.c Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Sat Feb 7 13:26:13 2015 (r278358) +++ head/sys/dev/iscsi/icl_soft.c Sat Feb 7 14:15:17 2015 (r278359) @@ -29,8 +29,7 @@ */ /* - * iSCSI Common Layer. It's used by both the initiator and target to send - * and receive iSCSI PDUs. + * Software implementation of iSCSI Common Layer kobj(9) interface. */ #include @@ -117,8 +116,6 @@ static kobj_method_t icl_soft_methods[] DEFINE_CLASS(icl_soft, icl_soft_methods, sizeof(struct icl_conn)); -static void icl_conn_close(struct icl_conn *ic); - static void icl_conn_fail(struct icl_conn *ic) { @@ -201,6 +198,7 @@ icl_pdu_free(struct icl_pdu *ip) void icl_soft_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip) { + icl_pdu_free(ip); } @@ -696,7 +694,7 @@ icl_conn_receive_pdu(struct icl_conn *ic if (error != 0) { /* * Don't free the PDU; it's pointed to by ic->ic_receive_pdu - * and will get freed in icl_conn_close(). + * and will get freed in icl_soft_conn_close(). */ icl_conn_fail(ic); } @@ -1248,7 +1246,7 @@ icl_conn_start(struct icl_conn *ic) error = soreserve(ic->ic_socket, sendspace, recvspace); if (error != 0) { ICL_WARN("soreserve failed with error %d", error); - icl_conn_close(ic); + icl_soft_conn_close(ic); return (error); } ic->ic_socket->so_snd.sb_flags |= SB_AUTOSIZE; @@ -1266,7 +1264,7 @@ icl_conn_start(struct icl_conn *ic) error = sosetopt(ic->ic_socket, &opt); if (error != 0) { ICL_WARN("disabling TCP_NODELAY failed with error %d", error); - icl_conn_close(ic); + icl_soft_conn_close(ic); return (error); } @@ -1277,7 +1275,7 @@ icl_conn_start(struct icl_conn *ic) ic->ic_name); if (error != 0) { ICL_WARN("kthread_add(9) failed with error %d", error); - icl_conn_close(ic); + icl_soft_conn_close(ic); return (error); } @@ -1285,7 +1283,7 @@ icl_conn_start(struct icl_conn *ic) ic->ic_name); if (error != 0) { ICL_WARN("kthread_add(9) failed with error %d", error); - icl_conn_close(ic); + icl_soft_conn_close(ic); return (error); } @@ -1350,7 +1348,7 @@ icl_soft_conn_handoff(struct icl_conn *i } void -icl_conn_close(struct icl_conn *ic) +icl_soft_conn_close(struct icl_conn *ic) { struct icl_pdu *pdu; @@ -1419,13 +1417,6 @@ icl_conn_close(struct icl_conn *ic) ICL_CONN_UNLOCK(ic); } -void -icl_soft_conn_close(struct icl_conn *ic) -{ - - icl_conn_close(ic); -} - bool icl_soft_conn_connected(struct icl_conn *ic) { From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 14:31:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1BDFA44; Sat, 7 Feb 2015 14:31:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD353E74; Sat, 7 Feb 2015 14:31:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17EVq0n025976; Sat, 7 Feb 2015 14:31:52 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17EVqEC025974; Sat, 7 Feb 2015 14:31:52 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201502071431.t17EVqEC025974@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 7 Feb 2015 14:31:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278360 - in head/usr.sbin/bluetooth: hccontrol sdpcontrol 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 14:31:53 -0000 Author: trasz Date: Sat Feb 7 14:31:51 2015 New Revision: 278360 URL: https://svnweb.freebsd.org/changeset/base/278360 Log: Make hccontrol(8) and sdpcontrol(8) appear in "man -k bluetooth" output. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/bluetooth/hccontrol/hccontrol.8 head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 Modified: head/usr.sbin/bluetooth/hccontrol/hccontrol.8 ============================================================================== --- head/usr.sbin/bluetooth/hccontrol/hccontrol.8 Sat Feb 7 14:15:17 2015 (r278359) +++ head/usr.sbin/bluetooth/hccontrol/hccontrol.8 Sat Feb 7 14:31:51 2015 (r278360) @@ -25,12 +25,12 @@ .\" $Id: hccontrol.8,v 1.6 2003/08/06 21:26:38 max Exp $ .\" $FreeBSD$ .\" -.Dd June 14, 2002 +.Dd February 7, 2015 .Dt HCCONTROL 8 .Os .Sh NAME .Nm hccontrol -.Nd HCI configuration utility +.Nd Bluetooth HCI configuration utility .Sh SYNOPSIS .Nm .Op Fl hN Modified: head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 ============================================================================== --- head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 Sat Feb 7 14:15:17 2015 (r278359) +++ head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 Sat Feb 7 14:31:51 2015 (r278360) @@ -25,12 +25,12 @@ .\" $Id: sdpcontrol.8,v 1.1 2003/09/08 02:27:27 max Exp $ .\" $FreeBSD$ .\" -.Dd September 7, 2003 +.Dd February 7, 2015 .Dt SDPCONTROL 8 .Os .Sh NAME .Nm sdpcontrol -.Nd SDP query utility +.Nd Bluetooth Service Discovery Protocol query utility .Sh SYNOPSIS .Nm .Fl h From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 16:42:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC441D46; Sat, 7 Feb 2015 16:42:40 +0000 (UTC) Received: from thyme.infocus-llc.com (thyme.infocus-llc.com [199.15.120.10]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F66EC2C; Sat, 7 Feb 2015 16:42:40 +0000 (UTC) Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id 75DAD37B567; Sat, 7 Feb 2015 10:42:33 -0600 (CST) Received: by draco.over-yonder.net (Postfix, from userid 100) id 3kffRr5nVnz2MT; Sat, 7 Feb 2015 10:42:32 -0600 (CST) Date: Sat, 7 Feb 2015 10:42:32 -0600 From: "Matthew D. Fuller" To: Dimitry Andric Subject: Re: svn commit: r278349 - head/contrib/llvm/lib/Target/X86 Message-ID: <20150207164232.GA97044@over-yonder.net> References: <201502071250.t17CoY49076516@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <201502071250.t17CoY49076516@svn.freebsd.org> X-Editor: vi X-OS: FreeBSD User-Agent: Mutt/1.5.23-fullermd.4 (2014-03-12) X-Virus-Scanned: clamav-milter 0.98.6 at thyme.infocus-llc.com X-Virus-Status: Clean 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 16:42:40 -0000 On Sat, Feb 07, 2015 at 12:50:34PM +0000 I heard the voice of Dimitry Andric, and lo! it spake thus: >=20 > Log: > Pull in r224884 from upstream llvm trunk (by Keno Fischer): This blows up the kernel build for me. Apparently reproducible, as my first build was -j'd and so unreadable, and another non--j build yielded the below. With the rev patch -R'd out, build completes fine. cc -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADER= S -include /usr/obj/usr/src/sys/MORTIS/opt_global.h -I. -I/usr/src/sys -I/u= sr/src/sys/contrib/altq -fno-common -g -fno-omit-frame-pointer -mno-omit-le= af-frame-pointer -I/usr/obj/usr/src/sys/MORTIS -mcmodel=3Dkernel -mno-red-= zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffree= standing -fwrapv -fstack-protector -gdwarf-2 -Wno-error-tautological-compar= e -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-= function -Wno-error-pointer-sign -Wall -Wredundant-decls -Wnested-externs = -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-q= ual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs = -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautological-co= mpare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unu= sed-function -Wno-error-pointer-sign -mno-aes -mno-avx -std=3Diso9899:19= 99 -c /usr/src/sys/modules/hptmv/../../dev/hptmv/hptproc.c Cannot emit physreg copy instruction UNREACHABLE executed at /usr/src/lib/clang/libllvmx86codegen/../../../contr= ib/llvm/lib/Target/X86/X86InstrInfo.cpp:3176! Stack dump: 0. Program arguments: /usr/obj/usr/src/tmp/usr/bin/cc -cc1 -triple x86_64-u= nknown-freebsd11.0 -emit-obj -mrelax-all -disable-free -main-file-name hptp= roc.c -mrelocation-model static -mdisable-fp-elim -masm-verbose -mconstruct= or-aliases -mcode-model kernel -target-cpu x86-64 -target-feature -mmx -tar= get-feature -sse -target-feature -aes -target-feature -avx -disable-red-zon= e -no-implicit-float -gdwarf-2 -dwarf-column-info -coverage-file /usr/obj/u= sr/src/sys/MORTIS/modules/usr/src/sys/modules/hptmv/hptproc.o -nostdsystemi= nc -nobuiltininc -resource-dir /usr/obj/usr/src/tmp/usr/bin/../lib/clang/3.= 5.1 -include /usr/obj/usr/src/sys/MORTIS/opt_global.h -D _KERNEL -D KLD_MOD= ULE -D HAVE_KERNEL_OPTION_HEADERS -I . -I /usr/src/sys -I /usr/src/sys/cont= rib/altq -I /usr/obj/usr/src/sys/MORTIS -isysroot /usr/obj/usr/src/tmp -Wer= ror -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parent= heses-equality -Wno-error-unused-function -Wno-error-pointer-sign -Wall -Wr= edundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -W= pointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -Wmissing-incl= ude-dirs -Wno-unknown-pragmas -Wno-error-tautological-compare -Wno-error-em= pty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wno-er= ror-pointer-sign -std=3Diso9899:1999 -fdebug-compilation-dir /usr/obj/usr/s= rc/sys/MORTIS/modules/usr/src/sys/modules/hptmv -ferror-limit 19 -fmessage-= length 80 -ffreestanding -fformat-extensions -fwrapv -stack-protector 1 -ms= tackrealign -fobjc-runtime=3Dgnustep -fno-common -fdiagnostics-show-option = -fcolor-diagnostics -o hptproc.o -x c /usr/src/sys/modules/hptmv/../../dev/= hptmv/hptproc.c=20 1. parser at end of file 2. Code generation 3. Running pass 'Function Pass Manager' on module '/usr/src/sys/modules/hpt= mv/../../dev/hptmv/hptproc.c'. 4. Running pass 'Post-RA pseudo instruction expansion pass' on function '@h= pt_proc_in' cc: error: unable to execute command: Abort trap (core dumped) cc: error: clang frontend command failed due to signal (use -v to see invoc= ation) FreeBSD clang version 3.5.1 (tags/RELEASE_351/final 225668) 20150115 Target: x86_64-unknown-freebsd11.0 Thread model: posix cc: note: diagnostic msg: PLEASE submit a bug report to https://bugs.freebs= d.org/submit/ and include the crash backtrace, preprocessed source, and ass= ociated run script. cc: note: diagnostic msg:=20 ******************** PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: Preprocessed source(s) and associated run script(s) are located at: cc: note: diagnostic msg: /tmp/hptproc-809e0b.c cc: note: diagnostic msg: /tmp/hptproc-809e0b.sh cc: note: diagnostic msg:=20 ******************** *** Error code 254 Stop. make[4]: stopped in /usr/src/sys/modules/hptmv *** Error code 1 Stop. make[3]: stopped in /usr/src/sys/modules *** Error code 1 Stop. make[2]: stopped in /usr/obj/usr/src/sys/MORTIS *** Error code 1 Stop. make[1]: stopped in /usr/src *** Error code 1 Stop. make: stopped in /usr/src --=20 Matthew Fuller (MF4839) | fullermd@over-yonder.net Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ On the Internet, nobody can hear you scream. From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 16:57:33 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A67D160; Sat, 7 Feb 2015 16:57:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75FA4D24; Sat, 7 Feb 2015 16:57:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17GvXE6092529; Sat, 7 Feb 2015 16:57:33 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17GvXW9092528; Sat, 7 Feb 2015 16:57:33 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502071657.t17GvXW9092528@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 7 Feb 2015 16:57:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278361 - in head/contrib/llvm: lib/Target/X86 patches 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 16:57:33 -0000 Author: dim Date: Sat Feb 7 16:57:32 2015 New Revision: 278361 URL: https://svnweb.freebsd.org/changeset/base/278361 Log: Back out r278349 and r278350 for now, since this apparently blows up the kernel build in sys/dev/hptmv/hptproc.c for some people. Reported by: sbruno, Matthew Fuller Deleted: head/contrib/llvm/patches/patch-32-llvm-r224884-invalid-reg-replacement.diff Modified: head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Modified: head/contrib/llvm/lib/Target/X86/X86FastISel.cpp ============================================================================== --- head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Sat Feb 7 14:31:51 2015 (r278360) +++ head/contrib/llvm/lib/Target/X86/X86FastISel.cpp Sat Feb 7 16:57:32 2015 (r278361) @@ -2699,9 +2699,6 @@ bool X86FastISel::FastLowerCall(CallLowe TM.Options.GuaranteedTailCallOpt)) return false; - SmallVector OutVTs; - SmallVector ArgRegs; - // If this is a constant i1/i8/i16 argument, promote to i32 to avoid an extra // instruction. This is safe because it is common to all FastISel supported // calling conventions on x86. @@ -2719,34 +2716,28 @@ bool X86FastISel::FastLowerCall(CallLowe // Passing bools around ends up doing a trunc to i1 and passing it. // Codegen this as an argument + "and 1". - MVT VT; - auto *TI = dyn_cast(Val); - unsigned ResultReg; - if (TI && TI->getType()->isIntegerTy(1) && CLI.CS && - (TI->getParent() == CLI.CS->getInstruction()->getParent()) && - TI->hasOneUse()) { - Value *PrevVal = TI->getOperand(0); - ResultReg = getRegForValue(PrevVal); - - if (!ResultReg) - return false; + if (auto *TI = dyn_cast(Val)) { + if (TI->getType()->isIntegerTy(1) && CLI.CS && + (TI->getParent() == CLI.CS->getInstruction()->getParent()) && + TI->hasOneUse()) { + Val = cast(Val)->getOperand(0); + unsigned ResultReg = getRegForValue(Val); - if (!isTypeLegal(PrevVal->getType(), VT)) - return false; + if (!ResultReg) + return false; - ResultReg = - FastEmit_ri(VT, VT, ISD::AND, ResultReg, hasTrivialKill(PrevVal), 1); + MVT ArgVT; + if (!isTypeLegal(Val->getType(), ArgVT)) + return false; - if (!ResultReg) - return false; - } else { - if (!isTypeLegal(Val->getType(), VT)) - return false; - ResultReg = getRegForValue(Val); - } + ResultReg = + FastEmit_ri(ArgVT, ArgVT, ISD::AND, ResultReg, Val->hasOneUse(), 1); - ArgRegs.push_back(ResultReg); - OutVTs.push_back(VT); + if (!ResultReg) + return false; + UpdateValueMap(Val, ResultReg); + } + } } // Analyze operands of the call, assigning locations to each operand. @@ -2758,6 +2749,13 @@ bool X86FastISel::FastLowerCall(CallLowe if (IsWin64) CCInfo.AllocateStack(32, 8); + SmallVector OutVTs; + for (auto *Val : OutVals) { + MVT VT; + if (!isTypeLegal(Val->getType(), VT)) + return false; + OutVTs.push_back(VT); + } CCInfo.AnalyzeCallOperands(OutVTs, OutFlags, CC_X86); // Get a count of how many bytes are to be pushed on the stack. @@ -2779,7 +2777,9 @@ bool X86FastISel::FastLowerCall(CallLowe if (ArgVT == MVT::x86mmx) return false; - unsigned ArgReg = ArgRegs[VA.getValNo()]; + unsigned ArgReg = getRegForValue(ArgVal); + if (!ArgReg) + return false; // Promote the value if needed. switch (VA.getLocInfo()) { From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 16:58:51 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 603BE29E; Sat, 7 Feb 2015 16:58:51 +0000 (UTC) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06022D29; Sat, 7 Feb 2015 16:58:51 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::ec16:797c:c5e:89e3] (unknown [IPv6:2001:7b8:3a7:0:ec16:797c:c5e:89e3]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A4FA55C2E; Sat, 7 Feb 2015 17:58:47 +0100 (CET) Subject: Re: svn commit: r278349 - head/contrib/llvm/lib/Target/X86 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_74D83A27-F902-4A20-B63B-167CE967C1B1"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 (c621b2a+) From: Dimitry Andric In-Reply-To: <20150207164232.GA97044@over-yonder.net> Date: Sat, 7 Feb 2015 17:58:42 +0100 Message-Id: <5E79A85C-D0F8-42EB-B82D-7C624F7F2E7E@FreeBSD.org> References: <201502071250.t17CoY49076516@svn.freebsd.org> <20150207164232.GA97044@over-yonder.net> To: "Matthew D. Fuller" X-Mailer: Apple Mail (2.2070.6) 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 16:58:51 -0000 --Apple-Mail=_74D83A27-F902-4A20-B63B-167CE967C1B1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 07 Feb 2015, at 17:42, Matthew D. Fuller = wrote: >=20 > On Sat, Feb 07, 2015 at 12:50:34PM +0000 I heard the voice of > Dimitry Andric, and lo! it spake thus: >>=20 >> Log: >> Pull in r224884 from upstream llvm trunk (by Keno Fischer): >=20 > This blows up the kernel build for me. Apparently reproducible, as my > first build was -j'd and so unreadable, and another non--j build > yielded the below. With the rev patch -R'd out, build completes fine. ... > Cannot emit physreg copy instruction > UNREACHABLE executed at = /usr/src/lib/clang/libllvmx86codegen/../../../contrib/llvm/lib/Target/X86/= X86InstrInfo.cpp:3176! > Stack dump: > 0. Program arguments: /usr/obj/usr/src/tmp/usr/bin/cc -cc1 -triple = x86_64-unknown-freebsd11.0 -emit-obj -mrelax-all -disable-free = -main-file-name hptproc.c -mrelocation-model static -mdisable-fp-elim = -masm-verbose -mconstructor-aliases -mcode-model kernel -target-cpu = x86-64 -target-feature -mmx -target-feature -sse -target-feature -aes = -target-feature -avx -disable-red-zone -no-implicit-float -gdwarf-2 = -dwarf-column-info -coverage-file = /usr/obj/usr/src/sys/MORTIS/modules/usr/src/sys/modules/hptmv/hptproc.o = -nostdsysteminc -nobuiltininc -resource-dir = /usr/obj/usr/src/tmp/usr/bin/../lib/clang/3.5.1 -include = /usr/obj/usr/src/sys/MORTIS/opt_global.h -D _KERNEL -D KLD_MODULE -D = HAVE_KERNEL_OPTION_HEADERS -I . -I /usr/src/sys -I = /usr/src/sys/contrib/altq -I /usr/obj/usr/src/sys/MORTIS -isysroot = /usr/obj/usr/src/tmp -Werror -Wno-error-tautological-compare = -Wno-error-empty-body -Wno-error-parentheses-equality = -Wno-error-unused-function -Wno-error-pointer-sign -Wall = -Wredundant-decls -Wnested-externs -Wstrict-prototypes = -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef = -Wno-pointer-sign -Wmissing-include-dirs -Wno-unknown-pragmas = -Wno-error-tautological-compare -Wno-error-empty-body = -Wno-error-parentheses-equality -Wno-error-unused-function = -Wno-error-pointer-sign -std=3Diso9899:1999 -fdebug-compilation-dir = /usr/obj/usr/src/sys/MORTIS/modules/usr/src/sys/modules/hptmv = -ferror-limit 19 -fmessage-length 80 -ffreestanding -fformat-extensions = -fwrapv -stack-protector 1 -mstackrealign -fobjc-runtime=3Dgnustep = -fno-common -fdiagnostics-show-option -fcolor-diagnostics -o hptproc.o = -x c /usr/src/sys/modules/hptmv/../../dev/hptmv/hptproc.c > 1. parser at end of file > 2. Code generation > 3. Running pass 'Function Pass Manager' on module = '/usr/src/sys/modules/hptmv/../../dev/hptmv/hptproc.c'. > 4. Running pass 'Post-RA pseudo instruction expansion pass' on = function '@hpt_proc_in' Right, I also got the same report from Sean Bruno. I've backed this out in r278361 for now, since building head is more important than one particular file from LibreOffice. Sorry for the breakage. -Dimitry --Apple-Mail=_74D83A27-F902-4A20-B63B-167CE967C1B1 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTWREUACgkQsF6jCi4glqMOAgCg2ZkJhioyJdI7CSzK1pn1CF6w U0cAoKIM7a2OO4DBswIBcbwM7HxCBQUW =kxsC -----END PGP SIGNATURE----- --Apple-Mail=_74D83A27-F902-4A20-B63B-167CE967C1B1-- From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 17:44:49 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE5671FC; Sat, 7 Feb 2015 17:44:49 +0000 (UTC) Received: from thyme.infocus-llc.com (thyme.infocus-llc.com [199.15.120.10]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B55BD213; Sat, 7 Feb 2015 17:44:49 +0000 (UTC) Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id E9BCB37B55B; Sat, 7 Feb 2015 11:44:47 -0600 (CST) Received: by draco.over-yonder.net (Postfix, from userid 100) id 3kfgqg2ljMz2Nk; Sat, 7 Feb 2015 11:44:47 -0600 (CST) Date: Sat, 7 Feb 2015 11:44:47 -0600 From: "Matthew D. Fuller" To: Dimitry Andric Subject: Re: svn commit: r278349 - head/contrib/llvm/lib/Target/X86 Message-ID: <20150207174447.GF82544@over-yonder.net> References: <201502071250.t17CoY49076516@svn.freebsd.org> <20150207164232.GA97044@over-yonder.net> <5E79A85C-D0F8-42EB-B82D-7C624F7F2E7E@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5E79A85C-D0F8-42EB-B82D-7C624F7F2E7E@FreeBSD.org> X-Editor: vi X-OS: FreeBSD User-Agent: Mutt/1.5.23-fullermd.4 (2014-03-12) X-Virus-Scanned: clamav-milter 0.98.6 at thyme.infocus-llc.com X-Virus-Status: Clean 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 17:44:50 -0000 On Sat, Feb 07, 2015 at 05:58:42PM +0100 I heard the voice of Dimitry Andric, and lo! it spake thus: > > since building head is more important than one particular file from > LibreOffice. FWIW, I built LibreOffice on my current -CURRENT (r277329) just earlier this week. A glance at src/contrib/llvm/ suggests only ARM/MIPS changes have happened since then, so at least some of the time you can probably still do both :) -- Matthew Fuller (MF4839) | fullermd@over-yonder.net Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ On the Internet, nobody can hear you scream. From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 17:53:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B37BD4D4; Sat, 7 Feb 2015 17:53:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F92F3B4; Sat, 7 Feb 2015 17:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17HrmdO021138; Sat, 7 Feb 2015 17:53:48 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17HrmcU021137; Sat, 7 Feb 2015 17:53:48 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502071753.t17HrmcU021137@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 7 Feb 2015 17:53:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278362 - head/usr.bin/ctlstat 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 17:53:48 -0000 Author: mav Date: Sat Feb 7 17:53:47 2015 New Revision: 278362 URL: https://svnweb.freebsd.org/changeset/base/278362 Log: Fix couple issues in ctlstat header printing. MFC after: 1 week Modified: head/usr.bin/ctlstat/ctlstat.c Modified: head/usr.bin/ctlstat/ctlstat.c ============================================================================== --- head/usr.bin/ctlstat/ctlstat.c Sat Feb 7 16:57:32 2015 (r278361) +++ head/usr.bin/ctlstat/ctlstat.c Sat Feb 7 17:53:47 2015 (r278362) @@ -449,7 +449,7 @@ ctlstat_standard(struct ctlstat_context (F_LUNVAL(ctx) != 0) ? " " : "", (F_LUNVAL(ctx) != 0) ? " " : "", (F_LUNVAL(ctx) != 0) ? " " : "", - (F_CPU(ctx) == 0) ? " CPU" : ""); + (F_CPU(ctx)) ? " CPU" : ""); hdr_devs = 3; } else { if (F_CPU(ctx)) @@ -468,8 +468,9 @@ ctlstat_standard(struct ctlstat_context if (bit_test(ctx->lun_mask, lun) == 0) continue; - fprintf(stdout, "%15.6s%d ", - "lun", lun); + fprintf(stdout, "%15.6s%d %s", + "lun", lun, + (F_LUNVAL(ctx) != 0) ? " " : ""); hdr_devs++; } fprintf(stdout, "\n"); From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 19:51:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DEB55F8; Sat, 7 Feb 2015 19:51:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 597C1FB5; Sat, 7 Feb 2015 19:51:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17Jpa30076710; Sat, 7 Feb 2015 19:51:36 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17JpZ6O076707; Sat, 7 Feb 2015 19:51:35 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502071951.t17JpZ6O076707@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 7 Feb 2015 19:51:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278363 - head/lib/libc/gen 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 19:51:36 -0000 Author: pfg Date: Sat Feb 7 19:51:34 2015 New Revision: 278363 URL: https://svnweb.freebsd.org/changeset/base/278363 Log: Protect uninitialized scalar variable from being accessed In a couple of cases a variable "stayopen" can be checked unitialized. This is of no danger as the complementary condition is false but prevent the access by switching the checks. CID: 1018729 CID: 1018732 Modified: head/lib/libc/gen/getgrent.c head/lib/libc/gen/getpwent.c Modified: head/lib/libc/gen/getgrent.c ============================================================================== --- head/lib/libc/gen/getgrent.c Sat Feb 7 17:53:47 2015 (r278362) +++ head/lib/libc/gen/getgrent.c Sat Feb 7 19:51:34 2015 (r278363) @@ -896,7 +896,7 @@ files_group(void *retval, void *mdata, v break; pos = ftello(st->fp); } - if (!stayopen && st->fp != NULL) { + if (st->fp != NULL && !stayopen) { fclose(st->fp); st->fp = NULL; } Modified: head/lib/libc/gen/getpwent.c ============================================================================== --- head/lib/libc/gen/getpwent.c Sat Feb 7 17:53:47 2015 (r278362) +++ head/lib/libc/gen/getpwent.c Sat Feb 7 19:51:34 2015 (r278363) @@ -921,7 +921,7 @@ files_passwd(void *retval, void *mdata, errnop); } while (how == nss_lt_all && !(rv & NS_TERMINATE)); fin: - if (!stayopen && st->db != NULL) { + if (st->db != NULL && !stayopen) { (void)st->db->close(st->db); st->db = NULL; } From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 21:29:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 147FC695; Sat, 7 Feb 2015 21:29:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0050BA57; Sat, 7 Feb 2015 21:29:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17LTHPW020953; Sat, 7 Feb 2015 21:29:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17LTHeI020952; Sat, 7 Feb 2015 21:29:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502072129.t17LTHeI020952@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 7 Feb 2015 21:29:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278364 - head/sys/dev/cxgb 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 21:29:18 -0000 Author: ngie Date: Sat Feb 7 21:29:17 2015 New Revision: 278364 URL: https://svnweb.freebsd.org/changeset/base/278364 Log: Remove kdb_backtrace extern; get the definition for kdb_backtrace from instead Fix whitespace in WARN_ON macro definition MFC after: 1 week Reviewed by: np Differential Revision: https://reviews.freebsd.org/D1799 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/cxgb/cxgb_osdep.h Modified: head/sys/dev/cxgb/cxgb_osdep.h ============================================================================== --- head/sys/dev/cxgb/cxgb_osdep.h Sat Feb 7 19:51:34 2015 (r278363) +++ head/sys/dev/cxgb/cxgb_osdep.h Sat Feb 7 21:29:17 2015 (r278364) @@ -39,6 +39,8 @@ $FreeBSD$ #include #include +#include + #include #ifndef _CXGB_OSDEP_H_ @@ -128,10 +130,8 @@ void prefetch(void *x) #define smp_mb() mb() #define L1_CACHE_BYTES 128 -extern void kdb_backtrace(void); - #define WARN_ON(condition) do { \ - if (__predict_false((condition)!=0)) { \ + if (__predict_false((condition)!=0)) { \ log(LOG_WARNING, "BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \ kdb_backtrace(); \ } \ From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 23:09:04 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FBFD42E; Sat, 7 Feb 2015 23:09:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B33A320; Sat, 7 Feb 2015 23:09:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17N94w6067151; Sat, 7 Feb 2015 23:09:04 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17N93tx067149; Sat, 7 Feb 2015 23:09:03 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201502072309.t17N93tx067149@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 7 Feb 2015 23:09:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278365 - in head/sys: conf modules/wpi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 23:09:04 -0000 Author: adrian Date: Sat Feb 7 23:09:03 2015 New Revision: 278365 URL: https://svnweb.freebsd.org/changeset/base/278365 Log: Add WPI_DEBUG option. PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/conf/options head/sys/modules/wpi/Makefile Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Sat Feb 7 21:29:17 2015 (r278364) +++ head/sys/conf/options Sat Feb 7 23:09:03 2015 (r278365) @@ -847,6 +847,9 @@ MWL_TX_NODROP opt_mwl.h # Options for the Intel 802.11n wireless driver IWN_DEBUG opt_iwn.h +# Options for the Intel 3945ABG wireless driver +WPI_DEBUG opt_wpi.h + # dcons options DCONS_BUF_SIZE opt_dcons.h DCONS_POLL_HZ opt_dcons.h Modified: head/sys/modules/wpi/Makefile ============================================================================== --- head/sys/modules/wpi/Makefile Sat Feb 7 21:29:17 2015 (r278364) +++ head/sys/modules/wpi/Makefile Sat Feb 7 23:09:03 2015 (r278365) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/wpi KMOD = if_wpi -SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wlan.h +SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wpi.h opt_wlan.h .include From owner-svn-src-head@FreeBSD.ORG Sat Feb 7 23:11:39 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FB0B720; Sat, 7 Feb 2015 23:11:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A7743D6; Sat, 7 Feb 2015 23:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17NBdf7070962; Sat, 7 Feb 2015 23:11:39 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17NBduF070960; Sat, 7 Feb 2015 23:11:39 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201502072311.t17NBduF070960@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 7 Feb 2015 23:11:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278366 - head/sys/dev/wpi 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.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Feb 2015 23:11:39 -0000 Author: adrian Date: Sat Feb 7 23:11:38 2015 New Revision: 278366 URL: https://svnweb.freebsd.org/changeset/base/278366 Log: Big wpi(4) overhaul! Not by me! This is a sync against iwn(4) and openbsd. - Add power management support; - Add background scanning support; - Fix few LORs; - Handle rfkill switch state changes properly; - Fix recovering after firmware failure; - Add more error checking; - Cleanup & disable by default debug output; - Update macroses names; - Other various fixes; - Add IBSS support: - don't set data_ntries field for management frames; - Add AHDEMO support: - fix padding; - Sync eeprom functions; - Use CMD_RXON_ASSOC where possible; - Enable HW CCMP encryption/decryption for pairwise keys; - Fix filter flags for CMD_RXON. Tested (by submitter) - iwn 3945 NIC. I have one somewhere; I'll validate this later on and revert it if it's a problem. Thanks! PR: 197143 Submitted by: Andriy Voskoboinyk Added: head/sys/dev/wpi/if_wpi_debug.h (contents, props changed) Modified: head/sys/dev/wpi/if_wpi.c head/sys/dev/wpi/if_wpireg.h head/sys/dev/wpi/if_wpivar.h Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sat Feb 7 23:09:03 2015 (r278365) +++ head/sys/dev/wpi/if_wpi.c Sat Feb 7 23:11:38 2015 (r278366) @@ -16,8 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define VERSION "20071127" - #include __FBSDID("$FreeBSD$"); @@ -60,6 +58,7 @@ __FBSDID("$FreeBSD$"); */ #include "opt_wlan.h" +#include "opt_wpi.h" #include #include @@ -93,51 +92,20 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include - #include #include #include -#include #include +#include + +#include +#include +#include +#include #include #include - -#define WPI_DEBUG - -#ifdef WPI_DEBUG -#define DPRINTF(x) do { if (wpi_debug != 0) printf x; } while (0) -#define DPRINTFN(n, x) do { if (wpi_debug & n) printf x; } while (0) -#define WPI_DEBUG_SET (wpi_debug != 0) - -enum { - WPI_DEBUG_UNUSED = 0x00000001, /* Unused */ - WPI_DEBUG_HW = 0x00000002, /* Stage 1 (eeprom) debugging */ - WPI_DEBUG_TX = 0x00000004, /* Stage 2 TX intrp debugging*/ - WPI_DEBUG_RX = 0x00000008, /* Stage 2 RX intrp debugging */ - WPI_DEBUG_CMD = 0x00000010, /* Stage 2 CMD intrp debugging*/ - WPI_DEBUG_FIRMWARE = 0x00000020, /* firmware(9) loading debug */ - WPI_DEBUG_DMA = 0x00000040, /* DMA (de)allocations/syncs */ - WPI_DEBUG_SCANNING = 0x00000080, /* Stage 2 Scanning debugging */ - WPI_DEBUG_NOTIFY = 0x00000100, /* State 2 Noftif intr debug */ - WPI_DEBUG_TEMP = 0x00000200, /* TXPower/Temp Calibration */ - WPI_DEBUG_OPS = 0x00000400, /* wpi_ops taskq debug */ - WPI_DEBUG_WATCHDOG = 0x00000800, /* Watch dog debug */ - WPI_DEBUG_ANY = 0xffffffff -}; - -static int wpi_debug; -SYSCTL_INT(_debug, OID_AUTO, wpi, CTLFLAG_RWTUN, &wpi_debug, 0, "wpi debug level"); - -#else -#define DPRINTF(x) -#define DPRINTFN(n, x) -#define WPI_DEBUG_SET 0 -#endif +#include struct wpi_ident { uint16_t vendor; @@ -158,99 +126,138 @@ static const struct wpi_ident wpi_ident_ { 0, 0, 0, NULL } }; +static int wpi_probe(device_t); +static int wpi_attach(device_t); +static void wpi_radiotap_attach(struct wpi_softc *); +static void wpi_sysctlattach(struct wpi_softc *); static struct ieee80211vap *wpi_vap_create(struct ieee80211com *, const char [IFNAMSIZ], int, enum ieee80211_opmode, int, const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN]); static void wpi_vap_delete(struct ieee80211vap *); +static int wpi_detach(device_t); +static int wpi_shutdown(device_t); +static int wpi_suspend(device_t); +static int wpi_resume(device_t); +static int wpi_nic_lock(struct wpi_softc *); +static int wpi_read_prom_data(struct wpi_softc *, uint32_t, void *, int); +static void wpi_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int wpi_dma_contig_alloc(struct wpi_softc *, struct wpi_dma_info *, - void **, bus_size_t, bus_size_t, int); + void **, bus_size_t, bus_size_t); static void wpi_dma_contig_free(struct wpi_dma_info *); -static void wpi_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int wpi_alloc_shared(struct wpi_softc *); static void wpi_free_shared(struct wpi_softc *); -static int wpi_alloc_rx_ring(struct wpi_softc *, struct wpi_rx_ring *); -static void wpi_reset_rx_ring(struct wpi_softc *, struct wpi_rx_ring *); -static void wpi_free_rx_ring(struct wpi_softc *, struct wpi_rx_ring *); +static int wpi_alloc_fwmem(struct wpi_softc *); +static void wpi_free_fwmem(struct wpi_softc *); +static int wpi_alloc_rx_ring(struct wpi_softc *); +static void wpi_update_rx_ring(struct wpi_softc *); +static void wpi_reset_rx_ring(struct wpi_softc *); +static void wpi_free_rx_ring(struct wpi_softc *); static int wpi_alloc_tx_ring(struct wpi_softc *, struct wpi_tx_ring *, - int, int); + int); +static void wpi_update_tx_ring(struct wpi_softc *, struct wpi_tx_ring *); static void wpi_reset_tx_ring(struct wpi_softc *, struct wpi_tx_ring *); static void wpi_free_tx_ring(struct wpi_softc *, struct wpi_tx_ring *); +static int wpi_read_eeprom(struct wpi_softc *, + uint8_t macaddr[IEEE80211_ADDR_LEN]); +static uint32_t wpi_eeprom_channel_flags(struct wpi_eeprom_chan *); +static void wpi_read_eeprom_band(struct wpi_softc *, int); +static int wpi_read_eeprom_channels(struct wpi_softc *, int); +static struct wpi_eeprom_chan *wpi_find_eeprom_channel(struct wpi_softc *, + struct ieee80211_channel *); +static int wpi_setregdomain(struct ieee80211com *, + struct ieee80211_regdomain *, int, + struct ieee80211_channel[]); +static int wpi_read_eeprom_group(struct wpi_softc *, int); +static void wpi_node_free(struct ieee80211_node *); +static struct ieee80211_node *wpi_node_alloc(struct ieee80211vap *, + const uint8_t mac[IEEE80211_ADDR_LEN]); static int wpi_newstate(struct ieee80211vap *, enum ieee80211_state, int); -static void wpi_mem_lock(struct wpi_softc *); -static void wpi_mem_unlock(struct wpi_softc *); -static uint32_t wpi_mem_read(struct wpi_softc *, uint16_t); -static void wpi_mem_write(struct wpi_softc *, uint16_t, uint32_t); -static void wpi_mem_write_region_4(struct wpi_softc *, uint16_t, - const uint32_t *, int); -static uint16_t wpi_read_prom_data(struct wpi_softc *, uint32_t, void *, int); -static int wpi_alloc_fwmem(struct wpi_softc *); -static void wpi_free_fwmem(struct wpi_softc *); -static int wpi_load_firmware(struct wpi_softc *); -static void wpi_unload_firmware(struct wpi_softc *); -static int wpi_load_microcode(struct wpi_softc *, const uint8_t *, int); -static void wpi_rx_intr(struct wpi_softc *, struct wpi_rx_desc *, +static void wpi_calib_timeout(void *); +static void wpi_rx_done(struct wpi_softc *, struct wpi_rx_desc *, struct wpi_rx_data *); -static void wpi_tx_intr(struct wpi_softc *, struct wpi_rx_desc *); -static void wpi_cmd_intr(struct wpi_softc *, struct wpi_rx_desc *); +static void wpi_rx_statistics(struct wpi_softc *, struct wpi_rx_desc *, + struct wpi_rx_data *); +static void wpi_tx_done(struct wpi_softc *, struct wpi_rx_desc *); +static void wpi_cmd_done(struct wpi_softc *, struct wpi_rx_desc *); static void wpi_notif_intr(struct wpi_softc *); +static void wpi_wakeup_intr(struct wpi_softc *); +static void wpi_fatal_intr(struct wpi_softc *); static void wpi_intr(void *); -static uint8_t wpi_plcp_signal(int); -static void wpi_watchdog(void *); +static int wpi_cmd2(struct wpi_softc *, struct wpi_buf *); static int wpi_tx_data(struct wpi_softc *, struct mbuf *, - struct ieee80211_node *, int); -static void wpi_start(struct ifnet *); -static void wpi_start_locked(struct ifnet *); + struct ieee80211_node *); +static int wpi_tx_data_raw(struct wpi_softc *, struct mbuf *, + struct ieee80211_node *, + const struct ieee80211_bpf_params *); static int wpi_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); -static void wpi_scan_start(struct ieee80211com *); -static void wpi_scan_end(struct ieee80211com *); -static void wpi_set_channel(struct ieee80211com *); -static void wpi_scan_curchan(struct ieee80211_scan_state *, unsigned long); -static void wpi_scan_mindwell(struct ieee80211_scan_state *); +static void wpi_start(struct ifnet *); +static void wpi_start_locked(struct ifnet *); +static void wpi_watchdog_rfkill(void *); +static void wpi_watchdog(void *); static int wpi_ioctl(struct ifnet *, u_long, caddr_t); -static void wpi_read_eeprom(struct wpi_softc *, - uint8_t macaddr[IEEE80211_ADDR_LEN]); -static void wpi_read_eeprom_channels(struct wpi_softc *, int); -static void wpi_read_eeprom_group(struct wpi_softc *, int); -static int wpi_cmd(struct wpi_softc *, int, const void *, int, int); -static int wpi_wme_update(struct ieee80211com *); +static int wpi_cmd(struct wpi_softc *, int, const void *, size_t, int); static int wpi_mrr_setup(struct wpi_softc *); +static int wpi_add_node(struct wpi_softc *, struct ieee80211_node *); +static int wpi_add_broadcast_node(struct wpi_softc *, int); +static int wpi_add_ibss_node(struct wpi_softc *, struct ieee80211_node *); +static void wpi_del_node(struct wpi_softc *, struct ieee80211_node *); +static int wpi_updateedca(struct ieee80211com *); +static void wpi_set_promisc(struct wpi_softc *); +static void wpi_update_promisc(struct ifnet *); +static void wpi_update_mcast(struct ifnet *); static void wpi_set_led(struct wpi_softc *, uint8_t, uint8_t, uint8_t); -static void wpi_enable_tsf(struct wpi_softc *, struct ieee80211_node *); -#if 0 -static int wpi_setup_beacon(struct wpi_softc *, struct ieee80211_node *); -#endif +static int wpi_set_timing(struct wpi_softc *, struct ieee80211_node *); +static void wpi_power_calibration(struct wpi_softc *); +static int wpi_set_txpower(struct wpi_softc *, int); +static int wpi_get_power_index(struct wpi_softc *, + struct wpi_power_group *, struct ieee80211_channel *, int); +static int wpi_set_pslevel(struct wpi_softc *, uint8_t, int, int); +static int wpi_send_btcoex(struct wpi_softc *); +static int wpi_send_rxon(struct wpi_softc *, int, int); +static int wpi_config(struct wpi_softc *); +static uint16_t wpi_get_active_dwell_time(struct wpi_softc *, + struct ieee80211_channel *, uint8_t); +static uint16_t wpi_limit_dwell(struct wpi_softc *, uint16_t); +static uint16_t wpi_get_passive_dwell_time(struct wpi_softc *, + struct ieee80211_channel *); +static int wpi_scan(struct wpi_softc *, struct ieee80211_channel *); static int wpi_auth(struct wpi_softc *, struct ieee80211vap *); +static void wpi_update_beacon(struct ieee80211vap *, int); +static int wpi_setup_beacon(struct wpi_softc *, struct ieee80211_node *); static int wpi_run(struct wpi_softc *, struct ieee80211vap *); -static int wpi_scan(struct wpi_softc *); -static int wpi_config(struct wpi_softc *); -static void wpi_stop_master(struct wpi_softc *); -static int wpi_power_up(struct wpi_softc *); -static int wpi_reset(struct wpi_softc *); -static void wpi_hwreset(void *, int); -static void wpi_rfreset(void *, int); -static void wpi_hw_config(struct wpi_softc *); +static int wpi_key_alloc(struct ieee80211vap *, struct ieee80211_key *, + ieee80211_keyix *, ieee80211_keyix *); +static int wpi_key_set(struct ieee80211vap *, + const struct ieee80211_key *, + const uint8_t mac[IEEE80211_ADDR_LEN]); +static int wpi_key_delete(struct ieee80211vap *, + const struct ieee80211_key *); +static int wpi_post_alive(struct wpi_softc *); +static int wpi_load_bootcode(struct wpi_softc *, const uint8_t *, int); +static int wpi_load_firmware(struct wpi_softc *); +static int wpi_read_firmware(struct wpi_softc *); +static void wpi_unload_firmware(struct wpi_softc *); +static int wpi_clock_wait(struct wpi_softc *); +static int wpi_apm_init(struct wpi_softc *); +static void wpi_apm_stop_master(struct wpi_softc *); +static void wpi_apm_stop(struct wpi_softc *); +static void wpi_nic_config(struct wpi_softc *); +static int wpi_hw_init(struct wpi_softc *); +static void wpi_hw_stop(struct wpi_softc *); +static void wpi_radio_on(void *, int); +static void wpi_radio_off(void *, int); +static void wpi_init_locked(struct wpi_softc *); static void wpi_init(void *); -static void wpi_init_locked(struct wpi_softc *, int); -static void wpi_stop(struct wpi_softc *); static void wpi_stop_locked(struct wpi_softc *); - -static int wpi_set_txpower(struct wpi_softc *, struct ieee80211_channel *, - int); -static void wpi_calib_timeout(void *); -static void wpi_power_calibration(struct wpi_softc *, int); -static int wpi_get_power_index(struct wpi_softc *, - struct wpi_power_group *, struct ieee80211_channel *, int); -#ifdef WPI_DEBUG -static const char *wpi_cmd_str(int); -#endif -static int wpi_probe(device_t); -static int wpi_attach(device_t); -static int wpi_detach(device_t); -static int wpi_shutdown(device_t); -static int wpi_suspend(device_t); -static int wpi_resume(device_t); +static void wpi_stop(struct wpi_softc *); +static void wpi_scan_start(struct ieee80211com *); +static void wpi_scan_end(struct ieee80211com *); +static void wpi_set_channel(struct ieee80211com *); +static void wpi_scan_curchan(struct ieee80211_scan_state *, unsigned long); +static void wpi_scan_mindwell(struct ieee80211_scan_state *); +static void wpi_hw_reset(void *, int); static device_method_t wpi_methods[] = { /* Device interface */ @@ -269,25 +276,15 @@ static driver_t wpi_driver = { wpi_methods, sizeof (struct wpi_softc) }; - static devclass_t wpi_devclass; DRIVER_MODULE(wpi, pci, wpi_driver, wpi_devclass, NULL, NULL); MODULE_VERSION(wpi, 1); -static const uint8_t wpi_ridx_to_plcp[] = { - /* OFDM: IEEE Std 802.11a-1999, pp. 14 Table 80 */ - /* R1-R4 (ral/ural is R4-R1) */ - 0xd, 0xf, 0x5, 0x7, 0x9, 0xb, 0x1, 0x3, - /* CCK: device-dependent */ - 10, 20, 55, 110 -}; - -static const uint8_t wpi_ridx_to_rate[] = { - 12, 18, 24, 36, 48, 72, 96, 108, /* OFDM */ - 2, 4, 11, 22 /*CCK */ -}; +MODULE_DEPEND(wpi, pci, 1, 1, 1); +MODULE_DEPEND(wpi, wlan, 1, 1, 1); +MODULE_DEPEND(wpi, firmware, 1, 1, 1); static int wpi_probe(device_t dev) @@ -304,202 +301,38 @@ wpi_probe(device_t dev) return ENXIO; } -/** - * Load the firmare image from disk to the allocated dma buffer. - * we also maintain the reference to the firmware pointer as there - * is times where we may need to reload the firmware but we are not - * in a context that can access the filesystem (ie taskq cause by restart) - * - * @return 0 on success, an errno on failure - */ -static int -wpi_load_firmware(struct wpi_softc *sc) -{ - const struct firmware *fp; - struct wpi_dma_info *dma = &sc->fw_dma; - const struct wpi_firmware_hdr *hdr; - const uint8_t *itext, *idata, *rtext, *rdata, *btext; - uint32_t itextsz, idatasz, rtextsz, rdatasz, btextsz; - int error; - - DPRINTFN(WPI_DEBUG_FIRMWARE, - ("Attempting Loading Firmware from wpi_fw module\n")); - - WPI_UNLOCK(sc); - - if (sc->fw_fp == NULL && (sc->fw_fp = firmware_get("wpifw")) == NULL) { - device_printf(sc->sc_dev, - "could not load firmware image 'wpifw'\n"); - error = ENOENT; - WPI_LOCK(sc); - goto fail; - } - - fp = sc->fw_fp; - - WPI_LOCK(sc); - - /* Validate the firmware is minimum a particular version */ - if (fp->version < WPI_FW_MINVERSION) { - device_printf(sc->sc_dev, - "firmware version is too old. Need %d, got %d\n", - WPI_FW_MINVERSION, - fp->version); - error = ENXIO; - goto fail; - } - - if (fp->datasize < sizeof (struct wpi_firmware_hdr)) { - device_printf(sc->sc_dev, - "firmware file too short: %zu bytes\n", fp->datasize); - error = ENXIO; - goto fail; - } - - hdr = (const struct wpi_firmware_hdr *)fp->data; - - /* | RUNTIME FIRMWARE | INIT FIRMWARE | BOOT FW | - |HDR|<--TEXT-->|<--DATA-->|<--TEXT-->|<--DATA-->|<--TEXT-->| */ - - rtextsz = le32toh(hdr->rtextsz); - rdatasz = le32toh(hdr->rdatasz); - itextsz = le32toh(hdr->itextsz); - idatasz = le32toh(hdr->idatasz); - btextsz = le32toh(hdr->btextsz); - - /* check that all firmware segments are present */ - if (fp->datasize < sizeof (struct wpi_firmware_hdr) + - rtextsz + rdatasz + itextsz + idatasz + btextsz) { - device_printf(sc->sc_dev, - "firmware file too short: %zu bytes\n", fp->datasize); - error = ENXIO; /* XXX appropriate error code? */ - goto fail; - } - - /* get pointers to firmware segments */ - rtext = (const uint8_t *)(hdr + 1); - rdata = rtext + rtextsz; - itext = rdata + rdatasz; - idata = itext + itextsz; - btext = idata + idatasz; - - DPRINTFN(WPI_DEBUG_FIRMWARE, - ("Firmware Version: Major %d, Minor %d, Driver %d, \n" - "runtime (text: %u, data: %u) init (text: %u, data %u) boot (text %u)\n", - (le32toh(hdr->version) & 0xff000000) >> 24, - (le32toh(hdr->version) & 0x00ff0000) >> 16, - (le32toh(hdr->version) & 0x0000ffff), - rtextsz, rdatasz, - itextsz, idatasz, btextsz)); - - DPRINTFN(WPI_DEBUG_FIRMWARE,("rtext 0x%x\n", *(const uint32_t *)rtext)); - DPRINTFN(WPI_DEBUG_FIRMWARE,("rdata 0x%x\n", *(const uint32_t *)rdata)); - DPRINTFN(WPI_DEBUG_FIRMWARE,("itext 0x%x\n", *(const uint32_t *)itext)); - DPRINTFN(WPI_DEBUG_FIRMWARE,("idata 0x%x\n", *(const uint32_t *)idata)); - DPRINTFN(WPI_DEBUG_FIRMWARE,("btext 0x%x\n", *(const uint32_t *)btext)); - - /* sanity checks */ - if (rtextsz > WPI_FW_MAIN_TEXT_MAXSZ || - rdatasz > WPI_FW_MAIN_DATA_MAXSZ || - itextsz > WPI_FW_INIT_TEXT_MAXSZ || - idatasz > WPI_FW_INIT_DATA_MAXSZ || - btextsz > WPI_FW_BOOT_TEXT_MAXSZ || - (btextsz & 3) != 0) { - device_printf(sc->sc_dev, "firmware invalid\n"); - error = EINVAL; - goto fail; - } - - /* copy initialization images into pre-allocated DMA-safe memory */ - memcpy(dma->vaddr, idata, idatasz); - memcpy(dma->vaddr + WPI_FW_INIT_DATA_MAXSZ, itext, itextsz); - - bus_dmamap_sync(dma->tag, dma->map, BUS_DMASYNC_PREWRITE); - - /* tell adapter where to find initialization images */ - wpi_mem_lock(sc); - wpi_mem_write(sc, WPI_MEM_DATA_BASE, dma->paddr); - wpi_mem_write(sc, WPI_MEM_DATA_SIZE, idatasz); - wpi_mem_write(sc, WPI_MEM_TEXT_BASE, - dma->paddr + WPI_FW_INIT_DATA_MAXSZ); - wpi_mem_write(sc, WPI_MEM_TEXT_SIZE, itextsz); - wpi_mem_unlock(sc); - - /* load firmware boot code */ - if ((error = wpi_load_microcode(sc, btext, btextsz)) != 0) { - device_printf(sc->sc_dev, "Failed to load microcode\n"); - goto fail; - } - - /* now press "execute" */ - WPI_WRITE(sc, WPI_RESET, 0); - - /* wait at most one second for the first alive notification */ - if ((error = msleep(sc, &sc->sc_mtx, PCATCH, "wpiinit", hz)) != 0) { - device_printf(sc->sc_dev, - "timeout waiting for adapter to initialize\n"); - goto fail; - } - - /* copy runtime images into pre-allocated DMA-sage memory */ - memcpy(dma->vaddr, rdata, rdatasz); - memcpy(dma->vaddr + WPI_FW_MAIN_DATA_MAXSZ, rtext, rtextsz); - bus_dmamap_sync(dma->tag, dma->map, BUS_DMASYNC_PREWRITE); - - /* tell adapter where to find runtime images */ - wpi_mem_lock(sc); - wpi_mem_write(sc, WPI_MEM_DATA_BASE, dma->paddr); - wpi_mem_write(sc, WPI_MEM_DATA_SIZE, rdatasz); - wpi_mem_write(sc, WPI_MEM_TEXT_BASE, - dma->paddr + WPI_FW_MAIN_DATA_MAXSZ); - wpi_mem_write(sc, WPI_MEM_TEXT_SIZE, WPI_FW_UPDATED | rtextsz); - wpi_mem_unlock(sc); - - /* wait at most one second for the first alive notification */ - if ((error = msleep(sc, &sc->sc_mtx, PCATCH, "wpiinit", hz)) != 0) { - device_printf(sc->sc_dev, - "timeout waiting for adapter to initialize2\n"); - goto fail; - } - - DPRINTFN(WPI_DEBUG_FIRMWARE, - ("Firmware loaded to driver successfully\n")); - return error; -fail: - wpi_unload_firmware(sc); - return error; -} - -/** - * Free the referenced firmware image - */ -static void -wpi_unload_firmware(struct wpi_softc *sc) -{ - - if (sc->fw_fp) { - WPI_UNLOCK(sc); - firmware_put(sc->fw_fp, FIRMWARE_UNLOAD); - WPI_LOCK(sc); - sc->fw_fp = NULL; - } -} - static int wpi_attach(device_t dev) { - struct wpi_softc *sc = device_get_softc(dev); - struct ifnet *ifp; + struct wpi_softc *sc = (struct wpi_softc *)device_get_softc(dev); struct ieee80211com *ic; - int ac, error, rid, supportsa = 1; - uint32_t tmp; + struct ifnet *ifp; + int i, error, rid, supportsa = 1; const struct wpi_ident *ident; uint8_t macaddr[IEEE80211_ADDR_LEN]; sc->sc_dev = dev; - if (bootverbose || WPI_DEBUG_SET) - device_printf(sc->sc_dev,"Driver Revision %s\n", VERSION); +#ifdef WPI_DEBUG + error = resource_int_value(device_get_name(sc->sc_dev), + device_get_unit(sc->sc_dev), "debug", &(sc->sc_debug)); + if (error != 0) + sc->sc_debug = 0; +#else + sc->sc_debug = 0; +#endif + + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__); + + /* + * Get the offset of the PCI Express Capability Structure in PCI + * Configuration Space. + */ + error = pci_find_cap(dev, PCIY_EXPRESS, &sc->sc_cap_off); + if (error != 0) { + device_printf(dev, "PCIe capability structure not found!\n"); + return error; + } /* * Some card's only support 802.11b/g not a, check to see if @@ -514,131 +347,118 @@ wpi_attach(device_t dev) } } - /* Create the tasks that can be queued */ - TASK_INIT(&sc->sc_restarttask, 0, wpi_hwreset, sc); - TASK_INIT(&sc->sc_radiotask, 0, wpi_rfreset, sc); - - WPI_LOCK_INIT(sc); - - callout_init_mtx(&sc->calib_to, &sc->sc_mtx, 0); - callout_init_mtx(&sc->watchdog_to, &sc->sc_mtx, 0); - - /* disable the retry timeout register */ + /* Clear device-specific "PCI retry timeout" register (41h). */ pci_write_config(dev, 0x41, 0, 1); - /* enable bus-mastering */ + /* Enable bus-mastering. */ pci_enable_busmaster(dev); rid = PCIR_BAR(0); sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->mem == NULL) { - device_printf(dev, "could not allocate memory resource\n"); + device_printf(dev, "can't map mem space\n"); error = ENOMEM; - goto fail; + return error; } - sc->sc_st = rman_get_bustag(sc->mem); sc->sc_sh = rman_get_bushandle(sc->mem); + i = 1; rid = 0; - sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE | RF_SHAREABLE); + if (pci_alloc_msi(dev, &i) == 0) + rid = 1; + /* Install interrupt handler. */ + sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | + (rid != 0 ? 0 : RF_SHAREABLE)); if (sc->irq == NULL) { - device_printf(dev, "could not allocate interrupt resource\n"); + device_printf(dev, "can't map interrupt\n"); error = ENOMEM; goto fail; } - /* - * Allocate DMA memory for firmware transfers. - */ - if ((error = wpi_alloc_fwmem(sc)) != 0) { - printf(": could not allocate firmware memory\n"); - error = ENOMEM; - goto fail; - } + WPI_LOCK_INIT(sc); - /* - * Put adapter into a known state. - */ - if ((error = wpi_reset(sc)) != 0) { - device_printf(dev, "could not reset adapter\n"); + sc->sc_unr = new_unrhdr(WPI_ID_IBSS_MIN, WPI_ID_IBSS_MAX, &sc->sc_mtx); + + /* Allocate DMA memory for firmware transfers. */ + if ((error = wpi_alloc_fwmem(sc)) != 0) { + device_printf(dev, + "could not allocate memory for firmware, error %d\n", + error); goto fail; } - wpi_mem_lock(sc); - tmp = wpi_mem_read(sc, WPI_MEM_PCIDEV); - if (bootverbose || WPI_DEBUG_SET) - device_printf(sc->sc_dev, "Hardware Revision (0x%X)\n", tmp); - - wpi_mem_unlock(sc); - - /* Allocate shared page */ + /* Allocate shared page. */ if ((error = wpi_alloc_shared(sc)) != 0) { device_printf(dev, "could not allocate shared page\n"); goto fail; } - /* tx data queues - 4 for QoS purposes */ - for (ac = 0; ac < WME_NUM_AC; ac++) { - error = wpi_alloc_tx_ring(sc, &sc->txq[ac], WPI_TX_RING_COUNT, ac); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring %d\n",ac); - goto fail; + /* Allocate TX rings - 4 for QoS purposes, 1 for commands. */ + for (i = 0; i < WPI_NTXQUEUES; i++) { + if ((error = wpi_alloc_tx_ring(sc, &sc->txq[i], i)) != 0) { + device_printf(dev, + "could not allocate TX ring %d, error %d\n", i, + error); + goto fail; } } - /* command queue to talk to the card's firmware */ - error = wpi_alloc_tx_ring(sc, &sc->cmdq, WPI_CMD_RING_COUNT, 4); - if (error != 0) { - device_printf(dev, "could not allocate command ring\n"); + /* Allocate RX ring. */ + if ((error = wpi_alloc_rx_ring(sc)) != 0) { + device_printf(dev, "could not allocate RX ring, error %d\n", + error); goto fail; } - /* receive data queue */ - error = wpi_alloc_rx_ring(sc, &sc->rxq); - if (error != 0) { - device_printf(dev, "could not allocate Rx ring\n"); - goto fail; - } + /* Clear pending interrupts. */ + WPI_WRITE(sc, WPI_INT, 0xffffffff); ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { - device_printf(dev, "can not if_alloc()\n"); - error = ENOMEM; + device_printf(dev, "can not allocate ifnet structure\n"); goto fail; } - ic = ifp->if_l2com; + ic = ifp->if_l2com; ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ - /* set device capabilities */ + /* Set device capabilities. */ ic->ic_caps = IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* IBSS mode supported */ | IEEE80211_C_MONITOR /* monitor mode supported */ + | IEEE80211_C_AHDEMO /* adhoc demo mode */ + | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ - | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_WPA /* 802.11i */ -/* XXX looks like WME is partly supported? */ + | IEEE80211_C_SHPREAMBLE /* short preamble supported */ #if 0 - | IEEE80211_C_IBSS /* IBSS mode support */ - | IEEE80211_C_BGSCAN /* capable of bg scanning */ - | IEEE80211_C_WME /* 802.11e */ | IEEE80211_C_HOSTAP /* Host access point mode */ #endif + | IEEE80211_C_WME /* 802.11e */ + | IEEE80211_C_PMGT /* Station-side power mgmt */ ; + ic->ic_cryptocaps = + IEEE80211_CRYPTO_AES_CCM; + /* * Read in the eeprom and also setup the channels for * net80211. We don't set the rates as net80211 does this for us */ - wpi_read_eeprom(sc, macaddr); + if ((error = wpi_read_eeprom(sc, macaddr)) != 0) { + device_printf(dev, "could not read EEPROM, error %d\n", + error); + goto fail; + } - if (bootverbose || WPI_DEBUG_SET) { +#ifdef WPI_DEBUG + if (bootverbose) { device_printf(sc->sc_dev, "Regulatory Domain: %.4s\n", sc->domain); device_printf(sc->sc_dev, "Hardware Type: %c\n", sc->type > 1 ? 'B': '?'); @@ -650,6 +470,7 @@ wpi_attach(device_t dev) /* XXX hw_config uses the PCIDEV for the Hardware rev. Must check what sc->rev really represents - benjsc 20070615 */ } +#endif if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_softc = sc; @@ -662,99 +483,90 @@ wpi_attach(device_t dev) IFQ_SET_READY(&ifp->if_snd); ieee80211_ifattach(ic, macaddr); - /* override default methods */ + ic->ic_vap_create = wpi_vap_create; + ic->ic_vap_delete = wpi_vap_delete; ic->ic_raw_xmit = wpi_raw_xmit; - ic->ic_wme.wme_update = wpi_wme_update; + ic->ic_node_alloc = wpi_node_alloc; + sc->sc_node_free = ic->ic_node_free; + ic->ic_node_free = wpi_node_free; + ic->ic_wme.wme_update = wpi_updateedca; + ic->ic_update_promisc = wpi_update_promisc; + ic->ic_update_mcast = wpi_update_mcast; ic->ic_scan_start = wpi_scan_start; ic->ic_scan_end = wpi_scan_end; ic->ic_set_channel = wpi_set_channel; + sc->sc_scan_curchan = ic->ic_scan_curchan; ic->ic_scan_curchan = wpi_scan_curchan; ic->ic_scan_mindwell = wpi_scan_mindwell; + ic->ic_setregdomain = wpi_setregdomain; - ic->ic_vap_create = wpi_vap_create; - ic->ic_vap_delete = wpi_vap_delete; + wpi_radiotap_attach(sc); - ieee80211_radiotap_attach(ic, - &sc->sc_txtap.wt_ihdr, sizeof(sc->sc_txtap), - WPI_TX_RADIOTAP_PRESENT, - &sc->sc_rxtap.wr_ihdr, sizeof(sc->sc_rxtap), - WPI_RX_RADIOTAP_PRESENT); + callout_init_mtx(&sc->calib_to, &sc->sc_mtx, 0); + callout_init_mtx(&sc->watchdog_to, &sc->sc_mtx, 0); + callout_init_mtx(&sc->watchdog_rfkill, &sc->sc_mtx, 0); + TASK_INIT(&sc->sc_reinittask, 0, wpi_hw_reset, sc); + TASK_INIT(&sc->sc_radiooff_task, 0, wpi_radio_off, sc); + TASK_INIT(&sc->sc_radioon_task, 0, wpi_radio_on, sc); + + wpi_sysctlattach(sc); /* * Hook our interrupt after all initialization is complete. */ - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET |INTR_MPSAFE, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE, NULL, wpi_intr, sc, &sc->sc_ih); if (error != 0) { - device_printf(dev, "could not set up interrupt\n"); + device_printf(dev, "can't establish interrupt, error %d\n", + error); goto fail; } if (bootverbose) ieee80211_announce(ic); -#ifdef XXX_DEBUG - ieee80211_announce_channels(ic); + +#ifdef WPI_DEBUG + if (sc->sc_debug & WPI_DEBUG_HW) + ieee80211_announce_channels(ic); #endif + + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); return 0; fail: wpi_detach(dev); - return ENXIO; + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__); + return error; } -static int -wpi_detach(device_t dev) +/* + * Attach the interface to 802.11 radiotap. + */ +static void +wpi_radiotap_attach(struct wpi_softc *sc) { - struct wpi_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic; - int ac; + struct ieee80211com *ic = ifp->if_l2com; + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__); + ieee80211_radiotap_attach(ic, + &sc->sc_txtap.wt_ihdr, sizeof(sc->sc_txtap), + WPI_TX_RADIOTAP_PRESENT, + &sc->sc_rxtap.wr_ihdr, sizeof(sc->sc_rxtap), + WPI_RX_RADIOTAP_PRESENT); + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); +} - if (sc->irq != NULL) - bus_teardown_intr(dev, sc->irq, sc->sc_ih); +static void +wpi_sysctlattach(struct wpi_softc *sc) +{ +#ifdef WPI_DEBUG + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev); + struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); - if (ifp != NULL) { - ic = ifp->if_l2com; - - ieee80211_draintask(ic, &sc->sc_restarttask); - ieee80211_draintask(ic, &sc->sc_radiotask); - wpi_stop(sc); - callout_drain(&sc->watchdog_to); - callout_drain(&sc->calib_to); - ieee80211_ifdetach(ic); - } - - WPI_LOCK(sc); - if (sc->txq[0].data_dmat) { - for (ac = 0; ac < WME_NUM_AC; ac++) - wpi_free_tx_ring(sc, &sc->txq[ac]); - - wpi_free_tx_ring(sc, &sc->cmdq); - wpi_free_rx_ring(sc, &sc->rxq); - wpi_free_shared(sc); - } - - if (sc->fw_fp != NULL) { - wpi_unload_firmware(sc); - } - - if (sc->fw_dma.tag) - wpi_free_fwmem(sc); - WPI_UNLOCK(sc); - - if (sc->irq != NULL) - bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq), - sc->irq); - if (sc->mem != NULL) - bus_release_resource(dev, SYS_RES_MEMORY, - rman_get_rid(sc->mem), sc->mem); - - if (ifp != NULL) - if_free(ifp); - - WPI_LOCK_DESTROY(sc); - - return 0; -} + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "debug", CTLFLAG_RW, &sc->sc_debug, sc->sc_debug, + "control debugging printfs"); +#endif +} static struct ieee80211vap * wpi_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, @@ -763,22 +575,32 @@ wpi_vap_create(struct ieee80211com *ic, const uint8_t mac[IEEE80211_ADDR_LEN]) { struct wpi_vap *wvp; + struct wpi_buf *bcn; struct ieee80211vap *vap; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ return NULL; + wvp = (struct wpi_vap *) malloc(sizeof(struct wpi_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (wvp == NULL) return NULL; vap = &wvp->vap; ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); - /* override with driver methods */ + + bcn = &wvp->wv_bcbuf; + bcn->data = NULL; + + /* Override with driver methods. */ wvp->newstate = vap->iv_newstate; + vap->iv_key_alloc = wpi_key_alloc; + vap->iv_key_set = wpi_key_set; + vap->iv_key_delete = wpi_key_delete; vap->iv_newstate = wpi_newstate; + vap->iv_update_beacon = wpi_update_beacon; ieee80211_ratectl_init(vap); - /* complete setup */ + /* Complete setup. */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ic->ic_opmode = opmode; return vap; @@ -788,127 +610,291 @@ static void wpi_vap_delete(struct ieee80211vap *vap) { struct wpi_vap *wvp = WPI_VAP(vap); + struct wpi_buf *bcn = &wvp->wv_bcbuf; ieee80211_ratectl_deinit(vap); ieee80211_vap_detach(vap); + + if (bcn->data != NULL) + free(bcn->data, M_DEVBUF); free(wvp, M_80211_VAP); } -static void -wpi_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +static int +wpi_detach(device_t dev) { - if (error != 0) - return; + struct wpi_softc *sc = device_get_softc(dev); + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic; + int qid; - KASSERT(nsegs == 1, ("too many DMA segments, %d should be 1", nsegs)); + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__); - *(bus_addr_t *)arg = segs[0].ds_addr; + if (ifp != NULL) { + ic = ifp->if_l2com; + + ieee80211_draintask(ic, &sc->sc_reinittask); + ieee80211_draintask(ic, &sc->sc_radiooff_task); + + wpi_stop(sc); + + callout_drain(&sc->watchdog_to); + callout_drain(&sc->watchdog_rfkill); + callout_drain(&sc->calib_to); + ieee80211_ifdetach(ic); + } + + /* Uninstall interrupt handler. */ + if (sc->irq != NULL) { + bus_teardown_intr(dev, sc->irq, sc->sc_ih); + bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq), + sc->irq); + pci_release_msi(dev); + } + + if (sc->txq[0].data_dmat) { + /* Free DMA resources. */ + for (qid = 0; qid < WPI_NTXQUEUES; qid++) + wpi_free_tx_ring(sc, &sc->txq[qid]); + + wpi_free_rx_ring(sc); + wpi_free_shared(sc); + } + + if (sc->fw_dma.tag) + wpi_free_fwmem(sc); + + if (sc->mem != NULL) + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(sc->mem), sc->mem); + + if (ifp != NULL) + if_free(ifp); + + delete_unrhdr(sc->sc_unr); + + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); + WPI_LOCK_DESTROY(sc); + return 0; +} + +static int *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***