summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MFC r284237,284277:delphij2015-06-2470-553/+1319
| | | | | | file 5.23. Relnotes: yes
* MFC r284512: Properly handle locking on the ARP protocol request sending.eri2015-06-241-3/+12
|
* MFC r284683:gjb2015-06-241-3/+3
| | | | | | | | | | | | | | Enable ttyu1, ttyu2, ttyu3 for arm installations. This should make all consoles available, whether it is VGA, HDMI, serial, or JTAG, but more importantly enables all consoles when ttyu0 is not predictable. For example, the Pandaboard ES apparently has three consoles available, but the DB9/RS232 serial port is ttyu2, so not available by default after the system boots. Sponsored by: The FreeBSD Foundation
* MFC r284660, r284676:gjb2015-06-243-16/+3
| | | | | | | | | | | | | | | | | | | r284660: Remove the Azure-local vm_extra_create_disk(), since we no longer need qemu-img to convert the final VHD image to an Azure-compatible format. Although the waagent utility is installed from ports, create the symlink to /usr/sbin, pending investigation on where this is hard-coded, so it can be reported upstream. r284676: Append the hour and minute to the snapshot suffix for EC2 AMIs and Azure VM images. This is particularly helpful for testing to avoid name collisions, but also useful for cases where a necessary rebuild is done before the date changes. Sponsored by: The FreeBSD Foundation
* MFC r284269, r284270, r284655, r284656, r284658:marcel2015-06-243-52/+76
| | | | | | | | | | VHD fixes for Microsoft Azure: 1. Round the image size to the VHD geometry and then round to a multiple of 1MB. 2. Change the creator OS from "FBSD" to "Wi2k". It matters... 3. Bump the VHD tool version and the mkimg version. Approved by: re (gjb)
* MFC r284306: MFV r284036: 5961 Fix stack overflow in zfs_create_fsavg2015-06-241-16/+17
|
* MFC r284303: MFV r283534: 5515 dataset user hold doesn't reject empty tagsavg2015-06-241-2/+15
|
* MFC r284301: MFV r284040: check that datasets are snapshotsavg2015-06-242-0/+12
|
* MFC r284309: zfs clone should not mount the clone if canmount == noautoavg2015-06-241-11/+30
|
* MFH: r284250brueffer2015-06-241-1/+1
| | | | | | | Consistently use trailing whitespace in passphrase prompts. PR: 193496 Submitted by: Fabian Keil
* MFH: r284249brueffer2015-06-241-1/+1
| | | | | | Correct Hawaii's admission day. PR: 192651
* Fix r284612: As pointed out by jhb, in stable branches, if_baudrategallatin2015-06-231-1/+1
| | | | | | | | is 32b on 32b platforms. So rather than a simple MFC of r284612, we need to use if_initbaudrate() to properly express a 40Gb speed. Spotted by: jhb Sponsored by: Netflix
* Revert part of the r283303 (by jhb):kib2015-06-232-2/+2
| | | | | | | | | Revert MFC of r270223, which bumped MAXCPU on amd64 from 64 to 256. The cpuset_getaffinity(2) and cpuset_setaffinity(2) check minimum set size, which now fails for binaries compiled on 10.0 with MAXCPU == 64. Submitted by: jhb PR: 200802
* MFC r284609: Interim fix for "Login not found" error.dteske2015-06-232-10/+10
| | | | PR: bin/196514
* MFC r283863:dteske2015-06-232-4/+1
| | | | | | | | | Fix a debug statement. Only the callback function (performing the incrementing of dpv_overall_oread) knows what its purpose is (and often times it was bytes, not lines). MFC r283975 (araujo): Clean up unused variable and silence clang warnings.
* MFC r284672 (antoine):dteske2015-06-231-1/+2
| | | | | | Install version.4th.8 again It was disconnected from installation in r281081, but was never removed from the tree or added to ObsoleteFiles.inc
* MFC r284612: Fix a typogallatin2015-06-221-1/+1
| | | | Sponsored by: Netflix
* MFC: r284578jkim2015-06-221-1/+1
| | | | Fix a typo.
* When using KTRACE, set a variable to the appropriate value and don'ttuexen2015-06-221-0/+8
| | | | | | | | | | leave it initialized at NULL. Since the affected functions where moved from sys/kern/uipc_syscalls.c to sys/netinet/sctp_syscalls.c it was not possible to MFC r284613. Therefore, this is a direct commit with the corresponding changes of r284613. Reported by: Coverity CID: 1018058, 1018060
* MFC r284604:tuexen2015-06-221-13/+39
| | | | | | | Don't leak sockets. Reported by: Coverity CID: 1306785
* MFC r284596:tuexen2015-06-221-9/+16
| | | | When setting the primary address, return an error whenever it fails.
* MFC r284547:tuexen2015-06-221-7/+10
| | | | | | | | Fix a bug reported by coverity. Since AF_UNIX sockets don't have multiple addresses, the problem didn't show up during testing. Reported by: Coverity CID: 1306787
* MFC r284617:gjb2015-06-221-2/+2
| | | | | | Fix path to waagent. Sponsored by: The FreeBSD Foundation
* MFC r283141:trasz2015-06-211-2/+6
| | | | | | | Remove the warning about invalid PE checksum; apparently nothing cares about those checksums anyway. Sponsored by: The FreeBSD Foundation
* MFC r283285:trasz2015-06-214-6/+10
| | | | | | Advertise ctlstat(8) a little better. Sponsored by: The FreeBSD Foundation
* MFC r281929:trasz2015-06-212-5/+5
| | | | | | Fix growfs(8) build with debug enabled (make -DGFSDBG). Sponsored by: The FreeBSD Foundation
* MFC r282238:trasz2015-06-211-1/+1
| | | | | | Remove spurious period. Sponsored by: The FreeBSD Foundation
* MFC r282236:trasz2015-06-211-5/+42
| | | | | | Make rctl(8) more user-friendly when RACCT/RCTL is disabled for some reason. Sponsored by: The FreeBSD Foundation
* MFC r282857:trasz2015-06-211-1/+23
| | | | | | Document RCTL events in devd.conf(5). Sponsored by: The FreeBSD Foundation
* MFC r282213:trasz2015-06-2125-182/+456
| | | | | | | | | | | | | | | | | | Add kern.racct.enable tunable and RACCT_DISABLED config option. The point of this is to be able to add RACCT (with RACCT_DISABLED) to GENERIC, to avoid having to rebuild the kernel to use rctl(8). MFC r282901: Build GENERIC with RACCT/RCTL support by default. Note that it still needs to be enabled by adding "kern.racct.enable=1" to /boot/loader.conf. Note those two are MFC-ed together, because the latter one changes the name of RACCT_DISABLED option to RACCT_DEFAULT_TO_DISABLED. Should have committed the renaming separately... Relnotes: yes Sponsored by: The FreeBSD Foundation
* MFC r284567:gjb2015-06-212-0/+54
| | | | | | | Add Makefile.azure, used to upload VHD images to the Microsoft Azure environment, similar to the EC2 AMIs. Sponsored by: The FreeBSD Foundation
* MFC r284127:markj2015-06-211-4/+13
| | | | | | | | | witness: don't warn about matrix inconsistencies without holding the mutex Lock order checking is done without the witness mutex held, so multiple threads that are racing to establish a new lock order may read matrix entries that are in an inconsistent state. Don't print a warning in this case, but instead just redo the check after taking the witness lock.
* MFC: r284531rmacklem2015-06-201-1/+4
| | | | | | | Document that a forced dismount of an NFSv3 mount when the NLM (rpc.lockd) is running can crash the system. Unfortunately this is not easy to fix, but I have left PR#200585 open.
* MFC r281820:trasz2015-06-201-3/+9
| | | | | | Add hint about "volmode=dev" to ctl.conf(5). Sponsored by: The FreeBSD Foundation
* MFC r284346:dim2015-06-201-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following clang 3.7.0 warnings in lib/libfetch/http.c: lib/libfetch/http.c:1628:26: error: address of array 'purl->user' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.user = purl->user ? ~~~~~~^~~~ ~ lib/libfetch/http.c:1630:30: error: address of array 'purl->pwd' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.password = purl->pwd? ~~~~~~^~~~ lib/libfetch/http.c:1657:25: error: address of array 'url->user' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.user = url->user ? ~~~~~^~~~ ~ lib/libfetch/http.c:1659:29: error: address of array 'url->pwd' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.password = url->pwd ? ~~~~~^~~ ~ lib/libfetch/http.c:1669:25: error: address of array 'url->user' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.user = url->user ? ~~~~~^~~~ ~ lib/libfetch/http.c:1671:29: error: address of array 'url->pwd' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] aparams.password = url->pwd ? ~~~~~^~~ ~ Since url->user and url->pwd are arrays, they can never be NULL, so the checks can be removed. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D2673
* MFC r284167:dim2015-06-201-6/+2
| | | | | | | | | | | | | | | Merge r283870 from amd64: Remove unneeded NULL checks in trap_fatal(). Since td_name is an array member of struct thread, it can never be NULL, so the check can be removed. In addition, curproc can never be NULL, so remove the if statement, and splice the two printfs() together. While here, remove the u_long cast, and use the correct printf format specifier for curproc->p_pid. Requested by: jhb
* MFC r284526:tuexen2015-06-201-3/+6
| | | | | Fix a bug related to flow assignment I introduced in https://svnweb.freebsd.org/base?view=revision&revision=275483
* MFC r284515:tuexen2015-06-2012-46/+65
| | | | | | | Add FIB support for SCTP. This fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200379 PR: 200379
* MFC r266420 (by adrian)hiren2015-06-192-0/+2
| | | | | | | | Ensure that the flowid hashtype is assigned to the inp if the flowid is also assigned. Spotted by: gallatin Tested by: gallatin
* MFC r284013: Allow setting only WWNN or only WWPN.mav2015-06-191-5/+13
|
* Update stable/10 from 10.1-STABLE to 10.2-PRERELEASE,gjb2015-06-193-5/+6
| | | | | | | | | | marking the official start of the code slush. Set the default mdoc(7) version to 10.2, and update the clang(1) TARGET_TRIPLE and BUILD_TRIPLE to reflect 10.2. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
* Merge r284280kp2015-06-181-7/+3
| | | | | | | | | | | pf: Remove frc_direction We don't use the direction of the fragments for anything. The frc_direction field is assigned, but never read. Just remove it. Differential Revision: https://reviews.freebsd.org/D2825 Reviewed by: gnn
* Merge r284222, r284260kp2015-06-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | pf: address family must be set when creating a pf_fragment Fix a panic when handling fragmented ip4 packets with 'drop-ovl' set. In that scenario we take a different branch in pf_normalize_ip(), taking us to pf_fragcache() (rather than pf_reassemble()). In pf_fragcache() we create a pf_fragment, but do not set the address family. This leads to a panic when we try to insert that into pf_frag_tree because pf_addr_cmp(), which is used to compare the pf_fragments doesn't know what to do if the address family is not set. Simply ensure that the address family is set correctly (always AF_INET in this path). When we try to look up a pf_fragment with pf_find_fragment() we compare (see pf_frag_compare()) addresses (and family), but also protocol. We failed to save the protocol to the pf_fragment in pf_fragcache(), resulting in failing reassembly. PR: 200330 Differential Revision: https://reviews.freebsd.org/D2824 Reviewed by: gnn
* Merge r278874, r278925, r278868kp2015-06-182-45/+41
| | | | | | | | | | | | - Improve INET/INET6 scope. - style(9) declarations. - Make couple of local functions static. - Even more fixes to !INET and !INET6 kernels. In collaboration with pluknet - Toss declarations to fix regular build and NO_INET6 build. Differential Revision: https://reviews.freebsd.org/D2823 Reviewed by: gnn
* Merge r281536kp2015-06-181-1/+1
| | | | | | | | | | | | | | pf: Fix forwarding detection If the direction is not PF_OUT we can never be forwarding. Some input packets have rcvif != ifp (looped back packets), which lead us to ip6_forward() inbound packets, causing panics. Equally, we need to ensure that packets were really received and not locally generated before trying to ip6_forward() them. Differential Revision: https://reviews.freebsd.org/D2822 Reviewed by: gnn
* Merge r281234kp2015-06-181-40/+41
| | | | | | | | | | | Evaluate packet size after the firewall had its chance Defer the packet size check until after the firewall has had a look at it. This means that the firewall now has the opportunity to (re-)fragment an oversized packet. Differential Revision: https://reviews.freebsd.org/D2821 Reviewed by: gnn
* Merge r281165kp2015-06-181-15/+2
| | | | | | | | | | | Remove duplicate code We'll just fall into the same local delivery block under the 'if (m->m_flags & M_FASTFWD_OURS)'. Suggested by: ae Differential Revision: https://reviews.freebsd.org/D2820 Reviewed by: gnn
* Merge r281164kp2015-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pf: Skip firewall for refragmented ip6 packets In cases where we scrub (fragment reassemble) on both input and output we risk ending up in infinite loops when forwarding packets. Fragmented packets come in and get collected until we can defragment. At that point the defragmented packet is handed back to the ip stack (at the pfil point in ip6_input(). Normal processing continues. Eventually we figure out that the packet has to be forwarded and we end up at the pfil hook in ip6_forward(). After doing the inspection on the defragmented packet we see that the packet has been defragmented and because we're forwarding we have to refragment it. In pf_refragment6() we split the packet up again and then ip6_forward() the individual fragments. Those fragments hit the pfil hook on the way out, so they're collected until we can reconstruct the full packet, at which point we're right back where we left off and things continue until we run out of stack. Break that loop by marking the fragments generated by pf_refragment6() as M_SKIP_FIREWALL. There's no point in processing those packets in the firewall anyway. We've already filtered on the full packet. Differential Revision: https://reviews.freebsd.org/D2819 Reviewed by: gnn
* Merge r280956kp2015-06-181-4/+4
| | | | | | | | | | | | | | | | pf: Deal with runt packets On Ethernet packets have a minimal length, so very short packets get padding appended to them. This padding is not stripped off in ip6_input() (due to support for IPv6 Jumbograms, RFC2675). That means PF needs to be careful when reassembling fragmented packets to not include the padding in the reassembled packet. While here also remove the 'Magic from ip_input.' bits. Splitting up and re-joining an mbuf chain here doesn't make any sense. Differential Revision: https://reviews.freebsd.org/D2818 Reviewed by: gnn
* Merge r280955kp2015-06-183-5/+13
| | | | | | | | | | | | | | | Preserve IPv6 fragment IDs accross reassembly and refragmentation When forwarding fragmented IPv6 packets and filtering with PF we reassemble and refragment. That means we generate new fragment headers and a new fragment ID. We already save the fragment IDs so we can do the reassembly so it's straightforward to apply the incoming fragment ID on the refragmented packets. Differential Revision: https://reviews.freebsd.org/D2817 Reviewed by: gnn
OpenPOWER on IntegriCloud