Merge branch 'latest' into net

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>

Author: matttbe

README.md

@@ -298,14 +298,8 @@ source (or use symbolic links). `.clangd` needs to be placed at the root of the
 kernel source directory.
 
 Notes:
-- The VSCode add-on needs some modifications, see
-  [PR #5](https://github.com/FlorentRevest/linux-kernel-vscode/pull/5) and
-  [PR #6](https://github.com/FlorentRevest/linux-kernel-vscode/pull/6). If these
-  PRs are not merged, you can use
-  [this fork](https://github.com/matttbe/linux-kernel-vscode/) (`virtme-support`
-  branch) for the moment.
-- CLang will be used by VSCode instead of GCC. It is then required to launch all
-  docker commands with `-e INPUT_CLANG=1`, see above.
+- CLang will be used by VSCode instead of GCC. If you still want to use some
+  docker commands for manual actions, add `-e INPUT_CLANG=1`, see above.
 - CLangD will be used on the host machine, not in the Docker.
 
 ## CLang Analyzer

entrypoint.sh

@@ -119,6 +119,7 @@ VIRTME_RUN_OPTS=(
 	--mods=auto
 	--rw  # Don't use "rwdir", it will use 9p ; in a container, we can use rw
 	--pwd
+	--server --port "${INPUT_VSOCK_CID}" # To connect to the VM using VSock
 	--show-command
 	--verbose --show-boot-console
 	--kopt mitigations=off
@@ -401,8 +402,6 @@ setup_env() { local mode
 		--memory "${INPUT_RAM}"
 	)
 
-	# To connect to the VM using VSock
-	VIRTME_RUN_OPTS+=("--server" "--port" "${INPUT_VSOCK_CID}")
 
 	OUTPUT_VIRTME="${RESULTS_DIR}/output.log"
 	TESTS_SUMMARY="${RESULTS_DIR}/summary.txt"
@@ -622,8 +621,28 @@ gen_kconfig() { local mode kconfig=() vck rc=0
 	if [ -s "${1:-}" ]; then
 		local i
 		for i in "${@}"; do
+			# These options are already set by virtme, to avoid
+			# duplicated output in the terminal, e.g. syzbot options
+			sed -i 's/console=\S\+ //g;s/earlyprintk=\S\+ //g' "${i}"
 			vck+=(--custom "${i}")
 		done
+
+		# Disable components present in syzbot and not needed here
+		kconfig+=(
+			-d WLAN -d WIRELESS -d HAMRADIO -d CAN -d BT -d CAIF -d NFC
+			-d ATA -d MEDIA_SUPPORT -d INFINIBAND -d STAGING
+			-d X86_PLATFORM_DEVICES -d BATMAN_ADV -d OPENVSWITCH -d MPLS
+			-d QRTR -d IP_DCCP -d RDS -d DLM -d IP_SCTP
+			-d BCACHEFS_FS -d F2FS_FS -d BTRFS_FS -d OCFS2_FS -d XFS_FS
+			-d JFS_FS -d ISO9660_FS -d MISC_FILESYSTEMS -d NFS_FS -d NFSD
+			-d CEPH_FS -d CIFS -d SMB_SERVER -d AFS_FS -d TTY_PRINTK
+		)
+
+		# Disable all net vendors, except Intel, for their e1000 driver
+		# shellcheck disable=SC2207 # we do want to split
+		kconfig+=($(grep "^config NET_VENDOR_" drivers/net/ethernet/*/Kconfig |
+			awk '{ print "-d " $2 }'))
+		kconfig+=(-e NET_VENDOR_INTEL)
 	else
 		kconfig+=("${@}")
 	fi

run.sh

@@ -8,6 +8,7 @@ test -t 1 && VIRTME_INTERACTIVE="-t"
 
 # host is different if worktree are used
 VIRTME_GIT_DIR="$(realpath "$(git rev-parse --git-common-dir)")"
+VIRTME_REAL_DIR="$(realpath .virtme)"
 
 HOME_DIR="$(realpath "$(dirname "${0}")/.home")"
 
@@ -19,6 +20,7 @@ done
 docker run \
 	-v "${PWD}:${PWD}:rw" \
 	-v "${VIRTME_GIT_DIR}:${VIRTME_GIT_DIR}:ro" \
+	-v "${VIRTME_REAL_DIR}:${VIRTME_REAL_DIR}:rw" \
 	${VIRTME_PACKETDRILL_PATH:+-v "${VIRTME_PACKETDRILL_PATH}:/opt/packetdrill:rw"} \
 	-v "${HOME_DIR}:/root" \
 	${VIRTME_SYZKALLER_PATH:+ -v "${VIRTME_SYZKALLER_PATH}:/opt/syzkaller:rw"} \