env/freebsd-amd64: add FreeBSD 10.4, 11.2 images, update build script

Use freebsd-update when preparing the downloaded -RELEASE image to get errata and security
updates made since the release.

Switch kern.timecounter.hardware from ACPI-safe to TSC on GCE
https://lists.freebsd.org/pipermail/freebsd-cloud/2017-January/000080.html

Drop vtnet hw.vtnet.csum_disable=1 workaround, should be fixed in all supported versions.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=207446

Update the expect script to switch the console to serial, this makes it possible to match
prompts via a regexp (11.2 has 'root@freebsd:~ #', while the older images are 'root@:~ #').
Otherwise qemu with -display curses emits ansi escape codes which make a mess of everything.
This requires the sgabios smbios extension installed on the host preparing the images.
https://code.google.com/archive/p/sgabios/
https://packages.ubuntu.com/xenial/sgabios
SeaBIOS 1.11.0 and up should have a compatible rom builtin,
but it's not even available in Ubuntu 18.04.
qemu/seabios@d6728f3

Additionaly drop the -smp 2 directive for qemu, until MTTCG is enabled on amd64 targets.

Updates golang/go#25289

Change-Id: If33c2b35b4221f27d719938bcfc013efe3549305
Reviewed-on: https://go-review.googlesource.com/135475
Reviewed-by: Brad Fitzpatrick <[email protected]>

Author: paulzhol

env/freebsd-amd64/README

@@ -1,7 +1,9 @@
 make.bash creates a Google Compute Engine VM image to run the Go
 FreeBSD builder, booting up to run the buildlet.
 
-make.bash should be run on a Linux box with qemu.
+make.bash should be run on a Linux box with qemu and a few additional packages.
+on ubuntu 16.04 / debian 9 install:
+  apt-get install qemu-system-x86 sgabios expect genisoimage
 
 After it completes, it creates a file freebsd-amd64-gce101.tar.gz
 

env/freebsd-amd64/loader.conf

@@ -4,7 +4,7 @@ loader_logo="none"
 hw.memtest.tests="0"
 console="comconsole,vidconsole"
 hw.vtnet.csum_disable=1
-hw.vtnet.mq_disable=1
-kern.timecounter.hardware=ACPI-safe
+machdep.disable_tsc_calibration=1
+kern.timecounter.invariant_tsc=1
 aesni_load="YES"
 nvme_load="YES"

env/freebsd-amd64/make.bash

@@ -9,7 +9,7 @@
 # SSH is enabled, and a user gopher, password gopher, is created.
 
 # Only tested on Ubuntu 16.04.
-# Requires packages: qemu expect genisoimage
+# Requires packages: qemu expect sgabios genisoimage
 
 set -e
 
@@ -33,6 +33,11 @@ case $1 in
   readonly VERSION_TRAILER=
   readonly SHA256=1d710ba643bf6a8ce5bff5a9d69b1657ccff83dd1f2df711d9b4e02f9aab7d06
 ;;
+10.4)
+  readonly VERSION=10.4
+  readonly VERSION_TRAILER=
+  readonly SHA256=8d1ff92e74a70f1ec039a465467f19abd7892331403ef1d4952d271adddab625
+;;
 11.0)
   readonly VERSION=11.0
   readonly VERSION_TRAILER=
@@ -43,9 +48,14 @@ case $1 in
   readonly VERSION_TRAILER=
   readonly SHA256=233c6b269a29c1ce38bb4eb861251d1c74643846c1de937b8e31cc0316632bc0
 ;;
+11.2)
+  readonly VERSION=11.2
+  readonly VERSION_TRAILER=
+  readonly SHA256=d8638aecbb13bdc891e17187f3932fe477f5655846bdaad8fecd60614de9312c
+;;
 *)
   echo "Usage: $0 <version>"
-  echo " version - FreeBSD version to build. Valid choices: 9.3 10.3 11.0 11.1"
+  echo " version - FreeBSD version to build. Valid choices: 9.3 10.3 10.4 11.0 11.1 11.2"
   exit 1
 esac
 
@@ -65,6 +75,7 @@ cp FreeBSD-${VERSION:?}-RELEASE-amd64${VERSION_TRAILER}.raw disk.raw
 mkdir -p iso/boot iso/etc iso/usr/local/etc/rc.d
 cp loader.conf iso/boot
 cp rc.conf iso/etc
+cp sysctl.conf iso/etc
 cp buildlet iso/usr/local/etc/rc.d
 
 cat >iso/install.sh <<'EOF'
@@ -76,6 +87,7 @@ cp /mnt/usr/local/etc/rc.d/buildlet /usr/local/etc/rc.d/buildlet
 chmod +x /usr/local/etc/rc.d/buildlet
 cp /mnt/boot/loader.conf /boot/loader.conf
 cp /mnt/etc/rc.conf /etc/rc.conf
+cat /mnt/etc/sysctl.conf >> /etc/sysctl.conf
 adduser -f - <<ADDUSEREOF
 gopher::::::Gopher Gopherson::/bin/sh:gopher
 ADDUSEREOF
@@ -89,32 +101,69 @@ genisoimage -r -o config.iso iso/
 # TODO(wathiede): remove sleep
 sleep 2
 
-# TODO(wathiede): set serial output so we can track boot on GCE.
-expect <<EOF
-set timeout 600
-spawn qemu-system-x86_64 -display curses -smp 2 -m 1G -drive if=virtio,file=disk.raw,cache=none -cdrom config.iso -net nic,model=virtio -net user
+expect <<'EOF'
+set prompt "root@.*:~ #[ ]"
+set timeout -1
 
-# Speed-up boot by going in to single user mode.
-expect "Welcome to FreeBSD"
+spawn qemu-system-x86_64 -nographic -option-rom sgabios.bin -m 1G -drive if=virtio,file=disk.raw,format=raw,cache=none -cdrom config.iso -net nic,model=virtio -net user
+set qemu_pid $spawn_id
+
+# boot with serial console enabled
+expect -ex "Welcome to FreeBSD"
 sleep 2
-send "\n"
+expect -ex "ape to loader prompt"
+send "3\n"
+expect -ex "Type '?' for a list of commands, 'help' for more detailed help."
+send "set console=\"comconsole\"\n"
+sleep 1
+send "boot\n"
+
+# wait for login prompt
+set timeout 120
+expect {
+    "\nlogin: " {
+        send "root\n"
+        sleep 1
+    }
+    timeout     { exit 2 }
+}
 
-expect "login:"
+expect -re $prompt
 sleep 1
-send "root\n"
+send "mount_cd9660 /dev/cd0 /mnt\nsh /mnt/install.sh\n"
 
-expect "root@:~ # "
+expect -re $prompt
 sleep 1
-send "dhclient vtnet0\n"
 
-expect "root@:~ # "
+# generate SSH keys
+send "service sshd keygen\n"
+expect -re "Generating .+ host key."
 sleep 1
-send "mount_cd9660 /dev/cd0 /mnt\nsh /mnt/install.sh\n"
 
-expect "root@:~ # "
+expect -re $prompt
 sleep 1
-send "pkg install bash curl git\n"
+set timeout -1
+# download updates
+send "env PAGER=cat freebsd-update fetch --not-running-from-cron\n"
+expect {
+    "The following files will be updated as part of updating to" {
+        sleep 2
+        expect -re $prompt
+        send "freebsd-update install\n"
+        expect "Installing updates... done."
+        sleep 1
+        send "\n"
+    }
+
+    "No updates needed to update system to" {
+        sleep 1
+        send "\n"
+    }
+}
 
+expect -re $prompt
+sleep 1
+send "pkg install bash curl git\n"
 expect "Do you want to fetch and install it now"
 sleep 1
 send "y\n"
@@ -123,11 +172,12 @@ expect "Proceed with this action"
 sleep 1
 send "y\n"
 
-expect "root@:~ # "
+expect -re $prompt
 sleep 1
 send "poweroff\n"
 expect "All buffers synced."
-sleep 5
+
+wait -i $qemu_pid
 EOF
 
 # Create Compute Engine disk image.

env/freebsd-amd64/sysctl.conf

@@ -0,0 +1 @@
+kern.timecounter.hardware=TSC-low