------------------------------------------------------------------------ r369250 | emaste | 2021-02-10 06:45:47 -0800 (Wed, 10 Feb 2021) | 10 lines Upgrade to OpenPAM Tabebuia. PR: 235903 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D28528 (cherry picked from commit 23d17223345108c52b96dcc5d7e6dab29e95f3e9) Git Hash: 42167258150ebaaade9c09e3dd05ba02249933aa Git Author: des@FreeBSD.org ------------------------------------------------------------------------ r369251 | git2svn | 2021-02-10 21:16:51 -0800 (Wed, 10 Feb 2021) | 16 lines nvdimm: Fix error path mis-free (diff applied manually due to refactoring) Regression introduced in r343629 when malloc result was renamed from spa to spa_mapping and the 'spa' name was instead used to iterate a table, but the free() target was not updated. Reviewed by: kib, scottph Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D21871 (cherry picked from commit 31f1c8fc84c850d73e74781126e12efceb50032b) Git Hash: 40c1f835412d3e00901a146db6c317d654e65980 Git Author: cem@FreeBSD.org ------------------------------------------------------------------------ r369252 | git2svn | 2021-02-10 21:16:59 -0800 (Wed, 10 Feb 2021) | 17 lines acpi: limit the AMDI0020/AMDI0010 workaround to an option It appears that production versions of EPYC firmware get the _STA method right for these nodes. In fact, this workaround breaks on production hardware by including too many uart nodes. This work around was for pre-release hardware that wound up not having a large deployment. Move this work around to a kernel option since the machines that needed it have been powered off and are difficult to resurrect. Should there be a more significant deployment than is understood, we can restrict it based on smbios strings. Discussed with: mmacy@, seanc@, jhb@ MFC After: 3 days (cherry picked from commit 35af933173d516101f4c44af328fbe2d6e587869) Git Hash: a7c68340584c942792188ad50593d4ef15cc8982 Git Author: imp@FreeBSD.org ------------------------------------------------------------------------ r369253 | git2svn | 2021-02-11 07:22:53 -0800 (Thu, 11 Feb 2021) | 10 lines zgrep: fix exit status with multiple files zgrep should exit with success when given multiple files and the pattern is found in at least one file. Prior to this change, it would exit with success only if the pattern was found in _every_ file. (cherry picked from commit 63c8336d4de15085d50c9d8c855cdc97ee018a04) Git Hash: 07c84bb078e1974be265fc921481ee1608684103 Git Author: vangyzen@FreeBSD.org ------------------------------------------------------------------------ r369254 | kevans | 2021-02-11 07:23:09 -0800 (Thu, 11 Feb 2021) | 27 lines grep: fix null pattern and empty pattern file behavior The null pattern semantics were terrible because I tried to match gnugrep, but I got it wrong. Let's unwind that: - The null pattern should match every line if neither -w nor -x. - The null pattern should match empty lines if -x. - The null pattern should not match any lines if -w. The first two will stop processing (shortcut) even if additional patterns are specified. In any other case, we will continue processing other patterns. If no other patterns are specified beside a null pattern, then we match if neither -w nor -x or set and do not match if either of those are specified. The justification for -w is that it should match on a whole word, but the null pattern deos not have a whole word to match on. Empty pattern files should never match anything, and more importantly, -v should cause everything to be written. PR: 253209 (cherry picked from commit f823c6dc730b0dd08b54a53be1d8fd587eee7021) Git Hash: 92ddb6090b0c5091a64855a514676a452c10750c Git Author: kevans@FreeBSD.org ------------------------------------------------------------------------ r369255 | kevans | 2021-02-11 07:23:12 -0800 (Thu, 11 Feb 2021) | 9 lines grep: turn off -w if -x is specified -x overcomes -w in gnugrep, and it should here as well. Flip it off as needed to avoid confusing other parts of grep. (cherry picked from commit 2373acbbb77d694b997d90f3251810c6edf5d6d8) Git Hash: 1db55207b66154de839e515046736cd06e50fe30 Git Author: kevans@FreeBSD.org ------------------------------------------------------------------------ r369256 | git2svn | 2021-02-11 07:23:14 -0800 (Thu, 11 Feb 2021) | 33 lines grep: fix -A handling in conjunction with -m match limitation The basic issue here is that grep, when given -m 1, would stop all line processing once it hit the match count and exit immediately. The problem with exiting immediately is that -A processing only happens when subsequent lines are processed and do not match. The fix here is relatively easy; when bsdgrep matches a line, it resets the 'tail' of the matching context to the value supplied to -A and dumps anything that's been queued up for -B. After the current line has been printed and tail is reset, we check our mcount and do what's needed. Therefore, at the time that we decide we're doing nothing, we know that 'tail' of the context is correct and we can simply continue on if there's still more to pick up. With this change, we still bail out immediately if there's been no -A flag. If -A was supplied, we signal that we should continue on. However, subsequent lines will not even bothere to try and process the line. We have reached the match count, so even if the next line would match then we must process it if it hadn't. Thus, the loop in procfile() can short-circuit and just process the line as a non-match until procmatches() indicates that it's safe to stop. A test has been added to reflect both that we should be picking up the next line and that the next line should be considered a non-match even if it should have been. PR: 253350 (cherry picked from commit 3e2d96ac974db823255a6f40b90eeffa6e38d022) Git Hash: ad488c9793fd5040f8267620f370f319df31af2d Git Author: kevans@FreeBSD.org ------------------------------------------------------------------------ r369257 | git2svn | 2021-02-11 20:05:46 -0800 (Thu, 11 Feb 2021) | 8 lines Improve ACPI_NFIT_CONTROL_REGION formatting. MFC after: 1 week (cherry picked from commit 35e39fd95fda64699b638192f3bab955d0f1cf0c) Git Hash: f8c7687febedd758705f5fb9fcb8265fff955c1f Git Author: mav@FreeBSD.org ------------------------------------------------------------------------ r369258 | mav | 2021-02-11 20:05:58 -0800 (Thu, 11 Feb 2021) | 11 lines Print DeviceHandle and PhysicalId in hex. The first is actually a bitfield. The second is printed in hex by dmidecode, so uniformidy should be good. MFC after: 1 week (cherry picked from commit 92d0d6bb14d24abea0786edf546af316ff4a2afe) Git Hash: 9525ccc84e337f4261425fc8fbf9f0de18500a1b Git Author: mav@FreeBSD.org ------------------------------------------------------------------------ r369260 | dim | 2021-02-12 13:02:48 -0800 (Fri, 12 Feb 2021) | 20 lines test_inf_inputs: Use atf_tc_expect_fail() instead of atf_tc_skip() Reviewed By: lwhsu Differential Revision: https://reviews.freebsd.org/D28396 (cherry picked from commit 4d2edf3af1dbd8a3e7cf1b22343a1ecfc2dd41ba) Fix lib/msun's ctrig_test/test_inf_inputs test case with clang >= 10 This sprinkles a few strategic volatiles in an attempt to defeat clang's optimization interfering with the expected floating-point exception flags. Reported by: lwhsu PR: 244732 (cherry picked from commit ac76bc1145dd7f4476e5d982ce8f355f71015713) Git Hash: f2a88e744701de1b37d7463828f2147f96e39d58 Git Author: arichardson@FreeBSD.org ------------------------------------------------------------------------ r369261 | kib | 2021-02-13 16:48:34 -0800 (Sat, 13 Feb 2021) | 8 lines usleep(3): replace 'process' with 'calling thread' PR: 253395 (cherry picked from commit 4956af2a8f0d7723cb09c98e7f5295b156136f70) Git Hash: 5357bd228fca092453c0970ccb54fc08f5deb939 Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369262 | dim | 2021-02-15 10:14:35 -0800 (Mon, 15 Feb 2021) | 19 lines Fix incorrect powf(3) result with x near 1 and |y| much larger than 1 This adjusts the check to trigger overflow/underflow to a slightly lower value. Before: powf(9.999995e-01, -1.342177e+08) -> inf After: powf(9.999995e-01, -1.342177e+08) -> 1.858724e+31 (cherry picked from commit 93fc67896550548f91b307dbe3053f11db5d4a8a) Add test case for 93fc67896550 (incorrect powf(3) result) This adds the test case to contrib/netbsd-tests/lib/libm/t_pow.c, as it is currently the only place testing pow(3) and friends. (cherry picked from commit 51af03328755c9095e94d20858a8d10acfe412ae) Git Hash: cedb8de26ccc46a9b8215dad58f411b93d101db5 Git Author: sgk@troutmask.apl.washington.edu ------------------------------------------------------------------------ r369264 | markj | 2021-02-15 11:48:27 -0800 (Mon, 15 Feb 2021) | 15 lines mca: Handle inconsistent CMCI capability reporting A BIOS bug may apparently cause the BSP to report that it does not implement CMCI, with some APs reporting that they do. In this scenario, avoid a NULL pointer dereference that occurs in cmci_monitor() because cmc_state was not allocated by the BSP. PR: 253272 Reported by: asomers, mmacy Reviewed by: kib (previous version) (cherry picked from commit b5770470276268acef21368b3e77a325df883500) Git Hash: dadf603f0f7b54c65fa5f16f552ae6da12f8210b Git Author: markj@FreeBSD.org ------------------------------------------------------------------------ r369265 | emaste | 2021-02-15 15:51:35 -0800 (Mon, 15 Feb 2021) | 7 lines Cirrus-CI: use FreeBSD 12.2 image Direct commit to stable/12 as main has other changes here, using the llvm package to avoid building the toolchain. Git Hash: 046f91f21ac619f7307a8e853f863ded4df7f322 Git Author: emaste@FreeBSD.org ------------------------------------------------------------------------ r369266 | cy | 2021-02-15 16:47:33 -0800 (Mon, 15 Feb 2021) | 11 lines MFC 0f34c80f376345b98a972940dd4757e58d7beb06: Replace the redundant MENTAT macro with SOLARIS. MENTAT and SOLARIS are synonymous. Remove the extraneous duplicate macro. (cherry picked from commit 0f34c80f376345b98a972940dd4757e58d7beb06) Git Hash: 624f34ed82b2a712316f257a756c9ca76228a5c9 Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369267 | cy | 2021-02-15 16:47:41 -0800 (Mon, 15 Feb 2021) | 10 lines MFC commit e673debe7db8ba95e4ee3b549d2570e71d19b596: Simplify BSD macro tests. All FreeBSD and NetBSD are BSD >= 199306 and have been for a long time. (cherry picked from commit e673debe7db8ba95e4ee3b549d2570e71d19b596) Git Hash: 1d1120c6ce7a40c47caceb0cdb80dfc6022f259c Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369268 | cy | 2021-02-15 16:47:43 -0800 (Mon, 15 Feb 2021) | 8 lines MFC 10990cb46027b4cc4339540b1217117863b2cd15: Simplify FreeBSD check. (cherry picked from commit 10990cb46027b4cc4339540b1217117863b2cd15) Git Hash: 98cf94afab4dc1e259c6d12e417ce9f7bda2d447 Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369269 | git2svn | 2021-02-15 16:47:45 -0800 (Mon, 15 Feb 2021) | 16 lines MFC 344f1083e128d8d41ca31853dac513ca3efd9d1f: ipfilter: Use the softn (NAT softc) host map size in ip_nat6 calculation. The ipfilter NAT table host map size is a tunable that defaults to a macro value defined at build time. HOSTMAP_SIZE is saved in softn (the ipnat softc) at initialization. It can be tuned (changed) at runtime using the ipf -T command. If the hostmap_size tunable is adjusted the calculation to determine where to put new entries in the table was incorrect. Use the tunable in the NAT softc instead of the static build time value. (cherry picked from commit 344f1083e128d8d41ca31853dac513ca3efd9d1f) Git Hash: 46f4eb3f1eb3ec582331941a173abad904ba198d Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369270 | cy | 2021-02-15 16:47:48 -0800 (Mon, 15 Feb 2021) | 8 lines MFC d20f7a5a3da1aa5bccdabb89c181ca0c49385ecd: Simply FreeBSD check using __FreeBSD__ and remove OpenBSD (cherry picked from commit d20f7a5a3da1aa5bccdabb89c181ca0c49385ecd) Git Hash: d4582137abc299998c92e8613597dbe35881b2aa Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369271 | cy | 2021-02-15 16:47:52 -0800 (Mon, 15 Feb 2021) | 31 lines MFC 57785538c6e0d7e8ca0f161ab95bae10fd304047 and 1e811efbc591699b872bea42b9de419c373199df: 57785538c6e0d7e8ca0f161ab95bae10fd304047: Simplify the FreeBSD check using __FreeBSD__ compiler macro. Rather than rely on __FreeBSD_version, defined in sys/param.h, use __FreeBSD__ defined by the compiler. Reported by: emaste MFC after: 1 week (cherry picked from commit 57785538c6e0d7e8ca0f161ab95bae10fd304047) 1e811efbc591699b872bea42b9de419c373199df: Fix non-IPv6 build post 57785538c6e0d7e8ca0f161ab95bae10fd304047. 57785538c6e0d7e8ca0f161ab95bae10fd304047 change the test for FreeBSD from __FreeBSD_version to __FreeBSD__. However this test was performed before sys/param.h was included, therefore __FreeBSD_version was never defined. As the test was never true opt_random_ip_id.h was never included. Submitted by: bdragon Reported by: bdragon (cherry picked from commit 1e811efbc591699b872bea42b9de419c373199df) Git Hash: c7d01e6f2c9606cbce3147ecf5d01f9656f67d2e Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369278 | git2svn | 2021-02-15 18:22:25 -0800 (Mon, 15 Feb 2021) | 14 lines fmtree: add a deprecation notice to the manpage Note that this mtree(8) is actually installed as fmtree(8), while mtree(8) is located in ^/contrib/mtree -- thus, the reference to mtree(8) makes a lot more sense in the context in which folks would actually notice it. Shout-out to Ravi for pointing out that this may not be an obvious fact. Relnotes: yes (cherry picked from commit 6fea22cebe5cb1e51e98c894a738bea910b7bc2f) Git Hash: f39a12f04308b9be57890c9c434ce0f93ccdb058 Git Author: kevans@FreeBSD.org ------------------------------------------------------------------------ r369279 | kevans | 2021-02-15 18:27:31 -0800 (Mon, 15 Feb 2021) | 14 lines inetd: fix unix sockaddr's length assignment unsz was always exactly '1' here due to an unfortunate mispositioning of closing parenthesis. While it's generally irrelevant because bind(2) is passed the (accurate) sep->se_ctrladdr_size instead, it's not very helpful for anything locally that wants to use it rather than assuming that sep->se_ctrladdr_size perfectly fits the end of sun_path. Just drop unsz entirely and use the result of SUN_LEN() for it. (cherry picked from commit 1253835121cb38fd93478849e32a4a4c13436fb2) Git Hash: 5ab679d9619afe8242200bdb4f0391b6fd405e25 Git Author: kevans@FreeBSD.org ------------------------------------------------------------------------ r369280 | donner | 2021-02-16 00:29:39 -0800 (Tue, 16 Feb 2021) | 10 lines netgraph/ng_source: Allow ng_source to inject into any netgraph network PR: 240530 Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D21968 (cherry picked from commit 75e7ef74dfc12e01b1ef4706110d238639e04543) Git Hash: 591e21210e35b7b0ed0a8c39404e15a1225976bf Git Author: donner@FreeBSD.org ------------------------------------------------------------------------ r369281 | np | 2021-02-16 12:35:32 -0800 (Tue, 16 Feb 2021) | 6 lines cxgbe(4): Check for descriptors before writing a TLS or raw work request. (cherry picked from commit 565b8fce23e6250b673a956ce753e37b201a5847) Git Hash: 568d9aa2b5bc1ce3c54dbb2586c75a4423db3399 Git Author: np@FreeBSD.org ------------------------------------------------------------------------ r369282 | np | 2021-02-16 12:39:03 -0800 (Tue, 16 Feb 2021) | 14 lines cxgbe(4): Fixes to tx coalescing. - The behavior implemented in r362905 resulted in delayed transmission of packets in some cases, causing performance issues. Use a different heuristic to predict tx requests. - Add a tunable/sysctl (hw.cxgbe.tx_coalesce) to disable tx coalescing entirely. It can be changed at any time. There is no change in default behavior. (cherry picked from commit 3447df8bc5b342bd88d565641435284ff620ee2a) Git Hash: 42f7f5c5d22cc9e845e51a1f8a5b92573b8b3d2f Git Author: np@FreeBSD.org ------------------------------------------------------------------------