FreshBSD

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/vm/vm_unix.c (unresolved)

Fix i386 build after r351368

Reported by:    cy
Submitted by:   cy

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  arch.7: add default tool chain table
  MFC 350666: Tidy up the list of auth and encryption algorithms for IPsec stats.
  MFC 348970,348974: Make the warning intervals for deprecated crypto algorithms tunable.

dsynth - Fix waitpid() bug, revamp phase poll loop

* Fix an issue where the wrong wait*() status is processed as
  the error code.  This could occur especially on slow machines.

* Be sure to clean out any log data on the pty while and after
  processing the wait*() on the primary pid as there might be
  some as-yet unprocessed data.

* Use non-blocking mode on the masterpty to ensure that we
  don't accidently block on it.

[debugserver] Switch back to std::once_flag

We cannot use llvm::once_flag in debugserver because doesn't link
against llvm.

[lit] Diagnose insufficient args to internal env

Without this patch, failing to provide a subcommand to lit's internal
`env` results in either a python `IndexError` or an attempt to execute
the final `env` argument, such as `FOO=1`, as a command.  This patch
diagnoses those cases with a more helpful message.

Reviewed By: stella.stamenova

Differential Revision: https://reviews.llvm.org/D66482

[OpenMP] Permit map with DSA on combined directive

For `map`, the following restriction changed in OpenMP 5.0:

* OpenMP 4.5 [2.15.5.1, Restrictions]: "A list item cannot appear in
  both a map clause and a data-sharing attribute clause on the same
  construct.

* OpenMP 5.0 [2.19.7.1, Restrictions]: "A list item cannot appear in
  both a map clause and a data-sharing attribute clause on the same
  construct unless the construct is a combined construct."

This patch removes this restriction in the case of combined constructs
and OpenMP 5.0, and it updates Sema not to capture a scalar by copy in
the target region when `firstprivate` and `map` appear for that scalar
on a combined target construct.

This patch also adds a fixme to a test that now reveals that a
diagnostic about loop iteration variables is dropped in the case of
OpenMP 5.0.  That bug exists regardless of this patch's changes.

Reviewed By: ABataev, jdoerfert, hfinkel, kkwli0

Differential Revision: https://reviews.llvm.org/D65835

Update 2.8 --> 2.9

Update 2.8 --> 2.9

Specifying array sizes for fully initialized tables at compile time is
redundant.

MFC after:      1 week

TODO: apache-commons-beanutils add CVE-2019-10086

Change w(1) to compute FROM (host) field size dynamically

It's nice to be able to display a full IPv6 host address if
needed, but it's also nice to display more than 3 characters of a command
line. Compute the needed size for the FROM column in an earlier pass,
and determine the maximum, then print what fits for the command.

Reviewed by:    marcel@ (markm@ previous revision)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D21211

[lldb] Replace std::once_flag with llvm::once_flag.

Summary:
The former seems like it's not working on some platforms.
All the other uses use `llvm::`, so, let's change for consistency.

Reviewers: jasonmolenda, friss

Subscribers: lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D66566

[FormatManage] Fix the format info order

The format info entries need to match the order of the enum entries.
This should fix the two failing data-formatter tests.

[analyzer] Enable control dependency condition tracking by default

This patch concludes my GSoC'19 project by enabling track-conditions by default.

Differential Revision: https://reviews.llvm.org/D66381

Tag wpa_supplicant/hostapd 2.9.

Import wpa_supplicant/hostapd 2.9

[analyzer] CastValueChecker: Model isa(), isa_and_nonnull()

Summary: -

Reviewed By: NoQ

Differential Revision: https://reviews.llvm.org/D66423

[FormatManager] Add static_assert to keep formats in sync.

This adds a static assert that ensures that there's a format info entry
for every format enum value. This should prevent others from making the
same mistake I made and Jason kindly fixed in r369611. (Thanks!)

Remove stray line that was duplicated.

Noticed by: rpokala@

Document Intel RST support just added

* Support Java 9+ by not setting java.endorsed.dirs for those versions

PR:            239892
Submitted by:   vvd at unislabs.com (maintainer)

[analyzer] Don't track the condition of foreach loops

As discussed on the mailing list, notes originating from the tracking of foreach
loop conditions are always meaningless.

Differential Revision: https://reviews.llvm.org/D66131

* Update to 9.0.24
* Support Java 9+ by not setting java.endorsed.dirs for those versions

PR:            239892
Submitted by:   vvd at unislabs.com (maintainer)

Pet portlint

[X86] Making X86OptimizeLEAs pass public. NFC

Reviewers: wxiao3, LuoYuanke, andrew.w.kaylor, craig.topper, annita.zhang, liutianle, 
pengfei, xiangzhangllvm, RKSimon, spatel, andreadb

Reviewed By: RKSimon

Subscribers: andreadb, hiraditya, llvm-commits

Tags: #llvm

Patch by Gen Pei (gpei)

Differential Revision: https://reviews.llvm.org/D65933

Update to netty 4.1.39

PR:            219218

The g_format_infos table needs to be updated in concert with the
enum Format entries; else we can crash in a place like
FormatManager::GetFormatAsCString().  We should add  bounds checks
to prevent this more reliably, but for tonight I'm just adding this
entry to keep an address-sanitizer test run working.

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Add hold events for lockmgr probes, missed in r351361.
  Add lockmgr(9) probes to the lockstat DTrace provider.
  nullfs: lock the vnode with LK_SHARED in null_vptocnp
  Fix inverted predicates for sx lock hold events in lockstat(1).
  Document RST support in nvme(4) and ahci(4).
  Create a AHCI attachment for nvme.
  Separate the pci attachment from the rest of nvme
  ping: add -H option for enabling reverse DNS lookup
  Improve NVMe hot unplug handling.
  Remove manual wire_count adjustments from the unmapped mbuf code.
  Fix _pthread_cancel_enter() and _pthread_cancel_leave() jmptable entries.
  Modify pipe_poll() to properly check for pending direct writes.
  makefs: Verify that the BPB media descriptor and FAT ID match
  makefs: share denode.h between kernel msdosfs and makefs

dsynth - Add manual page, change configuration directory, more

* Change the configuration location from /usr/local/etc/synth.ini
  to /etc/dsynth/dsynth.ini and (as an alternate)
  /usr/local/etc/dsynth/dsynth.ini

* Add 'dsynth debug <port>' directive.  This will build all
  dependencies and then build the specified port and freeze
  its worker slot with mounts still intact.

* Add the 'dsynth init' directive.  This will initialize the
  /etc/dsynth directory and default configuration files.
  This directive will refuse to do anything if /etc/dsynth
  or /usr/local/etc/dsynth already exists.

* Allow 'Number_of_builders' and/or 'Max_jobs_per_builder' to
  be specified as 0.  If 0, these parameters will be
  auto-configured.

* Add the dsynth(1) manual page.

* Include a procfs (/proc) mount in the worker chroot.

* Change a 'cpdup' to a 'cp' to improve portability.  Also change
  how the Template is generated a bit.

[COFF] Fix section name for constants larger than 64 bits on Windows

APIntToHexString returns wrong value ("0000000000000000ffffffffffffffff")
for integer larger than 64 bits, and thus
TargetLoweringObjectFileCOFF::getSectionForConstant returns same section name
for all numbers larger than 64 bits. This patch tries to fix it.

Differential Revision: https://reviews.llvm.org/D66458
Patch by Senran Zhang

[analyzer] CastValueChecker: Try to fix the buildbots

Add a couple of lines noting that r351372 maps ENOTTY->EINVAL for other cases.

Document r351361.

Map ENOTTY to EINVAL for lseek(SEEK_DATA/SEEK_HOLE).

Without this patch, when an application performed lseek(SEEK_DATA/SEEK_HOLE)
on a file in a file system that does not have its own VOP_IOCTL(), the
lseek(2) fails with errno ENOTTY. This didn't seem appropriate, since
ENOTTY is not listed as an error return by either the lseek(2) man page
nor the POSIX draft for lseek(2).
This was discussed on freebsd-current@ here:
http://docs.FreeBSD.org/cgi/mid.cgi?CAOtMX2iiQdv1+15e1N_r7V6aCx_VqAJCTP1AW+qs3Yg7sPg9wA

This trivial patch maps ENOTTY to EINVAL for lseek(SEEK_DATA/SEEK_HOLE).

Reviewed by:    markj
Relnotes:       yes
Differential Revision:  https://reviews.freebsd.org/D21300

   unused variable, after previous commit

Add a workaround for the midi issue.

Reviewed by:    so

- pet portlint
- define arch

gn build: Merge r369605

Allow a NFSv4.2 Data server to handle Seek.

The NFSv4.2 RFC allows a NFSv4.2 Data server to handle Seek, so this change
allows that.

[analyzer] CastValueChecker: Rewrite dead header hotfix

gdb(4): Style

No functional change.

I was surprised to find that no sys/ header already defines the -1 EOF
convention anywhere, so defined one locally.

gdb(4):amd64: Bump MI GDB_BUFSZ for more efficient transfers

A bigger buffer reduces the RTTs to transfer long messages and is otherwise
relatively harmless, especially on systems with plenty of memory.

gdb(4): Implement qXfer:threads:read

This streams out an XML document over several GDB packets describing all
threads in the system; their ids, name, and any loosely defined "extra info"
we feel like including.  For now, I have included a string version of the run
state, similar to some of the DDB logic to stringify thread state.

The benefit of supporting this in addition to the qfThreadInfo/qsThreadInfo
packing is that in this mode, the host gdb does not ask for every thread's
"qThreadExtraInfo," saving per-thread round-trips on "info threads."

To use this feature, (k)gdb needs to be built with the --with-expat option.
I would encourage enabling this option by default in our GDB port, if it is
not already.

Finally, there is another optional attribute you can specify per-thread
called a "handle."  Handles are arbitrarily long sequences of bytes,
represented in the XML as hexadecimal.  It is unclear to me how or if GDB
actually uses handles for anything.  So I have left them out.

arch.7: add default tool chain table

MFC r351035: arch.7: add tool chain table
MFC r351036: arch.7: add deprecation notice for GCC 4.2.1
MFC r351037: arch.7: clarify that the table shows the default tool chain
MFC r351063: arch.7: be explicit about the future for unmigrated GCC 4.2.1 archs

arch.7: add default tool chain table

MFC r351035: arch.7: add tool chain table
MFC r351036: arch.7: add deprecation notice for GCC 4.2.1
MFC r351037: arch.7: clarify that the table shows the default tool chain
MFC r351063: arch.7: be explicit about the future for unmigrated GCC 4.2.1 archs

   like most things: turn debug off by default, sysctl to enable

   usbhist(9):
   - add a USBHIST_CALLARGSN() that only prints the message if debug level is N

   aue(4):
   - switch from printf() to usbhist for debugging

[GWP-ASan] Remove c++ standard lib dependency.

Remove c++ standard library dependency for now for @phosek. They have a
complicated build system that breaks with the fuzzer target here.

Also added a todo to remedy later.

Differential Revision: https://reviews.llvm.org/D66568