John Marino [Fri, 10 Oct 2014 22:51:31 +0000 (00:51 +0200)]
Merge branch 'vendor/GREP'
Conflicts:
contrib/grep/src/main.c
John Marino [Fri, 10 Oct 2014 19:48:14 +0000 (21:48 +0200)]
Upgrade grep from 2.14 => 2.20 on the vendor branch
John Marino [Fri, 10 Oct 2014 18:21:11 +0000 (20:21 +0200)]
Complete upgrade of XZ 5.0.4 => 5.0.7
See the vendor branch commit for the change log diff.
John Marino [Fri, 10 Oct 2014 19:14:07 +0000 (21:14 +0200)]
Merge branch 'vendor/XZ'
John Marino [Fri, 10 Oct 2014 17:58:57 +0000 (19:58 +0200)]
Upgrade xz from 5.0.4 to 5.0.7 on the vendor branch
5.0.7 (2014-09-20)
* Fix regressions introduced in 5.0.6:
- Fix building with non-GNU make.
- Fix invalid Libs.private value in liblzma.pc which broke
static linking against liblzma if the linker flags were
taken from pkg-config.
5.0.6 (2014-09-14)
* xzgrep now exits with status 0 if at least one file matched.
* A few minor portability and build system fixes
5.0.5 (2013-06-30)
* lzmadec and liblzma's lzma_alone_decoder(): Support decompressing
.lzma files that have less common settings in the headers
(dictionary size other than 2^n or 2^n + 2^(n-1), or uncompressed
size greater than 256 GiB). The limitations existed to avoid false
positives when detecting .lzma files. The lc + lp <= 4 limitation
still remains since liblzma's LZMA decoder has that limitation.
NOTE: xz's .lzma support or liblzma's lzma_auto_decoder() are NOT
affected by this change. They still consider uncommon .lzma headers
as not being in the .lzma format. Changing this would give way too
many false positives.
* xz:
- Interaction of preset and custom filter chain options was
made less illogical. This affects only certain less typical
uses cases so few people are expected to notice this change.
Now when a custom filter chain option (e.g. --lzma2) is
specified, all preset options (-0 ... -9, -e) earlier are on
the command line are completely forgotten. Similarly, when
a preset option is specified, all custom filter chain options
earlier on the command line are completely forgotten.
Example 1: "xz -9 --lzma2=preset=5 -e" is equivalent to "xz -e"
which is equivalent to "xz -6e". Earlier -e didn't put xz back
into preset mode and thus the example command was equivalent
to "xz --lzma2=preset=5".
Example 2: "xz -9e --lzma2=preset=5 -7" is equivalent to
"xz -7". Earlier a custom filter chain option didn't make
xz forget the -e option so the example was equivalent to
"xz -7e".
- Fixes and improvements to error handling.
- Various fixes to the man page.
* xzless: Fixed to work with "less" versions 448 and later.
* xzgrep: Made -h an alias for --no-filename.
* Include the previously missing debug/translation.bash which can
be useful for translators.
* Include a build script for Mac OS X. This has been in the Git
repository since 2010 but due to a mistake in Makefile.am the
script hasn't been included in a release tarball before.
John Marino [Fri, 10 Oct 2014 15:17:44 +0000 (17:17 +0200)]
Complete upgrade of gcc 4.7.3 => 4.7.4
The GCC Bugzilla shows 134 PRs were resolved on the GCC 4.7 branch since
GCC 4.7.3 was released. I've run into one c++ bug on ports involving
try-catch that should be fixed (the current solution is use GCC 4.8.3
from ports). Not all the PRs listed in milestone 4.7.4 are pertinent
for DragonFly's base compiler though.
John Marino [Fri, 10 Oct 2014 16:32:41 +0000 (18:32 +0200)]
Merge branch 'vendor/GCC47'
John Marino [Fri, 10 Oct 2014 14:56:34 +0000 (16:56 +0200)]
Upgrade GCC from 4.7.3 to 4.7.4 on the vendor branch
Sascha Wildner [Fri, 10 Oct 2014 14:53:31 +0000 (16:53 +0200)]
VOP_FSYNC.9: Missing comma
Antonio Huete Jimenez [Fri, 10 Oct 2014 10:15:05 +0000 (12:15 +0200)]
manpages: Fix a couple things left behind on the previous commit
Antonio Huete Jimenez [Fri, 10 Oct 2014 09:45:21 +0000 (11:45 +0200)]
tools - Fix backup file permissions for hammer-backup.sh
- Make sure backup files are only readable by root
- Fix typo in a comment
- Set /usr/sbin as the default installation directory
Antonio Huete Jimenez [Wed, 8 Oct 2014 20:36:24 +0000 (22:36 +0200)]
manpages - Bring VOP_ACCESS(9) up to date
Antonio Huete Jimenez [Wed, 8 Oct 2014 20:27:47 +0000 (22:27 +0200)]
manpages - Bring VOP_FSYNC(9) up to date
Sascha Wildner [Fri, 10 Oct 2014 07:44:46 +0000 (09:44 +0200)]
Sync snapshots tools with pkgbox64's current.
Matteo Cypriani [Wed, 8 Oct 2014 21:01:58 +0000 (17:01 -0400)]
Improve frequency scaling-related manual pages
Cross-reference powerd(8), est(4) and powernow(4); state that powerd
should be the preferred option.
Enforce the "new sentence on a new line" rule.
Sascha Wildner [Thu, 9 Oct 2014 11:19:37 +0000 (13:19 +0200)]
kernel/acpica: Stop being prepared for using ACPICA's local cache.
We provide our own objcache(9) based one for some time now.
Sascha Wildner [Thu, 9 Oct 2014 08:29:44 +0000 (10:29 +0200)]
kernel/acpica: Don't use ACPICA's own versions of various POSIX functions.
This removes the need to compile utclib.c into the kernel, so remove it
from the list.
Sascha Wildner [Thu, 9 Oct 2014 10:24:10 +0000 (12:24 +0200)]
kernel/libkern: Add strncat() to libkern.
In preparation for switching ACPI over to using various of our
kernel functions instead of its own versions.
Taken from libc.
Sascha Wildner [Thu, 9 Oct 2014 07:55:21 +0000 (09:55 +0200)]
sys/conf/files: Sort ACPI alphabetically.
Sascha Wildner [Thu, 9 Oct 2014 06:42:10 +0000 (08:42 +0200)]
installer: Create an initial initrd unconditionally.
Now that the mkinitrd has been detached from installworld, the rescue
image is no longer part of the ISOs/IMGs, so we have to always create
one during installation, not just for encrypted setup.
Sascha Wildner [Thu, 9 Oct 2014 06:34:57 +0000 (08:34 +0200)]
installer: Save the installation log as the last step.
Sascha Wildner [Thu, 9 Oct 2014 06:32:30 +0000 (08:32 +0200)]
tools: Add some missing includes.
Robin Hahling [Tue, 7 Oct 2014 20:00:43 +0000 (22:00 +0200)]
sed(1): add -r option for compatibility with GNU sed.
-r option is exactly the same option as -E
Sascha Wildner [Sun, 5 Oct 2014 11:58:01 +0000 (13:58 +0200)]
kernel/smbfs: Tabify a few lines.
Sascha Wildner [Sun, 5 Oct 2014 11:55:45 +0000 (13:55 +0200)]
kernel: Remove some dead code.
While here, also remove an unnecessary NULL check in smbfs (M_WAITOK is used)
and use M_ZERO instead of an explicit bzero().
Submitted-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Sascha Wildner [Sat, 4 Oct 2014 11:18:49 +0000 (13:18 +0200)]
kernel/slaballoc: Remove redundant if().
Found-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
François Tigeot [Sat, 4 Oct 2014 07:45:33 +0000 (09:45 +0200)]
drm: Add Linux PCI headers
Sepherosa Ziehau [Fri, 3 Oct 2014 14:08:08 +0000 (22:08 +0800)]
udp: Add assertion for preconditions for direct detach
Sepherosa Ziehau [Fri, 3 Oct 2014 12:44:12 +0000 (20:44 +0800)]
udp: Add NOTINHASH assertion to udp_inswildcardhash()
So that we could catch programming bugs earlier.
Sepherosa Ziehau [Fri, 3 Oct 2014 12:42:02 +0000 (20:42 +0800)]
inpcb: Factor out ASSERT_INP_NOTINHASH
Sepherosa Ziehau [Fri, 3 Oct 2014 12:29:52 +0000 (20:29 +0800)]
udp: Use ncpus2 instead of ncpus, since udp uses ncpus2 netisrs
There is actually no functional change.
Sepherosa Ziehau [Fri, 3 Oct 2014 12:24:28 +0000 (20:24 +0800)]
inpcb: Factor out in_pcbresetroute()
François Tigeot [Fri, 3 Oct 2014 09:20:58 +0000 (11:20 +0200)]
drm/i915: Simplify the flush code
Reduce differences with Linux 3.8.13
Markus Pfeiffer [Tue, 30 Sep 2014 09:17:14 +0000 (09:17 +0000)]
net: some LINTing after if_lagg import
* remove duplicate from include/Makefile
* sort mtree alphabetically
* update ifmedia(4) manpage to reflect updates to if_media.h
Reported-By: Sascha Wildner <swildner@online.de>
François Tigeot [Tue, 30 Sep 2014 06:50:45 +0000 (08:50 +0200)]
Bump __DragonFly_version for i915 hw context support
Sepherosa Ziehau [Mon, 29 Sep 2014 12:18:46 +0000 (20:18 +0800)]
udp: Optimize detach path
If the inpcb was never put onto wildcard hash and the multicast options
were never accessed nor modified, we could directly dispose the inpcb
on detach path instead of going through all netisrs to make sure that
it is no longer being accessed.
After this commit 'kq_connect_client -u' gives ~180Kconns/s instead of
~160Kconns/s (~12% improvement).
Sepherosa Ziehau [Mon, 29 Sep 2014 12:16:56 +0000 (20:16 +0800)]
inpcb: Define INP_WASBOUND_NOTANY as protocol specific flag
Sepherosa Ziehau [Mon, 29 Sep 2014 12:15:50 +0000 (20:15 +0800)]
inpcb: Revoke INP_WILDCARD_MP, which serves no purpose now
While I'm here, use ncpus2 instead of ncpus for TCP, which only uses
ncpus2 netisrs.
Sepherosa Ziehau [Mon, 29 Sep 2014 12:14:39 +0000 (20:14 +0800)]
tcp: Check multicast sopt name after sopt level is checked
Markus Pfeiffer [Sun, 28 Sep 2014 22:32:19 +0000 (22:32 +0000)]
net: add version numbers to lagg sourcefiles, adapt manpage
Markus Pfeiffer [Fri, 22 Nov 2013 22:19:07 +0000 (22:19 +0000)]
net: import FreeBSD's if_lagg
Sepherosa Ziehau [Sun, 28 Sep 2014 11:43:20 +0000 (19:43 +0800)]
tools/netrate: Get socket's cpu hint and bind cpu accordingly
Sepherosa Ziehau [Thu, 25 Sep 2014 13:51:14 +0000 (21:51 +0800)]
socket: Provide socket owner cpuid hint
If the cpuid hint could not be provided or the cpuid hint does not make
sense, -1 will be returned as cpuid hint, e.g. TCP listen sockets w/o
SO_REUSEPORT.
This helps avoiding unnecessary IPIs and contention on receiving sockbuf
token.
Sepherosa Ziehau [Mon, 22 Sep 2014 14:26:40 +0000 (22:26 +0800)]
udp: Redistribute SO_REUSEPORT socket based on local group index
This improves the request/response transation rate a lot for UDP sockets
which set SO_REUSEPORT, by cpu localizing the request and response
processing.
tools/netrate/udpecho 64B request/response transation rate is raised from
1.24Mtrans/s to 1.39Mtrans/s (~12% improvement).
Sepherosa Ziehau [Mon, 22 Sep 2014 11:27:07 +0000 (19:27 +0800)]
inpcb: Add in_pcb{link,unlink}_flags() to bypass INP_WILDCARD check
It is safe to change the inpcb's pcblist while the it is still referenced
by the wildcard hash.
Sepherosa Ziehau [Sun, 21 Sep 2014 13:00:32 +0000 (21:00 +0800)]
inpcb: Save local group index
So that the caller, e.g. UDP protocol, could redistribute the inpcb
accordingly.
We keep the local group sorted by the inpcb local group index in
ascending order. This eases the multi-process userland application
which uses SO_REUSEPORT sockets and binds process to the owner cpu
of the SO_REUSEPORT socket:
If we didn't sort the local group by the inpcb local group index and
one of the process owning an inpcb in this local group restarted, e.g.
crashed and restarted by watchdog, other processes owning a inpcb in
this local group would have to detect that event, refetch its socket's
owner cpu, and re-bind.
Matthew Dillon [Sat, 27 Sep 2014 04:41:23 +0000 (21:41 -0700)]
hammer - Disallow creation of a file/subdir/etc in a deleted directory
* Disallow the creation of inodes within deleted directories. This
possibility occurs if a program is CD'd into an empty directory which
is then rmdir'd, and the program then tries to create something
in the now-destroyed directory.
Reported-by: varialus
Sepherosa Ziehau [Tue, 23 Sep 2014 12:51:14 +0000 (20:51 +0800)]
test/udp: Add SO_REUSEPORT test
Sascha Wildner [Tue, 23 Sep 2014 08:29:55 +0000 (10:29 +0200)]
kernel/lockf: Add include for LOCKF_DEBUG and fix printf warnings.
Sascha Wildner [Mon, 22 Sep 2014 11:33:25 +0000 (13:33 +0200)]
kernel/i915: Add missing opt_acpi.h to SRCS.
Sascha Wildner [Mon, 22 Sep 2014 11:14:01 +0000 (13:14 +0200)]
kernel/drm: Add back #include "opt_drm.h" to drmP.h so that DRM_DEBUG works.
Sepherosa Ziehau [Sun, 21 Sep 2014 14:00:40 +0000 (22:00 +0800)]
udp: Factor out function to reset inpcb route cache
Sascha Wildner [Sun, 21 Sep 2014 09:21:27 +0000 (11:21 +0200)]
kernel/acpi: Sync acpi_resource with FreeBSD.
* Use AcpiWalkResources() for parsing _CRS result.
* Add support for 64-bit address range resources.
* Add workaround for BIOSes that specify edge-sensitive but active low
settings for ACPI-enumerated serial ports (such as the one found on
an Intel
D2500CCE mobo).
* Minor fixes/cleanup.
Sepherosa Ziehau [Sun, 21 Sep 2014 08:09:15 +0000 (16:09 +0800)]
netrate/pktgen: Unbreak building
Sepherosa Ziehau [Sun, 21 Sep 2014 08:03:11 +0000 (16:03 +0800)]
inpcb: Remove the code that does hash-threshold wildcard sockets selection
We always use modulo-N here.
Sepherosa Ziehau [Sun, 21 Sep 2014 07:29:41 +0000 (15:29 +0800)]
udp: Prepare for re-redispatching for SO_REUSEPORT sockets
Sascha Wildner [Sat, 20 Sep 2014 15:05:26 +0000 (17:05 +0200)]
kernel/acpi: Use ACPI_FAILURE() and also remove unneeded variables.
François Tigeot [Thu, 18 Sep 2014 18:15:24 +0000 (20:15 +0200)]
drm: Fix a randr bug
* Sync drm_linux_list_sort.c with FreeBSD, fixing a qsort_r() bug
* Array elements were not properly sorted, resulting in infinite
loops in KDE
* FreeBSD revision: 258549
Pointed-out-by: dumbbell
Sepherosa Ziehau [Thu, 18 Sep 2014 12:31:57 +0000 (20:31 +0800)]
rip: All processing should only happens in netisr0
Add assertions about it and remove unnecessary token.
Sepherosa Ziehau [Thu, 18 Sep 2014 12:29:49 +0000 (20:29 +0800)]
divert: Don't call abort method in disconnect method
Use soisdisconnected() is enough; divert's abort method should never
be called.
Sascha Wildner [Wed, 17 Sep 2014 19:21:14 +0000 (21:21 +0200)]
Update the pciconf(8) database.
September 13, 2014 snapshot from http://pciids.sourceforge.net/
Sascha Wildner [Wed, 17 Sep 2014 18:46:04 +0000 (20:46 +0200)]
kernel/ale: Fix typo in a comment.
Sascha Wildner [Wed, 17 Sep 2014 17:11:25 +0000 (19:11 +0200)]
kernel/acpi: Add our copyright to two files.
Sascha Wildner [Tue, 16 Sep 2014 13:57:34 +0000 (15:57 +0200)]
kernel/acpi: Fix typo, i must be <count.
Sascha Wildner [Tue, 16 Sep 2014 13:20:37 +0000 (15:20 +0200)]
kernel/acpi: Add acpi_eval_osc() as a general function for running _OSCs.
This is a hopefully true-to-the-spec implementation, as described in
chapter "6.2.11 _OSC (Operating System Capabilities)" of the 5.1 spec.
Handling of the query support flag could be better (i.e., we could
pass the returned buffer back to the caller), but we don't need that
yet.
This also fixes bugs in the the error handling which in our acpi_cpu
specific previous implementation didn't work at all, due to my mistakes.
In-discussion-with: sephe
Antonio Huete Jimenez [Mon, 15 Sep 2014 22:00:40 +0000 (15:00 -0700)]
test - Testing the bot 1
Markus Pfeiffer [Mon, 8 Sep 2014 20:48:03 +0000 (21:48 +0100)]
sys/dev/drm/i915: Activate ACPI
While I am here, do some whitespace cleanup as well.
Markus Pfeiffer [Mon, 15 Sep 2014 21:19:56 +0000 (21:19 +0000)]
Revert "sys/dev/drm/i915: Activate ACPI"
This reverts commit
813bcdd292df9531f0d499d8cd9202238f51c961.
Antonio Huete Jimenez [Mon, 15 Sep 2014 21:38:29 +0000 (14:38 -0700)]
test - Testing the bot
Markus Pfeiffer [Mon, 8 Sep 2014 20:48:03 +0000 (21:48 +0100)]
sys/dev/drm/i915: Activate ACPI
Markus Pfeiffer [Sun, 14 Sep 2014 21:34:00 +0000 (21:34 +0000)]
usb4bsd: Fix race condition in usb_dev
The usb_filter_detach was racing the read fifo wakeup notification.
Markus Pfeiffer [Sun, 14 Sep 2014 21:05:27 +0000 (21:05 +0000)]
usb4bsd: fix ehci_device_resume panic
The onhwqueue flag wasn't reset on suspend which lead to a panic
on resume
Sascha Wildner [Sat, 13 Sep 2014 23:13:00 +0000 (01:13 +0200)]
kernel/acpi_battery: Add quirk for DSDTs which report a negative 16-bit rate.
Discovered on a Packard Bell ENTF71BM laptop.
Fix found in Linux.
François Tigeot [Sat, 13 Sep 2014 07:13:09 +0000 (09:13 +0200)]
drm/i915: i915_gem_object_pin() takes 4 arguments
Obtained-from: Linux 3.8.13
Sascha Wildner [Fri, 12 Sep 2014 23:04:17 +0000 (01:04 +0200)]
acpiconf(8): Sync with FreeBSD.
Sascha Wildner [Fri, 12 Sep 2014 22:42:14 +0000 (00:42 +0200)]
kernel/acpi: Sync acpi_battery and acpi_cmbat with FreeBSD.
Sascha Wildner [Fri, 12 Sep 2014 22:18:17 +0000 (00:18 +0200)]
rc.d/localdaemons: Redirect rcorder's stderr output rather than tr's.
This silences the warnings it outputs about unknown BEFOREs and
REQUIREs.
Sepherosa Ziehau [Thu, 11 Sep 2014 13:29:26 +0000 (21:29 +0800)]
divert: All processing should only happens in netisr0
Add assertions about it and remove unnecessary token.
Sascha Wildner [Wed, 10 Sep 2014 19:35:32 +0000 (21:35 +0200)]
bmake(1): Add missing DPADD.
Sascha Wildner [Wed, 10 Sep 2014 19:34:57 +0000 (21:34 +0200)]
dfregress(8): Fix typos in DPADDs.
Sascha Wildner [Wed, 10 Sep 2014 19:27:48 +0000 (21:27 +0200)]
split(1): Remove wrong semicolon in the Makefile.
François Tigeot [Tue, 9 Sep 2014 13:45:37 +0000 (15:45 +0200)]
drm/i915: Add the I915_REG_READ IOCTL
This driver now supports the same set of ioctls as its Linux 3.8.13
version.
Sascha Wildner [Wed, 10 Sep 2014 12:23:23 +0000 (14:23 +0200)]
icmp6.4: Fix typo.
Sepherosa Ziehau [Tue, 9 Sep 2014 14:40:39 +0000 (22:40 +0800)]
netrate/accept_connect: Switch to err(3)
Sepherosa Ziehau [Tue, 9 Sep 2014 13:38:42 +0000 (21:38 +0800)]
route/inet: Dispatch in_rtqdrain to netisrs to run
Sepherosa Ziehau [Tue, 9 Sep 2014 13:12:48 +0000 (21:12 +0800)]
syncache: Remove syncache_null_rport; use netisr_adone_rport instead
Markus Pfeiffer [Tue, 9 Sep 2014 22:03:09 +0000 (22:03 +0000)]
sys/dev/disk/sdhci: Adapt manpage
Markus Pfeiffer [Tue, 9 Sep 2014 19:55:10 +0000 (19:55 +0000)]
sys/dev/disk/sdhci: Make it possible to build as a module
Markus Pfeiffer [Tue, 9 Sep 2014 19:08:42 +0000 (20:08 +0100)]
sys/dev/disk/sdhci: update to FreeBSD r270885
Joris Giovannangeli [Tue, 9 Sep 2014 13:15:20 +0000 (15:15 +0200)]
libc/nmalloc: fix a mistake in previous commit
Sepherosa Ziehau [Mon, 8 Sep 2014 12:36:55 +0000 (20:36 +0800)]
syncache: Prioritize timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 12:30:48 +0000 (20:30 +0800)]
arp: Prioritize timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 12:26:47 +0000 (20:26 +0800)]
route/inet: Prioritize timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 12:11:22 +0000 (20:11 +0800)]
igmp: Prioritize fast and slow timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 12:07:11 +0000 (20:07 +0800)]
ipflow: Prioritize timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 12:01:54 +0000 (20:01 +0800)]
ip: Prioritize drain and timeout netmsgs
Sepherosa Ziehau [Mon, 8 Sep 2014 11:46:28 +0000 (19:46 +0800)]
tcp: Dispatch tcp_drain to netisrs to run
- Avoid two extra M_WAITOK mallocs
- Simplify drain logic, since inpcb marker is no longer needed
Joris Giovannangeli [Sun, 7 Sep 2014 22:24:18 +0000 (00:24 +0200)]
libc/nmalloc: add an integer overflow check to calloc
Sascha Wildner [Sun, 7 Sep 2014 21:46:49 +0000 (23:46 +0200)]
kernel/i386: In the RAM driver, don't include regions above 4GB.
Taken-from: FreeBSD
Sascha Wildner [Sun, 7 Sep 2014 18:11:05 +0000 (20:11 +0200)]
kernel/i386: Add RAM driver for i386.