Re: svn commit: r281451 - head/sys/vm
On 23 April 2015 at 22:26, Scott Long wrote: > >> On Apr 23, 2015, at 1:28 PM, Chagin Dmitry wrote: >> >> On Thu, Apr 23, 2015 at 12:49:51PM -0600, Scott Long wrote: >>> On Apr 23, 2015, at 6:19 AM, Scott Long wrote: > > On Apr 12, 2015, at 12:21 AM, Dmitry Chagin wrote: > > Author: dchagin > Date: Sun Apr 12 06:21:58 2015 > New Revision: 281451 > URL: https://svnweb.freebsd.org/changeset/base/281451 > > Log: > Rework r281162. Indeed, the flexible array member is preferable here. > > Suggested by: Justin T. Gibbs > > MFC after: 3 days > > Modified: > head/sys/vm/uma_core.c > head/sys/vm/uma_int.h There???s still something wrong with this. I have a machine with 28 cores (56 with hyperthreading) and 256GB of RAM, and ever since you committed r281162, it panics early in boot with a failed assertion. It looks like the first few members of a uma_slab_t are getting overwritten accidentally, and somehow the padding of the extra member in the uma_zone_t was previously protecting it. I don???t know the exact cause yet, but I must ask that you revert to r281161 in HEAD and stable/10 until the problem is resolved. >>> >>> I think the problem is that the masterzone_k and masterzone_z objects that >>> are statically allocated in uma_core.c no longer have space for the uz_cpu >>> field, but uma_zalloc_arg() always assumes that it???s there. Early in >>> boot when the ???kegs' and ???zones??? zones are being initialized, >>> there???s only 1 CPU so pre-allocating 1 uz_cpu element in the uma_zone is >>> enough. I can???t see any way around this without significantly changing >>> how uma_zalloc_arg() treats per-cpu caches. I think it???s best to revert >>> this change. >>> >> Hi, >> they initialized in uma_startup() and not used before. >> I have a private converstion with a man which stable/10 hangs in >> vm_mem_init().\ >> with my commit. weird. >> >> I do not object to revert, but give me a chance to figure out what's going >> on. > > With INVARIANTS enabled, the system will panic. Without it, it will spin in > vm_mem_init(), as you noted. Even if it’s not happening to everyone, it’s a > serious problem for such a minor anticipated benefit. I must insist that it > be reverted. Hi, +1 - please revert the patch for now and figure it out locally. Having -HEAD broken is very annoying. -a ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281451 - head/sys/vm
> On Apr 23, 2015, at 1:28 PM, Chagin Dmitry wrote: > > On Thu, Apr 23, 2015 at 12:49:51PM -0600, Scott Long wrote: >> >>> On Apr 23, 2015, at 6:19 AM, Scott Long wrote: >>> On Apr 12, 2015, at 12:21 AM, Dmitry Chagin wrote: Author: dchagin Date: Sun Apr 12 06:21:58 2015 New Revision: 281451 URL: https://svnweb.freebsd.org/changeset/base/281451 Log: Rework r281162. Indeed, the flexible array member is preferable here. Suggested by: Justin T. Gibbs MFC after: 3 days Modified: head/sys/vm/uma_core.c head/sys/vm/uma_int.h >>> >>> There???s still something wrong with this. I have a machine with 28 cores >>> (56 with hyperthreading) and 256GB of RAM, and ever since you committed >>> r281162, it panics early in boot with a failed assertion. It looks like >>> the first few members of a uma_slab_t are getting overwritten accidentally, >>> and somehow the padding of the extra member in the uma_zone_t was >>> previously protecting it. I don???t know the exact cause yet, but I must >>> ask that you revert to r281161 in HEAD and stable/10 until the problem is >>> resolved. >>> >> >> I think the problem is that the masterzone_k and masterzone_z objects that >> are statically allocated in uma_core.c no longer have space for the uz_cpu >> field, but uma_zalloc_arg() always assumes that it???s there. Early in boot >> when the ???kegs' and ???zones??? zones are being initialized, there???s >> only 1 CPU so pre-allocating 1 uz_cpu element in the uma_zone is enough. I >> can???t see any way around this without significantly changing how >> uma_zalloc_arg() treats per-cpu caches. I think it???s best to revert this >> change. >> > Hi, > they initialized in uma_startup() and not used before. > I have a private converstion with a man which stable/10 hangs in > vm_mem_init().\ > with my commit. weird. > > I do not object to revert, but give me a chance to figure out what's going on. With INVARIANTS enabled, the system will panic. Without it, it will spin in vm_mem_init(), as you noted. Even if it’s not happening to everyone, it’s a serious problem for such a minor anticipated benefit. I must insist that it be reverted. Scott ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281919 - head/share/man/man4
Author: kevlo Date: Fri Apr 24 05:00:57 2015 New Revision: 281919 URL: https://svnweb.freebsd.org/changeset/base/281919 Log: Plural fix. Modified: head/share/man/man4/urtwn.4 Modified: head/share/man/man4/urtwn.4 == --- head/share/man/man4/urtwn.4 Fri Apr 24 04:57:18 2015(r281918) +++ head/share/man/man4/urtwn.4 Fri Apr 24 05:00:57 2015(r281919) @@ -52,7 +52,7 @@ The driver supports USB 2.0 wireless network devices based on Realtek RTL8188CUS, RTL8188CE-VAU, RTL8188EUS, RTL8188RU and RTL8192CU chipsets. .Pp -The RTL8188CUS and RTL8188EUS are highly integrated 802.11n adapter that +The RTL8188CUS and RTL8188EUS are highly integrated 802.11n adapters that combine a MAC, a 1T1R capable baseband and an RF in a single chip. They operate in the 2GHz spectrum only. The RTL8188RU is a high-power variant of the RTL8188CUS. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281918 - head/sys/dev/usb/wlan
Author: kevlo
Date: Fri Apr 24 04:57:18 2015
New Revision: 281918
URL: https://svnweb.freebsd.org/changeset/base/281918
Log:
- Fix the length of efuse content.
- Replace the magic numbers with something more readable.
Modified:
head/sys/dev/usb/wlan/if_urtwn.c
Modified: head/sys/dev/usb/wlan/if_urtwn.c
==
--- head/sys/dev/usb/wlan/if_urtwn.cFri Apr 24 03:23:41 2015
(r281917)
+++ head/sys/dev/usb/wlan/if_urtwn.cFri Apr 24 04:57:18 2015
(r281918)
@@ -1236,9 +1236,11 @@ urtwn_efuse_read(struct urtwn_softc *sc)
static void
urtwn_efuse_switch_power(struct urtwn_softc *sc)
{
- uint8_t vol;
uint32_t reg;
+ if (sc->chip & URTWN_CHIP_88E)
+ urtwn_write_1(sc, R92C_EFUSE_ACCESS, R92C_EFUSE_ACCESS_ON);
+
reg = urtwn_read_2(sc, R92C_SYS_ISO_CTRL);
if (!(reg & R92C_SYS_ISO_CTRL_PWC_EV12V)) {
urtwn_write_2(sc, R92C_SYS_ISO_CTRL,
@@ -1256,11 +1258,15 @@ urtwn_efuse_switch_power(struct urtwn_so
reg | R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M);
}
- /* Enable LDO 2.5V. */
- vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3);
- vol &= 0x0f;
- vol |= 0x30;
- urtwn_write_1(sc, R92C_EFUSE_TEST + 3, (vol | 0x80));
+ if (!(sc->chip & URTWN_CHIP_88E)) {
+ uint8_t vol;
+
+ /* Enable LDO 2.5V. */
+ vol = urtwn_read_1(sc, R92C_EFUSE_TEST + 3);
+ vol &= 0x0f;
+ vol |= 0x30;
+ urtwn_write_1(sc, R92C_EFUSE_TEST + 3, (vol | 0x80));
+ }
}
static int
@@ -1328,7 +1334,7 @@ urtwn_r88e_read_rom(struct urtwn_softc *
/* Read full ROM image. */
memset(&sc->r88e_rom, 0xff, sizeof(sc->r88e_rom));
- while (addr < 1024) {
+ while (addr < 512) {
reg = urtwn_efuse_read_1(sc, addr);
if (reg == 0xff)
break;
@@ -1354,6 +1360,8 @@ urtwn_r88e_read_rom(struct urtwn_softc *
}
}
+ urtwn_write_1(sc, R92C_EFUSE_ACCESS, R92C_EFUSE_ACCESS_OFF);
+
addr = 0x10;
for (i = 0; i < 6; i++)
sc->cck_tx_pwr[i] = sc->r88e_rom[addr++];
@@ -2193,14 +2201,12 @@ urtwn_r92c_power_on(struct urtwn_softc *
static int
urtwn_r88e_power_on(struct urtwn_softc *sc)
{
- uint8_t val;
uint32_t reg;
int ntries;
/* Wait for power ready bit. */
for (ntries = 0; ntries < 5000; ntries++) {
- val = urtwn_read_1(sc, 0x6) & 0x2;
- if (val == 0x2)
+ if (urtwn_read_4(sc, R92C_APS_FSMCO) & R92C_APS_FSMCO_SUS_HOST)
break;
urtwn_ms_delay(sc);
}
@@ -2215,17 +2221,23 @@ urtwn_r88e_power_on(struct urtwn_softc *
urtwn_read_1(sc, R92C_SYS_FUNC_EN) & ~(R92C_SYS_FUNC_EN_BBRSTB |
R92C_SYS_FUNC_EN_BB_GLB_RST));
- urtwn_write_1(sc, 0x26, urtwn_read_1(sc, 0x26) | 0x80);
+ urtwn_write_1(sc, R92C_AFE_XTAL_CTRL + 2,
+ urtwn_read_1(sc, R92C_AFE_XTAL_CTRL + 2) | 0x80);
/* Disable HWPDN. */
- urtwn_write_1(sc, 0x5, urtwn_read_1(sc, 0x5) & ~0x80);
+ urtwn_write_2(sc, R92C_APS_FSMCO,
+ urtwn_read_2(sc, R92C_APS_FSMCO) & ~R92C_APS_FSMCO_APDM_HPDN);
/* Disable WL suspend. */
- urtwn_write_1(sc, 0x5, urtwn_read_1(sc, 0x5) & ~0x18);
+ urtwn_write_2(sc, R92C_APS_FSMCO,
+ urtwn_read_2(sc, R92C_APS_FSMCO) &
+ ~(R92C_APS_FSMCO_AFSM_HSUS | R92C_APS_FSMCO_AFSM_PCIE));
- urtwn_write_1(sc, 0x5, urtwn_read_1(sc, 0x5) | 0x1);
+ urtwn_write_2(sc, R92C_APS_FSMCO,
+ urtwn_read_2(sc, R92C_APS_FSMCO) | R92C_APS_FSMCO_APFM_ONMAC);
for (ntries = 0; ntries < 5000; ntries++) {
- if (!(urtwn_read_1(sc, 0x5) & 0x1))
+ if (!(urtwn_read_2(sc, R92C_APS_FSMCO) &
+ R92C_APS_FSMCO_APFM_ONMAC))
break;
urtwn_ms_delay(sc);
}
@@ -2233,7 +2245,8 @@ urtwn_r88e_power_on(struct urtwn_softc *
return (ETIMEDOUT);
/* Enable LDO normal mode. */
- urtwn_write_1(sc, 0x23, urtwn_read_1(sc, 0x23) & ~0x10);
+ urtwn_write_1(sc, R92C_LPLDO_CTRL,
+ urtwn_read_1(sc, R92C_LPLDO_CTRL) & ~0x10);
/* Enable MAC DMA/WMAC/SCHEDULE/SEC blocks. */
urtwn_write_2(sc, R92C_CR, 0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281917 - head
Author: markj Date: Fri Apr 24 03:23:41 2015 New Revision: 281917 URL: https://svnweb.freebsd.org/changeset/base/281917 Log: Add _.arm64.* to the svn:ignore property for head/. Modified: Directory Properties: head/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281916 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace dev/dtrace dev/dtrace/amd64 dev/dtrace/arm dev/dtrace/i386 dev/dtrace/mips dev/dtrace/powerpc
Author: markj Date: Fri Apr 24 03:19:30 2015 New Revision: 281916 URL: https://svnweb.freebsd.org/changeset/base/281916 Log: Fix DTrace's panic() action. It would previously call into some unfinished Solaris compatibility code and return without actually calling panic(9). The compatibility code is unneeded, however, so just remove it and have dtrace_panic() call vpanic(9) directly. Differential Revision:https://reviews.freebsd.org/D2349 Reviewed by: avg MFC after:2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S head/sys/cddl/dev/dtrace/arm/dtrace_asm.S head/sys/cddl/dev/dtrace/dtrace_hacks.c head/sys/cddl/dev/dtrace/i386/dtrace_asm.S head/sys/cddl/dev/dtrace/mips/dtrace_asm.S head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c == --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cFri Apr 24 03:17:21 2015(r281915) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cFri Apr 24 03:19:30 2015(r281916) @@ -611,7 +611,11 @@ dtrace_panic(const char *format, ...) va_list alist; va_start(alist, format); +#ifdef __FreeBSD__ + vpanic(format, alist); +#else dtrace_vpanic(format, alist); +#endif va_end(alist); } Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S == --- head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S Fri Apr 24 03:17:21 2015 (r281915) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S Fri Apr 24 03:19:30 2015 (r281916) @@ -363,211 +363,3 @@ dtrace_interrupt_enable(dtrace_icookie_t popfq ret END(dtrace_interrupt_enable) - -/* - * The panic() and cmn_err() functions invoke vpanic() as a common entry point - * into the panic code implemented in panicsys(). vpanic() is responsible - * for passing through the format string and arguments, and constructing a - * regs structure on the stack into which it saves the current register - * values. If we are not dying due to a fatal trap, these registers will - * then be preserved in panicbuf as the current processor state. Before - * invoking panicsys(), vpanic() activates the first panic trigger (see - * common/os/panic.c) and switches to the panic_stack if successful. Note that - * DTrace takes a slightly different panic path if it must panic from probe - * context. Instead of calling panic, it calls into dtrace_vpanic(), which - * sets up the initial stack as vpanic does, calls dtrace_panic_trigger(), and - * branches back into vpanic(). - */ - -/* -void -vpanic(const char *format, va_list alist) -*/ - ENTRY(vpanic) /* Initial stack layout: */ - - pushq %rbp/* | %rip | 0x60*/ - movq%rsp, %rbp /* | %rbp | 0x58*/ - pushfq /* | rfl | 0x50*/ - pushq %r11/* | %r11 | 0x48*/ - pushq %r10/* | %r10 | 0x40*/ - pushq %rbx/* | %rbx | 0x38*/ - pushq %rax/* | %rax | 0x30*/ - pushq %r9 /* | %r9 | 0x28*/ - pushq %r8 /* | %r8 | 0x20*/ - pushq %rcx/* | %rcx | 0x18*/ - pushq %rdx/* | %rdx | 0x10*/ - pushq %rsi/* | %rsi | 0x8 alist */ - pushq %rdi/* | %rdi | 0x0 format */ - - movq%rsp, %rbx /* %rbx = current %rsp */ - - leaqpanic_quiesce(%rip), %rdi /* %rdi = &panic_quiesce */ - callpanic_trigger /* %eax = panic_trigger() */ - -vpanic_common: - /* -* The panic_trigger result is in %eax from the call above, and -* dtrace_panic places it in %eax before branching here. -* The rdmsr instructions that follow below will clobber %eax so -* we stash the panic_trigger result in %r11d. -*/ - movl%eax, %r11d - cmpl$0, %r11d - je 0f - - /* -* If panic_trigger() was successful, we are the first to initiate a -* panic: we now switch to the reserved panic_stack before continuing. -*/ - leaqpanic_stack(%rip), %rsp - addq$PANICSTKSIZE, %rsp -0: subq$REGSIZE, %rsp - /* -* Now that we've got everything set up, store the register values as -* they were when we
svn commit: r281915 - in head: share/man/man9 sys/kern sys/sys
Author: markj
Date: Fri Apr 24 03:17:21 2015
New Revision: 281915
URL: https://svnweb.freebsd.org/changeset/base/281915
Log:
Make vpanic() externally visible so that it can be called as part of the
DTrace panic() action.
Differential Revision:https://reviews.freebsd.org/D2349
Reviewed by: avg
MFC after:2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/man/man9/Makefile
head/share/man/man9/panic.9
head/sys/kern/kern_shutdown.c
head/sys/sys/systm.h
Modified: head/share/man/man9/Makefile
==
--- head/share/man/man9/MakefileFri Apr 24 02:43:02 2015
(r281914)
+++ head/share/man/man9/MakefileFri Apr 24 03:17:21 2015
(r281915)
@@ -1135,6 +1135,7 @@ MLINKS+=osd.9 osd_call.9 \
osd.9 osd_get.9 \
osd.9 osd_register.9 \
osd.9 osd_set.9
+MLINKS+=panic.9 vpanic.9
MLINKS+=pbuf.9 getpbuf.9 \
pbuf.9 relpbuf.9 \
pbuf.9 trypbuf.9
Modified: head/share/man/man9/panic.9
==
--- head/share/man/man9/panic.9 Fri Apr 24 02:43:02 2015(r281914)
+++ head/share/man/man9/panic.9 Fri Apr 24 03:17:21 2015(r281915)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 11, 1995
+.Dd April 23, 2015
.Dt PANIC 9
.Os
.Sh NAME
@@ -42,10 +42,14 @@
.In sys/systm.h
.Ft void
.Fn panic "const char *fmt" ...
+.Ft void
+.Fn vpanic "const char *fmt" "va_list ap"
.Sh DESCRIPTION
The
.Fn panic
-function terminates the running system.
+and
+.Fn vpanic
+functions terminate the running system.
The message
.Fa fmt
is a
Modified: head/sys/kern/kern_shutdown.c
==
--- head/sys/kern/kern_shutdown.c Fri Apr 24 02:43:02 2015
(r281914)
+++ head/sys/kern/kern_shutdown.c Fri Apr 24 03:17:21 2015
(r281915)
@@ -154,7 +154,6 @@ static void poweroff_wait(void *, int);
static void shutdown_halt(void *junk, int howto);
static void shutdown_panic(void *junk, int howto);
static void shutdown_reset(void *junk, int howto);
-static void vpanic(const char *fmt, va_list ap) __dead2;
/* register various local shutdown events */
static void
@@ -676,7 +675,7 @@ panic(const char *fmt, ...)
vpanic(fmt, ap);
}
-static void
+void
vpanic(const char *fmt, va_list ap)
{
#ifdef SMP
Modified: head/sys/sys/systm.h
==
--- head/sys/sys/systm.hFri Apr 24 02:43:02 2015(r281914)
+++ head/sys/sys/systm.hFri Apr 24 03:17:21 2015(r281915)
@@ -187,6 +187,7 @@ void*phashinit(int count, struct malloc
void g_waitidle(void);
void panic(const char *, ...) __dead2 __printflike(1, 2);
+void vpanic(const char *, __va_list) __dead2 __printflike(1, 0);
void cpu_boot(int);
void cpu_flush_dcache(void *, size_t);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281914 - stable/9/sys/netinet6
Author: ae
Date: Fri Apr 24 02:43:02 2015
New Revision: 281914
URL: https://svnweb.freebsd.org/changeset/base/281914
Log:
MFC r281380:
Fix the IPV6_MULTICAST_IF sockopt handling. RFC 3493 says when the
interface index is specified as zero, the system should select the
interface to use for outgoing multicast packets. Even the comment
for the in6p_set_multicast_if() function says about index of zero.
But in fact for zero index the function just returns EADDRNOTAVAIL.
I.e. if you first set some interface and then will try reset it
with zero ifindex, you will get EADDRNOTAVAIL.
Reset im6o_multicast_ifp to NULL when interface index specified as
zero. Also return EINVAL in case when ifnet_byindex() returns NULL.
This will be the same behaviour as when ifindex is bigger than
V_if_index. And return EADDRNOTAVAIL only when interface is not
multicast capable.
Modified:
stable/9/sys/netinet6/in6_mcast.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet6/in6_mcast.c
==
--- stable/9/sys/netinet6/in6_mcast.c Fri Apr 24 02:15:14 2015
(r281913)
+++ stable/9/sys/netinet6/in6_mcast.c Fri Apr 24 02:43:02 2015
(r281914)
@@ -2353,11 +2353,15 @@ in6p_set_multicast_if(struct inpcb *inp,
return (error);
if (ifindex < 0 || V_if_index < ifindex)
return (EINVAL);
-
- ifp = ifnet_byindex(ifindex);
- if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0)
- return (EADDRNOTAVAIL);
-
+ if (ifindex == 0)
+ ifp = NULL;
+ else {
+ ifp = ifnet_byindex(ifindex);
+ if (ifp == NULL)
+ return (EINVAL);
+ if ((ifp->if_flags & IFF_MULTICAST) == 0)
+ return (EADDRNOTAVAIL);
+ }
imo = in6p_findmoptions(inp);
imo->im6o_multicast_ifp = ifp;
INP_WUNLOCK(inp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281913 - stable/9/sys/fs/nfsclient
Author: pfg
Date: Fri Apr 24 02:15:14 2015
New Revision: 281913
URL: https://svnweb.freebsd.org/changeset/base/281913
Log:
MFC r281756:
nfsrpc_createv4: fix double free.
Reported by: Oliver Pinter, clang static checker
Obtained from:HardenedBSD (63cac77c42c0c3fc67da62f97d5ab651d52ae707)
Reviewed by: rmacklem
Modified:
stable/9/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/nfsclient/nfs_clrpcops.c
==
--- stable/9/sys/fs/nfsclient/nfs_clrpcops.cFri Apr 24 02:14:01 2015
(r281912)
+++ stable/9/sys/fs/nfsclient/nfs_clrpcops.cFri Apr 24 02:15:14 2015
(r281913)
@@ -2027,8 +2027,10 @@ nfsrpc_createv4(vnode_t dvp, char *name,
(void) nfs_catnap(PZERO, ret, "nfs_crt2");
} while (ret == NFSERR_DELAY);
if (ret) {
- if (dp != NULL)
+ if (dp != NULL) {
FREE((caddr_t)dp, M_NFSCLDELEG);
+ dp = NULL;
+ }
if (ret == NFSERR_STALECLIENTID ||
ret == NFSERR_STALEDONTRECOVER)
error = ret;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281912 - stable/10/sys/fs/nfsclient
Author: pfg
Date: Fri Apr 24 02:14:01 2015
New Revision: 281912
URL: https://svnweb.freebsd.org/changeset/base/281912
Log:
MFC r281756:
nfsrpc_createv4: fix double free.
Reported by: Oliver Pinter, clang static checker
Obtained from:HardenedBSD (63cac77c42c0c3fc67da62f97d5ab651d52ae707)
Reviewed by: rmacklem
Modified:
stable/10/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/nfsclient/nfs_clrpcops.c
==
--- stable/10/sys/fs/nfsclient/nfs_clrpcops.c Fri Apr 24 02:12:25 2015
(r281911)
+++ stable/10/sys/fs/nfsclient/nfs_clrpcops.c Fri Apr 24 02:14:01 2015
(r281912)
@@ -2153,8 +2153,10 @@ nfsrpc_createv4(vnode_t dvp, char *name,
(void) nfs_catnap(PZERO, ret, "nfs_crt2");
} while (ret == NFSERR_DELAY);
if (ret) {
- if (dp != NULL)
+ if (dp != NULL) {
FREE((caddr_t)dp, M_NFSCLDELEG);
+ dp = NULL;
+ }
if (ret == NFSERR_STALECLIENTID ||
ret == NFSERR_STALEDONTRECOVER ||
ret == NFSERR_BADSESSION)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281911 - stable/10/sys/netinet6
Author: ae
Date: Fri Apr 24 02:12:25 2015
New Revision: 281911
URL: https://svnweb.freebsd.org/changeset/base/281911
Log:
MFC r281380:
Fix the IPV6_MULTICAST_IF sockopt handling. RFC 3493 says when the
interface index is specified as zero, the system should select the
interface to use for outgoing multicast packets. Even the comment
for the in6p_set_multicast_if() function says about index of zero.
But in fact for zero index the function just returns EADDRNOTAVAIL.
I.e. if you first set some interface and then will try reset it
with zero ifindex, you will get EADDRNOTAVAIL.
Reset im6o_multicast_ifp to NULL when interface index specified as
zero. Also return EINVAL in case when ifnet_byindex() returns NULL.
This will be the same behaviour as when ifindex is bigger than
V_if_index. And return EADDRNOTAVAIL only when interface is not
multicast capable.
Modified:
stable/10/sys/netinet6/in6_mcast.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet6/in6_mcast.c
==
--- stable/10/sys/netinet6/in6_mcast.c Thu Apr 23 22:39:32 2015
(r281910)
+++ stable/10/sys/netinet6/in6_mcast.c Fri Apr 24 02:12:25 2015
(r281911)
@@ -2350,11 +2350,15 @@ in6p_set_multicast_if(struct inpcb *inp,
return (error);
if (V_if_index < ifindex)
return (EINVAL);
-
- ifp = ifnet_byindex(ifindex);
- if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0)
- return (EADDRNOTAVAIL);
-
+ if (ifindex == 0)
+ ifp = NULL;
+ else {
+ ifp = ifnet_byindex(ifindex);
+ if (ifp == NULL)
+ return (EINVAL);
+ if ((ifp->if_flags & IFF_MULTICAST) == 0)
+ return (EADDRNOTAVAIL);
+ }
imo = in6p_findmoptions(inp);
imo->im6o_multicast_ifp = ifp;
INP_WUNLOCK(inp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281910 - in stable: 10/sys/dev/acpica 9/sys/dev/acpica
Author: jhb
Date: Thu Apr 23 22:39:32 2015
New Revision: 281910
URL: https://svnweb.freebsd.org/changeset/base/281910
Log:
MFC 281159:
Move the message complaining about failed system resource allocations
under bootverbose. Every example I've seen to date has been due to
an ACPI system resource device reserving a range that overlaps with
system memory (which ram0 attempts to reserve) or a local or I/O APIC
(which apic0 attempts to reserve). These are always harmless but look
scary to users.
Modified:
stable/10/sys/dev/acpica/acpi.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/sys/dev/acpica/acpi.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/10/sys/dev/acpica/acpi.c
==
--- stable/10/sys/dev/acpica/acpi.c Thu Apr 23 22:20:43 2015
(r281909)
+++ stable/10/sys/dev/acpica/acpi.c Thu Apr 23 22:39:32 2015
(r281910)
@@ -1148,7 +1148,7 @@ acpi_sysres_alloc(device_t dev)
if (res != NULL) {
rman_manage_region(rm, rman_get_start(res), rman_get_end(res));
rle->res = res;
- } else
+ } else if (bootverbose)
device_printf(dev, "reservation of %lx, %lx (%d) failed\n",
rle->start, rle->count, rle->type);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281910 - in stable: 10/sys/dev/acpica 9/sys/dev/acpica
Author: jhb
Date: Thu Apr 23 22:39:32 2015
New Revision: 281910
URL: https://svnweb.freebsd.org/changeset/base/281910
Log:
MFC 281159:
Move the message complaining about failed system resource allocations
under bootverbose. Every example I've seen to date has been due to
an ACPI system resource device reserving a range that overlaps with
system memory (which ram0 attempts to reserve) or a local or I/O APIC
(which apic0 attempts to reserve). These are always harmless but look
scary to users.
Modified:
stable/9/sys/dev/acpica/acpi.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/dev/acpica/acpi.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/sys/dev/acpica/acpi.c
==
--- stable/9/sys/dev/acpica/acpi.c Thu Apr 23 22:20:43 2015
(r281909)
+++ stable/9/sys/dev/acpica/acpi.c Thu Apr 23 22:39:32 2015
(r281910)
@@ -1112,7 +1112,7 @@ acpi_sysres_alloc(device_t dev)
if (res != NULL) {
rman_manage_region(rm, rman_get_start(res), rman_get_end(res));
rle->res = res;
- } else
+ } else if (bootverbose)
device_printf(dev, "reservation of %lx, %lx (%d) failed\n",
rle->start, rle->count, rle->type);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281909 - in head/sys: arm/conf arm/freescale/imx conf
Author: andrew Date: Thu Apr 23 22:20:43 2015 New Revision: 281909 URL: https://svnweb.freebsd.org/changeset/base/281909 Log: Add the SOC_IMX51, SOC_IMX53, and SOC_IMX6 options. These are used to select which SoCs the kernel config will support. Use these options to merge files.imx51 and files.imx53. Added: head/sys/arm/freescale/imx/files.imx5 - copied, changed from r281907, head/sys/arm/freescale/imx/files.imx53 Deleted: head/sys/arm/freescale/imx/files.imx51 head/sys/arm/freescale/imx/files.imx53 Modified: head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/freescale/imx/std.imx51 head/sys/arm/freescale/imx/std.imx53 head/sys/conf/options.arm Modified: head/sys/arm/conf/EFIKA_MX == --- head/sys/arm/conf/EFIKA_MX Thu Apr 23 22:06:02 2015(r281908) +++ head/sys/arm/conf/EFIKA_MX Thu Apr 23 22:20:43 2015(r281909) @@ -24,6 +24,8 @@ include "../freescale/imx/std.imx51" makeoptionsWITHOUT_MODULES="ahc" +optionsSOC_IMX51 + optionsSCHED_4BSD # 4BSD scheduler optionsPREEMPTION # Enable kernel thread preemption optionsINET# InterNETworking Modified: head/sys/arm/conf/IMX53 == --- head/sys/arm/conf/IMX53 Thu Apr 23 22:06:02 2015(r281908) +++ head/sys/arm/conf/IMX53 Thu Apr 23 22:20:43 2015(r281909) @@ -22,6 +22,8 @@ ident IMX53 include"../freescale/imx/std.imx53" +optionsSOC_IMX53 + optionsSCHED_4BSD # 4BSD scheduler optionsPREEMPTION # Enable kernel thread preemption optionsINET# InterNETworking Modified: head/sys/arm/conf/IMX6 == --- head/sys/arm/conf/IMX6 Thu Apr 23 22:06:02 2015(r281908) +++ head/sys/arm/conf/IMX6 Thu Apr 23 22:20:43 2015(r281909) @@ -21,6 +21,8 @@ ident IMX6 include"../freescale/imx/std.imx6" +optionsSOC_IMX6 + optionsHZ=500 # Scheduling quantum is 2 milliseconds. optionsSCHED_ULE # ULE scheduler optionsPREEMPTION # Enable kernel thread preemption Copied and modified: head/sys/arm/freescale/imx/files.imx5 (from r281907, head/sys/arm/freescale/imx/files.imx53) == --- head/sys/arm/freescale/imx/files.imx53 Thu Apr 23 21:39:32 2015 (r281907, copy source) +++ head/sys/arm/freescale/imx/files.imx5 Thu Apr 23 22:20:43 2015 (r281909) @@ -6,7 +6,8 @@ kern/kern_clocksource.c standard # Init arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_machdep.cstandard -arm/freescale/imx/imx53_machdep.c standard +arm/freescale/imx/imx51_machdep.c optionalsoc_imx51 +arm/freescale/imx/imx53_machdep.c optionalsoc_imx53 arm/arm/bus_space_base.c standard # Special serial console for debuging early boot code Modified: head/sys/arm/freescale/imx/std.imx51 == --- head/sys/arm/freescale/imx/std.imx51Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/freescale/imx/std.imx51Thu Apr 23 22:20:43 2015 (r281909) @@ -13,5 +13,4 @@ options PHYSADDR=0x9000 device fdt_pinctrl -files "../freescale/imx/files.imx51" - +files "../freescale/imx/files.imx5" Modified: head/sys/arm/freescale/imx/std.imx53 == --- head/sys/arm/freescale/imx/std.imx53Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/freescale/imx/std.imx53Thu Apr 23 22:20:43 2015 (r281909) @@ -13,5 +13,4 @@ options PHYSADDR=0x7000 device fdt_pinctrl -files "../freescale/imx/files.imx53" - +files "../freescale/imx/files.imx5" Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Thu Apr 23 22:06:02 2015(r281908) +++ head/sys/conf/options.arm Thu Apr 23 22:20:43 2015(r281909) @@ -40,6 +40,9 @@ PV_STATS opt_pmap.h QEMU_WORKAROUNDS opt_global.h SOC_BCM2835opt_global.h SOC_BCM2836opt_global.h +SOC_IMX51 opt_global.h +SOC_IMX53 opt_global.h +SOC_IMX6 opt_global.h SOC_MV_ARMADAXPopt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_DOVEopt_global.h ___ svn-src-all@freebsd.org ma
svn commit: r281908 - in stable: 10/contrib/llvm/lib/MC/MCParser 10/contrib/llvm/patches 9/contrib/llvm/lib/MC/MCParser 9/contrib/llvm/patches
Author: dim
Date: Thu Apr 23 22:06:02 2015
New Revision: 281908
URL: https://svnweb.freebsd.org/changeset/base/281908
Log:
MFC r281775:
Pull in r229911 from upstream llvm trunk (by Benjamin Kramer):
MC: Allow multiple comma-separated expressions on the .uleb128 directive.
For compatiblity with GNU as. Binutils documents this as
'.uleb128 expressions'. Subtle, isn't it?
Reported by: sbruno
PR: 199554
MFC r281777:
Add llvm patch corresponding to r281775.
Added:
stable/10/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
- copied unchanged from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
Modified:
stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Added:
stable/9/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
- copied unchanged from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
Modified:
stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
Directory Properties:
stable/9/contrib/llvm/ (props changed)
Modified: stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
==
--- stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cppThu Apr 23
21:39:32 2015(r281907)
+++ stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cppThu Apr 23
22:06:02 2015(r281908)
@@ -3370,21 +3370,27 @@ bool AsmParser::parseDirectiveSpace(Stri
}
/// parseDirectiveLEB128
-/// ::= (.sleb128 | .uleb128) expression
+/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ]
bool AsmParser::parseDirectiveLEB128(bool Signed) {
checkForValidSection();
const MCExpr *Value;
- if (parseExpression(Value))
-return true;
+ for (;;) {
+if (parseExpression(Value))
+ return true;
- if (getLexer().isNot(AsmToken::EndOfStatement))
-return TokError("unexpected token in directive");
+if (Signed)
+ getStreamer().EmitSLEB128Value(Value);
+else
+ getStreamer().EmitULEB128Value(Value);
- if (Signed)
-getStreamer().EmitSLEB128Value(Value);
- else
-getStreamer().EmitULEB128Value(Value);
+if (getLexer().is(AsmToken::EndOfStatement))
+ break;
+
+if (getLexer().isNot(AsmToken::Comma))
+ return TokError("unexpected token in directive");
+Lex();
+ }
return false;
}
Copied:
stable/10/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
(from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
stable/10/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
Thu Apr 23 22:06:02 2015(r281908, copy of r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff)
@@ -0,0 +1,77 @@
+Pull in r229911 from upstream llvm trunk (by Benjamin Kramer):
+
+ MC: Allow multiple comma-separated expressions on the .uleb128 directive.
+
+ For compatiblity with GNU as. Binutils documents this as
+ '.uleb128 expressions'. Subtle, isn't it?
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/281775
+
+Index: lib/MC/MCParser/AsmParser.cpp
+===
+--- lib/MC/MCParser/AsmParser.cpp
lib/MC/MCParser/AsmParser.cpp
+@@ -3636,22 +3636,28 @@ bool AsmParser::parseDirectiveSpace(StringRef IDVa
+ }
+
+ /// parseDirectiveLEB128
+-/// ::= (.sleb128 | .uleb128) expression
++/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ]
+ bool AsmParser::parseDirectiveLEB128(bool Signed) {
+ checkForValidSection();
+ const MCExpr *Value;
+
+- if (parseExpression(Value))
+-return true;
++ for (;;) {
++if (parseExpression(Value))
++ return true;
+
+- if (getLexer().isNot(AsmToken::EndOfStatement))
+-return TokError("unexpected token in directive");
++if (Signed)
++ getStreamer().EmitSLEB128Value(Value);
++else
++ getStreamer().EmitULEB128Value(Value);
+
+- if (Signed)
+-getStreamer().EmitSLEB128Value(Value);
+- else
+-getStreamer().EmitULEB128Value(Value);
++if (getLexer().is(AsmToken::EndOfStatement))
++ break;
+
++if (getLexer().isNot(AsmToken::Comma))
++ return TokError("unexpected token in directive");
++Lex();
++ }
++
+ return false;
+ }
+
+Index: test/MC/ELF/uleb.s
+===
+--- test/MC/ELF/uleb.s
test/MC/ELF/uleb.s
+@@ -11,16 +11,17 @@ foo:
+ .uleb128128
+ .uleb12816383
+ .uleb12816384
++.uleb128 23, 42
+
+ // ELF_32: Name: .text
+ // ELF_32: SectionData (
+-// ELF_32: : 00017F80 01FF7F80 8001
++// ELF_32:
svn commit: r281908 - in stable: 10/contrib/llvm/lib/MC/MCParser 10/contrib/llvm/patches 9/contrib/llvm/lib/MC/MCParser 9/contrib/llvm/patches
Author: dim
Date: Thu Apr 23 22:06:02 2015
New Revision: 281908
URL: https://svnweb.freebsd.org/changeset/base/281908
Log:
MFC r281775:
Pull in r229911 from upstream llvm trunk (by Benjamin Kramer):
MC: Allow multiple comma-separated expressions on the .uleb128 directive.
For compatiblity with GNU as. Binutils documents this as
'.uleb128 expressions'. Subtle, isn't it?
Reported by: sbruno
PR: 199554
MFC r281777:
Add llvm patch corresponding to r281775.
Added:
stable/9/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
- copied unchanged from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
Modified:
stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
Directory Properties:
stable/9/contrib/llvm/ (props changed)
Changes in other areas also in this revision:
Added:
stable/10/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
- copied unchanged from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
Modified:
stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
==
--- stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Thu Apr 23 21:39:32
2015(r281907)
+++ stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Thu Apr 23 22:06:02
2015(r281908)
@@ -3370,21 +3370,27 @@ bool AsmParser::parseDirectiveSpace(Stri
}
/// parseDirectiveLEB128
-/// ::= (.sleb128 | .uleb128) expression
+/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ]
bool AsmParser::parseDirectiveLEB128(bool Signed) {
checkForValidSection();
const MCExpr *Value;
- if (parseExpression(Value))
-return true;
+ for (;;) {
+if (parseExpression(Value))
+ return true;
- if (getLexer().isNot(AsmToken::EndOfStatement))
-return TokError("unexpected token in directive");
+if (Signed)
+ getStreamer().EmitSLEB128Value(Value);
+else
+ getStreamer().EmitULEB128Value(Value);
- if (Signed)
-getStreamer().EmitSLEB128Value(Value);
- else
-getStreamer().EmitULEB128Value(Value);
+if (getLexer().is(AsmToken::EndOfStatement))
+ break;
+
+if (getLexer().isNot(AsmToken::Comma))
+ return TokError("unexpected token in directive");
+Lex();
+ }
return false;
}
Copied:
stable/9/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
(from r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
stable/9/contrib/llvm/patches/patch-r281775-llvm-r229911-uleb128-commas.diff
Thu Apr 23 22:06:02 2015(r281908, copy of r281777,
head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff)
@@ -0,0 +1,77 @@
+Pull in r229911 from upstream llvm trunk (by Benjamin Kramer):
+
+ MC: Allow multiple comma-separated expressions on the .uleb128 directive.
+
+ For compatiblity with GNU as. Binutils documents this as
+ '.uleb128 expressions'. Subtle, isn't it?
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/281775
+
+Index: lib/MC/MCParser/AsmParser.cpp
+===
+--- lib/MC/MCParser/AsmParser.cpp
lib/MC/MCParser/AsmParser.cpp
+@@ -3636,22 +3636,28 @@ bool AsmParser::parseDirectiveSpace(StringRef IDVa
+ }
+
+ /// parseDirectiveLEB128
+-/// ::= (.sleb128 | .uleb128) expression
++/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ]
+ bool AsmParser::parseDirectiveLEB128(bool Signed) {
+ checkForValidSection();
+ const MCExpr *Value;
+
+- if (parseExpression(Value))
+-return true;
++ for (;;) {
++if (parseExpression(Value))
++ return true;
+
+- if (getLexer().isNot(AsmToken::EndOfStatement))
+-return TokError("unexpected token in directive");
++if (Signed)
++ getStreamer().EmitSLEB128Value(Value);
++else
++ getStreamer().EmitULEB128Value(Value);
+
+- if (Signed)
+-getStreamer().EmitSLEB128Value(Value);
+- else
+-getStreamer().EmitULEB128Value(Value);
++if (getLexer().is(AsmToken::EndOfStatement))
++ break;
+
++if (getLexer().isNot(AsmToken::Comma))
++ return TokError("unexpected token in directive");
++Lex();
++ }
++
+ return false;
+ }
+
+Index: test/MC/ELF/uleb.s
+===
+--- test/MC/ELF/uleb.s
test/MC/ELF/uleb.s
+@@ -11,16 +11,17 @@ foo:
+ .uleb128128
+ .uleb12816383
+ .uleb12816384
++.uleb128 23, 42
+
+ // ELF_32: Name: .text
+ // ELF_32: SectionData (
+-// ELF_32: : 00017F80 01FF7F80 8001
++// ELF_32: : 00017F80
Re: svn commit: r281888 - head/usr.bin/nfsstat
John Baldwin wrote: > On Thursday, April 23, 2015 02:36:02 PM Edward Tomasz Napierala > wrote: > > Author: trasz > > Date: Thu Apr 23 14:36:01 2015 > > New Revision: 281888 > > URL: https://svnweb.freebsd.org/changeset/base/281888 > > > > Log: > > Remove oldnfs support from nfsstat(1). > > > > Reviewed by: rmacklem@ (earlier version) > > Sponsored by: The FreeBSD Foundation > > > > Modified: > > head/usr.bin/nfsstat/nfsstat.1 > > head/usr.bin/nfsstat/nfsstat.c > > It might be nice to rename the "new" datastructure names as well, so > that > ext_nfsstats would just be nfsstats. > Actually, I hope to soon add a new revision of "nfsstats", so that the "iostat like stats" can be supported (D1626) and also make all the fields uint64_t, so they don't wrap. Maybe I can all that one "nfsstats"? ;-) Btw, if you have a suggestion for the best way to acquire this new structure from the kernel, please let me know. (I was planning on code that would copy this new one to ext_nfsstats when it is acquired by an old binary.) rick > -- > John Baldwin > > ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281907 - head/sys/arm/freescale/imx
Author: andrew Date: Thu Apr 23 21:39:32 2015 New Revision: 281907 URL: https://svnweb.freebsd.org/changeset/base/281907 Log: Reduce the diff between files.imx51 and files.imx53 Modified: head/sys/arm/freescale/imx/files.imx51 head/sys/arm/freescale/imx/files.imx53 Modified: head/sys/arm/freescale/imx/files.imx51 == --- head/sys/arm/freescale/imx/files.imx51 Thu Apr 23 21:31:06 2015 (r281906) +++ head/sys/arm/freescale/imx/files.imx51 Thu Apr 23 21:39:32 2015 (r281907) @@ -9,9 +9,12 @@ arm/freescale/imx/imx_machdep.cstandar arm/freescale/imx/imx51_machdep.c standard arm/arm/bus_space_base.c standard -# Dummy serial console +# Special serial console for debuging early boot code #arm/freescale/imx/console.c standard +# UART driver (includes serial console support) +dev/uart/uart_dev_imx.coptional uart + # TrustZone Interrupt Controller arm/freescale/imx/tzic.c standard @@ -30,9 +33,6 @@ arm/freescale/imx/imx51_ccm.c standard # i.MX5xx PATA controller dev/ata/chipsets/ata-fsl.c optional imxata -# UART driver -dev/uart/uart_dev_imx.coptional uart - # USB OH3 controller (1 OTG, 3 EHCI) arm/freescale/imx/imx_nop_usbphy.c optional ehci dev/usb/controller/ehci_imx.c optional ehci Modified: head/sys/arm/freescale/imx/files.imx53 == --- head/sys/arm/freescale/imx/files.imx53 Thu Apr 23 21:31:06 2015 (r281906) +++ head/sys/arm/freescale/imx/files.imx53 Thu Apr 23 21:39:32 2015 (r281907) @@ -13,7 +13,7 @@ arm/arm/bus_space_base.c standard #arm/freescale/imx/console.c standard # UART driver (includes serial console support) -dev/uart/uart_dev_imx.coptional uart +dev/uart/uart_dev_imx.coptional uart # TrustZone Interrupt Controller arm/freescale/imx/tzic.c standard ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281906 - head/sys/arm/conf
Author: andrew Date: Thu Apr 23 21:31:06 2015 New Revision: 281906 URL: https://svnweb.freebsd.org/changeset/base/281906 Log: Pull out the common parts of the ODROIDC1 and VSATV102 kernels to a new kernel config. This also removes the per-board config files from universe. Added: head/sys/arm/conf/AML8726 (contents, props changed) Modified: head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/VSATV102 Added: head/sys/arm/conf/AML8726 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/AML8726 Thu Apr 23 21:31:06 2015(r281906) @@ -0,0 +1,143 @@ +# +# Kernel configuration for Amlogic aml8726 boards. +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +ident AML8726 +include"../amlogic/aml8726/std.aml8726" + +optionsHZ=100 +optionsSCHED_ULE # ULE scheduler +optionsPREEMPTION # Enable kernel thread preemption +optionsINET# InterNETworking +optionsINET6 # IPv6 communications protocols +optionsSCTP# Stream Control Transmission Protocol +optionsFFS # Berkeley Fast Filesystem +optionsSOFTUPDATES # Enable FFS soft updates support +optionsUFS_ACL # Support for access control lists +optionsUFS_DIRHASH # Improve performance on big directories +optionsUFS_GJOURNAL# Enable gjournal-based UFS journaling +optionsQUOTA # Enable disk quotas for UFS +optionsNFSCL # Network Filesystem Client +optionsNFSLOCKD# Network Lock Manager +optionsNFS_ROOT# NFS usable as /, requires NFSCL +optionsMSDOSFS # MSDOS Filesystem +optionsCD9660 # ISO 9660 Filesystem +optionsPROCFS # Process filesystem (requires PSEUDOFS) +optionsPSEUDOFS# Pseudo-filesystem framework +optionsTMPFS # Efficient memory filesystem +optionsGEOM_PART_GPT # GUID Partition Tables +optionsGEOM_PART_BSD # BSD partition scheme +optionsGEOM_PART_MBR # MBR partition scheme +optionsCOMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +optionsSCSI_DELAY=5000 # Delay (in ms) before probing SCSI +optionsKTRACE # ktrace(1) support +optionsSYSVSHM # SYSV-style shared memory +optionsSYSVMSG # SYSV-style message queues +optionsSYSVSEM # SYSV-style semaphores +options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +optionsPRINTF_BUFR_SIZE=128# Prevent printf output being interspersed. +optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev +optionsFREEBSD_BOOT_LOADER # Process metadata passed from loader(8) +optionsLINUX_BOOT_ABI +optionsVFP # Enable floating point hardware support +optionsSMP # Enable multiple cores + +# Debugging +makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols +optionsALT_BREAK_TO_DEBUGGER +#options VERBOSE_SYSINIT # Enable verbose sysinit messages +optionsBOOTVERBOSE=1 +optionsKDB # Enable kernel debugger support +# For minimum debugger support (stable branch) use: +#options KDB_TRACE # Print a stack trace for a panic +# For full debugger support use this instead: +optionsDDB # Enable the kernel debugger +optionsINVARIANTS # Enable calls of extra sanity checking +optionsINVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +optionsWITNESS # Enable checks to detect deadlocks and cycles +optionsWITNESS_SKIPSPIN# Don't run witness on spinlocks for speed +#options DIAGNOSTIC + +# NFS root from boopt/dhcp +#options BOOTP +#options
svn commit: r281905 - in head/sys/arm: amlogic/aml8726 conf
Author: andrew Date: Thu Apr 23 20:53:29 2015 New Revision: 281905 URL: https://svnweb.freebsd.org/changeset/base/281905 Log: Remove the need for board specific std files on aml8726 by moving the options they set to the main kernel config. Deleted: head/sys/arm/amlogic/aml8726/std.odroidc1 head/sys/arm/amlogic/aml8726/std.vsatv102-m6 Modified: head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/VSATV102 Modified: head/sys/arm/conf/ODROIDC1 == --- head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:43:24 2015(r281904) +++ head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:53:29 2015(r281905) @@ -19,7 +19,7 @@ ident ODROIDC1 -include"../amlogic/aml8726/std.odroidc1" +include"../amlogic/aml8726/std.aml8726" optionsHZ=100 optionsSCHED_ULE # ULE scheduler @@ -56,6 +56,7 @@ options KBD_INSTALL_CDEV# install a CD optionsFREEBSD_BOOT_LOADER # Process metadata passed from loader(8) optionsLINUX_BOOT_ABI optionsVFP # Enable floating point hardware support +optionsSMP # Enable multiple cores # Debugging makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols @@ -141,3 +142,4 @@ device axe # ASIX Electronics USB Eth # Flattened Device Tree optionsFDT # Configure using FDT/DTB data optionsFDT_DTB_STATIC +makeoptionsFDT_DTS_FILE=odroidc1.dts Modified: head/sys/arm/conf/VSATV102 == --- head/sys/arm/conf/VSATV102 Thu Apr 23 20:43:24 2015(r281904) +++ head/sys/arm/conf/VSATV102 Thu Apr 23 20:53:29 2015(r281905) @@ -19,7 +19,7 @@ ident ODROIDC1 -include"../amlogic/aml8726/std.vsatv102-m6" +include"../amlogic/aml8726/std.aml8726" optionsHZ=100 optionsSCHED_ULE # ULE scheduler @@ -56,6 +56,7 @@ options KBD_INSTALL_CDEV# install a CD optionsFREEBSD_BOOT_LOADER # Process metadata passed from loader(8) optionsLINUX_BOOT_ABI optionsVFP # Enable floating point hardware support +optionsSMP # Enable multiple cores # Debugging makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols @@ -141,3 +142,4 @@ device axe # ASIX Electronics USB Eth # Flattened Device Tree optionsFDT # Configure using FDT/DTB data optionsFDT_DTB_STATIC +makeoptionsFDT_DTS_FILE=vsatv102-m6.dts ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281904 - head/sys/arm/amlogic/aml8726
Author: andrew Date: Thu Apr 23 20:43:24 2015 New Revision: 281904 URL: https://svnweb.freebsd.org/changeset/base/281904 Log: Move KERNVIRTADDR to the common std.aml8726. Modified: head/sys/arm/amlogic/aml8726/std.aml8726 head/sys/arm/amlogic/aml8726/std.odroidc1 head/sys/arm/amlogic/aml8726/std.vsatv102-m6 Modified: head/sys/arm/amlogic/aml8726/std.aml8726 == --- head/sys/arm/amlogic/aml8726/std.aml8726Thu Apr 23 20:39:40 2015 (r281903) +++ head/sys/arm/amlogic/aml8726/std.aml8726Thu Apr 23 20:43:24 2015 (r281904) @@ -4,6 +4,15 @@ cpuCPU_CORTEXA machinearm armv6 makeoptionsCONF_CFLAGS="-march=armv7a" +# Physical memory starts at 0x8000. We assume the kernel is loaded +# at 0x8010 by u-boot (which doesn't support ubldr since it's missing +# CONFIG_API). The kernel must be supplied as a binary since u-boot is +# also missing CONFIG_CMD_ELF. +# +# +optionsKERNVIRTADDR=0xc010 # Used in ldscript.arm +makeoptionsKERNVIRTADDR=0xc010 + device fdt_pinctrl files "../amlogic/aml8726/files.aml8726" Modified: head/sys/arm/amlogic/aml8726/std.odroidc1 == --- head/sys/arm/amlogic/aml8726/std.odroidc1 Thu Apr 23 20:39:40 2015 (r281903) +++ head/sys/arm/amlogic/aml8726/std.odroidc1 Thu Apr 23 20:43:24 2015 (r281904) @@ -5,12 +5,3 @@ include"../amlogic/aml8726/std.aml8726 makeoptionsFDT_DTS_FILE=odroidc1.dts optionsSMP # Enable multiple cores - -# Physical memory starts at 0x. We assume the kernel is loaded -# at 0x0010 by u-boot (which doesn't support ubldr since it's missing -# CONFIG_API). The kernel must be supplied as a binary since u-boot is -# also missing CONFIG_CMD_ELF. -# -# -optionsKERNVIRTADDR=0xc010 # Used in ldscript.arm -makeoptionsKERNVIRTADDR=0xc010 Modified: head/sys/arm/amlogic/aml8726/std.vsatv102-m6 == --- head/sys/arm/amlogic/aml8726/std.vsatv102-m6Thu Apr 23 20:39:40 2015(r281903) +++ head/sys/arm/amlogic/aml8726/std.vsatv102-m6Thu Apr 23 20:43:24 2015(r281904) @@ -5,12 +5,3 @@ include"../amlogic/aml8726/std.aml8726 makeoptionsFDT_DTS_FILE=vsatv102-m6.dts optionsSMP # Enable multiple cores - -# Physical memory starts at 0x8000. We assume the kernel is loaded -# at 0x8010 by u-boot (which doesn't support ubldr since it's missing -# CONFIG_API). The kernel must be supplied as a binary since u-boot is -# also missing CONFIG_CMD_ELF. -# -# -optionsKERNVIRTADDR=0xc010 # Used in ldscript.arm -makeoptionsKERNVIRTADDR=0xc010 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281903 - head/sys/arm/amlogic/aml8726
Author: andrew Date: Thu Apr 23 20:39:40 2015 New Revision: 281903 URL: https://svnweb.freebsd.org/changeset/base/281903 Log: - Move files selected in files.smp to files.aml8726 and remove it. - Remove a redundant file from files.aml8726 Deleted: head/sys/arm/amlogic/aml8726/files.smp Modified: head/sys/arm/amlogic/aml8726/files.aml8726 head/sys/arm/amlogic/aml8726/std.odroidc1 head/sys/arm/amlogic/aml8726/std.vsatv102-m6 Modified: head/sys/arm/amlogic/aml8726/files.aml8726 == --- head/sys/arm/amlogic/aml8726/files.aml8726 Thu Apr 23 20:28:56 2015 (r281902) +++ head/sys/arm/amlogic/aml8726/files.aml8726 Thu Apr 23 20:39:40 2015 (r281903) @@ -4,12 +4,13 @@ kern/kern_clocksource.c standard arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.cstandard -arm/arm/bus_space_asm_generic.Sstandard +arm/arm/gic.c standard arm/arm/pl310.cstandard arm/amlogic/aml8726/aml8726_l2cache.c standard arm/amlogic/aml8726/aml8726_machdep.c standard +arm/amlogic/aml8726/aml8726_mp.c optionalsmp arm/amlogic/aml8726/aml8726_identsoc.c standard arm/amlogic/aml8726/aml8726_ccm.c standard arm/amlogic/aml8726/aml8726_clkmsr.c standard Modified: head/sys/arm/amlogic/aml8726/std.odroidc1 == --- head/sys/arm/amlogic/aml8726/std.odroidc1 Thu Apr 23 20:28:56 2015 (r281902) +++ head/sys/arm/amlogic/aml8726/std.odroidc1 Thu Apr 23 20:39:40 2015 (r281903) @@ -5,7 +5,6 @@ include "../amlogic/aml8726/std.aml8726 makeoptionsFDT_DTS_FILE=odroidc1.dts optionsSMP # Enable multiple cores -files "../amlogic/aml8726/files.smp" # Physical memory starts at 0x. We assume the kernel is loaded # at 0x0010 by u-boot (which doesn't support ubldr since it's missing Modified: head/sys/arm/amlogic/aml8726/std.vsatv102-m6 == --- head/sys/arm/amlogic/aml8726/std.vsatv102-m6Thu Apr 23 20:28:56 2015(r281902) +++ head/sys/arm/amlogic/aml8726/std.vsatv102-m6Thu Apr 23 20:39:40 2015(r281903) @@ -5,7 +5,6 @@ include "../amlogic/aml8726/std.aml8726 makeoptionsFDT_DTS_FILE=vsatv102-m6.dts optionsSMP # Enable multiple cores -files "../amlogic/aml8726/files.smp" # Physical memory starts at 0x8000. We assume the kernel is loaded # at 0x8010 by u-boot (which doesn't support ubldr since it's missing ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281901 - head/sys/dev/kbdmux
Thank you! On 04/23/15 15:26, Ed Maste wrote: Author: emaste Date: Thu Apr 23 20:26:22 2015 New Revision: 281901 URL: https://svnweb.freebsd.org/changeset/base/281901 Log: Revert r281889, it broke keyboard input Modified: head/sys/dev/kbdmux/kbdmux.c For the record: I did test the patch and my keyboard is still working. Pedro. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281902 - head/sys/arm/conf
Author: andrew Date: Thu Apr 23 20:28:56 2015 New Revision: 281902 URL: https://svnweb.freebsd.org/changeset/base/281902 Log: Update the ODROIDC1 and VSATV102 to reduce the diff to the other armv6 kernel config files. Modified: head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/VSATV102 Modified: head/sys/arm/conf/ODROIDC1 == --- head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:26:22 2015(r281901) +++ head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:28:56 2015(r281902) @@ -1,7 +1,7 @@ # ODROIDC1 -- Custom configuration for the HardKernel ODROID-C1 SBC # -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # @@ -19,50 +19,60 @@ ident ODROIDC1 -include"../amlogic/aml8726/std.odroidc1" +include"../amlogic/aml8726/std.odroidc1" -optionsHZ=100 -optionsSCHED_ULE # ULE scheduler -optionsPREEMPTION # Enable kernel thread preemption -optionsINET# InterNETworking -optionsINET6 # IPv6 communications protocols -optionsFFS # Berkeley Fast Filesystem -optionsSOFTUPDATES # Enable FFS soft updates support -optionsUFS_ACL # Support for access control lists -optionsUFS_DIRHASH # Improve performance on big directories -optionsPROCFS # Process filesystem (requires PSEUDOFS) -optionsPSEUDOFS# Pseudo-filesystem framework -optionsGEOM_PART_BSD # BSD partition scheme -optionsGEOM_PART_MBR # MBR partition scheme -optionsSCSI_DELAY=5000 # Delay (in ms) before probing SCSI -optionsKTRACE # ktrace(1) support -optionsSYSVSHM # SYSV-style shared memory -optionsSYSVMSG # SYSV-style message queues -optionsSYSVSEM # SYSV-style semaphores -options_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions -optionsPRINTF_BUFR_SIZE=128# Prevent printf output being interspersed. -optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev -optionsLINUX_BOOT_ABI -optionsVFP # vfp/neon +optionsHZ=100 +optionsSCHED_ULE # ULE scheduler +optionsPREEMPTION # Enable kernel thread preemption +optionsINET# InterNETworking +optionsINET6 # IPv6 communications protocols +optionsSCTP# Stream Control Transmission Protocol +optionsFFS # Berkeley Fast Filesystem +optionsSOFTUPDATES # Enable FFS soft updates support +optionsUFS_ACL # Support for access control lists +optionsUFS_DIRHASH # Improve performance on big directories +optionsUFS_GJOURNAL# Enable gjournal-based UFS journaling +optionsQUOTA # Enable disk quotas for UFS +optionsNFSCL # Network Filesystem Client +optionsNFSLOCKD# Network Lock Manager +optionsNFS_ROOT# NFS usable as /, requires NFSCL +optionsMSDOSFS # MSDOS Filesystem +optionsCD9660 # ISO 9660 Filesystem +optionsPROCFS # Process filesystem (requires PSEUDOFS) +optionsPSEUDOFS# Pseudo-filesystem framework +optionsTMPFS # Efficient memory filesystem +optionsGEOM_PART_GPT # GUID Partition Tables +optionsGEOM_PART_BSD # BSD partition scheme +optionsGEOM_PART_MBR # MBR partition scheme +optionsCOMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +optionsSCSI_DELAY=5000 # Delay (in ms) before probing SCSI +optionsKTRACE # ktrace(1) support +optionsSYSVSHM # SYSV-style shared memory +optionsSYSVMSG # SYSV-style message queues +optionsSYSVSEM # SYSV-style semaphores +options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +optionsPRINTF_BUFR_SIZE=128# Prevent printf output being interspersed. +optionsKBD_INSTAL
svn commit: r281901 - head/sys/dev/kbdmux
Author: emaste
Date: Thu Apr 23 20:26:22 2015
New Revision: 281901
URL: https://svnweb.freebsd.org/changeset/base/281901
Log:
Revert r281889, it broke keyboard input
Modified:
head/sys/dev/kbdmux/kbdmux.c
Modified: head/sys/dev/kbdmux/kbdmux.c
==
--- head/sys/dev/kbdmux/kbdmux.cThu Apr 23 19:50:22 2015
(r281900)
+++ head/sys/dev/kbdmux/kbdmux.cThu Apr 23 20:26:22 2015
(r281901)
@@ -472,11 +472,6 @@ kbdmux_init(int unit, keyboard_t **kbdp,
KBDMUX_UNLOCK(state);
}
- if (needfree) {
- free(accmap, M_KBDMUX);
- free(fkeymap, M_KBDMUX);
- free(keymap, M_KBDMUX);
- }
return (0);
bad:
if (needfree) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281889 - head/sys/dev/kbdmux
On 23 April 2015 at 10:53, Pedro F. Giffuni wrote: > Author: pfg > Date: Thu Apr 23 14:53:45 2015 > New Revision: 281889 > URL: https://svnweb.freebsd.org/changeset/base/281889 accmap, fkeymap and keymap are passed to kbd_set_maps at line 1390. After r281889 kbd has references to these freed maps and the keyboard doesn't work. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281442 - head/sys/kern
On Sat, Apr 11, 2015 at 8:51 PM, Will Andrews wrote: > Author: will > Date: Sat Apr 11 18:51:41 2015 > New Revision: 281442 > URL: https://svnweb.freebsd.org/changeset/base/281442 > > Log: > uiomove_object_page(): Avoid instantiating pages in sparse regions on reads. > > Check whether the page being requested is either resident or on swap. If > not, read from the zero_region instead of instantiating an unnecessary page. > > This avoids consuming memory for sparse files on tmpfs, when they are read > by applications that do not use SEEK_HOLE/SEEK_DATA (which is most of them). > > Reviewed by: kib > MFC after:1 week > Sponsored by: Spectra Logic Hi, We have a daily panic on one of the package builders: https://reviews.freebsd.org/P60 Reverting this commit seems to fix the panic. Cheers, Antoine ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281900 - head/sys/arm/conf
Author: loos Date: Thu Apr 23 19:50:22 2015 New Revision: 281900 URL: https://svnweb.freebsd.org/changeset/base/281900 Log: Now that we have an U-Boot for RPI2, do not use the static DTB compiled into the kernel, which is used mostly on early development stages. On RPI(2) the DTB is loaded and modified by firmware and then handed to kernel via U-Boot and ubldr. The RPI firmware adds (or modify) a few valuable data to the in memory DTB, like: - System memory; - Ethernet MAC address; - framebuffer settings; - Board serial and revision; - clock-frequency for most of devices. Modified: head/sys/arm/conf/RPI2 Modified: head/sys/arm/conf/RPI2 == --- head/sys/arm/conf/RPI2 Thu Apr 23 18:36:36 2015(r281899) +++ head/sys/arm/conf/RPI2 Thu Apr 23 19:50:22 2015(r281900) @@ -137,6 +137,6 @@ device bcm2835_spi optionsFDT # Configure using FDT/DTB data # Note: DTB is normally loaded and modified by RPi boot loader, then # handed to kernel via U-Boot and ubldr. -optionsFDT_DTB_STATIC -makeoptionsFDT_DTS_FILE=rpi2.dts +#options FDT_DTB_STATIC +#makeoptions FDT_DTS_FILE=rpi2.dts makeoptionsMODULES_EXTRA=dtb/rpi ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281451 - head/sys/vm
On Thu, Apr 23, 2015 at 12:49:51PM -0600, Scott Long wrote: > > > On Apr 23, 2015, at 6:19 AM, Scott Long wrote: > > > >> > >> On Apr 12, 2015, at 12:21 AM, Dmitry Chagin wrote: > >> > >> Author: dchagin > >> Date: Sun Apr 12 06:21:58 2015 > >> New Revision: 281451 > >> URL: https://svnweb.freebsd.org/changeset/base/281451 > >> > >> Log: > >> Rework r281162. Indeed, the flexible array member is preferable here. > >> > >> Suggested by: Justin T. Gibbs > >> > >> MFC after: 3 days > >> > >> Modified: > >> head/sys/vm/uma_core.c > >> head/sys/vm/uma_int.h > > > > There???s still something wrong with this. I have a machine with 28 cores > > (56 with hyperthreading) and 256GB of RAM, and ever since you committed > > r281162, it panics early in boot with a failed assertion. It looks like > > the first few members of a uma_slab_t are getting overwritten accidentally, > > and somehow the padding of the extra member in the uma_zone_t was > > previously protecting it. I don???t know the exact cause yet, but I must > > ask that you revert to r281161 in HEAD and stable/10 until the problem is > > resolved. > > > > I think the problem is that the masterzone_k and masterzone_z objects that > are statically allocated in uma_core.c no longer have space for the uz_cpu > field, but uma_zalloc_arg() always assumes that it???s there. Early in boot > when the ???kegs' and ???zones??? zones are being initialized, there???s only > 1 CPU so pre-allocating 1 uz_cpu element in the uma_zone is enough. I > can???t see any way around this without significantly changing how > uma_zalloc_arg() treats per-cpu caches. I think it???s best to revert this > change. > Hi, they initialized in uma_startup() and not used before. I have a private converstion with a man which stable/10 hangs in vm_mem_init().\ with my commit. weird. I do not object to revert, but give me a chance to figure out what's going on. -- Have fun! chd ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281451 - head/sys/vm
> On Apr 23, 2015, at 6:19 AM, Scott Long wrote: > >> >> On Apr 12, 2015, at 12:21 AM, Dmitry Chagin wrote: >> >> Author: dchagin >> Date: Sun Apr 12 06:21:58 2015 >> New Revision: 281451 >> URL: https://svnweb.freebsd.org/changeset/base/281451 >> >> Log: >> Rework r281162. Indeed, the flexible array member is preferable here. >> >> Suggested by: Justin T. Gibbs >> >> MFC after: 3 days >> >> Modified: >> head/sys/vm/uma_core.c >> head/sys/vm/uma_int.h > > There’s still something wrong with this. I have a machine with 28 cores (56 > with hyperthreading) and 256GB of RAM, and ever since you committed r281162, > it panics early in boot with a failed assertion. It looks like the first few > members of a uma_slab_t are getting overwritten accidentally, and somehow the > padding of the extra member in the uma_zone_t was previously protecting it. > I don’t know the exact cause yet, but I must ask that you revert to r281161 > in HEAD and stable/10 until the problem is resolved. > I think the problem is that the masterzone_k and masterzone_z objects that are statically allocated in uma_core.c no longer have space for the uz_cpu field, but uma_zalloc_arg() always assumes that it’s there. Early in boot when the ‘kegs' and ‘zones’ zones are being initialized, there’s only 1 CPU so pre-allocating 1 uz_cpu element in the uma_zone is enough. I can’t see any way around this without significantly changing how uma_zalloc_arg() treats per-cpu caches. I think it’s best to revert this change. Scott ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281899 - head/sys/boot/fdt/dts/arm
Author: loos
Date: Thu Apr 23 18:36:36 2015
New Revision: 281899
URL: https://svnweb.freebsd.org/changeset/base/281899
Log:
Fix the gpio-leds node to match the LEDs on RPI2.
The 'pwr' LED is connected to GPIO pin 35 (active high) and the 'act' LED
is connected to GPIO pin 47 (active high).
Remove the GPIO pin 47 from reserved pins list, previously it was used to
signaling the SD Card presence and now it is used by act LED.
Modified:
head/sys/boot/fdt/dts/arm/bcm2836.dtsi
head/sys/boot/fdt/dts/arm/rpi2.dts
Modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi
==
--- head/sys/boot/fdt/dts/arm/bcm2836.dtsi Thu Apr 23 15:26:07 2015
(r281898)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi Thu Apr 23 18:36:36 2015
(r281899)
@@ -131,11 +131,11 @@
pinctrl-names = "default";
pinctrl-0 = <&pins_reserved>;
- /* Pins that can short 3.3V to GND in output mode: 46-47
+ /* Pins that can short 3.3V to GND in output mode: 46
* Pins used by VideoCore: 48-53
*/
- broadcom,read-only = <46>, <47>, <48>, <49>, <50>,
-<51>, <52>, <53>;
+ broadcom,read-only = <46>, <48>, <49>, <50>,
+<51>, <52>, <53>;
/* BSC0 */
pins_bsc0_a: bsc0_a {
Modified: head/sys/boot/fdt/dts/arm/rpi2.dts
==
--- head/sys/boot/fdt/dts/arm/rpi2.dts Thu Apr 23 15:26:07 2015
(r281898)
+++ head/sys/boot/fdt/dts/arm/rpi2.dts Thu Apr 23 18:36:36 2015
(r281899)
@@ -322,18 +322,14 @@
leds {
compatible = "gpio-leds";
- ok {
- label = "ok";
- gpios = <&gpio 16 1>;
-
- /* Don't change this - it configures
-* how the led driver determines if
-* the led is on or off when it loads.
-*/
- default-state = "keep";
+ pwr {
+ label = "pwr";
+ gpios = <&gpio 35 0>;
+ };
- /* This is the real default state. */
- linux,default-trigger = "default-on";
+ act {
+ label = "act";
+ gpios = <&gpio 47 0>;
};
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281898 - stable/8/usr.bin/lockf
Author: bdrewery
Date: Thu Apr 23 15:26:07 2015
New Revision: 281898
URL: https://svnweb.freebsd.org/changeset/base/281898
Log:
MFC r281582:
Remove extra flags from r250462.
Modified:
stable/8/usr.bin/lockf/lockf.c
Directory Properties:
stable/8/usr.bin/lockf/ (props changed)
Modified: stable/8/usr.bin/lockf/lockf.c
==
--- stable/8/usr.bin/lockf/lockf.c Thu Apr 23 15:25:22 2015
(r281897)
+++ stable/8/usr.bin/lockf/lockf.c Thu Apr 23 15:26:07 2015
(r281898)
@@ -169,7 +169,7 @@ acquire_lock(const char *name, int flags
{
int fd;
- if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
+ if ((fd = open(name, O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
if (errno == EAGAIN || errno == EINTR)
return (-1);
err(EX_CANTCREAT, "cannot open %s", name);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281897 - stable/9/usr.bin/lockf
Author: bdrewery
Date: Thu Apr 23 15:25:22 2015
New Revision: 281897
URL: https://svnweb.freebsd.org/changeset/base/281897
Log:
MFC r281582:
Remove extra flags from r250462.
Modified:
stable/9/usr.bin/lockf/lockf.c
Directory Properties:
stable/9/usr.bin/lockf/ (props changed)
Modified: stable/9/usr.bin/lockf/lockf.c
==
--- stable/9/usr.bin/lockf/lockf.c Thu Apr 23 15:24:33 2015
(r281896)
+++ stable/9/usr.bin/lockf/lockf.c Thu Apr 23 15:25:22 2015
(r281897)
@@ -169,7 +169,7 @@ acquire_lock(const char *name, int flags
{
int fd;
- if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
+ if ((fd = open(name, O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
if (errno == EAGAIN || errno == EINTR)
return (-1);
err(EX_CANTCREAT, "cannot open %s", name);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281896 - stable/10/usr.bin/lockf
Author: bdrewery
Date: Thu Apr 23 15:24:33 2015
New Revision: 281896
URL: https://svnweb.freebsd.org/changeset/base/281896
Log:
MFC r281582:
Remove extra flags from r250462.
Modified:
stable/10/usr.bin/lockf/lockf.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/lockf/lockf.c
==
--- stable/10/usr.bin/lockf/lockf.c Thu Apr 23 15:21:47 2015
(r281895)
+++ stable/10/usr.bin/lockf/lockf.c Thu Apr 23 15:24:33 2015
(r281896)
@@ -169,7 +169,7 @@ acquire_lock(const char *name, int flags
{
int fd;
- if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
+ if ((fd = open(name, O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
if (errno == EAGAIN || errno == EINTR)
return (-1);
err(EX_CANTCREAT, "cannot open %s", name);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281895 - stable/8/crypto/openssh
Author: bdrewery
Date: Thu Apr 23 15:21:47 2015
New Revision: 281895
URL: https://svnweb.freebsd.org/changeset/base/281895
Log:
MFC r280999:
Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.
Modified:
stable/8/crypto/openssh/clientloop.c
Directory Properties:
stable/8/crypto/openssh/ (props changed)
Modified: stable/8/crypto/openssh/clientloop.c
==
--- stable/8/crypto/openssh/clientloop.cThu Apr 23 15:20:57 2015
(r281894)
+++ stable/8/crypto/openssh/clientloop.cThu Apr 23 15:21:47 2015
(r281895)
@@ -1860,7 +1860,7 @@ client_request_agent(const char *request
if (options.hpn_disabled)
c = channel_new("authentication agent connection",
SSH_CHANNEL_OPEN, sock, sock, -1,
- CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
+ CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
"authentication agent connection", 1);
else
c = channel_new("authentication agent connection",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281888 - head/usr.bin/nfsstat
On Thursday, April 23, 2015 02:36:02 PM Edward Tomasz Napierala wrote: > Author: trasz > Date: Thu Apr 23 14:36:01 2015 > New Revision: 281888 > URL: https://svnweb.freebsd.org/changeset/base/281888 > > Log: > Remove oldnfs support from nfsstat(1). > > Reviewed by:rmacklem@ (earlier version) > Sponsored by: The FreeBSD Foundation > > Modified: > head/usr.bin/nfsstat/nfsstat.1 > head/usr.bin/nfsstat/nfsstat.c It might be nice to rename the "new" datastructure names as well, so that ext_nfsstats would just be nfsstats. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281894 - stable/9/crypto/openssh
Author: bdrewery
Date: Thu Apr 23 15:20:57 2015
New Revision: 281894
URL: https://svnweb.freebsd.org/changeset/base/281894
Log:
MFC r280999:
Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.
Modified:
stable/9/crypto/openssh/clientloop.c
Directory Properties:
stable/9/crypto/openssh/ (props changed)
Modified: stable/9/crypto/openssh/clientloop.c
==
--- stable/9/crypto/openssh/clientloop.cThu Apr 23 15:19:56 2015
(r281893)
+++ stable/9/crypto/openssh/clientloop.cThu Apr 23 15:20:57 2015
(r281894)
@@ -1923,7 +1923,7 @@ client_request_agent(const char *request
if (options.hpn_disabled)
c = channel_new("authentication agent connection",
SSH_CHANNEL_OPEN, sock, sock, -1,
- CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
+ CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
"authentication agent connection", 1);
else
c = channel_new("authentication agent connection",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281893 - stable/10/crypto/openssh
Author: bdrewery
Date: Thu Apr 23 15:19:56 2015
New Revision: 281893
URL: https://svnweb.freebsd.org/changeset/base/281893
Log:
MFC r280999:
Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.
Modified:
stable/10/crypto/openssh/clientloop.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/crypto/openssh/clientloop.c
==
--- stable/10/crypto/openssh/clientloop.c Thu Apr 23 15:18:43 2015
(r281892)
+++ stable/10/crypto/openssh/clientloop.c Thu Apr 23 15:19:56 2015
(r281893)
@@ -1922,7 +1922,7 @@ client_request_agent(const char *request
if (options.hpn_disabled)
c = channel_new("authentication agent connection",
SSH_CHANNEL_OPEN, sock, sock, -1,
- CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
+ CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
"authentication agent connection", 1);
else
c = channel_new("authentication agent connection",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281892 - stable/10/share/man/man5
Author: bdrewery Date: Thu Apr 23 15:18:43 2015 New Revision: 281892 URL: https://svnweb.freebsd.org/changeset/base/281892 Log: Regen for r281891 Modified: stable/10/share/man/man5/src.conf.5 Modified: stable/10/share/man/man5/src.conf.5 == --- stable/10/share/man/man5/src.conf.5 Thu Apr 23 15:15:45 2015 (r281891) +++ stable/10/share/man/man5/src.conf.5 Thu Apr 23 15:18:43 2015 (r281892) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des +.\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd March 1, 2015 +.Dd April 23, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -329,9 +329,9 @@ Set to not build .Xr ctm 1 and related utilities. .It Va WITHOUT_CXX -.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_CXX 220402 2011-04-06 20:19:07Z uqs +.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_CXX 281891 2015-04-23 15:15:45Z bdrewery Set to not build -.Xr g++ 1 +.Xr c++ 1 and related libraries. It will also prevent building of .Xr gperf 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281891 - stable/10/tools/build/options
Author: bdrewery Date: Thu Apr 23 15:15:45 2015 New Revision: 281891 URL: https://svnweb.freebsd.org/changeset/base/281891 Log: MFC r281053: Remove specific reference to g++(1) for WITH_CXX as it may be clang. Modified: stable/10/tools/build/options/WITHOUT_CXX Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/options/WITHOUT_CXX == --- stable/10/tools/build/options/WITHOUT_CXX Thu Apr 23 14:58:39 2015 (r281890) +++ stable/10/tools/build/options/WITHOUT_CXX Thu Apr 23 15:15:45 2015 (r281891) @@ -1,6 +1,6 @@ .\" $FreeBSD$ Set to not build -.Xr g++ 1 +.Xr c++ 1 and related libraries. It will also prevent building of .Xr gperf 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281890 - head/sys/boot/fdt/dts/arm
Author: loos
Date: Thu Apr 23 14:58:39 2015
New Revision: 281890
URL: https://svnweb.freebsd.org/changeset/base/281890
Log:
Enable the watchdog on RPI2.
The watchdog is used to reset the SoC on cpu_reset().
Without this, RPI2 will not reboot when asked to.
Modified:
head/sys/boot/fdt/dts/arm/bcm2836.dtsi
Modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi
==
--- head/sys/boot/fdt/dts/arm/bcm2836.dtsi Thu Apr 23 14:53:45 2015
(r281889)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi Thu Apr 23 14:58:39 2015
(r281890)
@@ -101,6 +101,12 @@
*/
};
+ watchdog0 {
+ compatible = "broadcom,bcm2835-wdt",
+"broadcom,bcm2708-wdt";
+ reg = <0x10001c 0x0c>; /* 0x1c, 0x20, 0x24 */
+ };
+
gpio: gpio {
compatible = "broadcom,bcm2835-gpio",
"broadcom,bcm2708-gpio";
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281889 - head/sys/dev/kbdmux
Author: pfg
Date: Thu Apr 23 14:53:45 2015
New Revision: 281889
URL: https://svnweb.freebsd.org/changeset/base/281889
Log:
Plug memory leaks in kbdmux(4)
Al kudos here for the Clang static analyzer which, unlike Coverity,
failed to flag a false positive.
Found by: clang static analyzer
CID: 1007072
CID: 1007073
CID: 1007074
MFC after:1 week
Modified:
head/sys/dev/kbdmux/kbdmux.c
Modified: head/sys/dev/kbdmux/kbdmux.c
==
--- head/sys/dev/kbdmux/kbdmux.cThu Apr 23 14:36:01 2015
(r281888)
+++ head/sys/dev/kbdmux/kbdmux.cThu Apr 23 14:53:45 2015
(r281889)
@@ -472,6 +472,11 @@ kbdmux_init(int unit, keyboard_t **kbdp,
KBDMUX_UNLOCK(state);
}
+ if (needfree) {
+ free(accmap, M_KBDMUX);
+ free(fkeymap, M_KBDMUX);
+ free(keymap, M_KBDMUX);
+ }
return (0);
bad:
if (needfree) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281888 - head/usr.bin/nfsstat
Author: trasz
Date: Thu Apr 23 14:36:01 2015
New Revision: 281888
URL: https://svnweb.freebsd.org/changeset/base/281888
Log:
Remove oldnfs support from nfsstat(1).
Reviewed by: rmacklem@ (earlier version)
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.bin/nfsstat/nfsstat.1
head/usr.bin/nfsstat/nfsstat.c
Modified: head/usr.bin/nfsstat/nfsstat.1
==
--- head/usr.bin/nfsstat/nfsstat.1 Thu Apr 23 14:22:20 2015
(r281887)
+++ head/usr.bin/nfsstat/nfsstat.1 Thu Apr 23 14:36:01 2015
(r281888)
@@ -28,7 +28,7 @@
.\" From: @(#)nfsstat.18.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd May 1, 2013
+.Dd April 23, 2015
.Dt NFSSTAT 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
statistics
.Sh SYNOPSIS
.Nm
-.Op Fl cemoszW
+.Op Fl cemszW
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl w Ar wait
@@ -58,10 +58,8 @@ The options are as follows:
.It Fl c
Only display client side statistics.
.It Fl e
-Report the extra statistics collected by the new NFS client and
+Report the extra statistics collected by the NFS client and
server for NFSv4.
-This option is incompatible with
-.Fl o .
.It Fl M
Extract values associated with the name list from the specified core
instead of the default
@@ -75,10 +73,6 @@ This option is only supported by the new
.It Fl N
Extract the name list from the specified system instead of the default
.Pa /boot/kernel/kernel .
-.It Fl o
-Report statistics for the old NFS client and/or server.
-Without this
-option statistics for the new NFS client and/or server will be reported.
.It Fl s
Only display server side statistics.
.It Fl W
Modified: head/usr.bin/nfsstat/nfsstat.c
==
--- head/usr.bin/nfsstat/nfsstat.c Thu Apr 23 14:22:20 2015
(r281887)
+++ head/usr.bin/nfsstat/nfsstat.c Thu Apr 23 14:36:01 2015
(r281888)
@@ -79,22 +79,19 @@ struct nlist nl[] = {
};
kvm_t *kd;
-static int deadkernel = 0;
static int widemode = 0;
static int zflag = 0;
-static int run_v4 = 1;
static int printtitle = 1;
static struct ext_nfsstats ext_nfsstats;
static int extra_output = 0;
-void intpr(int, int);
-void printhdr(int, int);
-void sidewaysintpr(u_int, int, int);
-void usage(void);
-char *sperc1(int, int);
-char *sperc2(int, int);
-void exp_intpr(int, int);
-void exp_sidewaysintpr(u_int, int, int);
+static void intpr(int, int);
+static void printhdr(int, int);
+static void usage(void);
+static char *sperc1(int, int);
+static char *sperc2(int, int);
+static void exp_intpr(int, int);
+static void exp_sidewaysintpr(u_int, int, int);
#define DELTA(field) (nfsstats.field - lastst.field)
@@ -106,7 +103,6 @@ main(int argc, char **argv)
int serverOnly = -1;
int ch;
char *memf, *nlistf;
- char errbuf[_POSIX2_LINE_MAX];
int mntlen, i;
char buf[1024];
struct statfs *mntbuf;
@@ -114,7 +110,7 @@ main(int argc, char **argv)
interval = 0;
memf = nlistf = NULL;
- while ((ch = getopt(argc, argv, "cesWM:mN:ow:z")) != -1)
+ while ((ch = getopt(argc, argv, "cesWM:mN:w:z")) != -1)
switch(ch) {
case 'M':
memf = optarg;
@@ -162,14 +158,7 @@ main(int argc, char **argv)
case 'z':
zflag = 1;
break;
- case 'o':
- if (extra_output != 0)
- err(1, "-o incompatible with -e");
- run_v4 = 0;
- break;
case 'e':
- if (run_v4 == 0)
- err(1, "-e incompatible with -o");
extra_output = 1;
break;
case '?':
@@ -190,26 +179,11 @@ main(int argc, char **argv)
}
}
#endif
- if (run_v4 != 0 && modfind("nfscommon") < 0)
- errx(1, "new client/server not loaded");
-
- if (run_v4 == 0 && (nlistf != NULL || memf != NULL)) {
- deadkernel = 1;
-
- if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
- errbuf)) == 0) {
- errx(1, "kvm_openfiles: %s", errbuf);
- }
- if (kvm_nlist(kd, nl) != 0) {
- errx(1, "kvm_nlist: can't get names");
- }
- }
+ if (modfind("nfscommon") < 0)
+ errx(1, "NFS client/server not loaded");
if (interval) {
- if (run_v4 > 0)
- exp_sidewaysintpr(interval, clientOnly, serverOnly);
- else
- sidewaysintpr(interval, clientOnly, serverOnly);
+ exp_sidewaysintpr(interval, clientOnly, serverOnly);
} else {
if (extra_output != 0)
svn commit: r281887 - in head: lib/libc/gen lib/libc/include lib/libc/stdio lib/libc/sys share/man/man9 sys/amd64/include sys/boot/i386/common sys/dev/pci sys/i386/include sys/sys sys/vm sys/x86/ac...
Author: jhb Date: Thu Apr 23 14:22:20 2015 New Revision: 281887 URL: https://svnweb.freebsd.org/changeset/base/281887 Log: Reassign copyright statements on several files from Advanced Computing Technologies LLC to Hudson River Trading LLC. Approved by: Hudson River Trading LLC (who owns ACT LLC) MFC after:1 week Modified: head/lib/libc/gen/_once_stub.c head/lib/libc/include/compat.h head/lib/libc/stdio/open_memstream.3 head/lib/libc/stdio/open_memstream.c head/lib/libc/stdio/open_wmemstream.c head/lib/libc/sys/closefrom.2 head/lib/libc/sys/procctl.2 head/share/man/man9/BUS_BIND_INTR.9 head/share/man/man9/BUS_CHILD_DELETED.9 head/share/man/man9/BUS_CHILD_DETACHED.9 head/share/man/man9/BUS_DESCRIBE_INTR.9 head/share/man/man9/BUS_NEW_PASS.9 head/share/man/man9/VOP_ADVISE.9 head/share/man/man9/VOP_ALLOCATE.9 head/share/man/man9/bus_adjust_resource.9 head/share/man/man9/bus_generic_new_pass.9 head/share/man/man9/bus_set_pass.9 head/share/man/man9/getenv.9 head/share/man/man9/refcount.9 head/share/man/man9/sglist.9 head/share/man/man9/shm_map.9 head/sys/amd64/include/vm.h head/sys/boot/i386/common/edd.h head/sys/dev/pci/pci_subr.c head/sys/i386/include/vm.h head/sys/sys/procctl.h head/sys/vm/sg_pager.c head/sys/x86/acpica/srat.c head/sys/x86/include/mca.h head/sys/x86/pci/qpi.c head/sys/x86/x86/mca.c head/tools/regression/file/closefrom/closefrom.c head/tools/regression/lib/libc/stdio/test-open_memstream.c head/tools/regression/lib/libc/stdio/test-open_wmemstream.c head/tools/regression/netinet/arphold/arphold.c head/tools/tools/tscdrift/tscdrift.c head/usr.bin/perror/perror.1 head/usr.bin/perror/perror.c head/usr.bin/procstat/procstat_rusage.c head/usr.bin/protect/protect.1 head/usr.bin/protect/protect.c head/usr.sbin/bhyve/ioapic.c head/usr.sbin/bhyve/ioapic.h head/usr.sbin/bhyve/pci_irq.c head/usr.sbin/bhyve/pci_irq.h head/usr.sbin/bhyve/pm.c head/usr.sbin/etcupdate/etcupdate.8 head/usr.sbin/etcupdate/etcupdate.sh head/usr.sbin/etcupdate/tests/always_test.sh head/usr.sbin/etcupdate/tests/conflicts_test.sh head/usr.sbin/etcupdate/tests/fbsdid_test.sh head/usr.sbin/etcupdate/tests/ignore_test.sh head/usr.sbin/etcupdate/tests/preworld_test.sh head/usr.sbin/etcupdate/tests/tests_test.sh head/usr.sbin/etcupdate/tests/tzsetup_test.sh head/usr.sbin/pciconf/err.c Modified: head/lib/libc/gen/_once_stub.c == --- head/lib/libc/gen/_once_stub.c Thu Apr 23 14:04:33 2015 (r281886) +++ head/lib/libc/gen/_once_stub.c Thu Apr 23 14:22:20 2015 (r281887) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Advanced Computing Technologies LLC + * Copyright (c) 2009 Hudson River Trading LLC * Written by: John H. Baldwin * All rights reserved. * Modified: head/lib/libc/include/compat.h == --- head/lib/libc/include/compat.h Thu Apr 23 14:04:33 2015 (r281886) +++ head/lib/libc/include/compat.h Thu Apr 23 14:22:20 2015 (r281887) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Advanced Computing Technologies LLC + * Copyright (c) 2009 Hudson River Trading LLC * Written by: John H. Baldwin * All rights reserved. * Modified: head/lib/libc/stdio/open_memstream.3 == --- head/lib/libc/stdio/open_memstream.3Thu Apr 23 14:04:33 2015 (r281886) +++ head/lib/libc/stdio/open_memstream.3Thu Apr 23 14:22:20 2015 (r281887) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013 Advanced Computing Technologies LLC +.\" Copyright (c) 2013 Hudson River Trading LLC .\" Written by: John H. Baldwin .\" All rights reserved. .\" Modified: head/lib/libc/stdio/open_memstream.c == --- head/lib/libc/stdio/open_memstream.cThu Apr 23 14:04:33 2015 (r281886) +++ head/lib/libc/stdio/open_memstream.cThu Apr 23 14:22:20 2015 (r281887) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013 Advanced Computing Technologies LLC + * Copyright (c) 2013 Hudson River Trading LLC * Written by: John H. Baldwin * All rights reserved. * Modified: head/lib/libc/stdio/open_wmemstream.c == --- head/lib/libc/stdio/open_wmemstream.c Thu Apr 23 14:04:33 2015 (r281886) +++ head/lib/libc/stdio/open_wmemstream.c Thu Apr 23 14:22:20 2015 (r281887) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013 Advanced Computing Technologies LLC + * Copyright (c) 2013 Hudson River Trading LLC * Written by: John H. Baldwin * All rights reserved. * Modified: head/lib/libc/sys/closefrom.2 == ---
svn commit: r281886 - in head: lib/libstand sys/boot/libstand32 sys/boot/userboot/libstand
Author: emaste
Date: Thu Apr 23 14:04:33 2015
New Revision: 281886
URL: https://svnweb.freebsd.org/changeset/base/281886
Log:
Reduce diffs between the three copies of libstand's Makefile
This should be a non-functional change. A future change should
address the functional differences between these three and converge
on a single source.
Differential Revision:https://reviews.freebsd.org/D2058
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/libstand/Makefile
head/sys/boot/libstand32/Makefile
head/sys/boot/userboot/libstand/Makefile
Modified: head/lib/libstand/Makefile
==
--- head/lib/libstand/Makefile Thu Apr 23 13:19:00 2015(r281885)
+++ head/lib/libstand/Makefile Thu Apr 23 14:04:33 2015(r281886)
@@ -11,6 +11,9 @@ MK_SSP= no
.include
+LIBSTAND_SRC= ${.CURDIR}
+LIBC_SRC= ${LIBSTAND_SRC}/../libc
+
LIB= stand
NO_PIC=
INCS= stand.h
@@ -19,7 +22,7 @@ MAN= libstand.3
WARNS?=0
CFLAGS+= -ffreestanding -Wformat
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${LIBSTAND_SRC}
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
@@ -54,54 +57,54 @@ SRCS+= gzguts.h zutil.h __main.c assert.
# private (pruned) versions of libc string functions
SRCS+= strcasecmp.c
-.PATH: ${.CURDIR}/../libc/net
+.PATH: ${LIBC_SRC}/net
SRCS+= ntoh.c
# string functions from libc
-.PATH: ${.CURDIR}/../libc/string
+.PATH: ${LIBC_SRC}/string
SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
.if ${MACHINE_CPUARCH} == "arm"
-.PATH: ${.CURDIR}/../libc/arm/gen
+.PATH: ${LIBC_SRC}/arm/gen
# Compiler support functions
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/builtins/
# __clzsi2 and ctzsi2 for various builtin functions
SRCS+= clzsi2.c ctzsi2.c
# Divide and modulus functions called by the compiler
SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c
SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/arm/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/builtins/arm/
SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
.endif
.if ${MACHINE_CPUARCH} == "aarch64"
-.PATH: ${.CURDIR}/../libc/aarch64/gen
+.PATH: ${LIBC_SRC}/aarch64/gen
.endif
.if ${MACHINE_CPUARCH} == "powerpc"
-.PATH: ${.CURDIR}/../libc/quad
+.PATH: ${LIBC_SRC}/quad
SRCS+= ashldi3.c ashrdi3.c
SRCS+= syncicache.c
.endif
# uuid functions from libc
-.PATH: ${.CURDIR}/../libc/uuid
+.PATH: ${LIBC_SRC}/uuid
SRCS+= uuid_equal.c uuid_is_nil.c
# _setjmp/_longjmp
-.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
+.PATH: ${LIBSTAND_SRC}/${MACHINE_CPUARCH}
SRCS+= _setjmp.S
# decompression functionality from libbz2
# NOTE: to actually test this functionality after libbz2 upgrade compile
# loader(8) with LOADER_BZIP2_SUPPORT defined
-.PATH: ${.CURDIR}/../../contrib/bzip2
+.PATH: ${LIBSTAND_SRC}/../../contrib/bzip2
CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS
SRCS+= libstand_bzlib_private.h
@@ -110,7 +113,8 @@ SRCS+= _${file}
CLEANFILES+= _${file}
_${file}: ${file}
- sed "s|bzlib_private\.h|libstand_bzlib_private.h|" ${.ALLSRC} >
${.TARGET}
+ sed "s|bzlib_private\.h|libstand_bzlib_private.h|" \
+ ${.ALLSRC} > ${.TARGET}
.endfor
CLEANFILES+= libstand_bzlib_private.h
@@ -119,8 +123,8 @@ libstand_bzlib_private.h: bzlib_private.
${.ALLSRC} > ${.TARGET}
# decompression functionality from libz
-.PATH: ${.CURDIR}/../libz
-CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz
+.PATH: ${LIBSTAND_SRC}/../libz
+CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../libz
SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h
.for file in infback.c inffast.c inflate.c inftrees.c zutil.c
@@ -165,4 +169,3 @@ SRCS+= nandfs.c
.endif
.include
-
Modified: head/sys/boot/libstand32/Makefile
==
--- head/sys/boot/libstand32/Makefile Thu Apr 23 13:19:00 2015
(r281885)
+++ head/sys/boot/libstand32/Makefile Thu Apr 23 14:04:33 2015
(r281886)
@@ -11,9 +11,10 @@ MAN=
.include
MK_SSP=no
-S= ${.CURDIR}/../../../lib/libstand
+LIBSTAND_SRC= ${.CURDIR}/../../../lib/libstand
+LIBC_SRC= ${LIBSTAND_SRC}/../libc
-.PATH: ${S}
+.PATH: ${LIBSTAND_SRC}
LIB= stand
INTERNALLIB=
MK_PROFILE=no
Re: svn commit: r281885 - head/sys/net
On Thursday, April 23, 2015 01:19:01 PM Gleb Smirnoff wrote: > Author: glebius > Date: Thu Apr 23 13:19:00 2015 > New Revision: 281885 > URL: https://svnweb.freebsd.org/changeset/base/281885 > > Log: > Don't propagate SIOCSIFCAPS from a vlan(4) to its parent. This leads to > quite unexpected result of toggling capabilities on the neighbour vlan(4) > interfaces. > > Reviewed by:melifaro, np > Differential Revision: https://reviews.freebsd.org/D2310 > Sponsored by: Nginx, Inc. Can you look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194855 or grab it? It seems to be closely related. I'm not sure if it is useful to allow vlans to use independent MTUs. It does not seem to make sense for a VLAN to have a larger MTU than the trunk though (perhaps the other direction can make sense, but maybe we should let a VLAN's MTU track the trunk unless the VLAN's MTU is set explicitly?) -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281885 - head/sys/net
Author: glebius
Date: Thu Apr 23 13:19:00 2015
New Revision: 281885
URL: https://svnweb.freebsd.org/changeset/base/281885
Log:
Don't propagate SIOCSIFCAPS from a vlan(4) to its parent. This leads to
quite unexpected result of toggling capabilities on the neighbour vlan(4)
interfaces.
Reviewed by: melifaro, np
Differential Revision:https://reviews.freebsd.org/D2310
Sponsored by: Nginx, Inc.
Modified:
head/sys/net/if_vlan.c
Modified: head/sys/net/if_vlan.c
==
--- head/sys/net/if_vlan.c Thu Apr 23 13:10:03 2015(r281884)
+++ head/sys/net/if_vlan.c Thu Apr 23 13:19:00 2015(r281885)
@@ -1705,27 +1705,6 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
}
break;
- case SIOCSIFCAP:
- VLAN_LOCK();
- if (TRUNK(ifv) != NULL) {
- p = PARENT(ifv);
- VLAN_UNLOCK();
- if ((p->if_type != IFT_ETHER) &&
- (ifr->ifr_reqcap & IFCAP_VLAN_HWTAGGING) == 0) {
- error = EINVAL;
- break;
- }
- error = (*p->if_ioctl)(p, cmd, data);
- if (error)
- break;
- /* Propogate vlan interface capabilities */
- vlan_trunk_capabilities(p);
- } else {
- VLAN_UNLOCK();
- error = EINVAL;
- }
- break;
-
default:
error = EINVAL;
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281884 - head/lib/libc/net
Author: tuexen Date: Thu Apr 23 13:10:03 2015 New Revision: 281884 URL: https://svnweb.freebsd.org/changeset/base/281884 Log: A complete user message is signalled with the MSG_EOR flag, not the MSG_EOF flag. Thanks to Valentin Nechayev for reporting the issue. MFC after: 1 week Modified: head/lib/libc/net/sctp_recvmsg.3 Modified: head/lib/libc/net/sctp_recvmsg.3 == --- head/lib/libc/net/sctp_recvmsg.3Thu Apr 23 11:27:21 2015 (r281883) +++ head/lib/libc/net/sctp_recvmsg.3Thu Apr 23 13:10:03 2015 (r281884) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2007 +.Dd April 23, 2015 .Dt SCTP_RECVMSG 3 .Os .Sh NAME @@ -98,13 +98,13 @@ receive buffer, then the argument will .Em not have the -.Dv MSG_EOF +.Dv MSG_EOR flag applied. If the message is a complete message then the .Fa flags argument will have -.Dv MSG_EOF +.Dv MSG_EOR set. Locally detected errors are indicated by a return value of -1 with ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r281451 - head/sys/vm
> On Apr 12, 2015, at 12:21 AM, Dmitry Chagin wrote: > > Author: dchagin > Date: Sun Apr 12 06:21:58 2015 > New Revision: 281451 > URL: https://svnweb.freebsd.org/changeset/base/281451 > > Log: > Rework r281162. Indeed, the flexible array member is preferable here. > > Suggested by: Justin T. Gibbs > > MFC after: 3 days > > Modified: > head/sys/vm/uma_core.c > head/sys/vm/uma_int.h There’s still something wrong with this. I have a machine with 28 cores (56 with hyperthreading) and 256GB of RAM, and ever since you committed r281162, it panics early in boot with a failed assertion. It looks like the first few members of a uma_slab_t are getting overwritten accidentally, and somehow the padding of the extra member in the uma_zone_t was previously protecting it. I don’t know the exact cause yet, but I must ask that you revert to r281161 in HEAD and stable/10 until the problem is resolved. Thanks, Scott ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281883 - head/sys/kern
Author: kib
Date: Thu Apr 23 11:27:21 2015
New Revision: 281883
URL: https://svnweb.freebsd.org/changeset/base/281883
Log:
Handle incorrect ELF images specifying size for PT_GNU_STACK not being
multiple of page size.
Sponsored by: The FreeBSD Foundation
MFC after:3 days
Modified:
head/sys/kern/kern_exec.c
Modified: head/sys/kern/kern_exec.c
==
--- head/sys/kern/kern_exec.c Thu Apr 23 08:41:50 2015(r281882)
+++ head/sys/kern/kern_exec.c Thu Apr 23 11:27:21 2015(r281883)
@@ -1060,7 +1060,7 @@ exec_new_vmspace(imgp, sv)
/* Allocate a new stack */
if (imgp->stack_sz != 0) {
- ssiz = imgp->stack_sz;
+ ssiz = trunc_page(imgp->stack_sz);
PROC_LOCK(p);
lim_rlimit(p, RLIMIT_STACK, &rlim_stack);
PROC_UNLOCK(p);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281882 - head/sys/compat/linux
Author: trasz
Date: Thu Apr 23 08:41:50 2015
New Revision: 281882
URL: https://svnweb.freebsd.org/changeset/base/281882
Log:
Simplify linux_getcwd(), removing code that was longer used.
Differential Revision:https://reviews.freebsd.org/D2326
Reviewed by: dchagin@, kib@
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/compat/linux/linux_getcwd.c
Modified: head/sys/compat/linux/linux_getcwd.c
==
--- head/sys/compat/linux/linux_getcwd.cThu Apr 23 07:41:58 2015
(r281881)
+++ head/sys/compat/linux/linux_getcwd.cThu Apr 23 08:41:50 2015
(r281882)
@@ -2,11 +2,15 @@
/* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * Copyright (c) 2015 The FreeBSD Foundation
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Bill Sommerfeld.
*
+ * Portions of this software were developed by Edward Tomasz Napierala
+ * under sponsorship from the FreeBSD Foundation.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -36,19 +40,9 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
-#include
#include
-#include
#include
-#include
-#include/* XXX only for DIRBLKSIZ */
#ifdef COMPAT_LINUX32
#include
@@ -60,408 +54,37 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
-
-static int
-linux_getcwd_scandir(struct vnode **, struct vnode **,
-char **, char *, struct thread *);
-static int
-linux_getcwd_common(struct vnode *, struct vnode *,
- char **, char *, int, int, struct thread *);
-
-#define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN+1) + 4)
-
-/*
- * Vnode variable naming conventions in this file:
- *
- * rvp: the current root we're aiming towards.
- * lvp, *lvpp: the "lower" vnode
- * uvp, *uvpp: the "upper" vnode.
- *
- * Since all the vnodes we're dealing with are directories, and the
- * lookups are going *up* in the filesystem rather than *down*, the
- * usual "pvp" (parent) or "dvp" (directory) naming conventions are
- * too confusing.
- */
-
-/*
- * XXX Will infinite loop in certain cases if a directory read reliably
- * returns EINVAL on last block.
- * XXX is EINVAL the right thing to return if a directory is malformed?
- */
-
-/*
- * XXX Untested vs. mount -o union; probably does the wrong thing.
- */
-
-/*
- * Find parent vnode of *lvpp, return in *uvpp
- *
- * If we care about the name, scan it looking for name of directory
- * entry pointing at lvp.
- *
- * Place the name in the buffer which starts at bufp, immediately
- * before *bpp, and move bpp backwards to point at the start of it.
- *
- * On entry, *lvpp is a locked vnode reference; on exit, it is vput and NULL'ed
- * On exit, *uvpp is either NULL or is a locked vnode reference.
- */
-static int
-linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td)
- struct vnode **lvpp;
- struct vnode **uvpp;
- char **bpp;
- char *bufp;
- struct thread *td;
-{
- int error = 0;
- int eofflag;
- off_t off;
- int tries;
- struct uio uio;
- struct iovec iov;
- char *dirbuf = NULL;
- int dirbuflen;
- ino_t fileno;
- struct vattr va;
- struct vnode *uvp = NULL;
- struct vnode *lvp = *lvpp;
- struct componentname cn;
- int len, reclen;
- tries = 0;
-
- /*
-* If we want the filename, get some info we need while the
-* current directory is still locked.
-*/
- if (bufp != NULL) {
- error = VOP_GETATTR(lvp, &va, td->td_ucred);
- if (error) {
- vput(lvp);
- *lvpp = NULL;
- *uvpp = NULL;
- return error;
- }
- }
-
- /*
-* Ok, we have to do it the hard way..
-* Next, get parent vnode using lookup of ..
-*/
- cn.cn_nameiop = LOOKUP;
- cn.cn_flags = ISLASTCN | ISDOTDOT | RDONLY;
- cn.cn_thread = td;
- cn.cn_cred = td->td_ucred;
- cn.cn_pnbuf = NULL;
- cn.cn_nameptr = "..";
- cn.cn_namelen = 2;
- cn.cn_consume = 0;
- cn.cn_lkflags = LK_SHARED;
-
- /*
-* At this point, lvp is locked and will be unlocked by the lookup.
-* On successful return, *uvpp will be locked
-*/
-#ifdef MAC
- error = mac_vnode_check_lookup(td->td_ucred, lvp, &cn);
- if (error == 0)
-#endif
- error = VOP_LOOKUP(lvp, uvpp, &cn);
- if (error) {
- vput(lvp);
- *lvpp = NULL;
- *uvpp = N
svn commit: r281881 - head/sys/dev/usb/controller
Author: hselasky
Date: Thu Apr 23 07:41:58 2015
New Revision: 281881
URL: https://svnweb.freebsd.org/changeset/base/281881
Log:
Disable multi process interrupts, because the current code doesn't use
them. Else we can end up in an infinite interrupt loop in USB device
mode.
MFC after:3 days
Modified:
head/sys/dev/usb/controller/dwc_otg.c
Modified: head/sys/dev/usb/controller/dwc_otg.c
==
--- head/sys/dev/usb/controller/dwc_otg.c Thu Apr 23 07:32:28 2015
(r281880)
+++ head/sys/dev/usb/controller/dwc_otg.c Thu Apr 23 07:41:58 2015
(r281881)
@@ -3876,20 +3876,18 @@ dwc_otg_init(struct dwc_otg_softc *sc)
if (temp & GHWCFG2_MPI) {
uint8_t x;
- DPRINTF("Multi Process Interrupts\n");
+ DPRINTF("Disable Multi Process Interrupts\n");
for (x = 0; x != sc->sc_dev_in_ep_max; x++) {
- DWC_OTG_WRITE_4(sc, DOTG_DIEPEACHINTMSK(x),
- DIEPMSK_XFERCOMPLMSK);
+ DWC_OTG_WRITE_4(sc, DOTG_DIEPEACHINTMSK(x), 0);
DWC_OTG_WRITE_4(sc, DOTG_DOEPEACHINTMSK(x), 0);
}
- DWC_OTG_WRITE_4(sc, DOTG_DEACHINTMSK, 0x);
- } else {
- DWC_OTG_WRITE_4(sc, DOTG_DIEPMSK,
- DIEPMSK_XFERCOMPLMSK);
- DWC_OTG_WRITE_4(sc, DOTG_DOEPMSK, 0);
- DWC_OTG_WRITE_4(sc, DOTG_DAINTMSK, 0x);
+ DWC_OTG_WRITE_4(sc, DOTG_DEACHINTMSK, 0);
}
+ DWC_OTG_WRITE_4(sc, DOTG_DIEPMSK,
+ DIEPMSK_XFERCOMPLMSK);
+ DWC_OTG_WRITE_4(sc, DOTG_DOEPMSK, 0);
+ DWC_OTG_WRITE_4(sc, DOTG_DAINTMSK, 0x);
}
if (sc->sc_mode == DWC_MODE_OTG || sc->sc_mode == DWC_MODE_HOST) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r281880 - in stable/10/sys: kern sys
Author: kib
Date: Thu Apr 23 07:32:28 2015
New Revision: 281880
URL: https://svnweb.freebsd.org/changeset/base/281880
Log:
MFC r281003:
Speed up symbol lookup for the amd64 kernel modules.
Modified:
stable/10/sys/kern/link_elf_obj.c
stable/10/sys/sys/elf_common.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/link_elf_obj.c
==
--- stable/10/sys/kern/link_elf_obj.c Thu Apr 23 02:50:06 2015
(r281879)
+++ stable/10/sys/kern/link_elf_obj.c Thu Apr 23 07:32:28 2015
(r281880)
@@ -173,6 +173,7 @@ static struct linker_class link_elf_clas
};
static int relocate_file(elf_file_t ef);
+static voidelf_obj_cleanup_globals_cache(elf_file_t);
static void
link_elf_error(const char *filename, const char *s)
@@ -1046,6 +1047,13 @@ relocate_file(elf_file_t ef)
}
}
+ /*
+* Only clean SHN_FBSD_CACHED for successfull return. If we
+* modified symbol table for the object but found an
+* unresolved symbol, there is no reason to roll back.
+*/
+ elf_obj_cleanup_globals_cache(ef);
+
return 0;
}
@@ -1194,6 +1202,21 @@ link_elf_each_function_nameval(linker_fi
return (0);
}
+static void
+elf_obj_cleanup_globals_cache(elf_file_t ef)
+{
+ Elf_Sym *sym;
+ Elf_Size i;
+
+ for (i = 0; i < ef->ddbsymcnt; i++) {
+ sym = ef->ddbsymtab + i;
+ if (sym->st_shndx == SHN_FBSD_CACHED) {
+ sym->st_shndx = SHN_UNDEF;
+ sym->st_value = 0;
+ }
+ }
+}
+
/*
* Symbol lookup function that can be used when the symbol index is known (ie
* in relocations). It uses the symbol index instead of doing a fully fledged
@@ -1205,7 +1228,7 @@ static Elf_Addr
elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps)
{
elf_file_t ef = (elf_file_t)lf;
- const Elf_Sym *sym;
+ Elf_Sym *sym;
const char *symbol;
Elf_Addr ret;
@@ -1233,7 +1256,22 @@ elf_obj_lookup(linker_file_t lf, Elf_Siz
if (*symbol == 0)
return (0);
ret = ((Elf_Addr)linker_file_lookup_symbol(lf, symbol, deps));
- return ret;
+
+ /*
+* Cache global lookups during module relocation. The failure
+* case is particularly expensive for callers, who must scan
+* through the entire globals table doing strcmp(). Cache to
+* avoid doing such work repeatedly.
+*
+* After relocation is complete, undefined globals will be
+* restored to SHN_UNDEF in elf_obj_cleanup_globals_cache(),
+* above.
+*/
+ if (ret != 0) {
+ sym->st_shndx = SHN_FBSD_CACHED;
+ sym->st_value = ret;
+ }
+ return (ret);
case STB_WEAK:
printf("link_elf_obj: Weak symbols not supported\n");
Modified: stable/10/sys/sys/elf_common.h
==
--- stable/10/sys/sys/elf_common.h Thu Apr 23 02:50:06 2015
(r281879)
+++ stable/10/sys/sys/elf_common.h Thu Apr 23 07:32:28 2015
(r281880)
@@ -251,6 +251,9 @@ typedef struct {
#defineSHN_LOPROC 0xff00 /* First processor-specific. */
#defineSHN_HIPROC 0xff1f /* Last processor-specific. */
#defineSHN_LOOS0xff20 /* First operating
system-specific. */
+#defineSHN_FBSD_CACHED SHN_LOOS/* Transient, for
sys/kern/link_elf_obj
+ linker only: Cached global in local
+ symtab. */
#defineSHN_HIOS0xff3f /* Last operating
system-specific. */
#defineSHN_ABS 0xfff1 /* Absolute values. */
#defineSHN_COMMON 0xfff2 /* Common data. */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
