From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 00:22:30 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AE24106568E; Sun, 18 Mar 2012 00:22:30 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 171D58FC24; Sun, 18 Mar 2012 00:22:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I0MTLm093559; Sun, 18 Mar 2012 00:22:29 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I0MThr093557; Sun, 18 Mar 2012 00:22:29 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203180022.q2I0MThr093557@svn.freebsd.org> From: David Xu Date: Sun, 18 Mar 2012 00:22:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233103 - head/lib/libthr/thread X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 00:22:30 -0000 Author: davidxu Date: Sun Mar 18 00:22:29 2012 New Revision: 233103 URL: http://svn.freebsd.org/changeset/base/233103 Log: Some software think a mutex can be destroyed after it owned it, for example, it uses a serialization point like following: pthread_mutex_lock(&mutex); pthread_mutex_unlock(&mutex); pthread_mutex_destroy(&muetx); They think a previous lock holder should have already left the mutex and is no longer referencing it, so they destroy it. To be maximum compatible with such code, we use IA64 version to unlock the mutex in kernel, remove the two steps unlocking code. Modified: head/lib/libthr/thread/thr_umtx.c Modified: head/lib/libthr/thread/thr_umtx.c ============================================================================== --- head/lib/libthr/thread/thr_umtx.c Sat Mar 17 23:55:18 2012 (r233102) +++ head/lib/libthr/thread/thr_umtx.c Sun Mar 18 00:22:29 2012 (r233103) @@ -154,13 +154,6 @@ __thr_umutex_timedlock(struct umutex *mt int __thr_umutex_unlock(struct umutex *mtx, uint32_t id) { -#ifndef __ia64__ - /* XXX this logic has a race-condition on ia64. */ - if ((mtx->m_flags & (UMUTEX_PRIO_PROTECT | UMUTEX_PRIO_INHERIT)) == 0) { - atomic_cmpset_rel_32(&mtx->m_owner, id | UMUTEX_CONTESTED, UMUTEX_CONTESTED); - return _umtx_op_err(mtx, UMTX_OP_MUTEX_WAKE, 0, 0, 0); - } -#endif /* __ia64__ */ return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 01:43:42 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42287106564A; Sun, 18 Mar 2012 01:43:42 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2DD568FC0C; Sun, 18 Mar 2012 01:43:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I1hgkY096010; Sun, 18 Mar 2012 01:43:42 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I1hfEh096007; Sun, 18 Mar 2012 01:43:41 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201203180143.q2I1hfEh096007@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 18 Mar 2012 01:43:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233104 - head/sys/mips/atheros X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 01:43:42 -0000 Author: gonzo Date: Sun Mar 18 01:43:41 2012 New Revision: 233104 URL: http://svn.freebsd.org/changeset/base/233104 Log: - Fix logic for detection if further processing of PMC should be performed. pmc_intr returns one if one of the counters actually triggered the IRQ - style(9) fixed Modified: head/sys/mips/atheros/apb.c Modified: head/sys/mips/atheros/apb.c ============================================================================== --- head/sys/mips/atheros/apb.c Sun Mar 18 00:22:29 2012 (r233103) +++ head/sys/mips/atheros/apb.c Sun Mar 18 01:43:41 2012 (r233104) @@ -347,6 +347,8 @@ apb_filter(void *arg) struct intr_event *event; uint32_t reg, irq; struct thread *td; + struct trapframe *tf; + register_t s; reg = ATH_READ_REG(AR71XX_MISC_INTR_STATUS); for (irq = 0; irq < APB_NIRQS; irq++) { @@ -368,18 +370,24 @@ apb_filter(void *arg) event = sc->sc_eventstab[irq]; if (!event || TAILQ_EMPTY(&event->ie_handlers)) { if (irq == APB_INTR_PMC) { - register_t s; - struct trapframe *tf = PCPU_GET(curthread)->td_intr_frame; + td = PCPU_GET(curthread); + tf = td->td_intr_frame; + s = intr_disable(); mips_intrcnt_inc(sc->sc_intr_counter[irq]); - if (pmc_intr && (*pmc_intr)(PCPU_GET(cpuid), tf)) { - intr_restore(s); - continue; + if (pmc_intr) { + /* + * Make sure at least one of counters + * generated this interrupt + */ + if (!(*pmc_intr)(PCPU_GET(cpuid), tf)) { + intr_restore(s); + continue; + } } intr_restore(s); - td = PCPU_GET(curthread); if (pmc_hook && (td->td_pflags & TDP_CALLCHAIN)) pmc_hook(PCPU_GET(curthread), From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 02:19:31 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F5BC106564A; Sun, 18 Mar 2012 02:19:31 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A17E8FC08; Sun, 18 Mar 2012 02:19:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I2JUTQ097131; Sun, 18 Mar 2012 02:19:30 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I2JUiZ097129; Sun, 18 Mar 2012 02:19:30 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201203180219.q2I2JUiZ097129@svn.freebsd.org> From: Marius Strobl Date: Sun, 18 Mar 2012 02:19:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233105 - head/sys/boot/common X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 02:19:31 -0000 Author: marius Date: Sun Mar 18 02:19:30 2012 New Revision: 233105 URL: http://svn.freebsd.org/changeset/base/233105 Log: Declare some variables static in order to reduce the object size and redo r232822 in a less hackish way. The latter now no longer breaks compiling the x86 boot2 with clang. MFC after: 1 week Modified: head/sys/boot/common/ufsread.c Modified: head/sys/boot/common/ufsread.c ============================================================================== --- head/sys/boot/common/ufsread.c Sun Mar 18 01:43:41 2012 (r233104) +++ head/sys/boot/common/ufsread.c Sun Mar 18 02:19:30 2012 (r233105) @@ -46,8 +46,6 @@ #include __FBSDID("$FreeBSD$"); -#include - #include #include #include @@ -96,7 +94,7 @@ static uint32_t fs_off; static __inline uint8_t fsfind(const char *name, ino_t * ino) { - char buf[DEV_BSIZE]; + static char buf[DEV_BSIZE]; struct direct *d; char *s; ssize_t n; @@ -121,7 +119,7 @@ fsfind(const char *name, ino_t * ino) static ino_t lookup(const char *path) { - char name[MAXNAMLEN + 1]; + static char name[MAXNAMLEN + 1]; const char *s; ino_t ino; ssize_t n; @@ -169,18 +167,19 @@ fsread(ino_t inode, void *buf, size_t nb { #ifndef UFS2_ONLY static struct ufs1_dinode dp1; + ufs1_daddr_t addr1; #endif #ifndef UFS1_ONLY static struct ufs2_dinode dp2; #endif + static struct fs fs; static ino_t inomap; char *blkbuf; void *indbuf; - struct fs fs; char *s; size_t n, nb, size, off, vboff; ufs_lbn_t lbn; - ufs2_daddr_t addr, vbaddr; + ufs2_daddr_t addr2, vbaddr; static ufs2_daddr_t blkmap, indmap; u_int u; @@ -251,12 +250,12 @@ fsread(ino_t inode, void *buf, size_t nb lbn = lblkno(&fs, fs_off); off = blkoff(&fs, fs_off); if (lbn < NDADDR) { - addr = DIP(di_db[lbn]); + addr2 = DIP(di_db[lbn]); } else if (lbn < NDADDR + NINDIR(&fs)) { n = INDIRPERVBLK(&fs); - addr = DIP(di_ib[0]); + addr2 = DIP(di_ib[0]); u = (u_int)(lbn - NDADDR) / n * DBPERVBLK; - vbaddr = fsbtodb(&fs, addr) + u; + vbaddr = fsbtodb(&fs, addr2) + u; if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) return -1; @@ -264,36 +263,24 @@ fsread(ino_t inode, void *buf, size_t nb } n = (lbn - NDADDR) & (n - 1); #if defined(UFS1_ONLY) -#if BYTE_ORDER == BIG_ENDIAN - memcpy((char *)&addr + sizeof(addr) - - sizeof(ufs1_daddr_t), (ufs1_daddr_t *)indbuf + n, - sizeof(ufs1_daddr_t)); -#else - memcpy(&addr, (ufs1_daddr_t *)indbuf + n, + memcpy(&addr1, (ufs1_daddr_t *)indbuf + n, sizeof(ufs1_daddr_t)); -#endif + addr2 = addr1; #elif defined(UFS2_ONLY) - memcpy(&addr, (ufs2_daddr_t *)indbuf + n, + memcpy(&addr2, (ufs2_daddr_t *)indbuf + n, sizeof(ufs2_daddr_t)); #else - if (fs.fs_magic == FS_UFS1_MAGIC) -#if BYTE_ORDER == BIG_ENDIAN - memcpy((char *)&addr + sizeof(addr) - - sizeof(ufs1_daddr_t), - (ufs1_daddr_t *)indbuf + n, - sizeof(ufs1_daddr_t)); -#else - memcpy(&addr, (ufs1_daddr_t *)indbuf + n, + if (fs.fs_magic == FS_UFS1_MAGIC) { + memcpy(&addr1, (ufs1_daddr_t *)indbuf + n, sizeof(ufs1_daddr_t)); -#endif - else - memcpy(&addr, (ufs2_daddr_t *)indbuf + n, + addr2 = addr1; + } else + memcpy(&addr2, (ufs2_daddr_t *)indbuf + n, sizeof(ufs2_daddr_t)); #endif - } else { + } else return -1; - } - vbaddr = fsbtodb(&fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK; + vbaddr = fsbtodb(&fs, addr2) + (off >> VBLKSHIFT) * DBPERVBLK; vboff = off & VBLKMASK; n = sblksize(&fs, size, lbn) - (off & ~VBLKMASK); if (n > VBLKSIZE) From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 03:42:54 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C15E2106566B; Sun, 18 Mar 2012 03:42:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B0CBF8FC0A; Sun, 18 Mar 2012 03:42:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I3gso4000105; Sun, 18 Mar 2012 03:42:54 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I3gsX7000103; Sun, 18 Mar 2012 03:42:54 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201203180342.q2I3gsX7000103@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 18 Mar 2012 03:42:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233106 - head/lib/libc/arm/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 03:42:54 -0000 Author: gonzo Date: Sun Mar 18 03:42:54 2012 New Revision: 233106 URL: http://svn.freebsd.org/changeset/base/233106 Log: Fix TLS for statically linked binaries Approved by: cognet Modified: head/lib/libc/arm/gen/_set_tp.c Modified: head/lib/libc/arm/gen/_set_tp.c ============================================================================== --- head/lib/libc/arm/gen/_set_tp.c Sun Mar 18 02:19:30 2012 (r233105) +++ head/lib/libc/arm/gen/_set_tp.c Sun Mar 18 03:42:54 2012 (r233106) @@ -29,7 +29,11 @@ #include #include +#include + void _set_tp(void *tp) { + + *((struct tcb **)ARM_TP_ADDRESS) = tp; } From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 08:08:07 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F917106566B; Sun, 18 Mar 2012 08:08:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65D3B8FC18; Sun, 18 Mar 2012 08:08:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I887tx008282; Sun, 18 Mar 2012 08:08:07 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I887ND008280; Sun, 18 Mar 2012 08:08:07 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201203180808.q2I887ND008280@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 18 Mar 2012 08:08:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233107 - head/lib/libc/arm/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 08:08:07 -0000 Author: gonzo Date: Sun Mar 18 08:08:06 2012 New Revision: 233107 URL: http://svn.freebsd.org/changeset/base/233107 Log: Unbreak trhe build by including proper header Modified: head/lib/libc/arm/gen/_set_tp.c Modified: head/lib/libc/arm/gen/_set_tp.c ============================================================================== --- head/lib/libc/arm/gen/_set_tp.c Sun Mar 18 03:42:54 2012 (r233106) +++ head/lib/libc/arm/gen/_set_tp.c Sun Mar 18 08:08:06 2012 (r233107) @@ -27,7 +27,7 @@ */ #include -#include +#include #include From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 09:19:40 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A173D1065670; Sun, 18 Mar 2012 09:19:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9001E8FC08; Sun, 18 Mar 2012 09:19:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I9Jenn010663; Sun, 18 Mar 2012 09:19:40 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I9Je7I010661; Sun, 18 Mar 2012 09:19:40 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201203180919.q2I9Je7I010661@svn.freebsd.org> From: Ed Schouten Date: Sun, 18 Mar 2012 09:19:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233108 - stable/9/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 09:19:40 -0000 Author: ed Date: Sun Mar 18 09:19:40 2012 New Revision: 233108 URL: http://svn.freebsd.org/changeset/base/233108 Log: MFC r228322,228330,228477,228495,228562,228564,228859,228897,229574,230277: Bring in sync with FreeBSD HEAD: - Add an __alignof() for non-GCC and GCC < 2.95. - Attempt to implement the following C11 keywords: _Alignas(), _Alignof(), _Noreturn, _Static_assert() and _Thread_local. - Add __generic(), which allows us to do _Generic() in a portable fashion. - Improve __offsetof(), __DECONST(), __DEVOLATILE() and __DEQUALIFY() to use __uintptr_t and __size_t to make them work with less header prerequisites. - Add __has_feature(), __has_include() and __has_builtin() to make it easier to test against Clang features. Tested by: linimon@'s exp-run (thanks!) Modified: stable/9/sys/sys/cdefs.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/sys/cdefs.h ============================================================================== --- stable/9/sys/sys/cdefs.h Sun Mar 18 08:08:06 2012 (r233107) +++ stable/9/sys/sys/cdefs.h Sun Mar 18 09:19:40 2012 (r233108) @@ -218,6 +218,54 @@ #endif #endif +#if !__GNUC_PREREQ__(2, 95) +#define __alignof(x) __offsetof(struct { char __a; x __b; }, __b) +#endif + +/* + * Keywords added in C11. + */ +#if defined(__cplusplus) && __cplusplus >= 201103L +#define _Alignas(e) alignas(e) +#define _Alignof(e) alignof(e) +#define _Noreturn [[noreturn]] +#define _Static_assert(e, s) static_assert(e, s) +#define _Thread_local thread_local +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +/* Do nothing. They are language keywords. */ +#else +/* Not supported. Implement them using our versions. */ +#define _Alignas(x) __aligned(x) +#define _Alignof(x) __alignof(x) +#define _Noreturn __dead2 +#define _Thread_local __thread +#ifdef __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] +#else +#define _Static_assert(x, y) struct __hack +#endif +#endif + +/* + * Emulation of C11 _Generic(). Unlike the previously defined C11 + * keywords, it is not possible to implement this using exactly the same + * syntax. Therefore implement something similar under the name + * __generic(). Unlike _Generic(), this macro can only distinguish + * between a single type, so it requires nested invocations to + * distinguish multiple cases. + */ + +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +#define __generic(expr, t, yes, no) \ + _Generic(expr, t: yes, default: no) +#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus) +#define __generic(expr, t, yes, no) \ + __builtin_choose_expr( \ + __builtin_types_compatible_p(__typeof(expr), t), yes, no) +#endif + #if __GNUC_PREREQ__(2, 96) #define __malloc_like __attribute__((__malloc__)) #define __pure __attribute__((__pure__)) @@ -319,10 +367,11 @@ #define __offsetof(type, field) __builtin_offsetof(type, field) #else #ifndef __cplusplus -#define __offsetof(type, field) ((size_t)(&((type *)0)->field)) +#define __offsetof(type, field) \ + ((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field)) #else #define __offsetof(type, field) \ - (__offsetof__ (reinterpret_cast \ + (__offsetof__ (reinterpret_cast <__size_t> \ (&reinterpret_cast \ (static_cast (0)->field)))) #endif @@ -450,15 +499,15 @@ #endif #ifndef __DECONST -#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) +#define __DECONST(type, var) ((type)(__uintptr_t)(const void *)(var)) #endif #ifndef __DEVOLATILE -#define __DEVOLATILE(type, var) ((type)(uintptr_t)(volatile void *)(var)) +#define __DEVOLATILE(type, var) ((type)(__uintptr_t)(volatile void *)(var)) #endif #ifndef __DEQUALIFY -#define __DEQUALIFY(type, var) ((type)(uintptr_t)(const volatile void *)(var)) +#define __DEQUALIFY(type, var) ((type)(__uintptr_t)(const volatile void *)(var)) #endif /*- @@ -574,4 +623,14 @@ #endif #endif +#ifndef __has_feature +#define __has_feature(x) 0 +#endif +#ifndef __has_include +#define __has_include(x) 0 +#endif +#ifndef __has_builtin +#define __has_builtin(x) 0 +#endif + #endif /* !_SYS_CDEFS_H_ */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 09:45:43 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEF78106566C; Sun, 18 Mar 2012 09:45:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A4BEF8FC15; Sun, 18 Mar 2012 09:45:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I9jhcq011540; Sun, 18 Mar 2012 09:45:43 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I9jhIE011537; Sun, 18 Mar 2012 09:45:43 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201203180945.q2I9jhIE011537@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 18 Mar 2012 09:45:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233109 - head/sbin/kldload X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 09:45:43 -0000 Author: hselasky Date: Sun Mar 18 09:45:43 2012 New Revision: 233109 URL: http://svn.freebsd.org/changeset/base/233109 Log: Add option to ignore error codes if the module specified is already loaded. MFC after: 1 week Modified: head/sbin/kldload/kldload.8 head/sbin/kldload/kldload.c Modified: head/sbin/kldload/kldload.8 ============================================================================== --- head/sbin/kldload/kldload.8 Sun Mar 18 09:19:40 2012 (r233108) +++ head/sbin/kldload/kldload.8 Sun Mar 18 09:45:43 2012 (r233109) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 5, 2009 +.Dd March 18, 2012 .Dt KLDLOAD 8 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd load a file into the kernel .Sh SYNOPSIS .Nm -.Op Fl qv +.Op Fl nqv .Ar .Sh DESCRIPTION The @@ -62,6 +62,8 @@ in the current directory. .Pp The following options are available: .Bl -tag -width indent +.It Fl n +Don't try to load module if already loaded. .It Fl v Be more verbose. .It Fl q Modified: head/sbin/kldload/kldload.c ============================================================================== --- head/sbin/kldload/kldload.c Sun Mar 18 09:19:40 2012 (r233108) +++ head/sbin/kldload/kldload.c Sun Mar 18 09:45:43 2012 (r233109) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define PATHCTL "kern.module_path" @@ -129,7 +130,7 @@ path_check(const char *kldname, int quie static void usage(void) { - fprintf(stderr, "usage: kldload [-qv] file ...\n"); + fprintf(stderr, "usage: kldload [-nqv] file ...\n"); exit(1); } @@ -141,12 +142,14 @@ main(int argc, char** argv) int fileid; int verbose; int quiet; + int check_loaded; errors = 0; verbose = 0; quiet = 0; + check_loaded = 0; - while ((c = getopt(argc, argv, "qv")) != -1) { + while ((c = getopt(argc, argv, "nqv")) != -1) { switch (c) { case 'q': quiet = 1; @@ -156,6 +159,9 @@ main(int argc, char** argv) verbose = 1; quiet = 0; break; + case 'n': + check_loaded = 1; + break; default: usage(); } @@ -170,8 +176,14 @@ main(int argc, char** argv) if (path_check(argv[0], quiet) == 0) { fileid = kldload(argv[0]); if (fileid < 0) { - warn("can't load %s", argv[0]); - errors++; + if (check_loaded != 0 && errno == EEXIST) { + if (verbose) + printf("%s is already " + "loaded\n", argv[0]); + } else { + warn("can't load %s", argv[0]); + errors++; + } } else { if (verbose) printf("Loaded %s, id=%d\n", argv[0], From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 09:47:28 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B9AA106564A; Sun, 18 Mar 2012 09:47:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5AC718FC16; Sun, 18 Mar 2012 09:47:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I9lSaD011631; Sun, 18 Mar 2012 09:47:28 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I9lS4x011629; Sun, 18 Mar 2012 09:47:28 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201203180947.q2I9lS4x011629@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 18 Mar 2012 09:47:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233110 - head/tools/tools/bus_autoconf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 09:47:28 -0000 Author: hselasky Date: Sun Mar 18 09:47:27 2012 New Revision: 233110 URL: http://svn.freebsd.org/changeset/base/233110 Log: Use new -n option when executing kldload, to not warn about already loaded module(s). MFC after: 1 week Modified: head/tools/tools/bus_autoconf/bus_usb.c Modified: head/tools/tools/bus_autoconf/bus_usb.c ============================================================================== --- head/tools/tools/bus_autoconf/bus_usb.c Sun Mar 18 09:45:43 2012 (r233109) +++ head/tools/tools/bus_autoconf/bus_usb.c Sun Mar 18 09:47:27 2012 (r233110) @@ -317,7 +317,7 @@ usb_dump(struct usb_device_id *id, uint3 printf(" match \"intprotocol\" \"0x%02x\";\n", id->bInterfaceProtocol); } - printf(" action \"kldload %s\";\n" + printf(" action \"kldload -n %s\";\n" "};\n\n", id->module_name); return (n); From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 09:52:55 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 419CA106566B; Sun, 18 Mar 2012 09:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3078B8FC0C; Sun, 18 Mar 2012 09:52:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2I9qtHk011836; Sun, 18 Mar 2012 09:52:55 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2I9qteB011834; Sun, 18 Mar 2012 09:52:55 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201203180952.q2I9qteB011834@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 18 Mar 2012 09:52:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233111 - head/etc/devd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 09:52:55 -0000 Author: hselasky Date: Sun Mar 18 09:52:54 2012 New Revision: 233111 URL: http://svn.freebsd.org/changeset/base/233111 Log: Regenerate usb.conf to use new -n option when doing kldload. MFC after: 1 week Modified: head/etc/devd/usb.conf Modified: head/etc/devd/usb.conf ============================================================================== --- head/etc/devd/usb.conf Sun Mar 18 09:47:27 2012 (r233110) +++ head/etc/devd/usb.conf Sun Mar 18 09:52:54 2012 (r233111) @@ -13,7 +13,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -24,7 +24,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -35,7 +35,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -46,7 +46,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -54,7 +54,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0104"; match "product" "0x00be"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -62,7 +62,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0123"; match "product" "0x0001"; - action "kldload uep"; + action "kldload -n uep"; }; nomatch 32 { @@ -70,7 +70,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03e8"; match "product" "0x0008"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -78,7 +78,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03eb"; match "product" "0x2109"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -86,7 +86,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x0121"; - action "kldload ugensa"; + action "kldload -n ugensa"; }; nomatch 32 { @@ -94,7 +94,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x1016|0x1116|0x1216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -102,7 +102,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x1b1d|0x1e1d)"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -110,7 +110,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116|0x3216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -118,7 +118,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x3524"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -126,7 +126,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x4016|0x4116|0x4216|0x5016|0x5116|0x5216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -134,7 +134,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x811c"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -142,7 +142,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0xca02"; - action "kldload if_urtw"; + action "kldload -n if_urtw"; }; nomatch 32 { @@ -150,7 +150,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0402"; match "product" "0x5632"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -158,7 +158,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0403"; match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -166,7 +166,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0408"; match "product" "0x0304"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -174,7 +174,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0408"; match "product" "(0x1000|0xea02|0xea03|0xea04|0xea05|0xea06)"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -182,7 +182,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0409"; match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -190,7 +190,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0001|0x0005|0x0009)"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -198,7 +198,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x0012"; - action "kldload if_rue"; + action "kldload -n if_rue"; }; nomatch 32 { @@ -206,7 +206,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x003d"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -214,7 +214,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x005e|0x0066|0x0067)"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -222,7 +222,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x006e"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -230,7 +230,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x008b"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -238,7 +238,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00b3"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -246,7 +246,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x00d8|0x00d9)"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -254,7 +254,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00da"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -262,7 +262,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00e8"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -270,7 +270,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0116|0x0119)"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -278,7 +278,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x012e"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -286,7 +286,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x0137"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -294,7 +294,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -302,7 +302,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0413"; match "product" "0x2101"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -310,7 +310,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0423"; match "product" "(0x000a|0x000c)"; - action "kldload if_cue"; + action "kldload -n if_cue"; }; nomatch 32 { @@ -318,7 +318,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x043e"; match "product" "0x9c01"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -326,7 +326,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045a"; match "product" "(0x5001|0x5002)"; - action "kldload urio"; + action "kldload -n urio"; }; nomatch 32 { @@ -334,7 +334,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045b"; match "product" "0x0053"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -342,7 +342,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "0x0079"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -350,7 +350,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "0x007a"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -358,7 +358,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "(0x00ce|0x0400|0x0401|0x0402|0x0403|0x0404|0x0405|0x0406|0x0407|0x0408|0x0409|0x040a|0x040b|0x040c|0x040d|0x040e|0x040f|0x0410|0x0411|0x0412|0x0413|0x0414|0x0415|0x0416|0x0417|0x0432|0x0433|0x0434|0x0435|0x0436|0x0437|0x0438|0x0439|0x043a|0x043b|0x043c|0x043d|0x043e|0x043f|0x0440|0x0441|0x0442|0x0443|0x0444|0x0445|0x0446|0x0447|0x0448|0x0449|0x044a|0x044b|0x044c|0x044d|0x044e|0x044f|0x0450|0x0451|0x0452|0x0453|0x0454|0x0455|0x0456|0x0457|0x0458|0x0459|0x045a|0x045b|0x045c|0x045d|0x045e|0x045f|0x0460|0x0461|0x0462|0x0463|0x0464|0x0465|0x0466|0x0467|0x0468|0x0469|0x046a|0x046b|0x046c|0x046d|0x046e|0x046f|0x0470|0x0471|0x0472|0x0473|0x0474|0x0475|0x0476|0x0477|0x0478|0x0479|0x047a|0x047b|0x04c8|0x04c9|0x04ca|0x04cb|0x04cc|0x04cd|0x04ce|0x04d7|0x04d8|0x04d9|0x04da|0x04db|0x04dc|0x04dd|0x04de|0x04df|0x04e0|0x04e1|0x04e2|0x04e3|0x04e4|0x04e5|0x04e6|0x04e7|0x04e8|0x04e9|0x04ea)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -366,7 +366,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x066a"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -374,7 +374,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x1236"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -382,7 +382,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x200f"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -390,7 +390,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0482"; match "product" "0x0203"; - action "kldload umodem"; + action "kldload -n umodem"; }; nomatch 32 { @@ -398,7 +398,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0489"; match "product" "(0xe000|0xe003)"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -406,7 +406,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x049f"; match "product" "(0x0003|0x0032)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -414,7 +414,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x049f"; match "product" "0x505a"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -422,7 +422,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a4"; match "product" "0x0014"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -430,7 +430,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a5"; match "product" "0x4027"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -438,7 +438,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a5"; match "product" "0x4068"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -446,7 +446,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04ad"; match "product" "(0x0301|0x0302|0x0303|0x0306)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -454,7 +454,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b4"; match "product" "0x1002"; - action "kldload ufm"; + action "kldload -n ufm"; }; nomatch 32 { @@ -462,7 +462,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b7"; match "product" "0x0531"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -470,7 +470,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b8"; match "product" "(0x0521|0x0522)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -478,7 +478,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "0x0901"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -486,7 +486,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0904|0x0913)"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -494,7 +494,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "0x0930"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -502,7 +502,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0944|0x0945|0x0947|0x0948)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -510,7 +510,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0a03|0x0a0e)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -518,7 +518,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bf"; match "product" "(0x0115|0x0117)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -526,7 +526,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04c5"; match "product" "(0x1058|0x1079)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -534,7 +534,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04da"; match "product" "0x2500"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -542,7 +542,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04da"; match "product" "0x3900"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -550,7 +550,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04dd"; match "product" "(0x8004|0x8005|0x8006|0x8007|0x9031)"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -558,7 +558,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04dd"; match "product" "(0x9102|0x9121|0x9123|0x9151|0x91ac|0x9242)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -566,7 +566,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x2018"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -574,7 +574,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "(0x5f00|0x5f01|0x5f02|0x5f03|0x5f04)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -582,7 +582,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x6601"; - action "kldload uvisor"; + action "kldload -n uvisor"; }; nomatch 32 { @@ -590,7 +590,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "(0x6611|0x6613|0x6615|0x6617|0x6619|0x661b|0x662e|0x6630|0x6632)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -598,7 +598,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x8001"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -606,7 +606,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04f1"; match "product" "0x3008"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -614,7 +614,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04f1"; match "product" "(0x3011|0x3012)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -622,7 +622,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0502"; match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -630,7 +630,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0506"; match "product" "(0x03e8|0x11f8)"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -638,7 +638,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0506"; match "product" "0x4601"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -646,7 +646,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0103"; - action "kldload ubsa"; + action "kldload -n ubsa"; }; nomatch 32 { @@ -654,7 +654,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0109"; - action "kldload umct"; + action "kldload -n umct"; }; nomatch 32 { @@ -662,7 +662,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0121"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -670,7 +670,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0257"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -678,7 +678,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0409"; - action "kldload umct"; + action "kldload -n umct"; }; nomatch 32 { @@ -686,7 +686,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x1203"; - action "kldload ubsa"; + action "kldload -n ubsa"; }; nomatch 32 { @@ -694,7 +694,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x4050"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -702,7 +702,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x5055"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -710,7 +710,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x7050"; - action "kldload if_upgt"; + action "kldload -n if_upgt"; }; nomatch 32 { @@ -718,7 +718,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "(0x7050|0x7051)"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -726,7 +726,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705a"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -734,7 +734,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705c"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -742,7 +742,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705e"; - action "kldload if_urtw"; + action "kldload -n if_urtw"; }; nomatch 32 { @@ -750,7 +750,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "(0x8053|0x805c|0x815c|0x825a|0x825b)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -758,7 +758,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x905b"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -766,7 +766,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x935a"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -774,7 +774,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0525"; match "product" "0x1080"; - action "kldload udbp"; + action "kldload -n udbp"; }; nomatch 32 { @@ -782,7 +782,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0525"; match "product" "0xa4a2"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -790,7 +790,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0536"; match "product" "0x01a0"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -798,7 +798,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0543"; match "product" "(0x0ed9|0x1527|0x1529|0x152b|0x152e|0x1921|0x1922|0x1923)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -806,7 +806,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0547"; match "product" "0x2008"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -814,7 +814,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0547"; match "product" "0x2720"; - action "kldload udbp"; + action "kldload -n udbp"; }; nomatch 32 { @@ -822,7 +822,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x054c"; match "product" "(0x0038|0x0066|0x0095|0x009a|0x00da|0x0169)"; - action "kldload uvisor"; + action "kldload -n uvisor"; }; nomatch 32 { @@ -830,7 +830,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x054c"; match "product" "0x0437"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -838,7 +838,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2002"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -846,7 +846,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2007"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -854,7 +854,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2008"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -862,7 +862,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2009"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -870,7 +870,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x4000"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -878,7 +878,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x055d"; match "product" "0x2018"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -886,7 +886,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0565"; match "product" "0x0001"; - action "kldload ubsa"; + action "kldload -n ubsa"; }; nomatch 32 { @@ -894,7 +894,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0565"; match "product" "(0x0002|0x0003|0x0005)"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -902,7 +902,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0567"; match "product" "(0x2000|0x2002)"; - action "kldload if_upgt"; + action "kldload -n if_upgt"; }; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 10:45:37 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 011101065674; Sun, 18 Mar 2012 10:45:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E44EE8FC14; Sun, 18 Mar 2012 10:45:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IAjaL9015715; Sun, 18 Mar 2012 10:45:36 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IAjapU015713; Sun, 18 Mar 2012 10:45:36 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201203181045.q2IAjapU015713@svn.freebsd.org> From: Hiroki Sato Date: Sun, 18 Mar 2012 10:45:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233112 - stable/8/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 10:45:37 -0000 Author: hrs Date: Sun Mar 18 10:45:36 2012 New Revision: 233112 URL: http://svn.freebsd.org/changeset/base/233112 Log: MFC r216650: Add IFT_L2VLAN to the list that is capable of supplying the ingredients of the EUI64 part of an IPv6 address. Otherwise vlans will all use the MAC address of the first ethernet interface of the system. Modified: stable/8/sys/netinet6/in6_ifattach.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/netinet6/in6_ifattach.c ============================================================================== --- stable/8/sys/netinet6/in6_ifattach.c Sun Mar 18 09:52:54 2012 (r233111) +++ stable/8/sys/netinet6/in6_ifattach.c Sun Mar 18 10:45:36 2012 (r233112) @@ -267,6 +267,7 @@ found: /* get EUI64 */ switch (ifp->if_type) { case IFT_ETHER: + case IFT_L2VLAN: case IFT_FDDI: case IFT_ISO88025: case IFT_ATM: From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 11:23:41 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B64DB106566B; Sun, 18 Mar 2012 11:23:41 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8C8DE8FC17; Sun, 18 Mar 2012 11:23:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IBNfbk016908; Sun, 18 Mar 2012 11:23:41 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IBNfYS016905; Sun, 18 Mar 2012 11:23:41 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201203181123.q2IBNfYS016905@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sun, 18 Mar 2012 11:23:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233113 - head/sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 11:23:41 -0000 Author: bz Date: Sun Mar 18 11:23:40 2012 New Revision: 233113 URL: http://svn.freebsd.org/changeset/base/233113 Log: Hide kernel option ROUTETABLES evaluations in the implementation rather than the header file. With this also move RT_MAXFIBS and RT_NUMFIBS into the implemantion to avoid further usage in other code. rt_numfibs is all that should be needed. This allows users to change the number of FIBs from 1..RT_MAXFIBS(16) dynamically using the tunable without the need to change the kernel config for the maximum anymore. This means that thet multi-FIB feature is now fully available with GENERIC kernels. The kernel option ROUTETABLES can still be used to set the default numbers of FIBs in absence of the tunable. Ok.ed by: julian, hrs, melifaro MFC after: 2 weeks Modified: head/sys/net/route.c head/sys/net/route.h Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Sun Mar 18 10:45:36 2012 (r233112) +++ head/sys/net/route.c Sun Mar 18 11:23:40 2012 (r233113) @@ -68,6 +68,24 @@ #include +/* We use 4 bits in the mbuf flags, thus we are limited to 16 FIBS. */ +#define RT_MAXFIBS 16 + +/* Kernel config default option. */ +#ifdef ROUTETABLES +#if ROUTETABLES <= 0 +#error "ROUTETABLES defined too low" +#endif +#if ROUTETABLES > RT_MAXFIBS +#error "ROUTETABLES defined too big" +#endif +#define RT_NUMFIBS ROUTETABLES +#endif /* ROUTETABLES */ +/* Initialize to default if not otherwise set. */ +#ifndef RT_NUMFIBS +#define RT_NUMFIBS 1 +#endif + u_int rt_numfibs = RT_NUMFIBS; SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, ""); /* Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Sun Mar 18 10:45:36 2012 (r233112) +++ head/sys/net/route.h Sun Mar 18 11:23:40 2012 (r233113) @@ -90,27 +90,6 @@ struct rt_metrics { #define RTM_RTTUNIT 1000000 /* units for rtt, rttvar, as units per sec */ #define RTTTOPRHZ(r) ((r) / (RTM_RTTUNIT / PR_SLOWHZ)) -/* MRT compile-time constants */ -#ifdef _KERNEL - #ifndef ROUTETABLES - #define RT_NUMFIBS 1 - #define RT_MAXFIBS 1 - #else - /* while we use 4 bits in the mbuf flags, we are limited to 16 */ - #define RT_MAXFIBS 16 - #if ROUTETABLES > RT_MAXFIBS - #define RT_NUMFIBS RT_MAXFIBS - #error "ROUTETABLES defined too big" - #else - #if ROUTETABLES == 0 - #define RT_NUMFIBS 1 - #else - #define RT_NUMFIBS ROUTETABLES - #endif - #endif - #endif -#endif - #define RT_DEFAULT_FIB 0 /* Explicitly mark fib=0 restricted cases */ extern u_int rt_numfibs; /* number fo usable routing tables */ /* From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 12:03:07 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D0541065670; Sun, 18 Mar 2012 12:03:07 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A68B8FC23; Sun, 18 Mar 2012 12:03:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IC37kA018166; Sun, 18 Mar 2012 12:03:07 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IC37c8018164; Sun, 18 Mar 2012 12:03:07 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201203181203.q2IC37c8018164@svn.freebsd.org> From: Hiroki Sato Date: Sun, 18 Mar 2012 12:03:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233114 - releng/8.3/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 12:03:07 -0000 Author: hrs Date: Sun Mar 18 12:03:06 2012 New Revision: 233114 URL: http://svn.freebsd.org/changeset/base/233114 Log: Add relnote items for 8.3R (revision numbers are fixed yet): SA-11:01 to SA-11:10, dtrace systrace_linux32 on amd64 support, hhook(9) and khelp(9~ added, hw.mwmtest.tests loader tunable, O_CLOEXEC for open(2) and fhopen(2) added, posix_fallocate(2) added, usbdump(8) added, cxgbe(4) 7.11.0 added, dc(4) PAE support, em(4) 7.3.2, igb(4) 2.3.1, igb(4) I350 support, ixgbe(4) 2.4.5, iwn(4) firmware image updated, msk(4) RXCSUM fixed, nge(4) MTU handling fixed, rdcphy(4) added, re(4) RTL8168E/8111E-VL and RTL8401E support added, re(4) TX interrupt moderation on RTL810xE added, re(4) RX interrupt moderation performance improvement, re(4) TSO support on RTL8168/8111 added, re(4) TXCSUM/RXCSUM offloading can be enabled independently now, re(4) RTL8105E support added, vte(4) added, ipfw(8) call and return actions added, IPsec HMAC-SHA-{256,384,512} in RFC 4868 supported, IPV6_PKTINFO bug in sendmsg(2) fixed, mod_cc(9) pluggable congestion control framework added, h_ertt(4) khelp module added, TCP_CONGESTION sockopt added, nf_ipfw(4) now supports IPv6, ng_one2many(4) XMIT_FAILOVER algorithm support added, ada(4) kern.cam.ada.write_cache, arcmsr(4) 1.20.00.22, graid(8) added, mxge(4) updated, tws(4) added, FFS TRIM support added, NFS nocto mount option added, vfs.typenumhash loader tunable added, ZFS SPA version 28, bsdtar 2.8.5, cpuset(1) -C, fetch(1) STAT FTP command bug fixed, gpart(8) show -p added, hastd(8) drops root privilege, hastd(8) checksum keyword support added, hastd(8) compression keyword support added, readline(3) API imported to libedit, makefs(8) ISO 9660 format support, libmd/libcrypt SHA-{256,512} support added, netstat(1) not expose scope addr representation derived from KAME stack, newsyslog(8) xz compression support, poweroff(8) added, ppp(8) iface name xxx and iface description xxx subcommands added, ps(1) -o usertime and -o systime, rtadvd(8) noifprefix, RFC 6106 support, rtadvctl(8) added, tftpd(8) large file bugfix, zpool labelclear subcommand added, awk 2011/8/7 snapshot, BIND 9.6-ESV-R5-P1, netcat 4.9, GCC r127959, the last GPLv2-licensed version, less v444, OpenSSH 5.4p1+HPN, sendmail 8.14.5, tzdata2011n, unifdef 2.5.6, xz 2011/7/11 snapshot, and x11/kde4 4.7.4. Approved by: re (implicit) Modified: releng/8.3/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: releng/8.3/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- releng/8.3/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sun Mar 18 11:23:40 2012 (r233113) +++ releng/8.3/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sun Mar 18 12:03:06 2012 (r233114) @@ -109,7 +109,6 @@ advisories, user-visible changes, and major architectural improvements. - Kernel Changes - + The &os; + &man.dtrace.1; framework now supports + systrace for system calls of + linux32 and freebsd32 on + &os;/&arch.amd64;. Two new + systrace_linux32 and + systrace_freebsd32 kernel modules provide + support for tracing compat system calls in addition to the native + system call tracing provided by the + systrace module. + + The &man.hhook.9; (Helper Hook) + and &man.khelp.9; (Kernel Helpers) KPIs have been implemented. + These are a kind of superset of &man.pfil.9; framework for + more general use in the kernel. The &man.hhook.9; KPI + provides a way for kernel subsystems to export hook points + that &man.khelp.9; modules can hook to provide enhanced or new + functionality to the kernel. The &man.khelp.9; KPI provides a + framework for managing &man.khelp.9; modules, which indirectly + use the &man.hhook.9; KPI to register their hook functions + with hook points of interest within the kernel. These allow a + structured way to dynamically extend the kernel at runtime in + an ABI preserving manner. + + A &man.loader.8; + tunable hw.memtest.tests has been added. + This controls whether to perform memory testing at boot time + or not. The default value is 1 (perform a + memory test). + + The &man.open.2; and &man.fhopen.2; + system calls now support the O_CLOEXEC flag, + which allows setting the FD_CLOEXEC flag for the + newly created file descriptor. This is standardized in IEEE + Std 1003.1-2008 (POSIX, Single UNIX Specification Version + 4). + + The &man.posix.fallocate.2; system call has + been implemented. This is a function in POSIX to ensure that + a part of the storage for regular file data is allocated on the + file system storage media. Boot Loader Changes @@ -170,7 +258,11 @@ Hardware Support - + The &os; &man.usb.4; subsystem now + supports USB packet filter. This allows to capture packets + which go through each USB host controller. The + implementation is almost based on &man.bpf.4; code. + The userland program &man.usbdump.8; has been added. Multimedia Support @@ -181,33 +273,360 @@ Network Interface Support - + The &man.cxgb.4; driver has been + updated to version 7.11.0. + + A &man.cxgbe.4; driver for Chelsio + T4 (Terminator 4) based 10Gb/1Gb adapters has been + added. + + The &man.dc.4; driver + now works correctly in kernels with the + option. + + The &man.em.4; driver has been + updated to version 7.3.2. + + The &man.igb.4; driver has been + updated to version 2.3.1. + + The &man.igb.4; driver now supports + Intel I350 PCIe Gigabit Ethernet controllers. + + The &man.ixgbe.4; driver has been + updated to version 2.4.5. + + Firmware images in the &man.iwn.4; + driver for 1000, 5000, 6000, and 6500 series cards have been + updated. + + A bug in the &man.msk.4; driver has been + fixed. It could prevent RX checksum offloading from + working. + + A bug in the &man.nfe.4; driver which + could prevent reinitialization after changing the MTU has + been fixed. + + A rdcphy(4) driver for RDC Semiconductor + R6040 10/100 PHY has been added. + + The &man.re.4; driver now supports + RTL8168E/8111E-VL PCIe Gigabit Ethernet controllers and + RTL8401E PCIe Fast Ethernet controllers. + + The &man.re.4; driver now supports + TX interrupt moderation on RTL810xE PCIe Fast Ethernet + controllers. + + The &man.re.4; driver now supports + another mechanism for RX interrupt moderation because of + performance problems. A &man.sysctl.8; variable + dev.re.N.int_rx_mod + has been added to control amount of time to delay RX + interrupt processing, in units of microsecond. Setting it + to 0 completely disables RX interrupt + moderation. A &man.loader.8; tunable + hw.re.intr_filter controls whether the + old mechanism utilizing MSI/MSI-X capability on + supported controllers is used or not. When set to + a non-zero value, the &man.re.4; driver uses the old + mechanism. The default value is 0 and + this tunable has no effect on controllers without MSI/MSI-X + capability. + + The &man.re.4; driver now + supports TSO (TCP Segmentation Offload) on RealTek + RTL8168/8111 C or later controllers. Note that this is + disabled by default because broken frames can be sent + under certain conditions. + + The &man.re.4; driver now + supports enabling TX and/or RX checksum offloading + independently from each other. Note that TX IP checksum + is disabled on some RTL8168C-based network interfaces + because it can generate an incorrect IP checksum when the + packet contains IP options. + + The &man.re.4; driver now supports + RTL8105E PCIe Fast Ethernet controllers. + + A &man.vte.4; driver for RDC R6040 Fast + Ethernet controllers, which are commonly found on the Vortex86 + System On a Chip, has been added. Network Protocols - + &man.ipfw.8; now supports the + call and return + actions. Upon the call + number action, the + current rule number is saved in the internal stack and + ruleset processing continues with the first rule numbered + number or higher. The + return action takes the rule number saved + to internal stack by the latest call + action and returns ruleset processing to the first rule with + number greater than that saved number. + + &os;'s &man.ipsec.4; support now uses + half of the hash size as the authenticator hash size in + Hashed Message Authentication Mode (HMAC-SHA-256, + HMAC-SHA-384, and HMAC-SHA-512) as described in RFC 4868. + This was a fixed 96-bit length in prior releases because the + implementation was based on an old Internet draft + draft-ietf-ipsec-ciph-sha-256-00. Note that this means + &release.current; and later are no longer interoperable with + the older &os; releases. + + A bug in the + IPV6_PKTINFO option used in + &man.sendmsg.2; has been fixed. The + IPV6_USE_MIN_MTU state set by + &man.setsockopt.2; was ignored. + + The + &os; TCP/IP network stack now supports the &man.mod.cc.9; pluggable + congestion control framework. This allows TCP congestion + control algorithms to be implemented as dynamically loadable + kernel modules. The following kernel modules are available + as of &release.current;: &man.cc.chd.4; for the + CAIA-Hamilton-Delay algorithm, &man.cc.cubic.4; for the CUBIC + algorithm, &man.cc.hd.4; for the Hamilton-Delay algorithm, + &man.cc.htcp.4; for the H-TCP algorithm, &man.cc.newreno.4; for + the NewReno algorithm, and &man.cc.vegas.4; for the Vegas algorithm. + The default algorithm can be set by a new &man.sysctl.8; + variable net.inet.tcp.cc.algorithm. The + value must be set to one of the names listed by + net.inet.tcp.cc.available, and + newreno is the default set at boot time. + For more + detail, see the &man.mod.cc.4; and &man.mod.cc.9; manual pages. + + An &man.h.ertt.4; (Enhanced Round Trip + Time) &man.khelp.9; module has been added. This module + allows per-connection, low noise estimates of the + instantaneous RTT in the TCP/IP network stack with a robust + implementation even in the face of delayed acknowledgments + and/or TSO (TCP Segmentation Offload) being in use for a + connection. + + A new &man.tcp.4; socket option + TCP_CONGESTION has been added. This + allows to select or query the congestion control algorithm + that the TCP/IP network stack will use for connections on + the socket. + + The &man.ng.ipfw.4; &man.netgraph.4; + node now supports IPv6. + + The &man.ng.one2many.4; + &man.netgraph.4; node now supports the + XMIT_FAILOVER transmit algorithm. This + makes packets deliver out of the first active + many hook. Disks and Storage - + The &man.ada.4; driver now supports + write cache control. A new &man.sysctl.8 variable + kern.cam.ada.write_cache determines + whether the write cache of &man.ada.4; devices is enabled or + not. Setting to 1 enables and + 0 disables the write cache, and -1 + leaves the device default behavior. &man.sysctl.8 variables + kern.cam.ada.N.write_cache + can override the configuration in a per-device basis (the + default value is -1, which means to use + the global setting). Note that the value can be changed at + runtime, but it takes effect only after a device + reset. + + The &man.arcmsr.4; driver has been + updated to version 1.20.00.22. + + The &man.graid.8; GEOM class has been + added. This is a replacement of the &man.ataraid.4; driver + supporting various BIOS-based software RAID. + + The &man.mxge.4; driver has been + updated. + + A &man.tws.4; driver for 3ware 9750 + SATA+SAS 6Gb/s RAID controllers has been added. + File Systems - + The &os; Fast File System now + supports the TRIM command when freeing data + blocks. A new flag in the &man.newfs.8; + and &man.tunefs.8; utilities sets the TRIM-enable flag for a + file system. The TRIM-enable flag makes the file system + send a delete request to the underlying device for each + freed block. The TRIM command is + specified as a Data Set Management Command in the ATA8-ACS2 + standard to carry the information related to deleted data + blocks to a device, especially for a SSD (Solid-State Drive) for + optimization. + + A new flag has + been added to the &man.newfs.8; and &man.fsck.ffs.8; utilities. + This clears unallocated blocks, notifying the underlying + device that they are not used and that their contents may be + discarded. This is useful in &man.fsck.ffs.8; for file + systems which have been mounted on systems without + TRIM support, or with + TRIM support disabled, as well as + filesystems which have been copied from one device to + another. + + The &os; NFS subsystem now supports a + mount option. This disables the + close-to-open cache coherency check at open time. This + option may improve performance for read-only mounts, but + should only be used only if the data on the server changes + rarely. The &man.mount.nfs.8; utility now also supports + this flag keyword. + + A &man.loader.8; tunable + vfs.typenumhash has been added. Setting + this to 1 enables to use a hash + calculation on the file system identification number + internally used in the kernel. This fixes the Stale + NFS file handle error on NFS clients when upgrading + or rebuilding the kernel on the NFS server due to unexpected + change of these identification number values. Note that + this is set to 0 (disable) by default for + backward compatibility. + + The &os; ZFS subsystem has been + updated to the SPA (Storage Pool Allocator, also known as + zpool) version 28. It now supports data deduplication, + triple parity RAIDZ (raidz3), snapshot holds, log device + removal, zfs diff, zpool split, zpool import + , and read-only zpool import. Userland Changes - + The &man.bsdtar.1; and + &man.cpio.1; utilities are now based on + libarchive version 2.8.5. + + The &man.cpuset.1; utility now supports + a flag to create a new cpuset and assign + an existing process into that set, and an + all keyword in the option to specify + all CPUs in the system. + + A bug in the &man.fetch.1; utility which + could prevent the STAT FTP command from working + properly has been fixed. + + The &man.gpart.8; utility now supports a + flag to the show + subcommand. This allows showing providers' names of + partitions instead of the partitions' indexes. + + The &man.hastd.8; utility now drops + root privileges of the worker processes to the + hast user. + + The &man.hastd.8; utility now supports a + checksum keyword to specify the checksum + algorithm in a resource section. As of + &release.current;, none, + sha256, and crc32 are + supported. + + The &man.hastd.8; utility now supports a + compression keyword to specify the compression + algorithm in a resource section. As of + &release.current;, none, + hole and lzf are + supported. + + The &man.hastd.8; utility now supports a + source keyword to specify the local address + to bind to before connecting the remote &man.hastd.8 + daemon. + + A &man.readline.3; API set has been + imported into libedit. This is + based on NetBSD's implementation and BSD licensed utilities + now use it instead of GNU + libreadline. + + The &man.makefs.8; utility now supports the + ISO 9660 format. + + libmd + and libcrypt now support the SHA-256 + and SHA-512 algorithms. + + The &man.netstat.1; utility now does not + expose the internal scope address representation used in the &os; + kernel, which is derived from KAME IPv6 stack, in the results + of netstat -ani and netstat + -nr. + + The &man.newsyslog.8; utility now + supports &man.xz.1; compression. An X flag + in the optional field has been added to specify the + compression. + + A &man.poweroff.8; utility has been added. + This is equivalent to: + + &prompt.root; shutdown -p now + + The &man.ppp.8; utility now supports + iface name name + and iface description + description commands. + These have the same functionalities as the name + and description subcommands of the + &man.ifconfig.8; utility. + + The &man.ps.1; utility now supports + and + options to display accumulated system and user CPU time, + respectively. + + The &man.rtadvd.8; daemon now supports a + noifprefix keyword to disable gathering + on-link prefixes from interfaces when no + addr keyword is specified. An entry in + /etc/rtadvd.conf with + noifprefix and no addr + generates an RA message with no prefix information + option. + + The &man.rtadvd.8; daemon now + supports the RDNSS and DNSSL options described in RFC 6106, + IPv6 Router Advertisement Options for DNS + Configuration. A &man.rtadvctl.8; utility to control + the &man.rtadvd.8; daemon has been added. + + A bug in the &man.tftpd.8; daemon has + been fixed. It had an interoperability issue when + transferring a large file. + + The &man.zpool.8: utility now supports a + zpool labelclear command. This allows to + wipe the label data from a drive that is not active in a + pool. <filename>/etc/periodic</filename> Scripts @@ -225,13 +644,51 @@ Contributed Software - + The awk has + been updated to the 7 August 2011 release. + + ISC BIND has + been updated to version 9.6-ESV-R5-P1. + + The netcat utility + has been updated to version 4.9. + + GNU GCC and + libstdc++ have been updated to rev + 127959 of gcc-4_2-branch (the last + GPLv2-licensed version). + + The LESS + program has been updated to version v444. + + The + OpenSSH utility has been updated to + 5.4p1, and optimization for large bandwidth-delay product + connection and none cipher support have + been merged + + sendmail + has been updated to version 8.14.5. + + The timezone + database has been updated to the + tzdata2011n release. + + The &man.unifdef.1; utility has been updated + to version 2.5.6. + + The xz + program has been updated from 5.0.0 to a snapshot as of 11 + July, 2011. Ports/Packages Collection Infrastructure - + The supported version of + the KDE desktop environment + (x11/kde4) has been + updated from 4.5.5 to 4.7.4. From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 12:07:00 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC727106566B; Sun, 18 Mar 2012 12:07:00 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CB86D8FC08; Sun, 18 Mar 2012 12:07:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IC70Wh018319; Sun, 18 Mar 2012 12:07:00 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IC70Gb018317; Sun, 18 Mar 2012 12:07:00 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201203181207.q2IC70Gb018317@svn.freebsd.org> From: Hiroki Sato Date: Sun, 18 Mar 2012 12:07:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233115 - releng/8.3/release/doc/en_US.ISO8859-1/errata X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 12:07:01 -0000 Author: hrs Date: Sun Mar 18 12:07:00 2012 New Revision: 233115 URL: http://svn.freebsd.org/changeset/base/233115 Log: Trim old news items. Approved by: re (implicit) Modified: releng/8.3/release/doc/en_US.ISO8859-1/errata/article.sgml Modified: releng/8.3/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- releng/8.3/release/doc/en_US.ISO8859-1/errata/article.sgml Sun Mar 18 12:03:06 2012 (r233114) +++ releng/8.3/release/doc/en_US.ISO8859-1/errata/article.sgml Sun Mar 18 12:07:00 2012 (r233115) @@ -166,13 +166,6 @@ Late-Breaking News and Corrections - A bug in OpenSSL that could cause - it to parse past the end of the message was found at the late - stage of &release.bugfix; release process. The &release.bugfix; - includes a fix for this issue by importing relevant parts from - the OpenSSL CVS. This could be triggered by an incorrectly - formatted ClientHello SSL/TLS handshake messages. The details - can be found at . + No news. From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 13:02:57 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 610EA1065673; Sun, 18 Mar 2012 13:02:57 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4E35D8FC18; Sun, 18 Mar 2012 13:02:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2ID2vDD020204; Sun, 18 Mar 2012 13:02:57 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2ID2vsD020197; Sun, 18 Mar 2012 13:02:57 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201203181302.q2ID2vsD020197@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 18 Mar 2012 13:02:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233116 - in stable/9/tools/regression/bin/sh: builtins expansion parameters X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 13:02:57 -0000 Author: jilles Date: Sun Mar 18 13:02:56 2012 New Revision: 233116 URL: http://svn.freebsd.org/changeset/base/233116 Log: MFC r226892,r228007,r228873,r230121,r232839: sh: Various testcases that already work. Added: stable/9/tools/regression/bin/sh/builtins/case11.0 - copied unchanged from r228007, head/tools/regression/bin/sh/builtins/case11.0 stable/9/tools/regression/bin/sh/builtins/case12.0 - copied unchanged from r228007, head/tools/regression/bin/sh/builtins/case12.0 stable/9/tools/regression/bin/sh/builtins/for1.0 - copied unchanged from r226892, head/tools/regression/bin/sh/builtins/for1.0 stable/9/tools/regression/bin/sh/expansion/arith12.0 - copied unchanged from r232839, head/tools/regression/bin/sh/expansion/arith12.0 stable/9/tools/regression/bin/sh/expansion/cmdsubst12.0 - copied unchanged from r230121, head/tools/regression/bin/sh/expansion/cmdsubst12.0 stable/9/tools/regression/bin/sh/expansion/cmdsubst13.0 - copied unchanged from r230121, head/tools/regression/bin/sh/expansion/cmdsubst13.0 stable/9/tools/regression/bin/sh/parameters/positional2.0 - copied unchanged from r228873, head/tools/regression/bin/sh/parameters/positional2.0 Modified: Directory Properties: stable/9/tools/regression/bin/sh/ (props changed) Copied: stable/9/tools/regression/bin/sh/builtins/case11.0 (from r228007, head/tools/regression/bin/sh/builtins/case11.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/builtins/case11.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r228007, head/tools/regression/bin/sh/builtins/case11.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +false +case x in +*) +esac Copied: stable/9/tools/regression/bin/sh/builtins/case12.0 (from r228007, head/tools/regression/bin/sh/builtins/case12.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/builtins/case12.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r228007, head/tools/regression/bin/sh/builtins/case12.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +false +case x in +y) +esac Copied: stable/9/tools/regression/bin/sh/builtins/for1.0 (from r226892, head/tools/regression/bin/sh/builtins/for1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/builtins/for1.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r226892, head/tools/regression/bin/sh/builtins/for1.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +false +for i in `false`; do exit 3; done Copied: stable/9/tools/regression/bin/sh/expansion/arith12.0 (from r232839, head/tools/regression/bin/sh/expansion/arith12.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/expansion/arith12.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r232839, head/tools/regression/bin/sh/expansion/arith12.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +_x=4 y_=5 z_z=6 +[ "$((_x*100+y_*10+z_z))" = 456 ] Copied: stable/9/tools/regression/bin/sh/expansion/cmdsubst12.0 (from r230121, head/tools/regression/bin/sh/expansion/cmdsubst12.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/expansion/cmdsubst12.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r230121, head/tools/regression/bin/sh/expansion/cmdsubst12.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +f() { + echo x$(printf foo >&2)y +} +[ "$(f 2>&1)" = "fooxy" ] Copied: stable/9/tools/regression/bin/sh/expansion/cmdsubst13.0 (from r230121, head/tools/regression/bin/sh/expansion/cmdsubst13.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/expansion/cmdsubst13.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r230121, head/tools/regression/bin/sh/expansion/cmdsubst13.0) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +x=1 y=2 +[ "$( + case $((x+=1)) in + ($((y+=1))) echo bad1 ;; + ($((y-1))) echo $x.$y ;; + ($((y=2))) echo bad2 ;; + (*) echo bad3 ;; + esac +)" = "2.3" ] || echo "Error at $LINENO" +[ "$x.$y" = "1.2" ] || echo "Error at $LINENO" Copied: stable/9/tools/regression/bin/sh/parameters/positional2.0 (from r228873, head/tools/regression/bin/sh/parameters/positional2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/parameters/positional2.0 Sun Mar 18 13:02:56 2012 (r233116, copy of r228873, head/tools/regression/bin/sh/parameters/positional2.0) @@ -0,0 +1,65 @@ +# $FreeBSD$ + +failures='' +ok='' + +testcase() { + code="$1" + expected="$2" + oIFS="$IFS" + eval "$code" + IFS='|' + result="$#|$*" + IFS="$oIFS" + if [ "x$result" = "x$expected" ]; then + ok=x$ok + else + failures=x$failures + echo "For $code, expected $expected actual $result" + fi +} + +testcase 'set -- a b; set -- p$@q' '2|pa|bq' +testcase 'set -- a b; set -- $@q' '2|a|bq' +testcase 'set -- a b; set -- p$@' '2|pa|b' +testcase 'set -- a b; set -- p$@q' '2|pa|bq' +testcase 'set -- a b; set -- $@q' '2|a|bq' +testcase 'set -- a b; set -- p$@' '2|pa|b' +testcase 'set -- a b; set -- p$*q' '2|pa|bq' +testcase 'set -- a b; set -- $*q' '2|a|bq' +testcase 'set -- a b; set -- p$*' '2|pa|b' +testcase 'set -- a b; set -- p$*q' '2|pa|bq' +testcase 'set -- a b; set -- $*q' '2|a|bq' +testcase 'set -- a b; set -- p$*' '2|pa|b' +testcase 'set -- a b; set -- "p$@q"' '2|pa|bq' +testcase 'set -- a b; set -- "$@q"' '2|a|bq' +testcase 'set -- a b; set -- "p$@"' '2|pa|b' +testcase 'set -- a b; set -- p"$@"q' '2|pa|bq' +testcase 'set -- a b; set -- "$@"q' '2|a|bq' +testcase 'set -- a b; set -- p"$@"' '2|pa|b' +testcase 'set -- "" a b; set -- "p$@q"' '3|p|a|bq' +testcase 'set -- "" a b; set -- "$@q"' '3||a|bq' +testcase 'set -- "" a b; set -- "p$@"' '3|p|a|b' +testcase 'set -- "" a b; set -- p"$@"q' '3|p|a|bq' +testcase 'set -- "" a b; set -- "$@"q' '3||a|bq' +testcase 'set -- "" a b; set -- p"$@"' '3|p|a|b' +testcase 'set -- a; set -- p$@q' '1|paq' +testcase 'set -- a; set -- $@q' '1|aq' +testcase 'set -- a; set -- p$@' '1|pa' +testcase 'set -- a; set -- p$@q' '1|paq' +testcase 'set -- a; set -- $@q' '1|aq' +testcase 'set -- a; set -- p$@' '1|pa' +testcase 'set -- a; set -- p$*q' '1|paq' +testcase 'set -- a; set -- $*q' '1|aq' +testcase 'set -- a; set -- p$*' '1|pa' +testcase 'set -- a; set -- p$*q' '1|paq' +testcase 'set -- a; set -- $*q' '1|aq' +testcase 'set -- a; set -- p$*' '1|pa' +testcase 'set -- a; set -- "p$@q"' '1|paq' +testcase 'set -- a; set -- "$@q"' '1|aq' +testcase 'set -- a; set -- "p$@"' '1|pa' +testcase 'set -- a; set -- p"$@"q' '1|paq' +testcase 'set -- a; set -- "$@"q' '1|aq' +testcase 'set -- a; set -- p"$@"' '1|pa' + +test "x$failures" = x From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 13:22:42 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD761106564A; Sun, 18 Mar 2012 13:22:42 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBA78FC08; Sun, 18 Mar 2012 13:22:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IDMgMh020837; Sun, 18 Mar 2012 13:22:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IDMg9W020835; Sun, 18 Mar 2012 13:22:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201203181322.q2IDMg9W020835@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 18 Mar 2012 13:22:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233117 - head/sys/powerpc/aim X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 13:22:42 -0000 Author: nwhitehorn Date: Sun Mar 18 13:22:42 2012 New Revision: 233117 URL: http://svn.freebsd.org/changeset/base/233117 Log: Remove acquisition of VM page queues lock from pmap_protect(). Any actual manipulation of the pvo_vlink and pvo_olink entries is already protected by the table lock, so most remaining instances of the acquisition of the page queues lock can likely be replaced with the table lock, or removed if the table lock is already held. Reviewed by: alc Modified: head/sys/powerpc/aim/mmu_oea64.c Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Sun Mar 18 13:02:56 2012 (r233116) +++ head/sys/powerpc/aim/mmu_oea64.c Sun Mar 18 13:22:42 2012 (r233117) @@ -1965,7 +1965,6 @@ moea64_protect(mmu_t mmu, pmap_t pm, vm_ return; } - vm_page_lock_queues(); PMAP_LOCK(pm); if ((eva - sva)/PAGE_SIZE < pm->pm_stats.resident_count) { for (; sva < eva; sva += PAGE_SIZE) { @@ -1980,7 +1979,6 @@ moea64_protect(mmu_t mmu, pmap_t pm, vm_ moea64_pvo_protect(mmu, pm, pvo, prot); } } - vm_page_unlock_queues(); PMAP_UNLOCK(pm); } From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 14:49:37 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 57C1E106566C; Sun, 18 Mar 2012 14:49:37 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 371768FC16; Sun, 18 Mar 2012 14:49:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IEnbDb023682; Sun, 18 Mar 2012 14:49:37 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IEnanM023678; Sun, 18 Mar 2012 14:49:36 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201203181449.q2IEnanM023678@svn.freebsd.org> From: Kevin Lo Date: Sun, 18 Mar 2012 14:49:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233119 - in stable/9/usr.bin: bc dc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 14:49:37 -0000 Author: kevlo Date: Sun Mar 18 14:49:36 2012 New Revision: 233119 URL: http://svn.freebsd.org/changeset/base/233119 Log: MFC r232994: - Fix an erroneous invocation of the editline. - Fix wrong scaling in the bc.library. - Let length(0.000) conform to what gnu bc does. PR: bin/159227 Submitted by: AIDA Shinra Modified: stable/9/usr.bin/bc/bc.library stable/9/usr.bin/bc/bc.y stable/9/usr.bin/dc/bcode.c Directory Properties: stable/9/usr.bin/ (props changed) Modified: stable/9/usr.bin/bc/bc.library ============================================================================== --- stable/9/usr.bin/bc/bc.library Sun Mar 18 13:54:57 2012 (r233118) +++ stable/9/usr.bin/bc/bc.library Sun Mar 18 14:49:36 2012 (r233119) @@ -46,7 +46,9 @@ define e(x) { r = ibase ibase = A t = scale - scale = t + .434*x + 1 + scale = 0 + if (x > 0) scale = (0.435*x)/1 + scale = scale + t + 1 w = 0 if (x < 0) { @@ -95,26 +97,33 @@ define l(x) { t = scale f = 1 - scale = scale + scale(x) - length(x) + 1 - s = scale + if (x < 1) { + s = scale(x) + } else { + s = length(x) - scale(x) + } + scale = 0 + a = (2.31*s)/1 /* estimated integer part of the answer */ + s = t + length(a) + 2 /* estimated length of the answer */ while (x > 2) { - s = s + (length(x) - scale(x))/2 + 1 - if (s > 0) scale = s + scale=0 + scale = (length(x) + scale(x))/2 + 1 + if (scale < s) scale = s x = sqrt(x) f = f*2 } while (x < .5) { - s = s + (length(x) - scale(x))/2 + 1 - if (s > 0) scale = s + scale = 0 + scale = scale(x)/2 + 1 + if (scale < s) scale = s x = sqrt(x) f = f*2 } - scale = t + length(f) - scale(f) + 1 + scale = t + length(f) + length(t + length(f)) + 1 u = (x - 1)/(x + 1) - - scale = scale + 1.1*length(t) - 1.1*scale(t) s = u*u + scale = t + 2 b = 2*f c = b d = 1 @@ -261,3 +270,4 @@ define j(n,x) { e = g } } +/* vim: set filetype=bc shiftwidth=8 noexpandtab: */ Modified: stable/9/usr.bin/bc/bc.y ============================================================================== --- stable/9/usr.bin/bc/bc.y Sun Mar 18 13:54:57 2012 (r233118) +++ stable/9/usr.bin/bc/bc.y Sun Mar 18 14:49:36 2012 (r233119) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "extern.h" #include "pathnames.h" @@ -1093,7 +1094,7 @@ sigchld(int signo) switch (signo) { default: for (;;) { - pid = waitpid(dc, &status, WCONTINUED); + pid = waitpid(dc, &status, WUNTRACED); if (pid == -1) { if (errno == EINTR) continue; @@ -1181,16 +1182,6 @@ main(int argc, char *argv[]) dup(p[1]); close(p[0]); close(p[1]); - if (interactive) { - el = el_init("bc", stdin, stderr, stderr); - hist = history_init(); - history(hist, &he, H_SETSIZE, 100); - el_set(el, EL_HIST, history, hist); - el_set(el, EL_EDITOR, "emacs"); - el_set(el, EL_SIGNAL, 1); - el_set(el, EL_PROMPT, dummy_prompt); - el_source(el, NULL); - } } else { close(STDIN_FILENO); dup(p[0]); @@ -1200,6 +1191,16 @@ main(int argc, char *argv[]) err(1, "cannot find dc"); } } + if (interactive) { + el = el_init("bc", stdin, stderr, stderr); + hist = history_init(); + history(hist, &he, H_SETSIZE, 100); + el_set(el, EL_HIST, history, hist); + el_set(el, EL_EDITOR, "emacs"); + el_set(el, EL_SIGNAL, 1); + el_set(el, EL_PROMPT, dummy_prompt); + el_source(el, NULL); + } yywrap(); return (yyparse()); } Modified: stable/9/usr.bin/dc/bcode.c ============================================================================== --- stable/9/usr.bin/dc/bcode.c Sun Mar 18 13:54:57 2012 (r233118) +++ stable/9/usr.bin/dc/bcode.c Sun Mar 18 14:49:36 2012 (r233119) @@ -693,7 +693,7 @@ count_digits(const struct number *n) u_int i; if (BN_is_zero(n->number)) - return (1); + return (n->scale ? n->scale : 1); int_part = new_number(); fract_part = new_number(); From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 15:03:02 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE6EF106566C; Sun, 18 Mar 2012 15:03:02 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A36E08FC14; Sun, 18 Mar 2012 15:03:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IF328p024190; Sun, 18 Mar 2012 15:03:02 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IF32k2024186; Sun, 18 Mar 2012 15:03:02 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201203181503.q2IF32k2024186@svn.freebsd.org> From: Kevin Lo Date: Sun, 18 Mar 2012 15:03:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233120 - in stable/9/sys/fs: hpfs msdosfs ntfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 15:03:02 -0000 Author: kevlo Date: Sun Mar 18 15:03:02 2012 New Revision: 233120 URL: http://svn.freebsd.org/changeset/base/233120 Log: MFC r232483: Clean up style(9) nits Modified: stable/9/sys/fs/hpfs/hpfs_vfsops.c stable/9/sys/fs/msdosfs/msdosfs_vfsops.c stable/9/sys/fs/ntfs/ntfs_vfsops.c Directory Properties: stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) Modified: stable/9/sys/fs/hpfs/hpfs_vfsops.c ============================================================================== --- stable/9/sys/fs/hpfs/hpfs_vfsops.c Sun Mar 18 14:49:36 2012 (r233119) +++ stable/9/sys/fs/hpfs/hpfs_vfsops.c Sun Mar 18 15:03:02 2012 (r233120) @@ -283,11 +283,11 @@ hpfs_mountfs(devvp, mp, td) hpmp->hpm_devvp = devvp; hpmp->hpm_dev = devvp->v_rdev; hpmp->hpm_mp = mp; - if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1) hpmp->hpm_uid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1) hpmp->hpm_gid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v) == 1) hpmp->hpm_mode = v; error = hpfs_bminit(hpmp); Modified: stable/9/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- stable/9/sys/fs/msdosfs/msdosfs_vfsops.c Sun Mar 18 14:49:36 2012 (r233119) +++ stable/9/sys/fs/msdosfs/msdosfs_vfsops.c Sun Mar 18 15:03:02 2012 (r233120) @@ -149,13 +149,13 @@ update_mp(struct mount *mp, struct threa } } - if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1) pmp->pm_gid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1) pmp->pm_uid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "mask", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "mask", "%d", &v) == 1) pmp->pm_mask = v & ALLPERMS; - if (1 == vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v) == 1) pmp->pm_dirmask = v & ALLPERMS; vfs_flagopt(mp->mnt_optnew, "shortname", &pmp->pm_flags, MSDOSFSMNT_SHORTNAME); Modified: stable/9/sys/fs/ntfs/ntfs_vfsops.c ============================================================================== --- stable/9/sys/fs/ntfs/ntfs_vfsops.c Sun Mar 18 14:49:36 2012 (r233119) +++ stable/9/sys/fs/ntfs/ntfs_vfsops.c Sun Mar 18 15:03:02 2012 (r233120) @@ -345,11 +345,11 @@ ntfs_mountfs(devvp, mp, td) ntmp->ntm_mountp = mp; ntmp->ntm_devvp = devvp; - if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1) ntmp->ntm_uid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1) ntmp->ntm_gid = v; - if (1 == vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v)) + if (vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v) == 1) ntmp->ntm_mode = v & ACCESSPERMS; vfs_flagopt(mp->mnt_optnew, "caseins", &ntmp->ntm_flag, NTFS_MFLAG_CASEINS); From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 15:34:39 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEECA1065675; Sun, 18 Mar 2012 15:34:39 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AEBCA8FC0A; Sun, 18 Mar 2012 15:34:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IFYdYj025172; Sun, 18 Mar 2012 15:34:39 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IFYdte025170; Sun, 18 Mar 2012 15:34:39 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201203181534.q2IFYdte025170@svn.freebsd.org> From: Kevin Lo Date: Sun, 18 Mar 2012 15:34:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233121 - head/usr.bin/bc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 15:34:39 -0000 Author: kevlo Date: Sun Mar 18 15:34:39 2012 New Revision: 233121 URL: http://svn.freebsd.org/changeset/base/233121 Log: Repair function when used with large scales Submitted by: AIDA Shinra Modified: head/usr.bin/bc/bc.library Modified: head/usr.bin/bc/bc.library ============================================================================== --- head/usr.bin/bc/bc.library Sun Mar 18 15:03:02 2012 (r233120) +++ head/usr.bin/bc/bc.library Sun Mar 18 15:34:39 2012 (r233121) @@ -48,7 +48,7 @@ define e(x) { t = scale scale = 0 if (x > 0) scale = (0.435*x)/1 - scale = scale + t + 1 + scale = scale + t + length(scale + t) + 1 w = 0 if (x < 0) { @@ -120,7 +120,8 @@ define l(x) { f = f*2 } - scale = t + length(f) + length(t + length(f)) + 1 + scale = 0 + scale = t + length(f) + length((1.05*(t+length(f))/1)) + 1 u = (x - 1)/(x + 1) s = u*u scale = t + 2 From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 17:41:55 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F010106564A; Sun, 18 Mar 2012 17:41:55 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A5878FC0C; Sun, 18 Mar 2012 17:41:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IHftfP029248; Sun, 18 Mar 2012 17:41:55 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IHftK6029246; Sun, 18 Mar 2012 17:41:55 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201203181741.q2IHftK6029246@svn.freebsd.org> From: Alan Cox Date: Sun, 18 Mar 2012 17:41:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233122 - head/sys/amd64/amd64 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 17:41:55 -0000 Author: alc Date: Sun Mar 18 17:41:54 2012 New Revision: 233122 URL: http://svn.freebsd.org/changeset/base/233122 Log: Style fix to pmap_protect(). Submitted by: bde Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Sun Mar 18 15:34:39 2012 (r233121) +++ head/sys/amd64/amd64/pmap.c Sun Mar 18 17:41:54 2012 (r233122) @@ -2939,8 +2939,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; pt_entry_t *pte; - int anychanged; - boolean_t pv_lists_locked; + boolean_t anychanged, pv_lists_locked; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); @@ -2953,7 +2952,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv pv_lists_locked = FALSE; resume: - anychanged = 0; + anychanged = FALSE; PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { @@ -3001,7 +3000,7 @@ resume: * invalidated by pmap_protect_pde(). */ if (pmap_protect_pde(pmap, pde, sva, prot)) - anychanged = 1; + anychanged = TRUE; continue; } else { if (!pv_lists_locked) { @@ -3055,7 +3054,7 @@ retry: if (obits & PG_G) pmap_invalidate_page(pmap, sva); else - anychanged = 1; + anychanged = TRUE; } } } From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 18:44:42 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE5FD106564A; Sun, 18 Mar 2012 18:44:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF3808FC0A; Sun, 18 Mar 2012 18:44:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IIigcm031222; Sun, 18 Mar 2012 18:44:42 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IIigi9031219; Sun, 18 Mar 2012 18:44:42 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201203181844.q2IIigi9031219@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 18 Mar 2012 18:44:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233123 - in head/sys: amd64/include i386/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 18:44:42 -0000 Author: tijl Date: Sun Mar 18 18:44:42 2012 New Revision: 233123 URL: http://svn.freebsd.org/changeset/base/233123 Log: Use exact width integer types in amd64/i386 reg.h to prepare for a merge. The only real change is replacing long with int on i386. Modified: head/sys/amd64/include/reg.h head/sys/i386/include/reg.h Modified: head/sys/amd64/include/reg.h ============================================================================== --- head/sys/amd64/include/reg.h Sun Mar 18 17:41:54 2012 (r233122) +++ head/sys/amd64/include/reg.h Sun Mar 18 18:44:42 2012 (r233123) @@ -45,32 +45,32 @@ * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ struct reg { - register_t r_r15; - register_t r_r14; - register_t r_r13; - register_t r_r12; - register_t r_r11; - register_t r_r10; - register_t r_r9; - register_t r_r8; - register_t r_rdi; - register_t r_rsi; - register_t r_rbp; - register_t r_rbx; - register_t r_rdx; - register_t r_rcx; - register_t r_rax; - uint32_t r_trapno; - uint16_t r_fs; - uint16_t r_gs; - uint32_t r_err; - uint16_t r_es; - uint16_t r_ds; - register_t r_rip; - register_t r_cs; - register_t r_rflags; - register_t r_rsp; - register_t r_ss; + __int64_t r_r15; + __int64_t r_r14; + __int64_t r_r13; + __int64_t r_r12; + __int64_t r_r11; + __int64_t r_r10; + __int64_t r_r9; + __int64_t r_r8; + __int64_t r_rdi; + __int64_t r_rsi; + __int64_t r_rbp; + __int64_t r_rbx; + __int64_t r_rdx; + __int64_t r_rcx; + __int64_t r_rax; + __uint32_t r_trapno; + __uint16_t r_fs; + __uint16_t r_gs; + __uint32_t r_err; + __uint16_t r_es; + __uint16_t r_ds; + __int64_t r_rip; + __int64_t r_cs; + __int64_t r_rflags; + __int64_t r_rsp; + __int64_t r_ss; }; /* @@ -82,17 +82,17 @@ struct fpreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long fpr_env[4]; - unsigned char fpr_acc[8][16]; - unsigned char fpr_xacc[16][16]; - unsigned long fpr_spare[12]; + __uint64_t fpr_env[4]; + __uint8_t fpr_acc[8][16]; + __uint8_t fpr_xacc[16][16]; + __uint64_t fpr_spare[12]; }; /* * Register set accessible via /proc/$pid/dbregs. */ struct dbreg { - unsigned long dr[16]; /* debug registers */ + __uint64_t dr[16]; /* debug registers */ /* Index 0-3: debug address registers */ /* Index 4-5: reserved */ /* Index 6: debug status */ Modified: head/sys/i386/include/reg.h ============================================================================== --- head/sys/i386/include/reg.h Sun Mar 18 17:41:54 2012 (r233122) +++ head/sys/i386/include/reg.h Sun Mar 18 18:44:42 2012 (r233123) @@ -36,6 +36,8 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#include + /* * Indices for registers in `struct trapframe' and `struct regs'. * @@ -78,25 +80,25 @@ * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ struct reg { - unsigned int r_fs; - unsigned int r_es; - unsigned int r_ds; - unsigned int r_edi; - unsigned int r_esi; - unsigned int r_ebp; - unsigned int r_isp; - unsigned int r_ebx; - unsigned int r_edx; - unsigned int r_ecx; - unsigned int r_eax; - unsigned int r_trapno; - unsigned int r_err; - unsigned int r_eip; - unsigned int r_cs; - unsigned int r_eflags; - unsigned int r_esp; - unsigned int r_ss; - unsigned int r_gs; + __uint32_t r_fs; + __uint32_t r_es; + __uint32_t r_ds; + __uint32_t r_edi; + __uint32_t r_esi; + __uint32_t r_ebp; + __uint32_t r_isp; + __uint32_t r_ebx; + __uint32_t r_edx; + __uint32_t r_ecx; + __uint32_t r_eax; + __uint32_t r_trapno; + __uint32_t r_err; + __uint32_t r_eip; + __uint32_t r_cs; + __uint32_t r_eflags; + __uint32_t r_esp; + __uint32_t r_ss; + __uint32_t r_gs; }; /* @@ -108,10 +110,10 @@ struct fpreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long fpr_env[7]; - unsigned char fpr_acc[8][10]; - unsigned long fpr_ex_sw; - unsigned char fpr_pad[64]; + __uint32_t fpr_env[7]; + __uint8_t fpr_acc[8][10]; + __uint32_t fpr_ex_sw; + __uint8_t fpr_pad[64]; }; struct xmmreg { @@ -120,17 +122,17 @@ struct xmmreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long xmm_env[8]; - unsigned char xmm_acc[8][16]; - unsigned char xmm_reg[8][16]; - unsigned char xmm_pad[224]; + __uint32_t xmm_env[8]; + __uint8_t xmm_acc[8][16]; + __uint8_t xmm_reg[8][16]; + __uint8_t xmm_pad[224]; }; /* * Register set accessible via /proc/$pid/dbregs. */ struct dbreg { - unsigned int dr[8]; /* debug registers */ + __uint32_t dr[8]; /* debug registers */ /* Index 0-3: debug address registers */ /* Index 4-5: reserved */ /* Index 6: debug status */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 18:51:51 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB77D106567A; Sun, 18 Mar 2012 18:51:51 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 883358FC1A; Sun, 18 Mar 2012 18:51:51 +0000 (UTC) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) by mail.dawidek.net (Postfix) with ESMTPSA id 4A12580C; Sun, 18 Mar 2012 19:51:42 +0100 (CET) Date: Sun, 18 Mar 2012 19:50:15 +0100 From: Pawel Jakub Dawidek To: David Xu Message-ID: <20120318185014.GK1340@garage.freebsd.pl> References: <201202271338.q1RDcqEQ020033@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Ms5iOKSBOB9YS8zC" Content-Disposition: inline In-Reply-To: <201202271338.q1RDcqEQ020033@svn.freebsd.org> X-OS: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r232209 - in head: lib/libthr/thread sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 18:51:52 -0000 --Ms5iOKSBOB9YS8zC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 27, 2012 at 01:38:52PM +0000, David Xu wrote: > Author: davidxu > Date: Mon Feb 27 13:38:52 2012 > New Revision: 232209 > URL: http://svn.freebsd.org/changeset/base/232209 >=20 > Log: > Follow changes made in revision 232144, pass absolute timeout to kernel, > this eliminates a clock_gettime() syscall. This or some other change has broken CLOCK_MONOTONIC usage with condition variables. You should be able to reproduce this by something like this: pthread_cond_t cv; pthread_condattr_t attr; pthread_mutex_t lock; struct timespec ts; int error; (void)pthread_mutex_init(&lock, NULL); (void)pthread_condattr_init(&attr); (void)pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); (void)pthread_cond_init(&cv, &attr); (void)pthread_condattr_destroy(&attr); (void)clock_gettime(CLOCK_MONOTONIC, &ts); ts.tv_sec +=3D 10; (void)pthread_mutex_lock(&lock); (void)pthread_cond_timedwait(&cv, &lock, &ts); (void)pthread_mutex_unlock(&lock); This should timeout after 10 seconds, but pthread_cond_timedwait(3) returns immediately with ETIMEDOUT. CLOCK_REALTIME works properly. Bascially pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) is no-op. If you change CLOCK_MONOTONIC to CLOCK_REALTIME in clock_gettime(2) call, it will timeout after 10 seconds. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://tupytaj.pl --Ms5iOKSBOB9YS8zC Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk9mLmYACgkQForvXbEpPzS+lQCgoKdnHns+Q/E+jvCf9O9RS42y 2bQAoIAg8CMWpS3fxaqha7beqw9bG7JN =UPcG -----END PGP SIGNATURE----- --Ms5iOKSBOB9YS8zC-- From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:06:38 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D05B7106566B; Sun, 18 Mar 2012 19:06:38 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B94A98FC0A; Sun, 18 Mar 2012 19:06:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJ6cAx031980; Sun, 18 Mar 2012 19:06:38 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJ6cWR031974; Sun, 18 Mar 2012 19:06:38 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201203181906.q2IJ6cWR031974@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 18 Mar 2012 19:06:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233124 - in head/sys: amd64/include compat/ia32 i386/include pc98/include x86/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:06:38 -0000 Author: tijl Date: Sun Mar 18 19:06:38 2012 New Revision: 233124 URL: http://svn.freebsd.org/changeset/base/233124 Log: Copy i386 reg.h to x86 and merge with amd64 reg.h. Replace i386/amd64/pc98 reg.h with stubs. The tREGISTER macros are only made visible on i386. These macros are deprecated and should not be available on amd64. The i386 and amd64 versions of struct reg have been renamed to struct __reg32 and struct __reg64. During compilation either __reg32 or __reg64 is defined as reg depending on the machine architecture. On amd64 the i386 struct is also available as struct reg32 which is used in COMPAT_FREEBSD32 code. Most of compat/ia32/ia32_reg.h is now IA64 only. Reviewed by: kib (previous version) Added: head/sys/x86/include/reg.h - copied, changed from r233123, head/sys/i386/include/reg.h Modified: head/sys/amd64/include/reg.h head/sys/compat/ia32/ia32_reg.h head/sys/i386/include/reg.h head/sys/pc98/include/reg.h Modified: head/sys/amd64/include/reg.h ============================================================================== --- head/sys/amd64/include/reg.h Sun Mar 18 18:44:42 2012 (r233123) +++ head/sys/amd64/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) @@ -1,141 +1,6 @@ /*- - * Copyright (c) 2003 Peter Wemm. - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD$ + * This file is in the public domain. */ +/* $FreeBSD$ */ -#ifndef _MACHINE_REG_H_ -#define _MACHINE_REG_H_ - -#if defined(_KERNEL) && !defined(_STANDALONE) -#include "opt_compat.h" -#endif - -/* - * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. - */ -struct reg { - __int64_t r_r15; - __int64_t r_r14; - __int64_t r_r13; - __int64_t r_r12; - __int64_t r_r11; - __int64_t r_r10; - __int64_t r_r9; - __int64_t r_r8; - __int64_t r_rdi; - __int64_t r_rsi; - __int64_t r_rbp; - __int64_t r_rbx; - __int64_t r_rdx; - __int64_t r_rcx; - __int64_t r_rax; - __uint32_t r_trapno; - __uint16_t r_fs; - __uint16_t r_gs; - __uint32_t r_err; - __uint16_t r_es; - __uint16_t r_ds; - __int64_t r_rip; - __int64_t r_cs; - __int64_t r_rflags; - __int64_t r_rsp; - __int64_t r_ss; -}; - -/* - * Register set accessible via /proc/$pid/fpregs. - */ -struct fpreg { - /* - * XXX should get struct from fpu.h. Here we give a slightly - * simplified struct. This may be too much detail. Perhaps - * an array of unsigned longs is best. - */ - __uint64_t fpr_env[4]; - __uint8_t fpr_acc[8][16]; - __uint8_t fpr_xacc[16][16]; - __uint64_t fpr_spare[12]; -}; - -/* - * Register set accessible via /proc/$pid/dbregs. - */ -struct dbreg { - __uint64_t dr[16]; /* debug registers */ - /* Index 0-3: debug address registers */ - /* Index 4-5: reserved */ - /* Index 6: debug status */ - /* Index 7: debug control */ - /* Index 8-15: reserved */ -}; - -#define DBREG_DR7_LOCAL_ENABLE 0x01 -#define DBREG_DR7_GLOBAL_ENABLE 0x02 -#define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ -#define DBREG_DR7_LEN_2 0x01 -#define DBREG_DR7_LEN_4 0x03 -#define DBREG_DR7_LEN_8 0x02 -#define DBREG_DR7_EXEC 0x00 /* break on execute */ -#define DBREG_DR7_WRONLY 0x01 /* break on write */ -#define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DR7_MASK(i) (0xful << ((i) * 4 + 16) | 0x3 << (i) * 2) -#define DBREG_DR7_SET(i, len, access, enable) \ - ((u_long)((len) << 2 | (access)) << ((i) * 4 + 16) | (enable) << (i) * 2) -#define DBREG_DR7_GD 0x2000 -#define DBREG_DR7_ENABLED(d, i) (((d) & 0x3 << (i) * 2) != 0) -#define DBREG_DR7_ACCESS(d, i) ((d) >> ((i) * 4 + 16) & 0x3) -#define DBREG_DR7_LEN(d, i) ((d) >> ((i) * 4 + 18) & 0x3) - -#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr15 by - register number */ - -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - -#ifdef _KERNEL -/* - * XXX these interfaces are MI, so they should be declared in a MI place. - */ -int fill_regs(struct thread *, struct reg *); -int fill_frame_regs(struct trapframe *, struct reg *); -int set_regs(struct thread *, struct reg *); -int fill_fpregs(struct thread *, struct fpreg *); -int set_fpregs(struct thread *, struct fpreg *); -int fill_dbregs(struct thread *, struct dbreg *); -int set_dbregs(struct thread *, struct dbreg *); -#endif - -#endif /* !_MACHINE_REG_H_ */ +#include Modified: head/sys/compat/ia32/ia32_reg.h ============================================================================== --- head/sys/compat/ia32/ia32_reg.h Sun Mar 18 18:44:42 2012 (r233123) +++ head/sys/compat/ia32/ia32_reg.h Sun Mar 18 19:06:38 2012 (r233124) @@ -36,6 +36,7 @@ #ifndef _COMPAT_IA32_IA32_REG_H_ #define _COMPAT_IA32_IA32_REG_H_ +#ifdef __ia64__ /* * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ @@ -77,6 +78,7 @@ struct fpreg32 { struct dbreg32 { unsigned int dr[8]; /* debug registers */ }; +#endif /* * Wrappers and converters. Modified: head/sys/i386/include/reg.h ============================================================================== --- head/sys/i386/include/reg.h Sun Mar 18 18:44:42 2012 (r233123) +++ head/sys/i386/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) @@ -1,174 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD$ + * This file is in the public domain. */ +/* $FreeBSD$ */ -#ifndef _MACHINE_REG_H_ -#define _MACHINE_REG_H_ - -#include - -/* - * Indices for registers in `struct trapframe' and `struct regs'. - * - * This interface is deprecated. In the kernel, it is only used in FPU - * emulators to convert from register numbers encoded in instructions to - * register values. Everything else just accesses the relevant struct - * members. In userland, debuggers tend to abuse this interface since - * they don't understand that `struct regs' is a struct. I hope they have - * stopped accessing the registers in the trap frame via PT_{READ,WRITE}_U - * and we can stop supporting the user area soon. - */ -#define tFS (0) -#define tES (1) -#define tDS (2) -#define tEDI (3) -#define tESI (4) -#define tEBP (5) -#define tISP (6) -#define tEBX (7) -#define tEDX (8) -#define tECX (9) -#define tEAX (10) -#define tERR (12) -#define tEIP (13) -#define tCS (14) -#define tEFLAGS (15) -#define tESP (16) -#define tSS (17) - -/* - * Indices for registers in `struct regs' only. - * - * Some registers live in the pcb and are only in an "array" with the - * other registers in application interfaces that copy all the registers - * to or from a `struct regs'. - */ -#define tGS (18) - -/* - * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. - */ -struct reg { - __uint32_t r_fs; - __uint32_t r_es; - __uint32_t r_ds; - __uint32_t r_edi; - __uint32_t r_esi; - __uint32_t r_ebp; - __uint32_t r_isp; - __uint32_t r_ebx; - __uint32_t r_edx; - __uint32_t r_ecx; - __uint32_t r_eax; - __uint32_t r_trapno; - __uint32_t r_err; - __uint32_t r_eip; - __uint32_t r_cs; - __uint32_t r_eflags; - __uint32_t r_esp; - __uint32_t r_ss; - __uint32_t r_gs; -}; - -/* - * Register set accessible via /proc/$pid/fpregs. - */ -struct fpreg { - /* - * XXX should get struct from npx.h. Here we give a slightly - * simplified struct. This may be too much detail. Perhaps - * an array of unsigned longs is best. - */ - __uint32_t fpr_env[7]; - __uint8_t fpr_acc[8][10]; - __uint32_t fpr_ex_sw; - __uint8_t fpr_pad[64]; -}; - -struct xmmreg { - /* - * XXX should get struct from npx.h. Here we give a slightly - * simplified struct. This may be too much detail. Perhaps - * an array of unsigned longs is best. - */ - __uint32_t xmm_env[8]; - __uint8_t xmm_acc[8][16]; - __uint8_t xmm_reg[8][16]; - __uint8_t xmm_pad[224]; -}; - -/* - * Register set accessible via /proc/$pid/dbregs. - */ -struct dbreg { - __uint32_t dr[8]; /* debug registers */ - /* Index 0-3: debug address registers */ - /* Index 4-5: reserved */ - /* Index 6: debug status */ - /* Index 7: debug control */ -}; - -#define DBREG_DR7_LOCAL_ENABLE 0x01 -#define DBREG_DR7_GLOBAL_ENABLE 0x02 -#define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ -#define DBREG_DR7_LEN_2 0x01 -#define DBREG_DR7_LEN_4 0x03 -#define DBREG_DR7_EXEC 0x00 /* break on execute */ -#define DBREG_DR7_WRONLY 0x01 /* break on write */ -#define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DR7_MASK(i) (0xf << ((i) * 4 + 16) | 0x3 << (i) * 2) -#define DBREG_DR7_SET(i, len, access, enable) \ - (((len) << 2 | (access)) << ((i) * 4 + 16) | (enable) << (i) * 2) -#define DBREG_DR7_GD 0x2000 -#define DBREG_DR7_ENABLED(d, i) (((d) & 0x3 << (i) * 2) != 0) -#define DBREG_DR7_ACCESS(d, i) ((d) >> ((i) * 4 + 16) & 0x3) -#define DBREG_DR7_LEN(d, i) ((d) >> ((i) * 4 + 18) & 0x3) - -#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr7 by - register number */ - -#ifdef _KERNEL -/* - * XXX these interfaces are MI, so they should be declared in a MI place. - */ -int fill_regs(struct thread *, struct reg *); -int fill_frame_regs(struct trapframe *, struct reg *); -int set_regs(struct thread *, struct reg *); -int fill_fpregs(struct thread *, struct fpreg *); -int set_fpregs(struct thread *, struct fpreg *); -int fill_dbregs(struct thread *, struct dbreg *); -int set_dbregs(struct thread *, struct dbreg *); -#endif - -#endif /* !_MACHINE_REG_H_ */ +#include Modified: head/sys/pc98/include/reg.h ============================================================================== --- head/sys/pc98/include/reg.h Sun Mar 18 18:44:42 2012 (r233123) +++ head/sys/pc98/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) @@ -3,4 +3,4 @@ */ /* $FreeBSD$ */ -#include +#include Copied and modified: head/sys/x86/include/reg.h (from r233123, head/sys/i386/include/reg.h) ============================================================================== --- head/sys/i386/include/reg.h Sun Mar 18 18:44:42 2012 (r233123, copy source) +++ head/sys/x86/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -38,6 +39,7 @@ #include +#ifdef __i386__ /* * Indices for registers in `struct trapframe' and `struct regs'. * @@ -75,11 +77,26 @@ * to or from a `struct regs'. */ #define tGS (18) +#endif /* __i386__ */ + +/* Rename the structs below depending on the machine architecture. */ +#ifdef __i386__ +#define __reg32 reg +#define __fpreg32 fpreg +#define __dbreg32 dbreg +#else +#define __reg32 reg32 +#define __reg64 reg +#define __fpreg32 fpreg32 +#define __fpreg64 fpreg +#define __dbreg32 dbreg32 +#define __dbreg64 dbreg +#endif /* * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ -struct reg { +struct __reg32 { __uint32_t r_fs; __uint32_t r_es; __uint32_t r_ds; @@ -101,21 +118,59 @@ struct reg { __uint32_t r_gs; }; +struct __reg64 { + __int64_t r_r15; + __int64_t r_r14; + __int64_t r_r13; + __int64_t r_r12; + __int64_t r_r11; + __int64_t r_r10; + __int64_t r_r9; + __int64_t r_r8; + __int64_t r_rdi; + __int64_t r_rsi; + __int64_t r_rbp; + __int64_t r_rbx; + __int64_t r_rdx; + __int64_t r_rcx; + __int64_t r_rax; + __uint32_t r_trapno; + __uint16_t r_fs; + __uint16_t r_gs; + __uint32_t r_err; + __uint16_t r_es; + __uint16_t r_ds; + __int64_t r_rip; + __int64_t r_cs; + __int64_t r_rflags; + __int64_t r_rsp; + __int64_t r_ss; +}; + /* * Register set accessible via /proc/$pid/fpregs. + * + * XXX should get struct from fpu.h. Here we give a slightly + * simplified struct. This may be too much detail. Perhaps + * an array of unsigned longs is best. */ -struct fpreg { - /* - * XXX should get struct from npx.h. Here we give a slightly - * simplified struct. This may be too much detail. Perhaps - * an array of unsigned longs is best. - */ +struct __fpreg32 { __uint32_t fpr_env[7]; __uint8_t fpr_acc[8][10]; __uint32_t fpr_ex_sw; __uint8_t fpr_pad[64]; }; +struct __fpreg64 { + __uint64_t fpr_env[4]; + __uint8_t fpr_acc[8][16]; + __uint8_t fpr_xacc[16][16]; + __uint64_t fpr_spare[12]; +}; + +/* + * Register set accessible via PT_GETXMMREGS (i386). + */ struct xmmreg { /* * XXX should get struct from npx.h. Here we give a slightly @@ -131,7 +186,7 @@ struct xmmreg { /* * Register set accessible via /proc/$pid/dbregs. */ -struct dbreg { +struct __dbreg32 { __uint32_t dr[8]; /* debug registers */ /* Index 0-3: debug address registers */ /* Index 4-5: reserved */ @@ -139,17 +194,29 @@ struct dbreg { /* Index 7: debug control */ }; +struct __dbreg64 { + __uint64_t dr[16]; /* debug registers */ + /* Index 0-3: debug address registers */ + /* Index 4-5: reserved */ + /* Index 6: debug status */ + /* Index 7: debug control */ + /* Index 8-15: reserved */ +}; + #define DBREG_DR7_LOCAL_ENABLE 0x01 #define DBREG_DR7_GLOBAL_ENABLE 0x02 #define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ #define DBREG_DR7_LEN_2 0x01 #define DBREG_DR7_LEN_4 0x03 +#define DBREG_DR7_LEN_8 0x02 #define DBREG_DR7_EXEC 0x00 /* break on execute */ #define DBREG_DR7_WRONLY 0x01 /* break on write */ #define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DR7_MASK(i) (0xf << ((i) * 4 + 16) | 0x3 << (i) * 2) +#define DBREG_DR7_MASK(i) \ + ((__u_register_t)(0xf) << ((i) * 4 + 16) | 0x3 << (i) * 2) #define DBREG_DR7_SET(i, len, access, enable) \ - (((len) << 2 | (access)) << ((i) * 4 + 16) | (enable) << (i) * 2) + ((__u_register_t)((len) << 2 | (access)) << ((i) * 4 + 16) | \ + (enable) << (i) * 2) #define DBREG_DR7_GD 0x2000 #define DBREG_DR7_ENABLED(d, i) (((d) & 0x3 << (i) * 2) != 0) #define DBREG_DR7_ACCESS(d, i) ((d) >> ((i) * 4 + 16) & 0x3) @@ -158,6 +225,18 @@ struct dbreg { #define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr7 by register number */ +#undef __reg32 +#undef __reg64 +#undef __fpreg32 +#undef __fpreg64 +#undef __dbreg32 +#undef __dbreg64 + +#ifdef COMPAT_FREEBSD32 +#include +#include +#endif + #ifdef _KERNEL /* * XXX these interfaces are MI, so they should be declared in a MI place. From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:12:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5908A106566C; Sun, 18 Mar 2012 19:12:12 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4285F8FC08; Sun, 18 Mar 2012 19:12:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJCCg6032187; Sun, 18 Mar 2012 19:12:12 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJCCwj032182; Sun, 18 Mar 2012 19:12:12 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201203181912.q2IJCCwj032182@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 18 Mar 2012 19:12:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233125 - in head/sys: amd64/ia32 compat/ia32 ia64/ia32 ia64/include x86/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:12:12 -0000 Author: tijl Date: Sun Mar 18 19:12:11 2012 New Revision: 233125 URL: http://svn.freebsd.org/changeset/base/233125 Log: Eliminate ia32_reg.h by moving its contents to x86 and ia64 reg.h. Reviewed by: kib Deleted: head/sys/compat/ia32/ia32_reg.h Modified: head/sys/amd64/ia32/ia32_reg.c head/sys/ia64/ia32/ia32_reg.c head/sys/ia64/include/reg.h head/sys/x86/include/reg.h Modified: head/sys/amd64/ia32/ia32_reg.c ============================================================================== --- head/sys/amd64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/amd64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/ia64/ia32/ia32_reg.c ============================================================================== --- head/sys/ia64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/ia64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) @@ -27,13 +27,13 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_compat.h" + #include #include #include #include -#include - int fill_regs32(struct thread *td, struct reg32 *regs) { Modified: head/sys/ia64/include/reg.h ============================================================================== --- head/sys/ia64/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/ia64/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) @@ -31,9 +31,27 @@ #include -#if defined(_KERNEL) && !defined(_STANDALONE) -#include "opt_compat.h" -#endif +struct reg32 { + unsigned int r_fs; + unsigned int r_es; + unsigned int r_ds; + unsigned int r_edi; + unsigned int r_esi; + unsigned int r_ebp; + unsigned int r_isp; + unsigned int r_ebx; + unsigned int r_edx; + unsigned int r_ecx; + unsigned int r_eax; + unsigned int r_trapno; + unsigned int r_err; + unsigned int r_eip; + unsigned int r_cs; + unsigned int r_eflags; + unsigned int r_esp; + unsigned int r_ss; + unsigned int r_gs; +}; struct reg { struct _special r_special; @@ -41,22 +59,28 @@ struct reg { struct _caller_saved r_scratch; }; +struct fpreg32 { + unsigned int fpr_env[7]; + unsigned char fpr_acc[8][10]; + unsigned int fpr_ex_sw; + unsigned char fpr_pad[64]; +}; + struct fpreg { struct _callee_saved_fp fpr_preserved; struct _caller_saved_fp fpr_scratch; struct _high_fp fpr_high; }; +struct dbreg32 { + unsigned int dr[8]; +}; + struct dbreg { unsigned long dbr_data[8]; unsigned long dbr_inst[8]; }; -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - #ifdef _KERNEL struct thread; @@ -67,6 +91,14 @@ int fill_fpregs(struct thread *, struct int set_fpregs(struct thread *, struct fpreg *); int fill_dbregs(struct thread *, struct dbreg *); int set_dbregs(struct thread *, struct dbreg *); +#ifdef COMPAT_FREEBSD32 +int fill_regs32(struct thread *, struct reg32 *); +int set_regs32(struct thread *, struct reg32 *); +int fill_fpregs32(struct thread *, struct fpreg32 *); +int set_fpregs32(struct thread *, struct fpreg32 *); +int fill_dbregs32(struct thread *, struct dbreg32 *); +int set_dbregs32(struct thread *, struct dbreg32 *); +#endif #endif #endif /* _MACHINE_REG_H_ */ Modified: head/sys/x86/include/reg.h ============================================================================== --- head/sys/x86/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) +++ head/sys/x86/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) @@ -232,11 +232,6 @@ struct __dbreg64 { #undef __dbreg32 #undef __dbreg64 -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - #ifdef _KERNEL /* * XXX these interfaces are MI, so they should be declared in a MI place. @@ -248,6 +243,14 @@ int fill_fpregs(struct thread *, struct int set_fpregs(struct thread *, struct fpreg *); int fill_dbregs(struct thread *, struct dbreg *); int set_dbregs(struct thread *, struct dbreg *); +#ifdef COMPAT_FREEBSD32 +int fill_regs32(struct thread *, struct reg32 *); +int set_regs32(struct thread *, struct reg32 *); +int fill_fpregs32(struct thread *, struct fpreg32 *); +int set_fpregs32(struct thread *, struct fpreg32 *); +int fill_dbregs32(struct thread *, struct dbreg32 *); +int set_dbregs32(struct thread *, struct dbreg32 *); +#endif #endif #endif /* !_MACHINE_REG_H_ */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:13:32 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DFEC5106566B; Sun, 18 Mar 2012 19:13:32 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC5008FC14; Sun, 18 Mar 2012 19:13:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJDWdW032256; Sun, 18 Mar 2012 19:13:32 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJDWGU032254; Sun, 18 Mar 2012 19:13:32 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201203181913.q2IJDWGU032254@svn.freebsd.org> From: Jaakko Heinonen Date: Sun, 18 Mar 2012 19:13:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233126 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:13:33 -0000 Author: jh Date: Sun Mar 18 19:13:32 2012 New Revision: 233126 URL: http://svn.freebsd.org/changeset/base/233126 Log: Cast wallclock.tv_sec to uint64_t to avoid overflow in the calculation. PR: kern/161552 Reviewed by: trasz Tested by: Nikos Vassiliadis MFC after: 1 week Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Sun Mar 18 19:12:11 2012 (r233125) +++ head/sys/kern/kern_racct.c Sun Mar 18 19:13:32 2012 (r233126) @@ -745,7 +745,8 @@ racctd(void) mtx_lock(&racct_lock); racct_set_locked(p, RACCT_CPU, runtime); racct_set_locked(p, RACCT_WALLCLOCK, - wallclock.tv_sec * 1000000 + wallclock.tv_usec); + (uint64_t)wallclock.tv_sec * 1000000 + + wallclock.tv_usec); mtx_unlock(&racct_lock); PROC_UNLOCK(p); } From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:15:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 111D4106566C; Sun, 18 Mar 2012 19:15:12 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F0E128FC16; Sun, 18 Mar 2012 19:15:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJFBIG032417; Sun, 18 Mar 2012 19:15:11 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJFBaL032415; Sun, 18 Mar 2012 19:15:11 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201203181915.q2IJFBaL032415@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 18 Mar 2012 19:15:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233127 - head/sys/compat/ia32 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:15:12 -0000 Author: tijl Date: Sun Mar 18 19:15:11 2012 New Revision: 233127 URL: http://svn.freebsd.org/changeset/base/233127 Log: Remove some unnecessary includes. Modified: head/sys/compat/ia32/ia32_sysvec.c Modified: head/sys/compat/ia32/ia32_sysvec.c ============================================================================== --- head/sys/compat/ia32/ia32_sysvec.c Sun Mar 18 19:13:32 2012 (r233126) +++ head/sys/compat/ia32/ia32_sysvec.c Sun Mar 18 19:15:11 2012 (r233127) @@ -69,15 +69,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef __amd64__ -#include -#include -#include -#else -#include -#include -#include -#endif #include #include #include From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:24:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ACE08106564A; Sun, 18 Mar 2012 19:24:12 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from gw01.mail.saunalahti.fi (gw01.mail.saunalahti.fi [195.197.172.115]) by mx1.freebsd.org (Postfix) with ESMTP id 576F38FC17; Sun, 18 Mar 2012 19:24:12 +0000 (UTC) Received: from a91-153-116-96.elisa-laajakaista.fi (a91-153-116-96.elisa-laajakaista.fi [91.153.116.96]) by gw01.mail.saunalahti.fi (Postfix) with SMTP id 1017A151C3F; Sun, 18 Mar 2012 21:23:59 +0200 (EET) Date: Sun, 18 Mar 2012 21:23:58 +0200 From: Jaakko Heinonen To: Kevin Lo Message-ID: <20120318192358.GA2279@a91-153-116-96.elisa-laajakaista.fi> References: <201203181503.q2IF32k2024186@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201203181503.q2IF32k2024186@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r233120 - in stable/9/sys/fs: hpfs msdosfs ntfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:24:12 -0000 On 2012-03-18, Kevin Lo wrote: > MFC r232483: > > Clean up style(9) nits > Directory Properties: > stable/9/sys/fs/ (props changed) > stable/9/sys/fs/ntfs/ (props changed) This should have been merged to stable/9/sys/. Also, r232995 incorrectly recorded mergeinfo to stable/9/sys/fs/ntfs/. -- Jaakko From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:25:38 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF0D6106567C; Sun, 18 Mar 2012 19:25:38 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay012.isp.belgacom.be (mailrelay012.isp.belgacom.be [195.238.6.179]) by mx1.freebsd.org (Postfix) with ESMTP id 95C638FC22; Sun, 18 Mar 2012 19:25:37 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EAIU1Zk9bsV1u/2dsb2JhbABChT6xAYEIggkBAQUjMyMQCxQEKgICOR6IJwenUpEcj2aBFgSmEIJn Received: from 110.93-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.93.110]) by relay.skynet.be with ESMTP; 18 Mar 2012 20:25:35 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.5/8.14.5) with ESMTP id q2IJPYNm006216; Sun, 18 Mar 2012 20:25:34 +0100 (CET) (envelope-from tijl@coosemans.org) From: Tijl Coosemans To: src-committers@freebsd.org Date: Sun, 18 Mar 2012 20:25:25 +0100 User-Agent: KMail/1.13.7 (FreeBSD/10.0-CURRENT; KDE/4.7.3; i386; ; ) References: <201203181912.q2IJCCwj032182@svn.freebsd.org> In-Reply-To: <201203181912.q2IJCCwj032182@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3461237.WHTPOhDjKD"; protocol="application/pgp-signature"; micalg=pgp-sha256 Content-Transfer-Encoding: 7bit Message-Id: <201203182025.32111.tijl@coosemans.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r233125 - in head/sys: amd64/ia32 compat/ia32 ia64/ia32 ia64/include x86/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:25:38 -0000 --nextPart3461237.WHTPOhDjKD Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Sunday 18 March 2012 20:12:12 Tijl Coosemans wrote: > Author: tijl > Date: Sun Mar 18 19:12:11 2012 > New Revision: 233125 > URL: http://svn.freebsd.org/changeset/base/233125 >=20 > Log: > Eliminate ia32_reg.h by moving its contents to x86 and ia64 reg.h. > =20 > Reviewed by: kib >=20 > Deleted: > head/sys/compat/ia32/ia32_reg.h > Modified: > head/sys/amd64/ia32/ia32_reg.c > head/sys/ia64/ia32/ia32_reg.c > head/sys/ia64/include/reg.h > head/sys/x86/include/reg.h >=20 > Modified: head/sys/amd64/ia32/ia32_reg.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/amd64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) > +++ head/sys/amd64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) > @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#include > #include > #include > #include >=20 > Modified: head/sys/ia64/ia32/ia32_reg.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/ia64/ia32/ia32_reg.c Sun Mar 18 19:06:38 2012 (r233124) > +++ head/sys/ia64/ia32/ia32_reg.c Sun Mar 18 19:12:11 2012 (r233125) > @@ -27,13 +27,13 @@ > #include > __FBSDID("$FreeBSD$"); > =20 > +#include "opt_compat.h" > + > #include > #include > #include > #include > =20 > -#include > - > int > fill_regs32(struct thread *td, struct reg32 *regs) > { >=20 > Modified: head/sys/ia64/include/reg.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/ia64/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) > +++ head/sys/ia64/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) > @@ -31,9 +31,27 @@ > =20 > #include > =20 > -#if defined(_KERNEL) && !defined(_STANDALONE) > -#include "opt_compat.h" > -#endif > +struct reg32 { > + unsigned int r_fs; > + unsigned int r_es; > + unsigned int r_ds; > + unsigned int r_edi; > + unsigned int r_esi; > + unsigned int r_ebp; > + unsigned int r_isp; > + unsigned int r_ebx; > + unsigned int r_edx; > + unsigned int r_ecx; > + unsigned int r_eax; > + unsigned int r_trapno; > + unsigned int r_err; > + unsigned int r_eip; > + unsigned int r_cs; > + unsigned int r_eflags; > + unsigned int r_esp; > + unsigned int r_ss; > + unsigned int r_gs; > +}; > =20 > struct reg { > struct _special r_special; > @@ -41,22 +59,28 @@ struct reg { > struct _caller_saved r_scratch; > }; > =20 > +struct fpreg32 { > + unsigned int fpr_env[7]; > + unsigned char fpr_acc[8][10]; > + unsigned int fpr_ex_sw; > + unsigned char fpr_pad[64]; > +}; > + > struct fpreg { > struct _callee_saved_fp fpr_preserved; > struct _caller_saved_fp fpr_scratch; > struct _high_fp fpr_high; > }; > =20 > +struct dbreg32 { > + unsigned int dr[8]; > +}; > + > struct dbreg { > unsigned long dbr_data[8]; > unsigned long dbr_inst[8]; > }; > =20 > -#ifdef COMPAT_FREEBSD32 > -#include > -#include > -#endif > - > #ifdef _KERNEL > struct thread; > =20 > @@ -67,6 +91,14 @@ int fill_fpregs(struct thread *, struct=20 > int set_fpregs(struct thread *, struct fpreg *); > int fill_dbregs(struct thread *, struct dbreg *); > int set_dbregs(struct thread *, struct dbreg *); > +#ifdef COMPAT_FREEBSD32 > +int fill_regs32(struct thread *, struct reg32 *); > +int set_regs32(struct thread *, struct reg32 *); > +int fill_fpregs32(struct thread *, struct fpreg32 *); > +int set_fpregs32(struct thread *, struct fpreg32 *); > +int fill_dbregs32(struct thread *, struct dbreg32 *); > +int set_dbregs32(struct thread *, struct dbreg32 *); > +#endif > #endif > =20 > #endif /* _MACHINE_REG_H_ */ >=20 > Modified: head/sys/x86/include/reg.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/x86/include/reg.h Sun Mar 18 19:06:38 2012 (r233124) > +++ head/sys/x86/include/reg.h Sun Mar 18 19:12:11 2012 (r233125) > @@ -232,11 +232,6 @@ struct __dbreg64 { > #undef __dbreg32 > #undef __dbreg64 > =20 > -#ifdef COMPAT_FREEBSD32 > -#include > -#include > -#endif > - > #ifdef _KERNEL > /* > * XXX these interfaces are MI, so they should be declared in a MI place. I didn't want to move them to an MI place in this patch because it involves all other architectures, but this might be a good time to discuss what that MI place should be. > @@ -248,6 +243,14 @@ int fill_fpregs(struct thread *, struct=20 > int set_fpregs(struct thread *, struct fpreg *); > int fill_dbregs(struct thread *, struct dbreg *); > int set_dbregs(struct thread *, struct dbreg *); > +#ifdef COMPAT_FREEBSD32 > +int fill_regs32(struct thread *, struct reg32 *); > +int set_regs32(struct thread *, struct reg32 *); > +int fill_fpregs32(struct thread *, struct fpreg32 *); > +int set_fpregs32(struct thread *, struct fpreg32 *); > +int fill_dbregs32(struct thread *, struct dbreg32 *); > +int set_dbregs32(struct thread *, struct dbreg32 *); > +#endif > #endif > =20 > #endif /* !_MACHINE_REG_H_ */ >=20 --nextPart3461237.WHTPOhDjKD Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iF4EABEIAAYFAk9mNqsACgkQfoCS2CCgtiuTswD+I5VocfYe22S0cuN1Z3kmZiee atn0HhdzpsY/WmZoYjoA/2xQu5qU6gu2nKc1DfPAFZZcfSJDT/qQaGhWtgA9f64t =+3AF -----END PGP SIGNATURE----- --nextPart3461237.WHTPOhDjKD-- From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:28:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DBD11065676; Sun, 18 Mar 2012 19:28:53 +0000 (UTC) (envelope-from harti@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 493998FC12; Sun, 18 Mar 2012 19:28:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJSrD8032845; Sun, 18 Mar 2012 19:28:53 GMT (envelope-from harti@svn.freebsd.org) Received: (from harti@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJSrQl032843; Sun, 18 Mar 2012 19:28:53 GMT (envelope-from harti@svn.freebsd.org) Message-Id: <201203181928.q2IJSrQl032843@svn.freebsd.org> From: Hartmut Brandt Date: Sun, 18 Mar 2012 19:28:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233128 - head/contrib/bsnmp/snmpd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:28:53 -0000 Author: harti Date: Sun Mar 18 19:28:52 2012 New Revision: 233128 URL: http://svn.freebsd.org/changeset/base/233128 Log: memset() wants the size of the structure to clear, not the size of the pointer to it. Submitted by: Pawel Worach Modified: head/contrib/bsnmp/snmpd/main.c Modified: head/contrib/bsnmp/snmpd/main.c ============================================================================== --- head/contrib/bsnmp/snmpd/main.c Sun Mar 18 19:15:11 2012 (r233127) +++ head/contrib/bsnmp/snmpd/main.c Sun Mar 18 19:28:52 2012 (r233128) @@ -2703,7 +2703,7 @@ bsnmpd_get_usm_stats(void) void bsnmpd_reset_usm_stats(void) { - memset(&snmpd_usmstats, 0, sizeof(&snmpd_usmstats)); + memset(&snmpd_usmstats, 0, sizeof(snmpd_usmstats)); } struct usm_user * From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 19:35:31 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 202131065673; Sun, 18 Mar 2012 19:35:31 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B33B8FC14; Sun, 18 Mar 2012 19:35:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IJZUdm033082; Sun, 18 Mar 2012 19:35:30 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IJZUbr033080; Sun, 18 Mar 2012 19:35:30 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201203181935.q2IJZUbr033080@svn.freebsd.org> From: Adrian Chadd Date: Sun, 18 Mar 2012 19:35:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233129 - head/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 19:35:31 -0000 Author: adrian Date: Sun Mar 18 19:35:30 2012 New Revision: 233129 URL: http://svn.freebsd.org/changeset/base/233129 Log: Add a missing endian conversion. Modified: head/sys/net80211/ieee80211_alq.h Modified: head/sys/net80211/ieee80211_alq.h ============================================================================== --- head/sys/net80211/ieee80211_alq.h Sun Mar 18 19:28:52 2012 (r233128) +++ head/sys/net80211/ieee80211_alq.h Sun Mar 18 19:35:30 2012 (r233129) @@ -27,7 +27,10 @@ #ifndef __IEEE80211_ALQ_H__ #define __IEEE80211_ALQ_H__ -#define IEEE80211_ALQ_PAYLOAD_SIZE 24 +/* + * 64 byte ieee80211_alq_rec size. + */ +#define IEEE80211_ALQ_PAYLOAD_SIZE 52 /* * timestamp @@ -50,4 +53,124 @@ struct ieee80211_alq_rec { extern void ieee80211_alq_log(struct ieee80211vap *vap, uint8_t op, u_char *p, int l); +/* + * Debugging entry points + */ + +/* + * This should be called by the driver on each RX frame. + */ +#define IEEE80211_ALQ_OP_RXFRAME 0x1 +#define IEEE80211_ALQ_OP_TXFRAME 0x2 +#define IEEE80211_ALQ_OP_TXCOMPLETE 0x3 +#define IEEE80211_ALQ_OP_TX_BAW 0x4 + +/* Driver-specific - for descriptor contents, etc */ +#define IEEE80211_ALQ_OP_RX_DESC 0x81 +#define IEEE80211_ALQ_OP_TX_DESC 0x82 +#define IEEE80211_ALQ_OP_TX_DESCCOMP 0x83 + +struct ieee80211_alq_rx_frame_struct { + uint64_t tsf; /* Network order */ + uintptr_t bf; /* Driver-specific buffer ptr */ + uint8_t rxq; /* Driver-specific RX queue */ + uint8_t pad[3]; /* Pad alignment */ + struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ +}; + +struct ieee80211_alq_tx_frame { + uint64_t tsf; /* Network order */ + uintptr_t bf; /* Driver-specific buffer ptr */ + uint32_t tx_flags; /* Driver-specific TX flags */ + uint8_t txq; /* Driver-specific TX queue */ + uint8_t pad[3]; /* Pad alignment */ + struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ +}; + +struct ieee80211_alq_tx_frame_complete { + uint64_t tsf; /* Network order */ + uintptr_t bf; /* Driver-specific buffer ptr */ + uint8_t txq; /* Driver-specific TX queue */ + uint8_t txstatus; /* driver-specific TX status */ + uint8_t pad[2]; /* Pad alignment */ + struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ +}; + + +/* + * This is used for frame RX. + */ +static inline void +ieee80211_alq_rx_frame(struct ieee80211vap *vap, + struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t rxq) +{ + struct ieee80211_alq_rx_frame_struct rf; + + memset(&rf, 0, sizeof(rf)); + rf.tsf = htole64(tsf); + rf.bf = (uintptr_t) bf; + rf.rxq = rxq; + memcpy(&rf.wh, wh, sizeof(struct ieee80211_qosframe)); + ieee80211_alq_log(vap, IEEE80211_ALQ_OP_RXFRAME, (char *) &rf, + sizeof(rf)); +} + +/* + * Frame TX scheduling + */ +static inline void +ieee80211_alq_tx_frame(struct ieee80211vap *vap, + struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, + uint32_t tx_flags) +{ + +} + +/* + * Frame TX completion + */ +static inline void +ieee80211_alq_tx_frame_comp(struct ieee80211vap *vap, + struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, + uint8_t tx_status) +{ + +} + +struct ieee80211_alq_tx_baw_note_struct { + uintptr_t bf; + uint8_t tid; + uint8_t what; + uint16_t baw; + uint16_t wnd; + uint16_t new_baw; +}; + +/* + * TX BAW noting - add, remove, etc + */ + +#define IEEE80211_ALQ_TX_BAW_ADD 0x1 +#define IEEE80211_ALQ_TX_BAW_COMPLETE 0x2 + +static inline void +ieee80211_alq_tx_baw_note(struct ieee80211vap *vap, + struct ieee80211_frame *wh, void *bf, uint8_t tid, uint8_t what, + uint16_t baw, uint16_t wnd, uint16_t new_baw) +{ + struct ieee80211_alq_tx_baw_note_struct tb; + + memset(&tb, 0, sizeof(tb)); + + tb.bf = (uintptr_t) bf; + tb.tid = tid; + tb.what = what; + tb.baw = htons(baw); + tb.wnd = htons(wnd); + tb.new_baw = htons(new_baw); + + ieee80211_alq_log(vap, IEEE80211_ALQ_OP_TX_BAW, (char *) &tb, + sizeof(tb)); +} + #endif /* __IEEE80211_ALQ_H__ */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 20:34:01 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2503106564A; Sun, 18 Mar 2012 20:34:01 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CD8EA8FC14; Sun, 18 Mar 2012 20:34:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IKY1e4034906; Sun, 18 Mar 2012 20:34:01 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IKY1q3034903; Sun, 18 Mar 2012 20:34:01 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201203182034.q2IKY1q3034903@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 18 Mar 2012 20:34:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233130 - head/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 20:34:02 -0000 Author: jilles Date: Sun Mar 18 20:34:01 2012 New Revision: 233130 URL: http://svn.freebsd.org/changeset/base/233130 Log: fts(3): Document cases where FTS_NOCHDIR is set implicitly. PR: docs/166091 Submitted by: Matthew Story MFC after: 1 week Modified: head/lib/libc/gen/fts.3 Modified: head/lib/libc/gen/fts.3 ============================================================================== --- head/lib/libc/gen/fts.3 Sun Mar 18 19:35:30 2012 (r233129) +++ head/lib/libc/gen/fts.3 Sun Mar 18 20:34:01 2012 (r233130) @@ -28,7 +28,7 @@ .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 .\" $FreeBSD$ .\" -.Dd November 25, 2009 +.Dd March 18, 2012 .Dt FTS 3 .Os .Sh NAME @@ -798,3 +798,13 @@ functions were introduced in principally to provide for alternative interfaces to the .Nm functionality using different data structures. +.Sh BUGS +The +.Fn fts_open +function will automatically set the +.Dv FTS_NOCHDIR +option if the +.Dv FTS_LOGICAL +option is provided, or if it cannot +.Xr open 2 +the current directory. From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:19:22 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12379106566B; Sun, 18 Mar 2012 21:19:22 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F08A58FC12; Sun, 18 Mar 2012 21:19:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2ILJLjY036295; Sun, 18 Mar 2012 21:19:21 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2ILJLn0036293; Sun, 18 Mar 2012 21:19:21 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201203182119.q2ILJLn0036293@svn.freebsd.org> From: Josh Paetzel Date: Sun, 18 Mar 2012 21:19:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233131 - head/usr.sbin/pc-sysinstall/backend-query X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:19:22 -0000 Author: jpaetzel Date: Sun Mar 18 21:19:21 2012 New Revision: 233131 URL: http://svn.freebsd.org/changeset/base/233131 Log: Redirect camcontrol stderr to /dev/null. Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh ============================================================================== --- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Sun Mar 18 20:34:01 2012 (r233130) +++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Sun Mar 18 21:19:21 2012 (r233131) @@ -86,7 +86,7 @@ do fi # Try and find some identification information with camcontrol or atacontrol - NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p') + NEWLINE=$(camcontrol identify $DEV 2>/dev/null | sed -ne 's/^device model *//p') if [ -z "$NEWLINE" ]; then # Now try atacontrol NEWLINE=$(atacontrol list 2>/dev/null | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p") From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:29:50 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E47C106566C; Sun, 18 Mar 2012 21:29:50 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [176.9.45.25]) by mx1.freebsd.org (Postfix) with ESMTP id 24E488FC14; Sun, 18 Mar 2012 21:29:49 +0000 (UTC) Received: from core2.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id 891D518C20; Sun, 18 Mar 2012 22:29:43 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core2.vx.sk (amavisd-new, unix socket) with LMTP id 6USe9PoiR2Ur; Sun, 18 Mar 2012 22:29:41 +0100 (CET) Received: from [10.9.8.1] (188-167-78-15.dynamic.chello.sk [188.167.78.15]) by mail.vx.sk (Postfix) with ESMTPSA id 3A35B18C19; Sun, 18 Mar 2012 22:29:41 +0100 (CET) Message-ID: <4F6653C6.6020405@FreeBSD.org> Date: Sun, 18 Mar 2012 22:29:42 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: Alexander Leidinger References: <201203162130.q2GLUQaw035726@svn.freebsd.org> <20120317163539.00004d8f@unknown> In-Reply-To: <20120317163539.00004d8f@unknown> X-Enigmail-Version: 1.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, pjd@FreeBSD.org, jamie@FreeBSD.org Subject: Re: svn commit: r233048 - head/etc/defaults X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:29:50 -0000 On 17.3.2012 16:35, Alexander Leidinger wrote: > On Fri, 16 Mar 2012 21:30:26 +0000 (UTC) Martin Matuska > wrote: > >> Author: mm >> Date: Fri Mar 16 21:30:26 2012 >> New Revision: 233048 >> URL: http://svn.freebsd.org/changeset/base/233048 >> >> Log: >> Unhide /dev/zfs in devfsrules_jail. >> >> The /dev/zfs device is required for managing jailed ZFS datasets. > This may give more info to a jail (ZFS is in use on this machine) than > what someone may want to provide. I have separate rulesets for jails > without and with ZFS (actually the one without is the default one and > the one with is a new one): > ---snip--- > ... > > [devfsrules_unhide_zfs=12] > add path zfs unhide > > ... > > [devfsrules_jail_withzfs=16] > add include $devfsrules_hide_all > add include $devfsrules_unhide_basic > add include $devfsrules_unhide_login > add include $devfsrules_unhide_zfs > ---snip--- > > Anyone with arguments why this may be overly paranoid? If not, I would > suggest that we go this way instead. > > Bye, > Alexander. > The only disclosed information I know of is whether the zfs module is loaded on your system. Other alternative I was thinking of would be using a new ruleset (e.g. devfsrules_jail_zfs=5). The disadvantage here is that users that already have defined a ruleset with this number should be informed somehow. -- Martin Matuska FreeBSD committer http://blog.vx.sk From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:46:27 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C61CE1065676; Sun, 18 Mar 2012 21:46:27 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B17948FC16; Sun, 18 Mar 2012 21:46:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2ILkRt6037122; Sun, 18 Mar 2012 21:46:27 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2ILkR7a037120; Sun, 18 Mar 2012 21:46:27 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201203182146.q2ILkR7a037120@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 18 Mar 2012 21:46:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233132 - head/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:46:27 -0000 Author: jilles Date: Sun Mar 18 21:46:27 2012 New Revision: 233132 URL: http://svn.freebsd.org/changeset/base/233132 Log: fts(3): Mention that FTS_NOCHDIR imposes {PATH_MAX} limits on the returned pathnames. With the current API (no *at functions), FTS_NOCHDIR requires that the fts_accpath start with the original path passed to fts_open(); therefore, the depth that can be reached is limited by the {PATH_MAX} constraint on this pathname. MFC after: 1 week Modified: head/lib/libc/gen/fts.3 Modified: head/lib/libc/gen/fts.3 ============================================================================== --- head/lib/libc/gen/fts.3 Sun Mar 18 21:19:21 2012 (r233131) +++ head/lib/libc/gen/fts.3 Sun Mar 18 21:46:27 2012 (r233132) @@ -419,14 +419,17 @@ be provided to the .Fn fts_open function. .It Dv FTS_NOCHDIR -As a performance optimization, the +To allow descending to arbitrary depths +(independent of +.Brq Dv PATH_MAX ) +and improve performance, the .Nm functions change directories as they walk the file hierarchy. This has the side-effect that an application cannot rely on being in any particular directory during the traversal. The .Dv FTS_NOCHDIR -option turns off this optimization, and the +option turns off this feature, and the .Nm functions will not change the current directory. Note that applications should not themselves change their current directory From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:50:16 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9963E106566B; Sun, 18 Mar 2012 21:50:16 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:150:6101::4]) by mx1.freebsd.org (Postfix) with ESMTP id 2CEF28FC12; Sun, 18 Mar 2012 21:50:16 +0000 (UTC) Received: from core2.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id 2219619827; Sun, 18 Mar 2012 22:50:15 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core2.vx.sk (amavisd-new, unix socket) with LMTP id l7tlPgApBQw0; Sun, 18 Mar 2012 22:50:13 +0100 (CET) Received: from [10.9.8.1] (188-167-78-15.dynamic.chello.sk [188.167.78.15]) by mail.vx.sk (Postfix) with ESMTPSA id DDB351981E; Sun, 18 Mar 2012 22:50:12 +0100 (CET) Message-ID: <4F665895.1050803@FreeBSD.org> Date: Sun, 18 Mar 2012 22:50:13 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: Alexander Leidinger References: <201203162130.q2GLUQaw035726@svn.freebsd.org> <20120317163539.00004d8f@unknown> <4F6653C6.6020405@FreeBSD.org> In-Reply-To: <4F6653C6.6020405@FreeBSD.org> X-Enigmail-Version: 1.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, pjd@FreeBSD.org, jamie@FreeBSD.org Subject: Re: svn commit: r233048 - head/etc/defaults X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:50:16 -0000 On 18.3.2012 22:29, Martin Matuska wrote: > On 17.3.2012 16:35, Alexander Leidinger wrote: >> On Fri, 16 Mar 2012 21:30:26 +0000 (UTC) Martin Matuska >> wrote: >> >>> Author: mm >>> Date: Fri Mar 16 21:30:26 2012 >>> New Revision: 233048 >>> URL: http://svn.freebsd.org/changeset/base/233048 >>> >>> Log: >>> Unhide /dev/zfs in devfsrules_jail. >>> >>> The /dev/zfs device is required for managing jailed ZFS datasets. >> This may give more info to a jail (ZFS is in use on this machine) than >> what someone may want to provide. I have separate rulesets for jails >> without and with ZFS (actually the one without is the default one and >> the one with is a new one): >> ---snip--- >> ... >> >> [devfsrules_unhide_zfs=12] >> add path zfs unhide >> >> ... >> >> [devfsrules_jail_withzfs=16] >> add include $devfsrules_hide_all >> add include $devfsrules_unhide_basic >> add include $devfsrules_unhide_login >> add include $devfsrules_unhide_zfs >> ---snip--- >> >> Anyone with arguments why this may be overly paranoid? If not, I would >> suggest that we go this way instead. >> >> Bye, >> Alexander. >> > The only disclosed information I know of is whether the zfs module is > loaded on your system. > Other alternative I was thinking of would be using a new ruleset (e.g. > devfsrules_jail_zfs=5). > The disadvantage here is that users that already have defined a ruleset > with this number should be informed somehow. > Btw. jail has access to sysctl(8) and this discloses a *LOT* of information, including if ZFS is loaded or not (existence of vfs.zfs) and all its settings and statistics, hardware devices, geom devices, network card counters and many more. Compared to this is /dev/zfs really a minor issue :-) Until we limit the output of sysctl() we don't hide this information just by hiding /dev/zfs. -- Martin Matuska FreeBSD committer http://blog.vx.sk From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:51:57 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48A9F106566C; Sun, 18 Mar 2012 21:51:57 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 0E6968FC19; Sun, 18 Mar 2012 21:51:56 +0000 (UTC) Received: by dald2 with SMTP id d2so9575797dal.13 for ; Sun, 18 Mar 2012 14:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; bh=w6BMnMoQFS5mhZhLX7Ink2+F2K4MoLvhm03kI/6PZkk=; b=p4Ool/XnlosTB+r5xSbhFfR6AR6UmlmLxgifN6oqb+arTKGUAVTTOonyA9FVRTOc0M Vw2PSDe0Qa6Ma20EpqvHis4NFxP7yTbVgevPJ0C5GqxKX7GT2Ls8syR7TlIEtq2ZT5aH pL2b6svNU4mT4Q8d3uK7RWi/F4OoxlbEaYFeUZt+IIRC6oFeJE8jjWPdEWWH/AqTTuDU eNXJyjqpSIXOJTcp5yKcbTTjZtgPI+UrQ2hstRqINKEp2aeTVSXq/9am9IsUMT92jvxa d4oN6VdzMRMb3dMQyjVGbwcqiZhRZMIMpmazlkNoqOj7LoHT8xZKCGiSaqBx8y2ePBDj lxcg== MIME-Version: 1.0 Received: by 10.68.232.2 with SMTP id tk2mr34560580pbc.68.1332107516552; Sun, 18 Mar 2012 14:51:56 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.143.33.5 with HTTP; Sun, 18 Mar 2012 14:51:56 -0700 (PDT) In-Reply-To: <201203181935.q2IJZUbr033080@svn.freebsd.org> References: <201203181935.q2IJZUbr033080@svn.freebsd.org> Date: Sun, 18 Mar 2012 14:51:56 -0700 X-Google-Sender-Auth: XSt2xATcx2j206eZaOyPfuilgqo Message-ID: From: Adrian Chadd To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Subject: Re: svn commit: r233129 - head/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:51:57 -0000 pointy-hat to me, sorry! *grumbles* Adrian On 18 March 2012 12:35, Adrian Chadd wrote: > Author: adrian > Date: Sun Mar 18 19:35:30 2012 > New Revision: 233129 > URL: http://svn.freebsd.org/changeset/base/233129 > > Log: > =A0Add a missing endian conversion. > > Modified: > =A0head/sys/net80211/ieee80211_alq.h > > Modified: head/sys/net80211/ieee80211_alq.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/net80211/ieee80211_alq.h =A0 Sun Mar 18 19:28:52 2012 =A0 = =A0 =A0 =A0(r233128) > +++ head/sys/net80211/ieee80211_alq.h =A0 Sun Mar 18 19:35:30 2012 =A0 = =A0 =A0 =A0(r233129) > @@ -27,7 +27,10 @@ > =A0#ifndef =A0 =A0 =A0 =A0__IEEE80211_ALQ_H__ > =A0#define =A0 =A0 =A0 =A0__IEEE80211_ALQ_H__ > > -#define =A0 =A0 =A0 =A0IEEE80211_ALQ_PAYLOAD_SIZE =A0 =A0 =A024 > +/* > + * 64 byte ieee80211_alq_rec size. > + */ > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_PAYLOAD_SIZE =A0 =A0 =A052 > > =A0/* > =A0* timestamp > @@ -50,4 +53,124 @@ struct ieee80211_alq_rec { > =A0extern void ieee80211_alq_log(struct ieee80211vap *vap, uint8_t op, > =A0 =A0 =A0 =A0 =A0 =A0u_char *p, int l); > > +/* > + * Debugging entry points > + */ > + > +/* > + * This should be called by the driver on each RX frame. > + */ > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_RXFRAME =A0 =A0 =A0 =A00x1 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_TXFRAME =A0 =A0 =A0 =A00x2 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_TXCOMPLETE =A0 =A0 0x3 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_TX_BAW =A0 =A0 =A0 =A0 0x4 > + > +/* Driver-specific - for descriptor contents, etc */ > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_RX_DESC =A0 =A0 =A0 =A00x81 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_TX_DESC =A0 =A0 =A0 =A00x82 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_OP_TX_DESCCOMP =A0 =A00x83 > + > +struct ieee80211_alq_rx_frame_struct { > + =A0 =A0 =A0 uint64_t =A0 =A0 =A0 =A0tsf; =A0 =A0/* Network order */ > + =A0 =A0 =A0 uintptr_t =A0 =A0 =A0 bf; =A0 =A0 /* Driver-specific buffer= ptr */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 rxq; =A0 =A0/* Driver-specific RX q= ueue */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 pad[3]; /* Pad alignment */ > + =A0 =A0 =A0 struct ieee80211_qosframe wh; =A0 /* XXX 4 bytes, QoS? */ > +}; > + > +struct ieee80211_alq_tx_frame { > + =A0 =A0 =A0 uint64_t =A0 =A0 =A0 =A0tsf; =A0 =A0/* Network order */ > + =A0 =A0 =A0 uintptr_t =A0 =A0 =A0 bf; =A0 =A0 /* Driver-specific buffer= ptr */ > + =A0 =A0 =A0 uint32_t =A0 =A0 =A0 =A0tx_flags; =A0 =A0 =A0 /* Driver-spe= cific TX flags */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 txq; =A0 =A0/* Driver-specific TX q= ueue */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 pad[3]; /* Pad alignment */ > + =A0 =A0 =A0 struct ieee80211_qosframe wh; =A0 /* XXX 4 bytes, QoS? */ > +}; > + > +struct ieee80211_alq_tx_frame_complete { > + =A0 =A0 =A0 uint64_t =A0 =A0 =A0 =A0tsf; =A0 =A0/* Network order */ > + =A0 =A0 =A0 uintptr_t =A0 =A0 =A0 bf; =A0 =A0 /* Driver-specific buffer= ptr */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 txq; =A0 =A0/* Driver-specific TX q= ueue */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 txstatus; =A0 =A0 =A0 /* driver-spe= cific TX status */ > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 pad[2]; /* Pad alignment */ > + =A0 =A0 =A0 struct ieee80211_qosframe wh; =A0 /* XXX 4 bytes, QoS? */ > +}; > + > + > +/* > + * This is used for frame RX. > + */ > +static inline void > +ieee80211_alq_rx_frame(struct ieee80211vap *vap, > + =A0 =A0struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t rxq) > +{ > + =A0 =A0 =A0 struct ieee80211_alq_rx_frame_struct rf; > + > + =A0 =A0 =A0 memset(&rf, 0, sizeof(rf)); > + =A0 =A0 =A0 rf.tsf =3D htole64(tsf); > + =A0 =A0 =A0 rf.bf =3D (uintptr_t) bf; > + =A0 =A0 =A0 rf.rxq =3D rxq; > + =A0 =A0 =A0 memcpy(&rf.wh, wh, sizeof(struct ieee80211_qosframe)); > + =A0 =A0 =A0 ieee80211_alq_log(vap, IEEE80211_ALQ_OP_RXFRAME, (char *) &= rf, > + =A0 =A0 =A0 =A0 =A0 sizeof(rf)); > +} > + > +/* > + * Frame TX scheduling > + */ > +static inline void > +ieee80211_alq_tx_frame(struct ieee80211vap *vap, > + =A0 =A0struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, > + =A0 =A0uint32_t tx_flags) > +{ > + > +} > + > +/* > + * Frame TX completion > + */ > +static inline void > +ieee80211_alq_tx_frame_comp(struct ieee80211vap *vap, > + =A0 =A0struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, > + =A0 =A0uint8_t tx_status) > +{ > + > +} > + > +struct ieee80211_alq_tx_baw_note_struct { > + =A0 =A0 =A0 uintptr_t =A0 =A0 =A0 bf; > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 tid; > + =A0 =A0 =A0 uint8_t =A0 =A0 =A0 =A0 what; > + =A0 =A0 =A0 uint16_t =A0 =A0 =A0 =A0baw; > + =A0 =A0 =A0 uint16_t =A0 =A0 =A0 =A0wnd; > + =A0 =A0 =A0 uint16_t =A0 =A0 =A0 =A0new_baw; > +}; > + > +/* > + * TX BAW noting - add, remove, etc > + */ > + > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_TX_BAW_ADD =A0 =A0 =A0 =A00x1 > +#define =A0 =A0 =A0 =A0IEEE80211_ALQ_TX_BAW_COMPLETE =A0 0x2 > + > +static inline void > +ieee80211_alq_tx_baw_note(struct ieee80211vap *vap, > + =A0 =A0struct ieee80211_frame *wh, void *bf, uint8_t tid, uint8_t what, > + =A0 =A0uint16_t baw, uint16_t wnd, uint16_t new_baw) > +{ > + =A0 =A0 =A0 struct ieee80211_alq_tx_baw_note_struct tb; > + > + =A0 =A0 =A0 memset(&tb, 0, sizeof(tb)); > + > + =A0 =A0 =A0 tb.bf =3D (uintptr_t) bf; > + =A0 =A0 =A0 tb.tid =3D tid; > + =A0 =A0 =A0 tb.what =3D what; > + =A0 =A0 =A0 tb.baw =3D htons(baw); > + =A0 =A0 =A0 tb.wnd =3D htons(wnd); > + =A0 =A0 =A0 tb.new_baw =3D htons(new_baw); > + > + =A0 =A0 =A0 ieee80211_alq_log(vap, IEEE80211_ALQ_OP_TX_BAW, (char *) &t= b, > + =A0 =A0 =A0 =A0 =A0 sizeof(tb)); > +} > + > =A0#endif /* __IEEE80211_ALQ_H__ */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 21:55:00 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 402C0106566C; Sun, 18 Mar 2012 21:55:00 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B7F38FC0C; Sun, 18 Mar 2012 21:55:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2ILt0f5037414; Sun, 18 Mar 2012 21:55:00 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2ILsxPf037412; Sun, 18 Mar 2012 21:54:59 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201203182154.q2ILsxPf037412@svn.freebsd.org> From: Adrian Chadd Date: Sun, 18 Mar 2012 21:54:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233133 - head/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 21:55:00 -0000 Author: adrian Date: Sun Mar 18 21:54:59 2012 New Revision: 233133 URL: http://svn.freebsd.org/changeset/base/233133 Log: .. revert out a local change that I hadn't yet completely finished fleshing out and testing. sorry! Modified: head/sys/net80211/ieee80211_alq.h Modified: head/sys/net80211/ieee80211_alq.h ============================================================================== --- head/sys/net80211/ieee80211_alq.h Sun Mar 18 21:46:27 2012 (r233132) +++ head/sys/net80211/ieee80211_alq.h Sun Mar 18 21:54:59 2012 (r233133) @@ -27,10 +27,7 @@ #ifndef __IEEE80211_ALQ_H__ #define __IEEE80211_ALQ_H__ -/* - * 64 byte ieee80211_alq_rec size. - */ -#define IEEE80211_ALQ_PAYLOAD_SIZE 52 +#define IEEE80211_ALQ_PAYLOAD_SIZE 24 /* * timestamp @@ -53,124 +50,4 @@ struct ieee80211_alq_rec { extern void ieee80211_alq_log(struct ieee80211vap *vap, uint8_t op, u_char *p, int l); -/* - * Debugging entry points - */ - -/* - * This should be called by the driver on each RX frame. - */ -#define IEEE80211_ALQ_OP_RXFRAME 0x1 -#define IEEE80211_ALQ_OP_TXFRAME 0x2 -#define IEEE80211_ALQ_OP_TXCOMPLETE 0x3 -#define IEEE80211_ALQ_OP_TX_BAW 0x4 - -/* Driver-specific - for descriptor contents, etc */ -#define IEEE80211_ALQ_OP_RX_DESC 0x81 -#define IEEE80211_ALQ_OP_TX_DESC 0x82 -#define IEEE80211_ALQ_OP_TX_DESCCOMP 0x83 - -struct ieee80211_alq_rx_frame_struct { - uint64_t tsf; /* Network order */ - uintptr_t bf; /* Driver-specific buffer ptr */ - uint8_t rxq; /* Driver-specific RX queue */ - uint8_t pad[3]; /* Pad alignment */ - struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ -}; - -struct ieee80211_alq_tx_frame { - uint64_t tsf; /* Network order */ - uintptr_t bf; /* Driver-specific buffer ptr */ - uint32_t tx_flags; /* Driver-specific TX flags */ - uint8_t txq; /* Driver-specific TX queue */ - uint8_t pad[3]; /* Pad alignment */ - struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ -}; - -struct ieee80211_alq_tx_frame_complete { - uint64_t tsf; /* Network order */ - uintptr_t bf; /* Driver-specific buffer ptr */ - uint8_t txq; /* Driver-specific TX queue */ - uint8_t txstatus; /* driver-specific TX status */ - uint8_t pad[2]; /* Pad alignment */ - struct ieee80211_qosframe wh; /* XXX 4 bytes, QoS? */ -}; - - -/* - * This is used for frame RX. - */ -static inline void -ieee80211_alq_rx_frame(struct ieee80211vap *vap, - struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t rxq) -{ - struct ieee80211_alq_rx_frame_struct rf; - - memset(&rf, 0, sizeof(rf)); - rf.tsf = htole64(tsf); - rf.bf = (uintptr_t) bf; - rf.rxq = rxq; - memcpy(&rf.wh, wh, sizeof(struct ieee80211_qosframe)); - ieee80211_alq_log(vap, IEEE80211_ALQ_OP_RXFRAME, (char *) &rf, - sizeof(rf)); -} - -/* - * Frame TX scheduling - */ -static inline void -ieee80211_alq_tx_frame(struct ieee80211vap *vap, - struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, - uint32_t tx_flags) -{ - -} - -/* - * Frame TX completion - */ -static inline void -ieee80211_alq_tx_frame_comp(struct ieee80211vap *vap, - struct ieee80211_frame *wh, uint64_t tsf, void *bf, uint8_t txq, - uint8_t tx_status) -{ - -} - -struct ieee80211_alq_tx_baw_note_struct { - uintptr_t bf; - uint8_t tid; - uint8_t what; - uint16_t baw; - uint16_t wnd; - uint16_t new_baw; -}; - -/* - * TX BAW noting - add, remove, etc - */ - -#define IEEE80211_ALQ_TX_BAW_ADD 0x1 -#define IEEE80211_ALQ_TX_BAW_COMPLETE 0x2 - -static inline void -ieee80211_alq_tx_baw_note(struct ieee80211vap *vap, - struct ieee80211_frame *wh, void *bf, uint8_t tid, uint8_t what, - uint16_t baw, uint16_t wnd, uint16_t new_baw) -{ - struct ieee80211_alq_tx_baw_note_struct tb; - - memset(&tb, 0, sizeof(tb)); - - tb.bf = (uintptr_t) bf; - tb.tid = tid; - tb.what = what; - tb.baw = htons(baw); - tb.wnd = htons(wnd); - tb.new_baw = htons(new_baw); - - ieee80211_alq_log(vap, IEEE80211_ALQ_OP_TX_BAW, (char *) &tb, - sizeof(tb)); -} - #endif /* __IEEE80211_ALQ_H__ */ From owner-svn-src-all@FreeBSD.ORG Sun Mar 18 23:16:23 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4D98F1065688; Sun, 18 Mar 2012 23:16:23 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 6D4248FC15; Sun, 18 Mar 2012 23:16:22 +0000 (UTC) Received: by bkcjc3 with SMTP id jc3so5443483bkc.13 for ; Sun, 18 Mar 2012 16:16:21 -0700 (PDT) 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=oC5YS86OyosJCMp6gRea85f1UzMmykW/nPvWcAsnypo=; b=RyMMgf1MWAW0BojnAISXRH0MkNPuBG9hhC8B44RMXZ5bEeLoSkZ+7PgKklQgeTI+73 N2vY8r9XP8MDax7PDQ6IfOSgVz5elXKbdja5vJcGeE4vrhYjuJ0kl+ZC6naC7Og6H4qP fP2KiUrMw2jwM6gZ3BoWTyaSL41AmqPvdRStfLbC1+h/T3ZZ/kvev8OOHCQIBWcO4MAj 4GivIvVGZiR/NJ4x/3BBwVgenGNy+/MDsTqJsIgXUarMNLImenW0SmP2lkPjRS+QB/vV bxcSqTQXcWFLlYoMGNmt3jGbjRpEyGOXhrf0wbPvoHIUAG7WVr7YPV4jCNlV+sWczdQY 0MGA== MIME-Version: 1.0 Received: by 10.204.132.80 with SMTP id a16mr3848595bkt.18.1332112581387; Sun, 18 Mar 2012 16:16:21 -0700 (PDT) Received: by 10.204.202.142 with HTTP; Sun, 18 Mar 2012 16:16:21 -0700 (PDT) Received: by 10.204.202.142 with HTTP; Sun, 18 Mar 2012 16:16:21 -0700 (PDT) In-Reply-To: <1331852174.8403.12.camel@revolution.hippie.lan> References: <201203141622.q2EGM9HR021407@svn.freebsd.org> <1331852174.8403.12.camel@revolution.hippie.lan> Date: Sun, 18 Mar 2012 23:16:21 +0000 Message-ID: From: Chris Rees To: Ian Lepore Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Ed Schouten Subject: Re: svn commit: r232977 - in head: etc sbin/init X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 23:16:23 -0000 On 15 Mar 2012 22:57, "Ian Lepore" wrote: > > On Wed, 2012-03-14 at 16:22 +0000, Ed Schouten wrote: > > Author: ed > > Date: Wed Mar 14 16:22:09 2012 > > New Revision: 232977 > > URL: http://svn.freebsd.org/changeset/base/232977 > > > > Log: > > Make init(8) slightly more robust when /dev/console is missing. > > > > If the environment doesn't offer a working /dev/console, the existing > > version of init(8) will simply refuse running rc(8) scripts. This means > > you'll only have a system running init(8) and nothing else. > > > > Change the code to do the following: > > > > - Open /dev/console like we used to do, but make it more robust to use > > O_NONBLOCK to prevent blocking on a carrier. > > - If this fails, use /dev/null as stdin and /var/log/init.log as stdout > > and stderr. > > Given that the /var filesystem is mounted (and with readonly root, > actually created) by an rc script run by init, does this make sense? > Maybe it makes sense only within a jail, but not when running as pid 1? > > > - If even this fails, use /dev/null as stdin, stdout and stderr. > > > > So why us this useful? Well, if you remove the `getpid() == 1' check in > > main(), you can now use init(8) inside jails to properly execute rc(8). > > It still requires some polishing, as existing tools assume init(8) has > > PID 1. > > Not just existing tools, but 3rd party software is likely to contain > this assumption (I know some of ours does). The manpage for init > contains examples of using a hard-coded 1. Would it be practical for > any reference to pid 1 to get somehow magically redirected inside a jail > to the pid of an init process running within that jail? That's just a > pure blue-sky idea that popped into my head; I know almost nothing about > jails (their implementation or how to use them). > Not really. Processes are given a 'jailed' property, but apart from that are just regular processes. Also, faking PIDs like that will also hide the host (real) init.... though whether that is a problem or not is an exercise for the reader. Chris From owner-svn-src-all@FreeBSD.ORG Mon Mar 19 00:07:11 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58CBE1065670; Mon, 19 Mar 2012 00:07:11 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 449F48FC0A; Mon, 19 Mar 2012 00:07:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2J07BJp041523; Mon, 19 Mar 2012 00:07:11 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2J07B5g041521; Mon, 19 Mar 2012 00:07:11 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203190007.q2J07B5g041521@svn.freebsd.org> From: David Xu Date: Mon, 19 Mar 2012 00:07:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233134 - head/lib/libthr/thread X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: