svn commit: r259462 - head/sys/dev/usb/controller
Author: hselasky Date: Mon Dec 16 10:50:13 2013 New Revision: 259462 URL: http://svnweb.freebsd.org/changeset/base/259462 Log: Fix regression issue after r259248: Some Intel XHCI controlles timeout processing so-called "TRBs" when the final LINK TRB of a so-called "TD" has the CHAIN-BIT set. MFC after:1 week Tested by:glebius @ Modified: head/sys/dev/usb/controller/xhci.c Modified: head/sys/dev/usb/controller/xhci.c == --- head/sys/dev/usb/controller/xhci.c Mon Dec 16 09:48:08 2013 (r259461) +++ head/sys/dev/usb/controller/xhci.c Mon Dec 16 10:50:13 2013 (r259462) @@ -1942,6 +1942,8 @@ restart: /* remove chain bit because this is the last data TRB in the chain */ td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15)); td->td_trb[td->ntrb - 1].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT); + /* remove CHAIN-BIT from last LINK TRB */ + td->td_trb[td->ntrb].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT); usb_pc_cpu_flush(td->page_cache); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259463 - in head/etc: defaults rc.d
Author: pjd
Date: Mon Dec 16 11:03:59 2013
New Revision: 259463
URL: http://svnweb.freebsd.org/changeset/base/259463
Log:
Start-up script for casperd daemon.
Sponsored by: The FreeBSD Foundation
Added:
head/etc/rc.d/casperd (contents, props changed)
Modified:
head/etc/defaults/rc.conf
head/etc/rc.d/Makefile
Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf Mon Dec 16 10:50:13 2013(r259462)
+++ head/etc/defaults/rc.conf Mon Dec 16 11:03:59 2013(r259463)
@@ -658,6 +658,7 @@ newsyslog_enable="YES" # Run newsyslog a
newsyslog_flags="-CN" # Newsyslog flags to create marked files
mixer_enable="YES" # Run the sound mixer.
opensm_enable="NO" # Opensm(8) for infiniband devices defaults to off
+casperd_enable="NO"# casperd(8) daemon
##
### Jail Configuration (see rc.conf(5) manual page) ##
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Mon Dec 16 10:50:13 2013(r259462)
+++ head/etc/rc.d/Makefile Mon Dec 16 11:03:59 2013(r259463)
@@ -26,6 +26,7 @@ FILES=DAEMON \
bridge \
bsnmpd \
${_bthidd} \
+ casperd \
ccd \
cleanvar \
cleartmp \
Added: head/etc/rc.d/casperd
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/rc.d/casperd Mon Dec 16 11:03:59 2013(r259463)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: casperd
+# REQUIRE: NETWORKING syslogd
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="casperd"
+rcvar="casperd_enable"
+pidfile="/var/run/${name}.pid"
+command="/sbin/${name}"
+
+load_rc_config $name
+run_rc_command "$1"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259422 - head/sys/conf
On Sun, Dec 15, 2013 at 10:33:47AM -0800, Rui Paulo wrote: > On 15 Dec 2013, at 10:13, Konstantin Belousov wrote: > > > Author: kib > > Date: Sun Dec 15 18:13:42 2013 > > New Revision: 259422 > > URL: http://svnweb.freebsd.org/changeset/base/259422 > > > > Log: > > Revert r259045. > > > > It seems that clang miscompiles code related to UDP with > > -fno-strict-overflow. > > Could you please file a bug report if you haven't already? I do not intend to do any further analysis of the issue. pgpFNQEjthWa5.pgp Description: PGP signature
Re: svn commit: r259010 - in head/sys: conf powerpc/fpu
John Baldwin writes: > Dag-Erling Smørgrav writes: > > John Baldwin writes: > > > LINT64 is yet another kernel config covered by 'make tinderbox', > > > but not by the periodic tinderbox. It is probably worth adding to > > > the periodic tinderbox (someday it'd be nice if the two > > > tinderboxes built the same set of things). > > Some day it would be nice if people talked to me directly instead of > > sniping from the sidelines. > Ah, but when people have raised this exact issue before (that tcbuild > and 'make tinderbox' build different things), you have blown them off > repeatedly. I have no idea what tcbuild is. I blow people off when they complain that the tinderbox doesn't work exactly like 'make tinderbox' because it's not intended to. > > Oh, and 'make tinderbox' should die. > No, it is very developer friendly as it Just Works(tm) as a single > command from an existing source tree checkout. We already had 'make universe'. The story behind 'make tinderbox' is that Alfred threw a fit over a tinderbox breakage and insisted, despite being provided with ample proof to the contrary, that my tinderbox was a black box which nobody knew how worked and nobody could reproduce and that tinderbox reports were therefore worthless. He then proceeded to implement 'make tinderbox' purely to piss me off. It serves no other purpose and needs to die. > It also happens to build more of the tree than the periodic tinderbox > (by building more kernel configs, albeit doing quite a bit of > duplicate work for platforms like arm in the process). That's simply not true. The tinderbox builds exactly the same kernels as 'make tinderbox' if they're present. The issue here is that a bug in the source tree prevents some of these kernel configurations from being generated, hence the tinderbox cannot build them. DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259464 - head/sys/kern
Author: mav
Date: Mon Dec 16 13:52:18 2013
New Revision: 259464
URL: http://svnweb.freebsd.org/changeset/base/259464
Log:
Fix periodic per-CPU timers startup on boot.
Reported by: neel
MFC after:2 weeks
Modified:
head/sys/kern/kern_clocksource.c
Modified: head/sys/kern/kern_clocksource.c
==
--- head/sys/kern/kern_clocksource.cMon Dec 16 11:03:59 2013
(r259463)
+++ head/sys/kern/kern_clocksource.cMon Dec 16 13:52:18 2013
(r259464)
@@ -233,7 +233,8 @@ handleevents(sbintime_t now, int fake)
if (!busy) {
state->idle = 0;
state->nextevent = t;
- loadtimer(now, 0);
+ loadtimer(now, (fake == 2) &&
+ (timer->et_flags & ET_FLAGS_PERCPU));
}
ET_HW_UNLOCK(state);
return (done);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259468 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 15:50:59 2013
New Revision: 259468
URL: http://svnweb.freebsd.org/changeset/base/259468
Log:
Add a fix for Long-standing problem with VMware. Described in below links:
https://communities.vmware.com/thread/107230
https://communities.vmware.com/docs/DOC-11677
Basically, ignore the ``function 62'' and ``function 63'' interpretations
of the left/right command key when we're in the lengthiest portion of the
installation (initiated by the `auto' module).
The net effect is that you can now (once you've started the installer from
the media) escape the VM without prematurely terminating the current action
due to spurious escape sequence.
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/auto
Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto Mon Dec 16 15:08:30 2013
(r259467)
+++ head/usr.sbin/bsdinstall/scripts/auto Mon Dec 16 15:50:59 2013
(r259468)
@@ -49,6 +49,10 @@ error() {
MAIN
+# Don't send ESC on function-key 62/63 (left/right command key)
+f_quietly kbdcontrol -f 62 ''
+f_quietly kbdcontrol -f 63 ''
+
f_dprintf "Began Installation at %s" "$( date )"
rm -rf $BSDINSTALL_TMPETC
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259469 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 15:52:44 2013
New Revision: 259469
URL: http://svnweb.freebsd.org/changeset/base/259469
Log:
Mask error from newaliases(1) when the hostname is not fully qualified.
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/config
Modified: head/usr.sbin/bsdinstall/scripts/config
==
--- head/usr.sbin/bsdinstall/scripts/config Mon Dec 16 15:50:59 2013
(r259468)
+++ head/usr.sbin/bsdinstall/scripts/config Mon Dec 16 15:52:44 2013
(r259469)
@@ -42,7 +42,7 @@ cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHR
[ "${debugFile#+}" ] && cp "${debugFile#+}" $BSDINSTALL_CHROOT/var/log/
# Set up other things from installed config
-chroot $BSDINSTALL_CHROOT /usr/bin/newaliases
+chroot $BSDINSTALL_CHROOT /usr/bin/newaliases > /dev/null 2>&1
# END
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259468 - head/usr.sbin/bsdinstall/scripts
Please add this to release/rc.local instead under the console setup.
There is no guarantee that "auto" is running from an environment where
this is defined -- for example, it may be running from a serial console
or an xterm -- and the actual installer should not be polluted with
assumptions about the media from which it runs.
-Nathan
On 12/16/13 09:50, Devin Teske wrote:
Author: dteske
Date: Mon Dec 16 15:50:59 2013
New Revision: 259468
URL: http://svnweb.freebsd.org/changeset/base/259468
Log:
Add a fix for Long-standing problem with VMware. Described in below links:
https://communities.vmware.com/thread/107230
https://communities.vmware.com/docs/DOC-11677
Basically, ignore the ``function 62'' and ``function 63'' interpretations
of the left/right command key when we're in the lengthiest portion of the
installation (initiated by the `auto' module).
The net effect is that you can now (once you've started the installer from
the media) escape the VM without prematurely terminating the current action
due to spurious escape sequence.
MFC after: 3 days
Modified:
head/usr.sbin/bsdinstall/scripts/auto
Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto Mon Dec 16 15:08:30 2013
(r259467)
+++ head/usr.sbin/bsdinstall/scripts/auto Mon Dec 16 15:50:59 2013
(r259468)
@@ -49,6 +49,10 @@ error() {
MAIN
+# Don't send ESC on function-key 62/63 (left/right command key)
+f_quietly kbdcontrol -f 62 ''
+f_quietly kbdcontrol -f 63 ''
+
f_dprintf "Began Installation at %s" "$( date )"
rm -rf $BSDINSTALL_TMPETC
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259470 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 16 17:03:44 2013 New Revision: 259470 URL: http://svnweb.freebsd.org/changeset/base/259470 Log: As per discussions on -current, re-add /var/mail (removed in r257842) but this time with atime=on in support of various software that requires it. Discussed on: -current MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 15:52:44 2013 (r259469) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:03:44 2013 (r259470) @@ -132,6 +132,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA /varmountpoint=/var /var/crash compression=lz4,exec=off,setuid=off /var/logcompression=lz4,exec=off,setuid=off + /var/mail compression=lz4,atime=on /var/tmpcompression=lz4,exec=on,setuid=off " # END-QUOTE ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259471 - head/share/misc
Author: bdrewery Date: Mon Dec 16 17:05:03 2013 New Revision: 259471 URL: http://svnweb.freebsd.org/changeset/base/259471 Log: Add myself to the src-committers list Approved by: bapt (mentor) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Mon Dec 16 17:03:44 2013 (r259470) +++ head/share/misc/committers-src.dot Mon Dec 16 17:05:03 2013 (r259471) @@ -114,6 +114,7 @@ art [label="Artem Belevich\nart@FreeBSD. asomers [label="Alan Somers\nasom...@freebsd.org\n2013/04/24"] avg [label="Andriy Gapon\n...@freebsd.org\n2009/02/18"] bapt [label="Baptiste Daroussin\nb...@freebsd.org\n2011/12/23"] +bdrewery [label="Bryan Drewery\nbdrew...@freebsd.org\n2013/12/14"] benl [label="Ben Laurie\nb...@freebsd.org\n2011/05/18"] benno [label="Benno Rice\nbe...@freebsd.org\n2000/11/02"] bms [label="Bruce M Simpson\n...@freebsd.org\n2003/08/06"] @@ -331,6 +332,8 @@ avg -> art avg -> pluknet avg -> smh +bapt -> bdrewery + benno -> grehan billf -> dougb ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259472 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 17:11:09 2013
New Revision: 259472
URL: http://svnweb.freebsd.org/changeset/base/259472
Log:
Accept NULL input as also meaning zero swap.
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:05:03 2013
(r259471)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 17:11:09 2013
(r259472)
@@ -1387,7 +1387,7 @@ while :; do
f_dialog_input input \
"$msg_please_enter_amount_of_swap_space" \
"$ZFSBOOT_SWAP_SIZE" &&
- ZFSBOOT_SWAP_SIZE="$input"
+ ZFSBOOT_SWAP_SIZE="${input:-0}"
;;
esac
done
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259473 - in head: lib/clang lib/clang/include lib/clang/include/llvm/Config lib/clang/libllvmpowerpcasmparser usr.bin/clang/clang usr.bin/clang/llc usr.bin/clang/lldb usr.bin/clang/llv...
Author: dim Date: Mon Dec 16 18:45:21 2013 New Revision: 259473 URL: http://svnweb.freebsd.org/changeset/base/259473 Log: Enable llvm's integrated assembler for PowerPC, since it should now be good enough for typical usage. Requested by: rdivacky MFC after:1 week Added: head/lib/clang/include/PPCGenAsmMatcher.inc (contents, props changed) head/lib/clang/libllvmpowerpcasmparser/ head/lib/clang/libllvmpowerpcasmparser/Makefile (contents, props changed) Modified: head/lib/clang/Makefile head/lib/clang/include/llvm/Config/AsmParsers.def head/usr.bin/clang/clang/Makefile head/usr.bin/clang/llc/Makefile head/usr.bin/clang/lldb/Makefile head/usr.bin/clang/llvm-mc/Makefile head/usr.bin/clang/llvm-objdump/Makefile head/usr.bin/clang/llvm-rtdyld/Makefile head/usr.bin/clang/opt/Makefile Modified: head/lib/clang/Makefile == --- head/lib/clang/Makefile Mon Dec 16 17:11:09 2013(r259472) +++ head/lib/clang/Makefile Mon Dec 16 18:45:21 2013(r259473) @@ -74,6 +74,7 @@ SUBDIR= libclanganalysis \ libllvmmipsdisassembler \ libllvmmipsinfo \ libllvmmipsinstprinter \ + libllvmpowerpcasmparser \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ libllvmpowerpcinfo \ Added: head/lib/clang/include/PPCGenAsmMatcher.inc == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/include/PPCGenAsmMatcher.inc Mon Dec 16 18:45:21 2013 (r259473) @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "PPCGenAsmMatcher.inc.h" Modified: head/lib/clang/include/llvm/Config/AsmParsers.def == --- head/lib/clang/include/llvm/Config/AsmParsers.def Mon Dec 16 17:11:09 2013(r259472) +++ head/lib/clang/include/llvm/Config/AsmParsers.def Mon Dec 16 18:45:21 2013(r259473) @@ -2,6 +2,7 @@ LLVM_ASM_PARSER(ARM) LLVM_ASM_PARSER(Mips) +LLVM_ASM_PARSER(PowerPC) LLVM_ASM_PARSER(X86) #undef LLVM_ASM_PARSER Added: head/lib/clang/libllvmpowerpcasmparser/Makefile == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/clang/libllvmpowerpcasmparser/Makefile Mon Dec 16 18:45:21 2013(r259473) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +.include + +LIB= llvmpowerpcasmparser + +SRCDIR=lib/Target/PowerPC/AsmParser +INCDIR=lib/Target/PowerPC +SRCS= PPCAsmParser.cpp + +TGHDRS=PPCGenAsmMatcher \ + PPCGenInstrInfo \ + PPCGenRegisterInfo \ + PPCGenSubtargetInfo + +.include "../clang.lib.mk" Modified: head/usr.bin/clang/clang/Makefile == --- head/usr.bin/clang/clang/Makefile Mon Dec 16 17:11:09 2013 (r259472) +++ head/usr.bin/clang/clang/Makefile Mon Dec 16 18:45:21 2013 (r259473) @@ -85,8 +85,9 @@ LIBDEPS=clangfrontendtool \ llvmmipsinstprinter \ llvmpowerpccodegen \ llvmpowerpcdesc \ - llvmpowerpcinfo \ llvmpowerpcinstprinter \ + llvmpowerpcasmparser \ + llvmpowerpcinfo \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ Modified: head/usr.bin/clang/llc/Makefile == --- head/usr.bin/clang/llc/Makefile Mon Dec 16 17:11:09 2013 (r259472) +++ head/usr.bin/clang/llc/Makefile Mon Dec 16 18:45:21 2013 (r259473) @@ -24,8 +24,9 @@ LIBDEPS=llvmirreader \ llvmmipsinstprinter \ llvmpowerpccodegen \ llvmpowerpcdesc \ - llvmpowerpcinfo \ llvmpowerpcinstprinter \ + llvmpowerpcasmparser \ + llvmpowerpcinfo \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ Modified: head/usr.bin/clang/lldb/Makefile == --- head/usr.bin/clang/lldb/MakefileMon Dec 16 17:11:09 2013 (r259472) +++ head/usr.bin/clang/lldb/MakefileMon Dec 16 18:45:21 2013 (r259473) @@ -106,6 +106,7 @@ LIBDEPS=\ llvmmipsinstprinter \ llvmpowerpcdesc \ llvmpowerpcinstprinter \ + llvmpowerpcasmparser \ llvmruntimedyld \ llvmvectorize \ llvmx86desc \ Modified: head/usr.bin/clang/llvm-mc/Makefile == --- head/usr.bin/clang/llvm-mc/Makefile Mon Dec 16 17:11:09 2013 (r259472) +++ head/usr.bin/clang/llvm-mc/Makefile Mon Dec 16 18:45:21 2013 (r259473) @@ -24,8 +24,9 @@ LIBDEPS=llvmmcdisassembler \ llvmmipsinstprinter \ llvmpowerpccodegen \ llvmpowerpcdesc \ -
svn commit: r259474 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 18:53:09 2013
New Revision: 259474
URL: http://svnweb.freebsd.org/changeset/base/259474
Log:
Bug-fixes and debugging improvments:
+ De-obfuscate debugging to show actual values
+ Change graid(8) syntax; s/destroy/delete/ [destroy is not invalid syntax]
+ Log commands that were previously quiet
+ Added some new comemnts and updated some existing ones
+ Add missing local for `disk' used in zfs_create_boot()
+ Use $disks instead of multiply-expanding $* in zfs_create_boot()
+ Pedantically unset variable holding geli(8) passphrase after use
+ Pedantically add double-quotes around zpool names and zfs datasets
+ Fix quotation expansion for zpool_cache entries of loader.conf(5)
+ Some limited whitespace changes
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 18:45:21 2013
(r259473)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 18:53:09 2013
(r259474)
@@ -156,8 +156,10 @@ CHMOD_MODE='chmod %s "%s"'
DD_WITH_OPTIONS='dd if="%s" of="%s" %s'
ECHO_APPEND='echo "%s" >> "%s"'
GELI_ATTACH='geli attach -j - -k "%s" "%s"'
+GELI_DETACH_F='geli detach -f "%s"'
GELI_PASSWORD_INIT='geli init -b -B "%s" -e %s -J - -K "%s" -l 256 -s 4096
"%s"'
GNOP_CREATE='gnop create -S 4096 "%s"'
+GNOP_DESTROY='gnop destroy "%s"'
GPART_ADD='gpart add -t %s "%s"'
GPART_ADD_INDEX='gpart add -i %s -t %s "%s"'
GPART_ADD_INDEX_WITH_SIZE='gpart add -i %s -t %s -s %s "%s"'
@@ -166,19 +168,23 @@ GPART_ADD_LABEL_WITH_SIZE='gpart add -l
GPART_BOOTCODE='gpart bootcode -b "%s" "%s"'
GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"'
GPART_CREATE='gpart create -s %s "%s"'
+GPART_DESTROY_F='gpart destroy -F "%s"'
GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
+GRAID_DELETE='graid delete "%s"'
LN_SF='ln -sf "%s" "%s"'
MKDIR_P='mkdir -p "%s"'
MOUNT_TYPE='mount -t %s "%s" "%s"'
PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\""
PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
SHELL_TRUNCATE=':> "%s"'
+UMOUNT='umount "%s"'
ZFS_CREATE_WITH_OPTIONS='zfs create %s "%s"'
ZFS_SET='zfs set "%s" "%s"'
ZFS_UNMOUNT='zfs unmount "%s"'
ZPOOL_CREATE_WITH_OPTIONS='zpool create %s "%s" %s %s'
ZPOOL_EXPORT='zpool export "%s"'
ZPOOL_IMPORT_WITH_OPTIONS='zpool import %s "%s"'
+ZPOOL_LABELCLEAR_F='zpool labelclear -f "%s"'
ZPOOL_SET='zpool set %s "%s"'
#
@@ -612,6 +618,8 @@ dialog_menu_layout()
# replacement drivers do not have the exact same sector counts.
#
# NOTE: The MBR layout is more complicated (GPT is preferred).
+# NOTE: $swapsize and $gelisize should be defined by the calling function.
+# NOTE: Sets $bootpart and $targetpart for the calling function.
#
zfs_create_diskpart()
{
@@ -664,13 +672,13 @@ zfs_create_diskpart()
# NOTE: Failure is ok here, blank disk will have nothing to destroy.
#
f_dprintf "$funcname: Destroying all data/layouts on \`%s'..." "$disk"
- f_quietly gpart destroy -F $disk
- f_quietly graid destroy $disk
- f_quietly zpool labelclear -f /dev/$disk # Kill it with fire
+ f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" $disk
+ f_eval_catch -d $funcname graid "$GRAID_DELETE" $disk
+ f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" /dev/$disk
# Make doubly-sure backup GPT is destroyed
- f_quietly gpart create -s gpt $disk
- f_quietly gpart destroy -F $disk
+ f_eval_catch -d $funcname gpart "$GPART_CREATE" gpt $disk
+ f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" $disk
# Calculate partition size given desired amount of swap
f_dprintf "$funcname: Getting disk capactiy for \`%s'" "$disk"
@@ -694,36 +702,35 @@ zfs_create_diskpart()
#
# 1. Create GPT layout using labels
#
- f_eval_catch $funcname gpart "$GPART_CREATE" gpt \$disk ||
+ f_eval_catch $funcname gpart "$GPART_CREATE" gpt $disk ||
return $FAILURE
#
# 2. Add small freebsd-boot partition labeled `boot#'
#
f_eval_catch $funcname gpart "$GPART_ADD_LABEL_WITH_SIZE" \
-gptboot\$index freebsd-boot 512k \$disk ||
+gptboot$index freebsd-boot 512k $disk ||
return $FAILURE
f_eval_catch $funcname gpart "$GPART_BOOTCODE_PART" \
-/boot/pmbr /boot/gptzfsboot 1 \$disk ||
+/boot/pmbr /boot/gptzfsboot 1 $disk ||
return $FAILURE
- # zpool will use the `zfs#' GPT labels
+ # NB: zpool will use the `zfs#' GPT labels
bootpart=p2 ta
svn commit: r259475 - head/sys/kern
Author: adrian
Date: Mon Dec 16 19:31:23 2013
New Revision: 259475
URL: http://svnweb.freebsd.org/changeset/base/259475
Log:
Migrate the sendfile_sync struct to use a UMA zone rather than M_TEMP.
This allows it to be better tracked as well as being able to leverage
UMA for more interesting/useful behaviour at a later date.
Sponsored by: Netflix, Inc.
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Mon Dec 16 18:53:09 2013
(r259474)
+++ head/sys/kern/uipc_syscalls.c Mon Dec 16 19:31:23 2013
(r259475)
@@ -80,6 +80,9 @@ __FBSDID("$FreeBSD$");
#include
#endif
+#include
+#include
+#include
#include
#include
@@ -130,6 +133,7 @@ static int sfreadahead = 1;
SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
&sfreadahead, 0, "Number of sendfile(2) read-ahead MAXBSIZE blocks");
+static uma_zone_t zone_sfsync;
static void
sfstat_init(const void *unused)
@@ -140,6 +144,22 @@ sfstat_init(const void *unused)
}
SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
+static void
+sf_sync_init(const void *unused)
+{
+
+ zone_sfsync = uma_zcreate("sendfile_sync", sizeof(struct sendfile_sync),
+ NULL, NULL,
+#ifdef INVARIANTS
+ trash_init, trash_fini,
+#else
+ NULL, NULL,
+#endif
+ UMA_ALIGN_CACHE,
+ 0);
+}
+SYSINIT(sf_sync, SI_SUB_MBUF, SI_ORDER_FIRST, sf_sync_init, NULL);
+
static int
sfstat_sysctl(SYSCTL_HANDLER_ARGS)
{
@@ -1898,7 +1918,7 @@ sf_sync_alloc(uint32_t flags)
{
struct sendfile_sync *sfs;
- sfs = malloc(sizeof *sfs, M_TEMP, M_WAITOK | M_ZERO);
+ sfs = uma_zalloc(zone_sfsync, M_WAITOK | M_ZERO);
mtx_init(&sfs->mtx, "sendfile", NULL, MTX_DEF);
cv_init(&sfs->cv, "sendfile");
sfs->flags = flags;
@@ -1953,7 +1973,7 @@ sf_sync_free(struct sendfile_sync *sfs)
KASSERT(sfs->count == 0, ("sendfile sync still busy"));
cv_destroy(&sfs->cv);
mtx_destroy(&sfs->mtx);
- free(sfs, M_TEMP);
+ uma_zfree(zone_sfsync, sfs);
}
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259476 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 19:37:15 2013
New Revision: 259476
URL: http://svnweb.freebsd.org/changeset/base/259476
Log:
Improve default ZFS disk layout (tested):
+ For GPT, always provision zfs# partition after swap [for resizability]
+ For MBR, always use a boot pool to relialy place root vdevs at EOD
NB: Fixes edge-cases where MBR combination failed boot (e.g. swap-less)
+ Generalize boot pool logic so it can be used for any scheme (namely MBR)
+ Update existing comments and some whitespace fixes
+ Change some variable names to make reading/debugging the code easier
in zfs_create_boot() (namely prepend zroot_ or bootpool_ to property)
+ Because zroot vdevs are at EOD, no longer need to calculate partsize
(vdev consumes remaining space after allocating swap)
+ Optimize processing of disks -- no reason to loop over the disks 3-4
separate times when we can logically use a single loop to do everything
Discussed on: -stable
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:31:23 2013
(r259475)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:37:15 2013
(r259476)
@@ -66,23 +66,30 @@ f_include $BSDCFG_SHARE/variable.subr
#
# Should we use geli(8) to encrypt the drives?
+# NB: Automatically enables ZFSBOOT_BOOT_POOL
#
: ${ZFSBOOT_GELI_ENCRYPTION=}
#
-# Default name the unencrypted pool when using geli(8) to encrypt the drives
+# Default path to the geli(8) keyfile used in drive encryption
#
-: ${ZFSBOOT_GELI_POOL_NAME:=bootpool}
+: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
#
-# Default size for the unencrypted boot pool when using geli(8)
+# Create a separate boot pool?
+# NB: Automatically set when using geli(8) or MBR
#
-: ${ZFSBOOT_GELI_BOOT_SIZE:=2g}
+: ${ZFSBOOT_BOOT_POOL=}
#
-# Default path to the geli(8) keyfile used in drive encryption
+# Default name for boot pool when enabled (e.g., geli(8) or MBR)
#
-: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
+: ${ZFSBOOT_BOOT_POOL_NAME:=bootpool}
+
+#
+# Default size for boot pool when enabled (e.g., geli(8) or MBR)
+#
+: ${ZFSBOOT_BOOT_POOL_SIZE:=2g}
#
# Default disks to use (always empty unless being scripted)
@@ -212,8 +219,8 @@ msg_geli_setup="Initializing encryption
msg_install="Install"
msg_install_desc="Proceed with Installation"
msg_install_help="Create ZFS boot pool with displayed options"
+msg_invalid_boot_pool_size="Invalid boot pool size \`%s'"
msg_invalid_disk_argument="Invalid disk argument \`%s'"
-msg_invalid_geli_boot_size="Invalid geli(8) boot size \`%s'"
msg_invalid_index_argument="Invalid index argument \`%s'"
msg_invalid_swap_size="Invalid swap size \`%s'"
msg_invalid_virtual_device_type="Invalid Virtual Device type \`%s'"
@@ -617,15 +624,13 @@ dialog_menu_layout()
# so we can have some real swap. This also provides wiggle room incase your
# replacement drivers do not have the exact same sector counts.
#
-# NOTE: The MBR layout is more complicated (GPT is preferred).
-# NOTE: $swapsize and $gelisize should be defined by the calling function.
+# NOTE: $swapsize and $bootsize should be defined by the calling function.
# NOTE: Sets $bootpart and $targetpart for the calling function.
#
zfs_create_diskpart()
{
local funcname=zfs_create_diskpart
local disk="$1" index="$2"
- local disksize partsize
# Check arguments
if [ ! "$disk" ]; then
@@ -680,18 +685,10 @@ zfs_create_diskpart()
f_eval_catch -d $funcname gpart "$GPART_CREATE" gpt $disk
f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" $disk
- # Calculate partition size given desired amount of swap
- f_dprintf "$funcname: Getting disk capactiy for \`%s'" "$disk"
- if ! device_$disk get capacity disksize; then
- f_dprintf "$funcname: Unable to get disk capacity of \`%s'" \
- "$disk"
- msg_error="$msg_error: $funcname" \
- f_show_err "$msg_unable_to_get_disk_capacity" "$disk"
- return $FAILURE
- fi
- partsize=$(( $disksize - $swapsize ))
- f_dprintf "$funcname: disksize=[%s] partsize=[%s]" \
- "$disksize" "$partsize"
+ #
+ # Enable boot pool if encryption is desired
+ #
+ [ "$ZFSBOOT_GELI_ENCRYPTION" ] && ZFSBOOT_BOOT_POOL=1
#
# Lay down the desired type of partition scheme
@@ -717,45 +714,36 @@ zfs_create_diskpart()
# NB: zpool will use the `zfs#' GPT labels
bootpart=p2 targetpart=p2
+ [ ${swapsize:-0} -gt 0 ] && targetpart=p3
- # Change things around if we are using geli(8)
- if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+ #
+ # Prepare
svn commit: r259477 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 16 19:43:04 2013 New Revision: 259477 URL: http://svnweb.freebsd.org/changeset/base/259477 Log: fletcher4 is currently the default. Discussed on: -current MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:37:15 2013 (r259476) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:43:04 2013 (r259477) @@ -1047,7 +1047,7 @@ zfs_create_boot() # Customize the zroot a bit... local option f_dprintf "$funcname: Setting miscellaneous options on root pool..." - for option in checksum=fletcher4 atime=off; do + for option in atime=off; do f_eval_catch $funcname zfs "$ZFS_SET" $option "$zroot_name" || return $FAILURE done ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259478 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 16 19:44:45 2013 New Revision: 259478 URL: http://svnweb.freebsd.org/changeset/base/259478 Log: De-uglify the geli(8)-setup infobox by adding a newline. MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:43:04 2013 (r259477) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013 (r259478) @@ -215,7 +215,7 @@ msg_force_4k_sectors="Force 4K Sectors?" msg_force_4k_sectors_help="Use gnop(8) to configure forced 4K sector alignment" msg_freebsd_installer="FreeBSD Installer" msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted" -msg_geli_setup="Initializing encryption on the selected disks, this will take several seconds per disk" +msg_geli_setup="Initializing encryption on selected disks,\n this will take several seconds per disk" msg_install="Install" msg_install_desc="Proceed with Installation" msg_install_help="Create ZFS boot pool with displayed options" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 16 19:47:04 2013 New Revision: 259479 URL: http://svnweb.freebsd.org/changeset/base/259479 Log: Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). Discussed on: -current, -stable MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013 (r259478) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013 (r259479) @@ -1159,6 +1159,9 @@ zfs_create_boot() $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE + f_eval_catch $funcname echo "$ECHO_APPEND" \ +'kern.geom.label.disk_ident.enable=\"0\"' \ +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE # We're all done unless we should go on for boot pool [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259480 - head/usr.sbin/bsdinstall/scripts
Author: dteske
Date: Mon Dec 16 19:51:11 2013
New Revision: 259480
URL: http://svnweb.freebsd.org/changeset/base/259480
Log:
Fix a long-standing edge-case that would result in a ghosted `zroot' pool
and subsequent headaches caused by multiple pools with the same name.
Specifically, blast away any labels on the designated swap partition.
Problem was when you install to a given layout *with* swap and then turn
around and re-install the same layout *without* swap (we weren't doing a
labelclear for the swap device, so would end up with an "UNAVAIL" status
zroot pool that may only exist in the pool cache).
MFC after:3 days
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013
(r259479)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:51:11 2013
(r259480)
@@ -745,6 +745,9 @@ zfs_create_diskpart()
"$GPART_ADD_LABEL_WITH_SIZE" swap$index \
freebsd-swap ${swapsize}b $disk ||
return $FAILURE
+ # Pedantically nuke any old labels on the swap
+ f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
+ /dev/gpt/swap$index
# Update fstab(5)
f_eval_catch $funcname printf "$PRINTF_FSTAB" \
/dev/gpt/swap$index none swap sw 0 0 \
@@ -818,6 +821,9 @@ zfs_create_diskpart()
"$GPART_ADD_INDEX_WITH_SIZE" 2 \
freebsd-swap ${swapsize}b ${disk}s1 ||
return $FAILURE
+ # Pedantically nuke any old labels on the swap
+ f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
+ /dev/${disk}s1b
# Update fstab(5)
f_eval_catch $funcname printf "$PRINTF_FSTAB" \
/dev/${disk}s1b none swap sw 0 0 \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259481 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Dec 16 19:54:55 2013 New Revision: 259481 URL: http://svnweb.freebsd.org/changeset/base/259481 Log: Auto-enable 4k sector alignment when disk encryption is requested (it is required in such a case). But don't prevent the user from pointing the gun at his/her foot -- you can disable 4k alignment after enabling geli). MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:51:11 2013 (r259480) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:54:55 2013 (r259481) @@ -1372,6 +1372,7 @@ while :; do if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then ZFSBOOT_GELI_ENCRYPTION= else + ZFSBOOT_GNOP_4K_FORCE_ALIGN=1 ZFSBOOT_GELI_ENCRYPTION=1 fi ;; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259482 - in head: lib/libvmmapi sys/amd64/include sys/amd64/vmm sys/amd64/vmm/io usr.sbin/bhyve
Author: neel
Date: Mon Dec 16 19:59:31 2013
New Revision: 259482
URL: http://svnweb.freebsd.org/changeset/base/259482
Log:
Add an API to deliver message signalled interrupts to vcpus. This allows
callers treat the MSI 'addr' and 'data' fields as opaque and also lets
bhyve implement multiple destination modes: physical, flat and clustered.
Submitted by: Tycho Nightingale (tycho.nighting...@pluribusnetworks.com)
Reviewed by: grehan@
Modified:
head/lib/libvmmapi/vmmapi.c
head/lib/libvmmapi/vmmapi.h
head/sys/amd64/include/vmm_dev.h
head/sys/amd64/vmm/io/ppt.c
head/sys/amd64/vmm/io/ppt.h
head/sys/amd64/vmm/io/vhpet.c
head/sys/amd64/vmm/io/vioapic.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/io/vlapic.h
head/sys/amd64/vmm/vmm_dev.c
head/sys/amd64/vmm/vmm_lapic.c
head/sys/amd64/vmm/vmm_lapic.h
head/usr.sbin/bhyve/pci_emul.c
head/usr.sbin/bhyve/pci_emul.h
head/usr.sbin/bhyve/pci_passthru.c
Modified: head/lib/libvmmapi/vmmapi.c
==
--- head/lib/libvmmapi/vmmapi.c Mon Dec 16 19:54:55 2013(r259481)
+++ head/lib/libvmmapi/vmmapi.c Mon Dec 16 19:59:31 2013(r259482)
@@ -397,6 +397,18 @@ vm_lapic_irq(struct vmctx *ctx, int vcpu
}
int
+vm_lapic_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg)
+{
+ struct vm_lapic_msi vmmsi;
+
+ bzero(&vmmsi, sizeof(vmmsi));
+ vmmsi.addr = addr;
+ vmmsi.msg = msg;
+
+ return (ioctl(ctx->fd, VM_LAPIC_MSI, &vmmsi));
+}
+
+int
vm_ioapic_assert_irq(struct vmctx *ctx, int irq)
{
struct vm_ioapic_irq ioapic_irq;
@@ -552,7 +564,7 @@ vm_map_pptdev_mmio(struct vmctx *ctx, in
int
vm_setup_msi(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
-int destcpu, int vector, int numvec)
+uint64_t addr, uint64_t msg, int numvec)
{
struct vm_pptdev_msi pptmsi;
@@ -561,8 +573,8 @@ vm_setup_msi(struct vmctx *ctx, int vcpu
pptmsi.bus = bus;
pptmsi.slot = slot;
pptmsi.func = func;
- pptmsi.destcpu = destcpu;
- pptmsi.vector = vector;
+ pptmsi.msg = msg;
+ pptmsi.addr = addr;
pptmsi.numvec = numvec;
return (ioctl(ctx->fd, VM_PPTDEV_MSI, &pptmsi));
@@ -570,7 +582,7 @@ vm_setup_msi(struct vmctx *ctx, int vcpu
int
vm_setup_msix(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
- int idx, uint32_t msg, uint32_t vector_control, uint64_t addr)
+ int idx, uint64_t addr, uint64_t msg, uint32_t vector_control)
{
struct vm_pptdev_msix pptmsix;
Modified: head/lib/libvmmapi/vmmapi.h
==
--- head/lib/libvmmapi/vmmapi.h Mon Dec 16 19:54:55 2013(r259481)
+++ head/lib/libvmmapi/vmmapi.h Mon Dec 16 19:59:31 2013(r259482)
@@ -67,6 +67,7 @@ int vm_inject_event(struct vmctx *ctx, i
intvm_inject_event2(struct vmctx *ctx, int vcpu, enum vm_event_type type,
int vector, int error_code);
intvm_lapic_irq(struct vmctx *ctx, int vcpu, int vector);
+intvm_lapic_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg);
intvm_ioapic_assert_irq(struct vmctx *ctx, int irq);
intvm_ioapic_deassert_irq(struct vmctx *ctx, int irq);
intvm_ioapic_pulse_irq(struct vmctx *ctx, int irq);
@@ -82,9 +83,9 @@ int vm_unassign_pptdev(struct vmctx *ctx
intvm_map_pptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa);
intvm_setup_msi(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
-int dest, int vector, int numvec);
+ uint64_t addr, uint64_t msg, int numvec);
intvm_setup_msix(struct vmctx *ctx, int vcpu, int bus, int slot, int func,
- int idx, uint32_t msg, uint32_t vector_control, uint64_t
addr);
+ int idx, uint64_t addr, uint64_t msg, uint32_t vector_control);
/*
* Return a pointer to the statistics buffer. Note that this is not MT-safe.
Modified: head/sys/amd64/include/vmm_dev.h
==
--- head/sys/amd64/include/vmm_dev.hMon Dec 16 19:54:55 2013
(r259481)
+++ head/sys/amd64/include/vmm_dev.hMon Dec 16 19:59:31 2013
(r259482)
@@ -66,6 +66,11 @@ struct vm_event {
int error_code_valid;
};
+struct vm_lapic_msi {
+ uint64_tmsg;
+ uint64_taddr;
+};
+
struct vm_lapic_irq {
int cpuid;
int vector;
@@ -103,8 +108,8 @@ struct vm_pptdev_msi {
int slot;
int func;
int numvec; /* 0 means disabled */
- int vector;
- int destcpu;
+ uint64_tmsg;
+ uint64_taddr;
};
struct vm_pptdev_msix {
@@ -113,7 +118,7
Re: svn commit: r259475 - head/sys/kern
Adrian,
On Mon, Dec 16, 2013 at 07:31:24PM +, Adrian Chadd wrote:
A> Modified: head/sys/kern/uipc_syscalls.c
A>
==
A> --- head/sys/kern/uipc_syscalls.cMon Dec 16 18:53:09 2013
(r259474)
A> +++ head/sys/kern/uipc_syscalls.cMon Dec 16 19:31:23 2013
(r259475)
A> @@ -80,6 +80,9 @@ __FBSDID("$FreeBSD$");
A> #include
A> #endif
A>
A> +#include
A> +#include
A> +#include
A> #include
A>
A> #include
A> @@ -130,6 +133,7 @@ static int sfreadahead = 1;
A> SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
A> &sfreadahead, 0, "Number of sendfile(2) read-ahead MAXBSIZE blocks");
A>
A> +static uma_zone_t zone_sfsync;
A>
A> static void
A> sfstat_init(const void *unused)
A> @@ -140,6 +144,22 @@ sfstat_init(const void *unused)
A> }
A> SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
A>
A> +static void
A> +sf_sync_init(const void *unused)
A> +{
A> +
A> +zone_sfsync = uma_zcreate("sendfile_sync", sizeof(struct sendfile_sync),
A> +NULL, NULL,
A> +#ifdef INVARIANTS
A> +trash_init, trash_fini,
A> +#else
A> +NULL, NULL,
A> +#endif
A> +UMA_ALIGN_CACHE,
A> +0);
A> +}
You do not need the INVARIANTS ifdef, because uma(9) will do the same thing
for you automatically. Thus, you also do not need to pollute namespace with
uma_int.h and uma_dbg.h.
--
Totus tuus, Glebius.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On 12/16/13 13:47, Devin Teske wrote: Author: dteske Date: Mon Dec 16 19:47:04 2013 New Revision: 259479 URL: http://svnweb.freebsd.org/changeset/base/259479 Log: Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). Discussed on: -current, -stable MFC after: 3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013 (r259478) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013 (r259479) @@ -1159,6 +1159,9 @@ zfs_create_boot() $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE + f_eval_catch $funcname echo "$ECHO_APPEND" \ +'kern.geom.label.disk_ident.enable=\"0\"' \ +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE # We're all done unless we should go on for boot pool [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS Uh -- what is all of this? Why are we disabling kernel functions depending on what the root filesystem is? Please don't MFC this. -Nathan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote: > On 12/16/13 13:47, Devin Teske wrote: >> Author: dteske >> Date: Mon Dec 16 19:47:04 2013 >> New Revision: 259479 >> URL: >> https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0A&s=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e >> >> Log: >> Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). >> Discussed on: -current, -stable >> MFC after: 3 days >> >> Modified: >> head/usr.sbin/bsdinstall/scripts/zfsboot >> >> Modified: head/usr.sbin/bsdinstall/scripts/zfsboot >> == >> --- head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:44:45 2013 >> (r259478) >> +++ head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:47:04 2013 >> (r259479) >> @@ -1159,6 +1159,9 @@ zfs_create_boot() >> $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE >> f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ >> $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE >> +f_eval_catch $funcname echo "$ECHO_APPEND" \ >> + 'kern.geom.label.disk_ident.enable=\"0\"' \ >> + $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE >> # We're all done unless we should go on for boot pool >> [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS > > Uh -- what is all of this? Why are we disabling kernel functions depending on > what the root filesystem is? Please don't MFC this. http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html NB: Happy to rip it out... but want something in-reply to those threads (pretty please). -- Devin _ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote: > > On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote: > >> On 12/16/13 13:47, Devin Teske wrote: >>> Author: dteske >>> Date: Mon Dec 16 19:47:04 2013 >>> New Revision: 259479 >>> URL: >>> https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0A&s=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e >>> >>> Log: >>> Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). >>> Discussed on: -current, -stable >>> MFC after: 3 days >>> >>> Modified: >>> head/usr.sbin/bsdinstall/scripts/zfsboot >>> >>> Modified: head/usr.sbin/bsdinstall/scripts/zfsboot >>> == >>> --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 >>> 2013(r259478) >>> +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 >>> 2013(r259479) >>> @@ -1159,6 +1159,9 @@ zfs_create_boot() >>> $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE >>> f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ >>> $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE >>> + f_eval_catch $funcname echo "$ECHO_APPEND" \ >>> +'kern.geom.label.disk_ident.enable=\"0\"' \ >>> +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE >>> # We're all done unless we should go on for boot pool >>> [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS >> >> Uh -- what is all of this? Why are we disabling kernel functions depending >> on what the root filesystem is? Please don't MFC this. > > http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html > http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html > > NB: Happy to rip it out... but want something in-reply to those threads > (pretty please). Basically... the logic is... The ZFS pool is built on vdevs of a specific name. The names that are used should remain the same. Adding this to the loader.conf ensures that the names that the pool(s) was/were built upon do not change. This goes beyond just a swap partition I imagine. For example... copying the data to a new drive using a duplicator. I'm sure there are other cases too. -- Devin _ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On 12/16/13 15:48, Teske, Devin wrote: On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote: On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote: On 12/16/13 13:47, Devin Teske wrote: Author: dteske Date: Mon Dec 16 19:47:04 2013 New Revision: 259479 URL: https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0A&s=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e Log: Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). Discussed on: -current, -stable MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013 (r259478) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013 (r259479) @@ -1159,6 +1159,9 @@ zfs_create_boot() $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE + f_eval_catch $funcname echo "$ECHO_APPEND" \ +'kern.geom.label.disk_ident.enable=\"0\"' \ +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE # We're all done unless we should go on for boot pool [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS Uh -- what is all of this? Why are we disabling kernel functions depending on what the root filesystem is? Please don't MFC this. http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html NB: Happy to rip it out... but want something in-reply to those threads (pretty please). Basically... the logic is... The ZFS pool is built on vdevs of a specific name. The names that are used should remain the same. Adding this to the loader.conf ensures that the names that the pool(s) was/were built upon do not change. This goes beyond just a swap partition I imagine. For example... copying the data to a new drive using a duplicator. I'm sure there are other cases too. Thanks for the explanation! I wonder if we should just turn off the disk ident stuff by default globally -- it was causing problems for me as well without ZFS root. -Nathan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On Dec 16, 2013, at 1:50 PM, Nathan Whitehorn wrote: > On 12/16/13 15:48, Teske, Devin wrote: >> On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote: >> >>> On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote: >>> On 12/16/13 13:47, Devin Teske wrote: > Author: dteske > Date: Mon Dec 16 19:47:04 2013 > New Revision: 259479 > URL: > https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0A&s=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e > > Log: > Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). > Discussed on: -current, -stable > MFC after: 3 days > > Modified: > head/usr.sbin/bsdinstall/scripts/zfsboot > > Modified: head/usr.sbin/bsdinstall/scripts/zfsboot > == > --- head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:44:45 > 2013(r259478) > +++ head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:47:04 > 2013(r259479) > @@ -1159,6 +1159,9 @@ zfs_create_boot() >$BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE > f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ >$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE > + f_eval_catch $funcname echo "$ECHO_APPEND" \ > + 'kern.geom.label.disk_ident.enable=\"0\"' \ > + $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE > # We're all done unless we should go on for boot pool > [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS Uh -- what is all of this? Why are we disabling kernel functions depending on what the root filesystem is? Please don't MFC this. >>> https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0A&m=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0A&s=4f16f0d6399e3a3c5e105a7869c580884327a8721c2f44c1711b319212a23db7 >>> https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0A&m=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0A&s=17882f97e3633c1e3ebd45f332e62d2212dc53d1f0577acc4ae15d8234d09c7f >>> >>> NB: Happy to rip it out... but want something in-reply to those threads >>> (pretty please). >> Basically... the logic is... >> >> The ZFS pool is built on vdevs of a specific name. The names that are used >> should remain the same. Adding this to the loader.conf ensures that the names >> that the pool(s) was/were built upon do not change. >> >> This goes beyond just a swap partition I imagine. For example... copying the >> data to a new drive using a duplicator. I'm sure there are other cases too. > > Thanks for the explanation! I wonder if we should just turn off the disk > ident stuff by default globally -- it was causing problems for me as well > without ZFS root. As I was making the commit to zfsboot... the very thought had occurred to me. I'm happy to rip this out in favor of a new global default. The end-result is that what Johan experienced won't be repeated. I think there's an urgency to get something to solve this into 10. -- Devin _ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts
On 12/16/13 15:55, Teske, Devin wrote: On Dec 16, 2013, at 1:50 PM, Nathan Whitehorn wrote: On 12/16/13 15:48, Teske, Devin wrote: On Dec 16, 2013, at 1:40 PM, Teske, Devin wrote: On Dec 16, 2013, at 1:26 PM, Nathan Whitehorn wrote: On 12/16/13 13:47, Devin Teske wrote: Author: dteske Date: Mon Dec 16 19:47:04 2013 New Revision: 259479 URL: https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/changeset/base/259479&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=fW6SVzmwwyz0yNXNK7sHp4zegrL63niU%2F%2F21DVtgyGU%3D%0A&s=cdd7f18e0151f222c2934ae69e473dac2e22e74cbde4d5af5758a083fb1c3a7e Log: Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). Discussed on: -current, -stable MFC after:3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot == --- head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:44:45 2013 (r259478) +++ head/usr.sbin/bsdinstall/scripts/zfsbootMon Dec 16 19:47:04 2013 (r259479) @@ -1159,6 +1159,9 @@ zfs_create_boot() $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \ $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE + f_eval_catch $funcname echo "$ECHO_APPEND" \ +'kern.geom.label.disk_ident.enable=\"0\"' \ +$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE # We're all done unless we should go on for boot pool [ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS Uh -- what is all of this? Why are we disabling kernel functions depending on what the root filesystem is? Please don't MFC this. https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076365.html&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0A&m=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0A&s=4f16f0d6399e3a3c5e105a7869c580884327a8721c2f44c1711b319212a23db7 https://urldefense.proofpoint.com/v1/url?u=http://lists.freebsd.org/pipermail/freebsd-stable/2013-December/076471.html&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r=LTzUWWrRnz2iN3PtHDubWRSAh9itVJ%2BMUcNBCQ4tyeo%3D%0A&m=WCmXzB4036KuOzNScbJsBQLKdo%2BAo15QWLYq4A7DKis%3D%0A&s=17882f97e3633c1e3ebd45f332e62d2212dc53d1f0577acc4ae15d8234d09c7f NB: Happy to rip it out... but want something in-reply to those threads (pretty please). Basically... the logic is... The ZFS pool is built on vdevs of a specific name. The names that are used should remain the same. Adding this to the loader.conf ensures that the names that the pool(s) was/were built upon do not change. This goes beyond just a swap partition I imagine. For example... copying the data to a new drive using a duplicator. I'm sure there are other cases too. Thanks for the explanation! I wonder if we should just turn off the disk ident stuff by default globally -- it was causing problems for me as well without ZFS root. As I was making the commit to zfsboot... the very thought had occurred to me. I'm happy to rip this out in favor of a new global default. The end-result is that what Johan experienced won't be repeated. I think there's an urgency to get something to solve this into 10. Yeah, I can see that. Let me bring this up on -CURRENT, with a short timeout, and see what the options are. -Nathan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259484 - head/sys/arm/mv
Author: nwhitehorn
Date: Mon Dec 16 22:04:47 2013
New Revision: 259484
URL: http://svnweb.freebsd.org/changeset/base/259484
Log:
Use the common Open Firmware PCI interrupt routing code instead of the
duplicate version in dev/fdt.
Tested by:zbb
Modified:
head/sys/arm/mv/mv_pci.c
Modified: head/sys/arm/mv/mv_pci.c
==
--- head/sys/arm/mv/mv_pci.cMon Dec 16 19:59:34 2013(r259483)
+++ head/sys/arm/mv/mv_pci.cMon Dec 16 22:04:47 2013(r259484)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -142,7 +143,7 @@ struct mv_pcib_softc {
int sc_type;
int sc_mode;/* Endpoint / Root Complex */
- struct fdt_pci_intr sc_intr_info;
+ struct ofw_bus_iinfosc_pci_iinfo;
};
/* Local forward prototypes */
@@ -155,7 +156,6 @@ static void mv_pcib_hw_cfgwrite(struct m
static int mv_pcib_init(struct mv_pcib_softc *, int, int);
static int mv_pcib_init_all_bars(struct mv_pcib_softc *, int, int, int, int);
static void mv_pcib_init_bridge(struct mv_pcib_softc *, int, int, int);
-static int mv_pcib_intr_info(phandle_t, struct mv_pcib_softc *);
static inline void pcib_write_irq_mask(struct mv_pcib_softc *, uint32_t);
static void mv_pcib_enable(struct mv_pcib_softc *, uint32_t);
static int mv_pcib_mem_init(struct mv_pcib_softc *);
@@ -243,8 +243,8 @@ mv_pcib_probe(device_t self)
if (!fdt_is_type(node, "pci"))
return (ENXIO);
- if (!(fdt_is_compatible(node, "mrvl,pcie") ||
- fdt_is_compatible(node, "mrvl,pci")))
+ if (!(ofw_bus_is_compatible(self, "mrvl,pcie") ||
+ ofw_bus_is_compatible(self, "mrvl,pci")))
return (ENXIO);
device_set_desc(self, "Marvell Integrated PCI/PCI-E Controller");
@@ -299,11 +299,8 @@ mv_pcib_attach(device_t self)
/*
* Get PCI interrupt info.
*/
- if ((sc->sc_mode == MV_MODE_ROOT) &&
- (mv_pcib_intr_info(node, sc) != 0)) {
- device_printf(self, "could not retrieve interrupt info\n");
- return (ENXIO);
- }
+ if (sc->sc_mode == MV_MODE_ROOT)
+ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(pcell_t));
/*
* Configure decode windows for PCI(E) access.
@@ -881,19 +878,33 @@ mv_pcib_write_config(device_t dev, u_int
}
static int
-mv_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
+mv_pcib_route_interrupt(device_t bus, device_t dev, int pin)
{
struct mv_pcib_softc *sc;
- int err, interrupt;
-
- sc = device_get_softc(pcib);
-
- err = fdt_pci_route_intr(pci_get_bus(dev), pci_get_slot(dev),
- pci_get_function(dev), pin, &sc->sc_intr_info, &interrupt);
- if (err == 0)
- return (interrupt);
+ struct ofw_pci_register reg;
+ uint32_t pintr, mintr;
+ phandle_t iparent;
+ uint8_t maskbuf[sizeof(reg) + sizeof(pintr)];
+
+ sc = device_get_softc(bus);
+ pintr = pin;
+
+ /* Fabricate imap information in case this isn't an OFW device */
+ bzero(®, sizeof(reg));
+ reg.phys_hi = (pci_get_bus(dev) << OFW_PCI_PHYS_HI_BUSSHIFT) |
+ (pci_get_slot(dev) << OFW_PCI_PHYS_HI_DEVICESHIFT) |
+ (pci_get_function(dev) << OFW_PCI_PHYS_HI_FUNCTIONSHIFT);
+
+ if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®,
+ sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr),
+ &iparent, maskbuf))
+ return (ofw_bus_map_intr(dev, iparent, mintr));
+
+ /* Maybe it's a real interrupt, not an intpin */
+ if (pin > 4)
+ return (pin);
- device_printf(pcib, "could not route pin %d for device %d.%d\n",
+ device_printf(bus, "could not route pin %d for device %d.%d\n",
pin, pci_get_slot(dev), pci_get_function(dev));
return (PCI_INVALID_IRQ);
}
@@ -938,17 +949,6 @@ mv_pcib_decode_win(phandle_t node, struc
return (0);
}
-static int
-mv_pcib_intr_info(phandle_t node, struct mv_pcib_softc *sc)
-{
- int error;
-
- if ((error = fdt_pci_intr_info(node, &sc->sc_intr_info)) != 0)
- return (error);
-
- return (0);
-}
-
#if defined(SOC_MV_ARMADAXP)
static int
mv_pcib_map_msi(device_t dev, device_t child, int irq, uint64_t *addr,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259487 - head/sys/dev/netmap
Author: luigi
Date: Mon Dec 16 23:57:43 2013
New Revision: 259487
URL: http://svnweb.freebsd.org/changeset/base/259487
Log:
fix the build using __builtin_prefetch() instead of redefining prefetch()
Modified:
head/sys/dev/netmap/ixgbe_netmap.h
head/sys/dev/netmap/netmap_kern.h
head/sys/dev/netmap/netmap_vale.c
Modified: head/sys/dev/netmap/ixgbe_netmap.h
==
--- head/sys/dev/netmap/ixgbe_netmap.h Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/ixgbe_netmap.h Mon Dec 16 23:57:43 2013
(r259487)
@@ -220,8 +220,8 @@ ixgbe_netmap_txsync(struct netmap_adapte
if (nm_i != cur) { /* we have new packets to send */
nic_i = netmap_idx_k2n(kring, nm_i);
- prefetch(&ring->slot[nm_i]);
- prefetch(&txr->tx_buffers[nic_i]);
+ __builtin_prefetch(&ring->slot[nm_i]);
+ __builtin_prefetch(&txr->tx_buffers[nic_i]);
for (n = 0; nm_i != cur; n++) {
struct netmap_slot *slot = &ring->slot[nm_i];
@@ -237,8 +237,8 @@ ixgbe_netmap_txsync(struct netmap_adapte
IXGBE_TXD_CMD_RS : 0;
/* prefetch for next round */
- prefetch(&ring->slot[nm_i + 1]);
- prefetch(&txr->tx_buffers[nic_i + 1]);
+ __builtin_prefetch(&ring->slot[nm_i + 1]);
+ __builtin_prefetch(&txr->tx_buffers[nic_i + 1]);
NM_CHECK_ADDR_LEN(addr, len);
Modified: head/sys/dev/netmap/netmap_kern.h
==
--- head/sys/dev/netmap/netmap_kern.h Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/netmap_kern.h Mon Dec 16 23:57:43 2013
(r259487)
@@ -61,7 +61,6 @@
#define NM_ATOMIC_TEST_AND_SET(p) (!atomic_cmpset_acq_int((p), 0, 1))
#define NM_ATOMIC_CLEAR(p) atomic_store_rel_int((p), 0)
-#define prefetch(x) __builtin_prefetch(x)
MALLOC_DECLARE(M_NETMAP);
Modified: head/sys/dev/netmap/netmap_vale.c
==
--- head/sys/dev/netmap/netmap_vale.c Mon Dec 16 22:26:25 2013
(r259486)
+++ head/sys/dev/netmap/netmap_vale.c Mon Dec 16 23:57:43 2013
(r259487)
@@ -79,8 +79,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-// #define prefetch(x) __builtin_prefetch(x)
-
#define BDG_RWLOCK_T struct rwlock // struct rwlock
@@ -1003,7 +1001,7 @@ nm_bdg_preflush(struct netmap_vp_adapter
ft[ft_i].ft_next = NM_FT_NULL;
buf = ft[ft_i].ft_buf = (slot->flags & NS_INDIRECT) ?
(void *)(uintptr_t)slot->ptr : BDG_NMB(&na->up, slot);
- prefetch(buf);
+ __builtin_prefetch(buf);
++ft_i;
if (slot->flags & NS_MOREFRAG) {
frags++;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259475 - head/sys/kern
Ok. I'll go find where I copy pastes thus from. The mbuf code perhaps?
Should we do a big quick tidy up?
Adrian
On Dec 16, 2013 1:40 PM, "Gleb Smirnoff" wrote:
> Adrian,
>
> On Mon, Dec 16, 2013 at 07:31:24PM +, Adrian Chadd wrote:
> A> Modified: head/sys/kern/uipc_syscalls.c
> A>
> ==
> A> --- head/sys/kern/uipc_syscalls.cMon Dec 16 18:53:09 2013
> (r259474)
> A> +++ head/sys/kern/uipc_syscalls.cMon Dec 16 19:31:23 2013
> (r259475)
> A> @@ -80,6 +80,9 @@ __FBSDID("$FreeBSD$");
> A> #include
> A> #endif
> A>
> A> +#include
> A> +#include
> A> +#include
> A> #include
> A>
> A> #include
> A> @@ -130,6 +133,7 @@ static int sfreadahead = 1;
> A> SYSCTL_INT(_kern_ipc_sendfile, OID_AUTO, readahead, CTLFLAG_RW,
> A> &sfreadahead, 0, "Number of sendfile(2) read-ahead MAXBSIZE
> blocks");
> A>
> A> +static uma_zone_t zone_sfsync;
> A>
> A> static void
> A> sfstat_init(const void *unused)
> A> @@ -140,6 +144,22 @@ sfstat_init(const void *unused)
> A> }
> A> SYSINIT(sfstat, SI_SUB_MBUF, SI_ORDER_FIRST, sfstat_init, NULL);
> A>
> A> +static void
> A> +sf_sync_init(const void *unused)
> A> +{
> A> +
> A> +zone_sfsync = uma_zcreate("sendfile_sync", sizeof(struct
> sendfile_sync),
> A> +NULL, NULL,
> A> +#ifdef INVARIANTS
> A> +trash_init, trash_fini,
> A> +#else
> A> +NULL, NULL,
> A> +#endif
> A> +UMA_ALIGN_CACHE,
> A> +0);
> A> +}
>
> You do not need the INVARIANTS ifdef, because uma(9) will do the same thing
> for you automatically. Thus, you also do not need to pollute namespace with
> uma_int.h and uma_dbg.h.
>
> --
> Totus tuus, Glebius.
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259475 - head/sys/kern
On Mon, Dec 16, 2013 at 04:54:15PM -0800, Adrian Chadd wrote: A> Ok. I'll go find where I copy pastes thus from. The mbuf code perhaps? A> A> Should we do a big quick tidy up? Nope, the mbuf code is somewhat different, due to secondary zones. An item freed there isn't actually freed, that's why they need a shift of trashing memory not in ctor/dtor, but in init/fini. Actually, now I see that your code is not only extraneous but wrong. You probably wanted to set ctor/dtor methods, not init/fini. So just remove it, in case of INVARIANTS the UMA automatically does all needed trash filling and later checking. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259489 - head/sys/kern
Author: adrian
Date: Tue Dec 17 03:06:21 2013
New Revision: 259489
URL: http://svnweb.freebsd.org/changeset/base/259489
Log:
Remove the invariants stuff I copy/paste'd from the mbuf code when
setting up the UMA zone.
This should (a) be correct(er) and (b) it should build on non-amd64.
Pointed out by: glebius
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Tue Dec 17 01:02:34 2013
(r259488)
+++ head/sys/kern/uipc_syscalls.c Tue Dec 17 03:06:21 2013
(r259489)
@@ -80,9 +80,6 @@ __FBSDID("$FreeBSD$");
#include
#endif
-#include
-#include
-#include
#include
#include
@@ -95,6 +92,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#if defined(INET) || defined(INET6)
#ifdef SCTP
@@ -150,11 +148,7 @@ sf_sync_init(const void *unused)
zone_sfsync = uma_zcreate("sendfile_sync", sizeof(struct sendfile_sync),
NULL, NULL,
-#ifdef INVARIANTS
- trash_init, trash_fini,
-#else
NULL, NULL,
-#endif
UMA_ALIGN_CACHE,
0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259490 - head/release/doc/en_US.ISO8859-1/relnotes
Author: rodrigc Date: Tue Dec 17 03:38:36 2013 New Revision: 259490 URL: http://svnweb.freebsd.org/changeset/base/259490 Log: Add release note items from Chelsio. Submitted by: np Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 17 03:06:21 2013(r259489) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 17 03:38:36 2013(r259490) @@ -248,6 +248,12 @@ The &man.wpi.4; driver has been updated to include a number of stability fixes. + The &man.cxgbe.4; driver has been updated to support + 40G/10G Ethernet NICs based on Chelsio's Terminator 5 (T5) ASIC. + + The iw_cxgbe driver has been added. This is an experimental iWARP/RDMA driver + (kernel verbs only) for Chelsio's T4 and T5 based cards. + ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259493 - head/release/doc/en_US.ISO8859-1/relnotes
Author: rodrigc Date: Tue Dec 17 04:19:03 2013 New Revision: 259493 URL: http://svnweb.freebsd.org/changeset/base/259493 Log: Add OFED and Mellanox items to release notes. Submitted by: Meny Yossefi Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 17 04:16:20 2013(r259492) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 17 04:19:03 2013(r259493) @@ -254,6 +254,15 @@ The iw_cxgbe driver has been added. This is an experimental iWARP/RDMA driver (kernel verbs only) for Chelsio's T4 and T5 based cards. + The Open Fabrics Enterprise Distribution (OFED) and OFED Infiniband core has been + updated to the same version as supplied by Linux version 3.7 + + The Mellanox Infiniband driver has been updated to firmware + version 2.30.3200 for ConnectX3 NICs. Support has been added for ConnectX3 VPI NICs, where + each port can be used as Infiniband 56 GB/s or Ethernet 40 GB/s. Support has been added + for dynamically loading kernel modules for Infiniband core (ibcore) and + IP over Infiniband (ipoib). + ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259481 - head/usr.sbin/bsdinstall/scripts
On Mon, Dec 16, 2013 at 2:54 PM, Devin Teske wrote: > Author: dteske > Date: Mon Dec 16 19:54:55 2013 > New Revision: 259481 > URL: http://svnweb.freebsd.org/changeset/base/259481 > > Log: > Auto-enable 4k sector alignment when disk encryption is requested (it is > required in such a case). Nice > But don't prevent the user from pointing the > gun at his/her foot -- you can disable 4k alignment after enabling geli). Why? Is there ever a reason you would want to do this? -- Eitan Adler ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r259463 - in head/etc: defaults rc.d
On Mon, Dec 16, 2013 at 6:03 AM, Pawel Jakub Dawidek wrote: > Author: pjd > Date: Mon Dec 16 11:03:59 2013 > New Revision: 259463 > URL: http://svnweb.freebsd.org/changeset/base/259463 > > Log: > Start-up script for casperd daemon. > > Sponsored by: The FreeBSD Foundation > > Added: > head/etc/rc.d/casperd (contents, props changed) > Modified: > head/etc/defaults/rc.conf > head/etc/rc.d/Makefile > > Modified: head/etc/defaults/rc.conf > == > --- head/etc/defaults/rc.conf Mon Dec 16 10:50:13 2013(r259462) > +++ head/etc/defaults/rc.conf Mon Dec 16 11:03:59 2013(r259463) > @@ -658,6 +658,7 @@ newsyslog_enable="YES" # Run newsyslog a > newsyslog_flags="-CN" # Newsyslog flags to create marked files > mixer_enable="YES" # Run the sound mixer. > opensm_enable="NO" # Opensm(8) for infiniband devices defaults to off > +casperd_enable="NO"# casperd(8) daemon Why is casper disabled by default? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259495 - head/share/misc
Author: milki (ports committer) Date: Tue Dec 17 05:13:37 2013 New Revision: 259495 URL: http://svnweb.freebsd.org/changeset/base/259495 Log: milki is a new committer for ports. Approved by: swills (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotTue Dec 17 04:26:20 2013 (r259494) +++ head/share/misc/committers-ports.dotTue Dec 17 05:13:37 2013 (r259495) @@ -154,6 +154,7 @@ mat [label="Mathieu Arnold\nmat@FreeBSD. matthew [label="Matthew Seaman\nmatt...@freebsd.org\n2012/02/07"] mezz [label="Jeremy Messenger\nm...@freebsd.org\n2004/04/30"] mharo [label="Michael Haro\nmh...@freebsd.org\n1999/04/13"] +milki [label="Jonathan Chu\nmi...@freebsd.org\n2013/12/15"] miwi [label="Martin Wilke\nm...@freebsd.org\n2006/06/04"] mm [label="Martin Matuska\n...@freebsd.org\n2007/04/04"] mnag [label="Marcus Alves Grando\nm...@freebsd.org\n2005/09/15"] @@ -301,6 +302,7 @@ eadler -> antoine eadler -> dbn eadler -> bdrewery eadler -> gjb +eadler -> milki eadler -> tj eadler -> vg @@ -510,6 +512,7 @@ stas -> araujo steve -> netchild swills -> feld +swills -> milki swills -> pclin tabthorpe -> ashish ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r259497 - head/sys/i386/i386
Author: pluknet Date: Tue Dec 17 07:47:27 2013 New Revision: 259497 URL: http://svnweb.freebsd.org/changeset/base/259497 Log: Nuke symbols.raw This file seems to be unused since the switch to the ELF binary format. Discussed with: jhb Deleted: head/sys/i386/i386/symbols.raw ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
