HardenedBSD/src cb3af7eshare/examples/bhyve vmrun.sh, sys/x86/x86 vmware_guestrpc.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,888-0usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
+31-1,807usr.sbin/bhyvectl/bhyvectl.c
+337-0sys/x86/x86/vmware_guestrpc.c
+81-52share/examples/bhyve/vmrun.sh
+82-0usr.sbin/bhyvectl/aarch64/bhyvectl_machdep.c
+53-0usr.sbin/bhyvectl/bhyvectl.h
+2,472-1,85922 files not shown
+2,624-1,94128 files

HardenedBSD/src 2f5fb2elib/libgcc_s Symbol.map, release Makefile.mirrors

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+337-0sys/x86/x86/vmware_guestrpc.c
+37-0sys/x86/include/vmware_guestrpc.h
+13-9lib/libgcc_s/Symbol.map
+3-12share/man/man8/beinstall.8
+1-14tools/build/beinstall.sh
+14-0release/Makefile.mirrors
+405-356 files not shown
+422-4012 files

HardenedBSD/src 542456a. ObsoleteFiles.inc, etc/mtree BSD.usr.dist

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+487-130share/man/man7/hier.7
+3-0ObsoleteFiles.inc
+0-2etc/mtree/BSD.usr.dist
+1-1share/man/man9/ieee80211_vap.9
+491-1334 files

HardenedBSD/src b07689dshare/man/man8 beinstall.8, tools/build beinstall.sh

beinstall: retire mergemaster support

Mergemaster has been deprecated for some time, and will be retired.

Reviewed by:    kevans
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D41799
DeltaFile
+3-12share/man/man8/beinstall.8
+1-14tools/build/beinstall.sh
+4-262 files

HardenedBSD/src 98c8caalib/libgcc_s Symbol.map

libgcc_s: 80-bit long double function are x86-only

Don't try to expose them on other architectures.

Reviewed by:    arichardson
Differential Revision:  https://reviews.freebsd.org/D45028
DeltaFile
+13-9lib/libgcc_s/Symbol.map
+13-91 files

HardenedBSD/src ecaab0fsys/x86/acpica madt.c, sys/x86/conf NOTES

guestrpc module to handle VMware backdoor port GuestRPC functionality

Convert existing FreeBSD vmware_hvcall function to take a channel
and parameter arguments.

Added vmware_guestrpc_cmd() to send GuestRPC commands to the VMware
hypervisor. The sbuf argument is used for both the command to send
and to store the data to return to the caller.

The following KPIs can be used to get and set FreeBSD-specific guest
information in key/value pairs:
 * vmware_guestrpc_set_guestinfo
   - set a value into the guestinfo.fbsd.<keyword> key
 * vmware_guestrpc_get_guestinfo
   - get the value stored in the guestinfo.fbsd.<keyword> key

Add VMware devices to x86 NOTES

Reviewed by:    jhb

    [2 lines not shown]
DeltaFile
+337-0sys/x86/x86/vmware_guestrpc.c
+37-0sys/x86/include/vmware_guestrpc.h
+6-2sys/x86/include/vmware.h
+5-0sys/x86/conf/NOTES
+2-1sys/x86/x86/identcpu.c
+2-1sys/x86/acpica/madt.c
+389-42 files not shown
+391-58 files

HardenedBSD/src 63b7478share/man/man7 hier.7

hier.7: polish entry to system manual

Entries reworded to improve grammar or add keywords:
- document description: substitute layout for index for first-glance
- /etc/freebsd/update.conf
- /usr/share/vi/

Entries that have been wordshuffled for brevity or consistency:
- /{bin,libexec,nonexistent,sbin,tmp}/
- /boot/dtb/overlays/
- /boot/{defaults,efi,kernel,lua}/
- /usr/libexec/
- /var/{db,games,lib,log/{bsdisks.log,spool/,tmp/}}
- /usr/share/sysroot/VERSION/MACHINE.MACHINE_ARCH/ (unfold a little)
- /usr/local/share/doc/freebsd/ (unfold a little)

Entries that have macro or linking adjustments:
- /{boot,boot/efi,dev,etc,home,sbin,usr/bin}/ (overview or intro pages)
- /media/ (bsdisks is from ports, but afaik pulled by every desktop)

    [23 lines not shown]
DeltaFile
+123-84share/man/man7/hier.7
+123-841 files

HardenedBSD/src a7a6873. ObsoleteFiles.inc, etc/mtree BSD.usr.dist

BSD.usr.dist: remove empty /usr/libdata/gcc directory

I am unsure of its exact historical usage, but, we no longer ship GCC
with FreeBSD, and it should have been removed.

Reviewed by:    imp, emaste
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D44440

(cherry picked from commit cc1268a926772900a08c61fd791bb66df1e6c30c)
DeltaFile
+1-3share/man/man7/hier.7
+3-0ObsoleteFiles.inc
+0-2etc/mtree/BSD.usr.dist
+4-53 files

HardenedBSD/src 3d50905share/man/man7 hier.7

hier.7: various improvements

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/831

(cherry picked from commit 03ee09148950c9ea99987bfee8a769473079745b)
(cherry picked from commit 94dedfdfa96baef02e4ad661512a267ae5647d7b)
(cherry picked from commit a5b07274fcaf71fc9c14947a75fbe0a13d381a79)
(cherry picked from commit f19875b66bf403ed5c57f82bbe2a3f42475d0a06)
DeltaFile
+417-97share/man/man7/hier.7
+417-971 files

HardenedBSD/src 1d921beshare/man/man9 ieee80211_vap.9

ieee80211_vap(9): fix the title

MFC after:      3 days

(cherry picked from commit c5989febcc00be41e05b4b714bbfc6ea1359abaf)
DeltaFile
+1-1share/man/man9/ieee80211_vap.9
+1-11 files

HardenedBSD/src 3c93b5eshare/examples/bhyve vmrun.sh

HBSD: Resolve merge conflict

Reduce diff against vmrun.sh by reverting it back to FreeBSD's version
entirely.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+9-39share/examples/bhyve/vmrun.sh
+9-391 files

HardenedBSD/src adf8b80share/examples/bhyve vmrun.sh, sys/sys sdt.h

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

Conflicts:
        share/examples/bhyve/vmrun.sh (unresolved)
DeltaFile
+1,888-0usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
+31-1,807usr.sbin/bhyvectl/bhyvectl.c
+83-24share/examples/bhyve/vmrun.sh
+82-0usr.sbin/bhyvectl/aarch64/bhyvectl_machdep.c
+53-0usr.sbin/bhyvectl/bhyvectl.h
+21-16sys/sys/sdt.h
+2,158-1,84710 files not shown
+2,204-1,87316 files

HardenedBSD/src f4b0809release Makefile.mirrors

release: Stage non-UFS images in vm-images-stage

When the VM image building code was updated to support building
non-UFS images, the vm-images-stage target was not updated to
install those newly built images to the FTP site.  As a result, we
have been sending weekly snapshot announcements since August claiming
that ZFS VM images are available when they are not in fact present
anywhere publicly accessible.

Fixes:  32ae9a6b3937 "release: Build UFS and ZFS VM images"
Reported by:    Michael Dexter
MFC after:      5 days
DeltaFile
+14-0release/Makefile.mirrors
+14-01 files

HardenedBSD/src 793556eshare/examples/modules Makefile

Fix up a mistake in the CFLAGS added.  Pointed out by jrtc.
DeltaFile
+1-1share/examples/modules/Makefile
+1-11 files

HardenedBSD/src e60ca52share/examples/modules Makefile

Out of tree modules should be built with DTrace by default.
DeltaFile
+2-0share/examples/modules/Makefile
+2-01 files

HardenedBSD/src c100fe0share/examples Makefile

examples: Install bhyve files on arm64

Sponsored by:   Innovate UK
DeltaFile
+1-1share/examples/Makefile
+1-11 files

HardenedBSD/src e10b9d6usr.sbin/bhyve uart_backend.c uart_pl011.c

bhyve: Move lock of uart frontend to uart backend

Currently, lock of uart in bhyve is placed in frontend. There are some
problems about it:

1. If every frontend should has a lock, why not move it inside backend
   as they all have same uart_softc.
2. If backend needs to modify the information of uart after initialize,
   it will be impossible as backend cannot use lock. For example, if we
   want implement a telnet support for uart in backend, It should wait
   for connection when initialize. After some remote process connect it,
   it needs to modify rfd and wfd in backend.

So I decide to move it to backend.

Reviewed by:    corvink, jhb, markj
Differential Revision:  https://reviews.freebsd.org/D44947
DeltaFile
+21-1usr.sbin/bhyve/uart_backend.c
+6-10usr.sbin/bhyve/uart_pl011.c
+6-9usr.sbin/bhyve/uart_emul.c
+2-1usr.sbin/bhyve/uart_backend.h
+35-214 files

HardenedBSD/src aa34b1dshare/examples/bhyve vmrun.sh

vmrun.sh: Add arm64 support

For now, we enumerate disk devices before network devices.  This is to
work around a problem wherein u-boot remaps BARs during boot in a way
that bhyve does not handle.  Some discussion and experiments suggest
that this can be handled by having bhyve not map BARs during boot on
arm64; until a solution is implemented, however, this workaround is
sufficient for simple usage and doesn't have any real downsides.

The console and bootrom are specified slightly differently versus amd64,
and a few of vmrun.sh's command-line options are amd64-only.

Reviewed by:    corvink, jhb
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D44933
DeltaFile
+71-29share/examples/bhyve/vmrun.sh
+71-291 files

HardenedBSD/src c1b37d9usr.sbin Makefile.aarch64, usr.sbin/bhyvectl/aarch64 bhyvectl_machdep.c Makefile.inc

bhyvectl: Add arm64 bits and hook it up to the build

For now this implementation doesn't provide any machine dependent
functionality on arm64, but it's enough to be able to reset and destroy
VMs.

Reviewed by:    jhb
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D44932
DeltaFile
+82-0usr.sbin/bhyvectl/aarch64/bhyvectl_machdep.c
+1-0usr.sbin/bhyvectl/aarch64/Makefile.inc
+1-0usr.sbin/Makefile.aarch64
+84-03 files

HardenedBSD/src 1c4ee7dusr.sbin/bhyvectl bhyvectl.c bhyvectl.h, usr.sbin/bhyvectl/amd64 bhyvectl_machdep.c Makefile.inc

bhyvectl: Prepare to add arm64 support

Move MD code into a separate directory and add a simple interface which
lets the MD bits register options and handle them.

No functional change intended.

Reviewed by:    jhb
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D44932
DeltaFile
+1,888-0usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
+31-1,807usr.sbin/bhyvectl/bhyvectl.c
+53-0usr.sbin/bhyvectl/bhyvectl.h
+5-4usr.sbin/bhyvectl/Makefile
+1-0usr.sbin/bhyvectl/amd64/Makefile.inc
+1,978-1,8115 files

HardenedBSD/src adadc53sys/kern subr_fattime.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+21-20sys/kern/subr_fattime.c
+21-201 files

HardenedBSD/src 6291d6bsys/kern subr_fattime.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+21-20sys/kern/subr_fattime.c
+21-201 files

HardenedBSD/src 4afce44sys/sys sdt.h

sdt: Add macros which expand to probe and provider structure names

No functional change intended.

MFC after:      1 week
DeltaFile
+21-16sys/sys/sdt.h
+21-161 files

HardenedBSD/src 97dbc5fsys/dev/cxgbe/tom t4_tom.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+4-2sys/dev/cxgbe/tom/t4_tom.c
+4-21 files

HardenedBSD/src 3cc37e4sys/dev/cxgbe/tom t4_tom.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+4-2sys/dev/cxgbe/tom/t4_tom.c
+4-21 files

HardenedBSD/src c252950sys/fs/nfs nfsport.h, sys/fs/nfsclient nfs_clbio.c nfs_clvnops.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+47-190sys/fs/nfsclient/nfs_clbio.c
+2-22sys/fs/nfsclient/nfs_clvnops.c
+14-6sys/fs/nfsclient/nfs_clrpcops.c
+8-11sys/fs/nfsclient/nfs_clnfsiod.c
+0-3sys/fs/nfsclient/nfsnode.h
+0-2sys/fs/nfs/nfsport.h
+71-2342 files not shown
+71-2368 files

HardenedBSD/src 7932d85sys/fs/nfs nfsport.h, sys/fs/nfsclient nfs_clbio.c nfs_clvnops.c

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+47-190sys/fs/nfsclient/nfs_clbio.c
+2-22sys/fs/nfsclient/nfs_clvnops.c
+14-6sys/fs/nfsclient/nfs_clrpcops.c
+8-11sys/fs/nfsclient/nfs_clnfsiod.c
+0-3sys/fs/nfsclient/nfsnode.h
+0-2sys/fs/nfs/nfsport.h
+71-2342 files not shown
+71-2368 files

HardenedBSD/src 0fe60dcsys/kern subr_fattime.c

fattime: fix fattime to timespec conversion of dates beyond 2106-02-06

It turns out that the only conversion issue was in fattime2timespec, where
multiplying the number of seconds in a day by the number of days overflowed
32-bit unsigned int for dates beyond 2106-02-07 06:28:15.

Casting one of the multiplicands as time_t forces a 64-bit multiplication on
systems where time_t is 64-bits and produces no binary changes on the one
remaining system with 32-bit time_t (namely i386).

Since the code is now tested & fixed, this change removes the fixme comments.

Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D44755
DeltaFile
+3-14sys/kern/subr_fattime.c
+3-141 files

HardenedBSD/src 9d1396csys/kern subr_fattime.c

fattime: make the test code check beyond 32-bit time_t limits

On systems that have a 64-bit time_t, the test code now exercises the whole
range of fattime.  To do this, this commit...

1. replaces the call to random() with two calls to arc4random() to
   generate a 33-bit number of seconds in order to cover the entire range of
   fattime [1970,2107].  (32-bits stops just short - in January 2106.)
   On systems with 32-bit time_t, the extra bits are discarded and only the
   time_t expressible range is tested.
2. casts time_t values passed to printf as longs and changes the format
   string to match.

Now, the test code builds, runs, and exercises what it can (i.e., the whole
fattime range or the 32-bit time_t subset of it) on both 32-bit and 64-bit
time_t systems.

Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D44754
DeltaFile
+11-4sys/kern/subr_fattime.c
+11-41 files

HardenedBSD/src 7b8b613sys/kern subr_fattime.c

fattime: make the test code build again

This change...

1. replaces calls to timet2fattime/fattime2timet with calls to
   timespec2fattime/fattime2timespec.  The functions got renamed shortly
   after they landed in the kernel but the test code wasn't updated (see
   7ea93e912bf0ef).
2. adds a utc_offset stub.

With this, the test code builds and runs as a 32-bit binary (cc -Wall -O2
-m32 subr_fattime.c).

Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D44753
DeltaFile
+7-2sys/kern/subr_fattime.c
+7-21 files