* [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks
@ 2023-01-06 10:23 Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh Benjamin Tissoires
` (8 more replies)
0 siblings, 9 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Hi,
So this is the fix for the bug that actually prevented me to integrate
HID-BPF in v6.2.
While testing the code base with LLVM, I realized that clang was smarter
than I expected it to be, and it sometimes inlined a function or not
depending on the branch. This lead to segfaults because my current code
in linux-next is messing up the bpf programs refcounts assuming that I
had enough observability over the kernel.
So I came back to the drawing board and realized that what I was missing
was exactly a bpf_link, to represent the attachment of a bpf program to
a HID device. This is the bulk of the series, in patch 6/9.
The other patches are cleanups, tests, and also the addition of the
vmtests.sh script I run locally, largely inspired by the one in the bpf
selftests dir. This allows very fast development of HID-BPF, assuming we
have tests that cover the bugs :)
Cheers,
Benjamin
Benjamin Tissoires (9):
selftests: hid: add vmtest.sh
selftests: hid: allow to compile hid_bpf with LLVM
selftests: hid: attach/detach 2 bpf programs, not just one
selftests: hid: ensure the program is correctly pinned
selftests: hid: prepare tests for HID_BPF API change
HID: bpf: rework how programs are attached and stored in the kernel
selftests: hid: enforce new attach API
HID: bpf: clean up entrypoint
HID: bpf: reorder BPF registration
Documentation/hid/hid-bpf.rst | 12 +-
drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 9 -
.../hid/bpf/entrypoints/entrypoints.lskel.h | 188 ++++--------
drivers/hid/bpf/hid_bpf_dispatch.c | 28 +-
drivers/hid/bpf/hid_bpf_dispatch.h | 3 -
drivers/hid/bpf/hid_bpf_jmp_table.c | 116 +++----
include/linux/hid_bpf.h | 7 +
tools/testing/selftests/hid/.gitignore | 1 +
tools/testing/selftests/hid/Makefile | 10 +-
tools/testing/selftests/hid/config.common | 241 +++++++++++++++
tools/testing/selftests/hid/config.x86_64 | 4 +
tools/testing/selftests/hid/hid_bpf.c | 32 +-
tools/testing/selftests/hid/progs/hid.c | 13 +
tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++
14 files changed, 724 insertions(+), 224 deletions(-)
create mode 100644 tools/testing/selftests/hid/config.common
create mode 100644 tools/testing/selftests/hid/config.x86_64
create mode 100755 tools/testing/selftests/hid/vmtest.sh
--
2.38.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-09 17:46 ` sdf
2023-01-06 10:23 ` [PATCH HID for-next v1 2/9] selftests: hid: allow to compile hid_bpf with LLVM Benjamin Tissoires
` (7 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Similar-ish in many points from the script in selftests/bpf, with a few
differences:
- relies on boot2container instead of a plain qemu image (meaning that
we can take any container in a registry as a base)
- runs in the hid selftest dir, and such uses the test program from there
- the working directory to store the config is in
tools/selftests/hid/results
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/.gitignore | 1 +
tools/testing/selftests/hid/config.common | 241 ++++++++++++++++++
tools/testing/selftests/hid/config.x86_64 | 4 +
tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++++++
4 files changed, 530 insertions(+)
create mode 100644 tools/testing/selftests/hid/config.common
create mode 100644 tools/testing/selftests/hid/config.x86_64
create mode 100755 tools/testing/selftests/hid/vmtest.sh
diff --git a/tools/testing/selftests/hid/.gitignore b/tools/testing/selftests/hid/.gitignore
index a462ca6ab2c0..995af0670f69 100644
--- a/tools/testing/selftests/hid/.gitignore
+++ b/tools/testing/selftests/hid/.gitignore
@@ -2,3 +2,4 @@ bpftool
*.skel.h
/tools
hid_bpf
+results
diff --git a/tools/testing/selftests/hid/config.common b/tools/testing/selftests/hid/config.common
new file mode 100644
index 000000000000..0617275d93cc
--- /dev/null
+++ b/tools/testing/selftests/hid/config.common
@@ -0,0 +1,241 @@
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_9P_FS=y
+CONFIG_AUDIT=y
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BONDING=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTTIME_TRACING=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CMA_AREAS=7
+CONFIG_CMA=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPUSETS=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_DEV_VIRTIO=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_XXHASH=y
+CONFIG_DCB=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_CREDENTIALS=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEFAULT_FQ_CODEL=y
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS=y
+CONFIG_DMA_CMA=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_EXPERT=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_FAIL_FUNCTION=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_FB_VESA=y
+CONFIG_FB=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_MINI_4x6=y
+CONFIG_FONTS=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FUSE_FS=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_GART_IOMMU=y
+CONFIG_GENERIC_PHY=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HPET=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HWPOISON_INJECT=y
+CONFIG_HZ_1000=y
+CONFIG_INET=y
+CONFIG_INTEL_POWERCLAMP=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_NAT=y
+CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IRQ_POLL=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_KEXEC=y
+CONFIG_KPROBES=y
+CONFIG_KSM=y
+CONFIG_LEGACY_VSYSCALL_NONE=y
+CONFIG_LOG_BUF_SHIFT=21
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=0
+CONFIG_LOGO=y
+CONFIG_LSM="selinux,bpf,integrity"
+CONFIG_MAC_PARTITION=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MCORE2=y
+CONFIG_MEMCG=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_MODULES=y
+CONFIG_NAMESPACES=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P=y
+CONFIG_NET_ACT_BPF=y
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_EMATCH=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+CONFIG_NETFILTER_XT_MATCH_BPF=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_NAT=y
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_NETLABEL=y
+CONFIG_NET_SCH_DEFAULT=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_TC_SKB_EXT=y
+CONFIG_NET_VRF=y
+CONFIG_NET=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NO_HZ=y
+CONFIG_NR_CPUS=128
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA=y
+CONFIG_NVMEM=y
+CONFIG_OSF_PARTITION=y
+CONFIG_OVERLAY_FS_INDEX=y
+CONFIG_OVERLAY_FS_METACOPY=y
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+CONFIG_OVERLAY_FS=y
+CONFIG_PACKET=y
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_PREEMPT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROFILING=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_RC_DEVICES=y
+CONFIG_RC_LOOPBACK=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SGI_PARTITION=y
+CONFIG_SMP=y
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_SYNC_FILE=y
+CONFIG_SYSVIPC=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_XACCT=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_MD5SIG=y
+CONFIG_TLS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TUN=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_UNIX=y
+CONFIG_USER_NS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_VETH=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_FS=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VLAN_8021Q=y
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_USER=y
+CONFIG_ZEROPLUS_FF=y
diff --git a/tools/testing/selftests/hid/config.x86_64 b/tools/testing/selftests/hid/config.x86_64
new file mode 100644
index 000000000000..a8721f403c21
--- /dev/null
+++ b/tools/testing/selftests/hid/config.x86_64
@@ -0,0 +1,4 @@
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_CPUID=y
+CONFIG_X86_MSR=y
+CONFIG_X86_POWERNOW_K8=y
diff --git a/tools/testing/selftests/hid/vmtest.sh b/tools/testing/selftests/hid/vmtest.sh
new file mode 100755
index 000000000000..90f34150f257
--- /dev/null
+++ b/tools/testing/selftests/hid/vmtest.sh
@@ -0,0 +1,284 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+set -u
+set -e
+
+# This script currently only works for x86_64
+ARCH="$(uname -m)"
+case "${ARCH}" in
+x86_64)
+ QEMU_BINARY=qemu-system-x86_64
+ BZIMAGE="arch/x86/boot/bzImage"
+ ;;
+*)
+ echo "Unsupported architecture"
+ exit 1
+ ;;
+esac
+DEFAULT_COMMAND="./hid_bpf"
+SCRIPT_DIR="$(dirname $(realpath $0))"
+OUTPUT_DIR="$SCRIPT_DIR/results"
+KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")
+B2C_URL="https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/master/vm2c.py"
+NUM_COMPILE_JOBS="$(nproc)"
+LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"
+LOG_FILE="${LOG_FILE_BASE}.log"
+EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"
+CONTAINER_IMAGE="registry.fedoraproject.org/fedora:36"
+
+usage()
+{
+ cat <<EOF
+Usage: $0 [-i] [-s] [-d <output_dir>] -- [<command>]
+
+<command> is the command you would normally run when you are in
+tools/testing/selftests/bpf. e.g:
+
+ $0 -- ./hid_bpf
+
+If no command is specified and a debug shell (-s) is not requested,
+"${DEFAULT_COMMAND}" will be run by default.
+
+If you build your kernel using KBUILD_OUTPUT= or O= options, these
+can be passed as environment variables to the script:
+
+ O=<kernel_build_path> $0 -- ./hid_bpf
+
+or
+
+ KBUILD_OUTPUT=<kernel_build_path> $0 -- ./hid_bpf
+
+Options:
+
+ -u) Update the boot2container script to a newer version.
+ -d) Update the output directory (default: ${OUTPUT_DIR})
+ -j) Number of jobs for compilation, similar to -j in make
+ (default: ${NUM_COMPILE_JOBS})
+ -s) Instead of powering off the VM, start an interactive
+ shell. If <command> is specified, the shell runs after
+ the command finishes executing
+EOF
+}
+
+download()
+{
+ local file="$1"
+
+ echo "Downloading $file..." >&2
+ curl -Lsf "$file" -o "${@:2}"
+}
+
+recompile_kernel()
+{
+ local kernel_checkout="$1"
+ local make_command="$2"
+
+ cd "${kernel_checkout}"
+
+ ${make_command} olddefconfig
+ ${make_command}
+}
+
+update_selftests()
+{
+ local kernel_checkout="$1"
+ local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"
+
+ cd "${selftests_dir}"
+ ${make_command}
+}
+
+run_vm()
+{
+ local b2c="$1"
+ local kernel_bzimage="$2"
+ local command="$3"
+ local post_command=""
+
+ if ! which "${QEMU_BINARY}" &> /dev/null; then
+ cat <<EOF
+Could not find ${QEMU_BINARY}
+Please install qemu or set the QEMU_BINARY environment variable.
+EOF
+ exit 1
+ fi
+
+ # alpine (used in post-container requires the PATH to have /bin
+ export PATH=$PATH:/bin
+
+ if [[ "${debug_shell}" != "yes" ]]
+ then
+ touch ${OUTPUT_DIR}/${LOG_FILE}
+ command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ; ${command} 2>&1 | tee ${OUTPUT_DIR}/${LOG_FILE}"
+ post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"
+ else
+ command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"
+ fi
+
+ set +e
+ $b2c --command "${command}" \
+ --kernel ${kernel_bzimage} \
+ --workdir ${OUTPUT_DIR} \
+ --image ${CONTAINER_IMAGE}
+
+ echo $? > ${OUTPUT_DIR}/${EXIT_STATUS_FILE}
+
+ set -e
+
+ ${post_command}
+}
+
+is_rel_path()
+{
+ local path="$1"
+
+ [[ ${path:0:1} != "/" ]]
+}
+
+do_update_kconfig()
+{
+ local kernel_checkout="$1"
+ local kconfig_file="$2"
+
+ rm -f "$kconfig_file" 2> /dev/null
+
+ for config in "${KCONFIG_REL_PATHS[@]}"; do
+ local kconfig_src="${config}"
+ cat "$kconfig_src" >> "$kconfig_file"
+ done
+}
+
+update_kconfig()
+{
+ local kernel_checkout="$1"
+ local kconfig_file="$2"
+
+ if [[ -f "${kconfig_file}" ]]; then
+ local local_modified="$(stat -c %Y "${kconfig_file}")"
+
+ for config in "${KCONFIG_REL_PATHS[@]}"; do
+ local kconfig_src="${config}"
+ local src_modified="$(stat -c %Y "${kconfig_src}")"
+ # Only update the config if it has been updated after the
+ # previously cached config was created. This avoids
+ # unnecessarily compiling the kernel and selftests.
+ if [[ "${src_modified}" -gt "${local_modified}" ]]; then
+ do_update_kconfig "$kernel_checkout" "$kconfig_file"
+ # Once we have found one outdated configuration
+ # there is no need to check other ones.
+ break
+ fi
+ done
+ else
+ do_update_kconfig "$kernel_checkout" "$kconfig_file"
+ fi
+}
+
+main()
+{
+ local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
+ local kernel_checkout=$(realpath "${script_dir}"/../../../../)
+ # By default the script searches for the kernel in the checkout directory but
+ # it also obeys environment variables O= and KBUILD_OUTPUT=
+ local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"
+ local command="${DEFAULT_COMMAND}"
+ local update_b2c="no"
+ local debug_shell="no"
+
+ while getopts ':hsud:j:' opt; do
+ case ${opt} in
+ u)
+ update_b2c="yes"
+ ;;
+ d)
+ OUTPUT_DIR="$OPTARG"
+ ;;
+ j)
+ NUM_COMPILE_JOBS="$OPTARG"
+ ;;
+ s)
+ command="/bin/sh"
+ debug_shell="yes"
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
+ \? )
+ echo "Invalid Option: -$OPTARG"
+ usage
+ exit 1
+ ;;
+ : )
+ echo "Invalid Option: -$OPTARG requires an argument"
+ usage
+ exit 1
+ ;;
+ esac
+ done
+ shift $((OPTIND -1))
+
+ # trap 'catch "$?"' EXIT
+
+ if [[ "${debug_shell}" == "no" ]]; then
+ if [[ $# -eq 0 ]]; then
+ echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"
+ else
+ command="$@"
+
+ if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]
+ then
+ debug_shell="yes"
+ fi
+ fi
+ fi
+
+ local kconfig_file="${OUTPUT_DIR}/latest.config"
+ local make_command="make -j ${NUM_COMPILE_JOBS} KCONFIG_CONFIG=${kconfig_file}"
+
+ # Figure out where the kernel is being built.
+ # O takes precedence over KBUILD_OUTPUT.
+ if [[ "${O:=""}" != "" ]]; then
+ if is_rel_path "${O}"; then
+ O="$(realpath "${PWD}/${O}")"
+ fi
+ kernel_bzimage="${O}/${BZIMAGE}"
+ make_command="${make_command} O=${O}"
+ elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then
+ if is_rel_path "${KBUILD_OUTPUT}"; then
+ KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"
+ fi
+ kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"
+ make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
+ fi
+
+ local b2c="${OUTPUT_DIR}/vm2c.py"
+
+ echo "Output directory: ${OUTPUT_DIR}"
+
+ mkdir -p "${OUTPUT_DIR}"
+ update_kconfig "${kernel_checkout}" "${kconfig_file}"
+
+ recompile_kernel "${kernel_checkout}" "${make_command}"
+
+ if [[ "${update_b2c}" == "no" && ! -f "${b2c}" ]]; then
+ echo "vm2c script not found in ${b2c}"
+ update_b2c="yes"
+ fi
+
+ if [[ "${update_b2c}" == "yes" ]]; then
+ download $B2C_URL $b2c
+ chmod +x $b2c
+ fi
+
+ update_selftests "${kernel_checkout}" "${make_command}"
+ run_vm $b2c "${kernel_bzimage}" "${command}"
+ if [[ "${debug_shell}" != "yes" ]]; then
+ echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"
+ fi
+
+ exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})
+}
+
+main "$@"
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 2/9] selftests: hid: allow to compile hid_bpf with LLVM
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 3/9] selftests: hid: attach/detach 2 bpf programs, not just one Benjamin Tissoires
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
clang doesn't like to compile a source to the final binary directly:
clang-14: error: cannot specify -o when generating multiple output files
So split the final rule in 2, and ensure we compile all dependencies
before.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
index f6fc5cfff770..83e8f87d643a 100644
--- a/tools/testing/selftests/hid/Makefile
+++ b/tools/testing/selftests/hid/Makefile
@@ -91,10 +91,6 @@ $(MAKE_DIRS):
$(call msg,MKDIR,,$@)
$(Q)mkdir -p $@
-$(OUTPUT)/%.o: %.c
- $(call msg,CC,,$@)
- $(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@
-
# LLVM's ld.lld doesn't support all the architectures, so use it only on x86
ifeq ($(SRCARCH),x86)
LLD := lld
@@ -223,7 +219,11 @@ $(BPF_SKELS): %.skel.h: %.bpf.o $(BPFTOOL) | $(OUTPUT)
$(Q)$(BPFTOOL) gen object $(<:.o=.linked1.o) $<
$(Q)$(BPFTOOL) gen skeleton $(<:.o=.linked1.o) name $(notdir $(<:.bpf.o=)) > $@
-$(OUTPUT)/%:%.c $(BPF_SKELS) $(KHDR_INCLUDES)/linux/hid.h
+$(OUTPUT)/%.o: %.c $(BPF_SKELS) $(KHDR_INCLUDES)/linux/hid.h
+ $(call msg,CC,,$@)
+ $(Q)$(CC) $(CFLAGS) -c $(filter %.c,$^) $(LDLIBS) -o $@
+
+$(OUTPUT)/%: $(OUTPUT)/%.o
$(call msg,BINARY,,$@)
$(Q)$(LINK.c) $^ $(LDLIBS) -o $@
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 3/9] selftests: hid: attach/detach 2 bpf programs, not just one
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 2/9] selftests: hid: allow to compile hid_bpf with LLVM Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 4/9] selftests: hid: ensure the program is correctly pinned Benjamin Tissoires
` (5 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Add a second BPF program to attach to the device, as the development of
this feature showed that we also need to ensure we can detach multiple
programs to a device (hid_bpf_link->index was actually not set initially,
and this lead to any BPF program not being released except for the first
one).
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/hid_bpf.c | 8 +++++++-
tools/testing/selftests/hid/progs/hid.c | 13 +++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index 6615c26fb5dd..d215bb492eb4 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -616,6 +616,7 @@ TEST_F(hid_bpf, test_attach_detach)
{
const struct test_program progs[] = {
{ .name = "hid_first_event" },
+ { .name = "hid_second_event" },
};
__u8 buf[10] = {0};
int err;
@@ -634,7 +635,10 @@ TEST_F(hid_bpf, test_attach_detach)
ASSERT_EQ(buf[0], 1);
ASSERT_EQ(buf[2], 47);
- /* pin the program and immediately unpin it */
+ /* make sure both programs are run */
+ ASSERT_EQ(buf[3], 52);
+
+ /* pin the first program and immediately unpin it */
#define PIN_PATH "/sys/fs/bpf/hid_first_event"
bpf_program__pin(self->skel->progs.hid_first_event, PIN_PATH);
remove(PIN_PATH);
@@ -660,6 +664,7 @@ TEST_F(hid_bpf, test_attach_detach)
ASSERT_EQ(buf[0], 1);
ASSERT_EQ(buf[1], 47);
ASSERT_EQ(buf[2], 0);
+ ASSERT_EQ(buf[3], 0);
/* re-attach our program */
@@ -677,6 +682,7 @@ TEST_F(hid_bpf, test_attach_detach)
ASSERT_EQ(err, 6) TH_LOG("read_hidraw");
ASSERT_EQ(buf[0], 1);
ASSERT_EQ(buf[2], 47);
+ ASSERT_EQ(buf[3], 52);
}
/*
diff --git a/tools/testing/selftests/hid/progs/hid.c b/tools/testing/selftests/hid/progs/hid.c
index 6a86af0aa545..88c593f753b5 100644
--- a/tools/testing/selftests/hid/progs/hid.c
+++ b/tools/testing/selftests/hid/progs/hid.c
@@ -32,6 +32,19 @@ int BPF_PROG(hid_first_event, struct hid_bpf_ctx *hid_ctx)
return hid_ctx->size;
}
+SEC("?fmod_ret/hid_bpf_device_event")
+int BPF_PROG(hid_second_event, struct hid_bpf_ctx *hid_ctx)
+{
+ __u8 *rw_data = hid_bpf_get_data(hid_ctx, 0 /* offset */, 4 /* size */);
+
+ if (!rw_data)
+ return 0; /* EPERM check */
+
+ rw_data[3] = rw_data[2] + 5;
+
+ return hid_ctx->size;
+}
+
SEC("?fmod_ret/hid_bpf_device_event")
int BPF_PROG(hid_change_report_id, struct hid_bpf_ctx *hid_ctx)
{
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 4/9] selftests: hid: ensure the program is correctly pinned
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (2 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 3/9] selftests: hid: attach/detach 2 bpf programs, not just one Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 5/9] selftests: hid: prepare tests for HID_BPF API change Benjamin Tissoires
` (4 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Turns out that if bpffs was not mounted, the test was silently passing.
So ensure it passes by checking the mount command result.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/hid_bpf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index d215bb492eb4..3b204a15e44b 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -640,7 +640,8 @@ TEST_F(hid_bpf, test_attach_detach)
/* pin the first program and immediately unpin it */
#define PIN_PATH "/sys/fs/bpf/hid_first_event"
- bpf_program__pin(self->skel->progs.hid_first_event, PIN_PATH);
+ err = bpf_program__pin(self->skel->progs.hid_first_event, PIN_PATH);
+ ASSERT_OK(err) TH_LOG("error while calling bpf_program__pin");
remove(PIN_PATH);
#undef PIN_PATH
usleep(100000);
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 5/9] selftests: hid: prepare tests for HID_BPF API change
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (3 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 4/9] selftests: hid: ensure the program is correctly pinned Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel Benjamin Tissoires
` (3 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
We plan on changing the return value of hid_bpf_attach_prog().
Instead of returning an error code, it will return an fd to a bpf_link.
This bpf_link is responsible for the binding between the bpf program and
the hid device.
Add a fallback mechanism to not break bisections by pinning the program
when we run this test against the non changed kernel.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/hid_bpf.c | 29 +++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index 3b204a15e44b..9a262fe99b32 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -444,13 +444,21 @@ FIXTURE(hid_bpf) {
int hid_id;
pthread_t tid;
struct hid *skel;
+ int hid_links[3]; /* max number of programs loaded in a single test */
};
static void detach_bpf(FIXTURE_DATA(hid_bpf) * self)
{
+ int i;
+
if (self->hidraw_fd)
close(self->hidraw_fd);
self->hidraw_fd = 0;
+ for (i = 0; i < ARRAY_SIZE(self->hid_links); i++) {
+ if (self->hid_links[i])
+ close(self->hid_links[i]);
+ }
+
hid__destroy(self->skel);
self->skel = NULL;
}
@@ -512,6 +520,9 @@ static void load_programs(const struct test_program programs[],
.ctx_size_in = sizeof(args),
);
+ ASSERT_LE(progs_count, ARRAY_SIZE(self->hid_links))
+ TH_LOG("too many programs are to be loaded");
+
/* open the bpf file */
self->skel = hid__open();
ASSERT_OK_PTR(self->skel) TEARDOWN_LOG("Error while calling hid__open");
@@ -543,7 +554,10 @@ static void load_programs(const struct test_program programs[],
args.hid = self->hid_id;
args.insert_head = programs[i].insert_head;
err = bpf_prog_test_run_opts(attach_fd, &tattr);
- ASSERT_OK(args.retval) TH_LOG("attach_hid(%s): %d", programs[i].name, args.retval);
+ ASSERT_GE(args.retval, 0)
+ TH_LOG("attach_hid(%s): %d", programs[i].name, args.retval);
+
+ self->hid_links[i] = args.retval;
}
self->hidraw_fd = open_hidraw(self->dev_id);
@@ -619,10 +633,17 @@ TEST_F(hid_bpf, test_attach_detach)
{ .name = "hid_second_event" },
};
__u8 buf[10] = {0};
- int err;
+ int err, link;
LOAD_PROGRAMS(progs);
+ link = self->hid_links[0];
+ /* we might not be using the new code path where hid_bpf_attach_prog()
+ * returns a link.
+ */
+ if (!link)
+ link = bpf_program__fd(self->skel->progs.hid_first_event);
+
/* inject one event */
buf[0] = 1;
buf[1] = 42;
@@ -640,8 +661,8 @@ TEST_F(hid_bpf, test_attach_detach)
/* pin the first program and immediately unpin it */
#define PIN_PATH "/sys/fs/bpf/hid_first_event"
- err = bpf_program__pin(self->skel->progs.hid_first_event, PIN_PATH);
- ASSERT_OK(err) TH_LOG("error while calling bpf_program__pin");
+ err = bpf_obj_pin(link, PIN_PATH);
+ ASSERT_OK(err) TH_LOG("error while calling bpf_obj_pin");
remove(PIN_PATH);
#undef PIN_PATH
usleep(100000);
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (4 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 5/9] selftests: hid: prepare tests for HID_BPF API change Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-11 6:10 ` Alexei Starovoitov
2023-01-06 10:23 ` [PATCH HID for-next v1 7/9] selftests: hid: enforce new attach API Benjamin Tissoires
` (2 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Previously, HID-BPF was relying on a bpf tracing program to be notified
when a program was released from userspace. This is error prone, as
LLVM sometimes inline the function and sometimes not.
So instead of messing up with the bpf prog ref count, we can use the
bpf_link concept which actually matches exactly what we want:
- a bpf_link represents the fact that a given program is attached to a
given HID device
- as long as the bpf_link has fd opened (either by the userspace program
still being around or by pinning the bpf object in the bpffs), the
program stays attached to the HID device
- once every user has closed the fd, we get called by
hid_bpf_link_release() that we no longer have any users, and we can
disconnect the program to the device in 2 passes: first atomically clear
the bit saying that the link is active, and then calling release_work in
a scheduled work item.
This solves entirely the problems of BPF tracing not showing up and is
definitely cleaner.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
Documentation/hid/hid-bpf.rst | 12 ++-
drivers/hid/bpf/hid_bpf_dispatch.c | 18 +++--
drivers/hid/bpf/hid_bpf_jmp_table.c | 116 +++++++++++++++-------------
include/linux/hid_bpf.h | 7 ++
4 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/Documentation/hid/hid-bpf.rst b/Documentation/hid/hid-bpf.rst
index a55f191d49a3..c205f92b7bcc 100644
--- a/Documentation/hid/hid-bpf.rst
+++ b/Documentation/hid/hid-bpf.rst
@@ -427,12 +427,22 @@ program first::
prog_fd = bpf_program__fd(hid_skel->progs.attach_prog);
err = bpf_prog_test_run_opts(prog_fd, &tattrs);
- return err;
+ if (err)
+ return err;
+
+ return args.retval; /* the fd of the created bpf_link */
}
Our userspace program can now listen to notifications on the ring buffer, and
is awaken only when the value changes.
+When the userspace program doesn't need to listen to events anymore, it can just
+close the returned fd from :c:func:`attach_filter`, which will tell the kernel to
+detach the program from the HID device.
+
+Of course, in other use cases, the userspace program can also pin the fd to the
+BPF filesystem through a call to :c:func:`bpf_obj_pin`, as with any bpf_link.
+
Controlling the device
----------------------
diff --git a/drivers/hid/bpf/hid_bpf_dispatch.c b/drivers/hid/bpf/hid_bpf_dispatch.c
index 58e608ebf0fa..8d29fd361ab9 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.c
+++ b/drivers/hid/bpf/hid_bpf_dispatch.c
@@ -249,7 +249,9 @@ int hid_bpf_reconnect(struct hid_device *hdev)
* @prog_fd: an fd in the user process representing the program to attach
* @flags: any logical OR combination of &enum hid_bpf_attach_flags
*
- * @returns %0 on success, an error code otherwise.
+ * @returns an fd of a bpf_link object on success (> %0), an error code otherwise.
+ * Closing this fd will detach the program from the HID device (unless the bpf_link
+ * is pinned to the BPF file system).
*/
/* called from syscall */
noinline int
@@ -257,7 +259,7 @@ hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags)
{
struct hid_device *hdev;
struct device *dev;
- int err, prog_type = hid_bpf_get_prog_attach_type(prog_fd);
+ int fd, err, prog_type = hid_bpf_get_prog_attach_type(prog_fd);
if (!hid_bpf_ops)
return -EINVAL;
@@ -283,17 +285,19 @@ hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags)
return err;
}
- err = __hid_bpf_attach_prog(hdev, prog_type, prog_fd, flags);
- if (err)
- return err;
+ fd = __hid_bpf_attach_prog(hdev, prog_type, prog_fd, flags);
+ if (fd < 0)
+ return fd;
if (prog_type == HID_BPF_PROG_TYPE_RDESC_FIXUP) {
err = hid_bpf_reconnect(hdev);
- if (err)
+ if (err) {
+ close_fd(fd);
return err;
+ }
}
- return 0;
+ return fd;
}
/**
diff --git a/drivers/hid/bpf/hid_bpf_jmp_table.c b/drivers/hid/bpf/hid_bpf_jmp_table.c
index 207972b028d9..21bbb5809fbc 100644
--- a/drivers/hid/bpf/hid_bpf_jmp_table.c
+++ b/drivers/hid/bpf/hid_bpf_jmp_table.c
@@ -322,16 +322,6 @@ static int hid_bpf_insert_prog(int prog_fd, struct bpf_prog *prog)
if (err)
goto out;
- /*
- * The program has been safely inserted, decrement the reference count
- * so it doesn't interfere with the number of actual user handles.
- * This is safe to do because:
- * - we overrite the put_ptr in the prog fd map
- * - we also have a cleanup function that monitors when a program gets
- * released and we manually do the cleanup in the prog fd map
- */
- bpf_prog_sub(prog, 1);
-
/* return the index */
err = index;
@@ -365,11 +355,43 @@ int hid_bpf_get_prog_attach_type(int prog_fd)
return prog_type;
}
+static void hid_bpf_link_release(struct bpf_link *link)
+{
+ struct hid_bpf_link *hid_link =
+ container_of(link, struct hid_bpf_link, link);
+
+ __clear_bit(hid_link->index, jmp_table.enabled);
+ schedule_work(&release_work);
+}
+
+static void hid_bpf_link_dealloc(struct bpf_link *link)
+{
+ struct hid_bpf_link *hid_link =
+ container_of(link, struct hid_bpf_link, link);
+
+ kfree(hid_link);
+}
+
+static void hid_bpf_link_show_fdinfo(const struct bpf_link *link,
+ struct seq_file *seq)
+{
+ seq_printf(seq,
+ "attach_type:\tHID-BPF\n");
+}
+
+static const struct bpf_link_ops hid_bpf_link_lops = {
+ .release = hid_bpf_link_release,
+ .dealloc = hid_bpf_link_dealloc,
+ .show_fdinfo = hid_bpf_link_show_fdinfo,
+};
+
/* called from syscall */
noinline int
__hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type,
int prog_fd, __u32 flags)
{
+ struct bpf_link_primer link_primer;
+ struct hid_bpf_link *link;
struct bpf_prog *prog = NULL;
struct hid_bpf_prog_entry *prog_entry;
int cnt, err = -EINVAL, prog_idx = -1;
@@ -381,23 +403,32 @@ __hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type,
mutex_lock(&hid_bpf_attach_lock);
+ link = kzalloc(sizeof(*link), GFP_USER);
+ if (!link) {
+ err = -ENOMEM;
+ goto err_unlock;
+ }
+
+ bpf_link_init(&link->link, BPF_LINK_TYPE_UNSPEC,
+ &hid_bpf_link_lops, prog);
+
/* do not attach too many programs to a given HID device */
cnt = hid_bpf_program_count(hdev, NULL, prog_type);
if (cnt < 0) {
err = cnt;
- goto out_unlock;
+ goto err_unlock;
}
if (cnt >= hid_bpf_max_programs(prog_type)) {
err = -E2BIG;
- goto out_unlock;
+ goto err_unlock;
}
prog_idx = hid_bpf_insert_prog(prog_fd, prog);
/* if the jmp table is full, abort */
if (prog_idx < 0) {
err = prog_idx;
- goto out_unlock;
+ goto err_unlock;
}
if (flags & HID_BPF_FLAG_INSERT_HEAD) {
@@ -418,16 +449,26 @@ __hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type,
/* finally store the index in the device list */
err = hid_bpf_populate_hdev(hdev, prog_type);
- if (err)
+ if (err) {
hid_bpf_release_prog_at(prog_idx);
+ goto err_unlock;
+ }
+
+ link->index = prog_idx;
+
+ err = bpf_link_prime(&link->link, &link_primer);
+ if (err)
+ goto err_unlock;
- out_unlock:
mutex_unlock(&hid_bpf_attach_lock);
- /* we only use prog as a key in the various tables, so we don't need to actually
- * increment the ref count.
- */
+ return bpf_link_settle(&link_primer);
+
+ err_unlock:
+ mutex_unlock(&hid_bpf_attach_lock);
+
bpf_prog_put(prog);
+ kfree(link);
return err;
}
@@ -460,36 +501,10 @@ void __hid_bpf_destroy_device(struct hid_device *hdev)
void call_hid_bpf_prog_put_deferred(struct work_struct *work)
{
- struct bpf_prog_aux *aux;
- struct bpf_prog *prog;
- bool found = false;
- int i;
-
- aux = container_of(work, struct bpf_prog_aux, work);
- prog = aux->prog;
-
- /* we don't need locking here because the entries in the progs table
- * are stable:
- * if there are other users (and the progs entries might change), we
- * would simply not have been called.
- */
- for (i = 0; i < HID_BPF_MAX_PROGS; i++) {
- if (jmp_table.progs[i] == prog) {
- __clear_bit(i, jmp_table.enabled);
- found = true;
- }
- }
-
- if (found)
- /* schedule release of all detached progs */
- schedule_work(&release_work);
-}
-
-static void hid_bpf_prog_fd_array_put_ptr(void *ptr)
-{
+ /* kept around for patch readability, to be dropped in the next commmit */
}
-#define HID_BPF_PROGS_COUNT 2
+#define HID_BPF_PROGS_COUNT 1
static struct bpf_link *links[HID_BPF_PROGS_COUNT];
static struct entrypoints_bpf *skel;
@@ -528,8 +543,6 @@ void hid_bpf_free_links_and_skel(void)
idx++; \
} while (0)
-static struct bpf_map_ops hid_bpf_prog_fd_maps_ops;
-
int hid_bpf_preload_skel(void)
{
int err, idx = 0;
@@ -548,14 +561,7 @@ int hid_bpf_preload_skel(void)
goto out;
}
- /* our jump table is stealing refs, so we should not decrement on removal of elements */
- hid_bpf_prog_fd_maps_ops = *jmp_table.map->ops;
- hid_bpf_prog_fd_maps_ops.map_fd_put_ptr = hid_bpf_prog_fd_array_put_ptr;
-
- jmp_table.map->ops = &hid_bpf_prog_fd_maps_ops;
-
ATTACH_AND_STORE_LINK(hid_tail_call);
- ATTACH_AND_STORE_LINK(hid_bpf_prog_put_deferred);
return 0;
out:
diff --git a/include/linux/hid_bpf.h b/include/linux/hid_bpf.h
index 3ca85ab91325..6da923c90393 100644
--- a/include/linux/hid_bpf.h
+++ b/include/linux/hid_bpf.h
@@ -3,6 +3,7 @@
#ifndef __HID_BPF_H
#define __HID_BPF_H
+#include <linux/bpf.h>
#include <linux/spinlock.h>
#include <uapi/linux/hid.h>
@@ -138,6 +139,12 @@ struct hid_bpf {
spinlock_t progs_lock; /* protects RCU update of progs */
};
+/* specific HID-BPF link when a program is attached to a device */
+struct hid_bpf_link {
+ struct bpf_link link;
+ int index;
+};
+
#ifdef CONFIG_HID_BPF
u8 *dispatch_hid_bpf_device_event(struct hid_device *hid, enum hid_report_type type, u8 *data,
u32 *size, int interrupt);
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 7/9] selftests: hid: enforce new attach API
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (5 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 9/9] HID: bpf: reorder BPF registration Benjamin Tissoires
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Now that the new API for hid_bpf_attach_prog() is in place, ensure we
get an fd when calling this function. And remove the fallback code.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
tools/testing/selftests/hid/hid_bpf.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index 9a262fe99b32..2cf96f818f25 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -638,11 +638,7 @@ TEST_F(hid_bpf, test_attach_detach)
LOAD_PROGRAMS(progs);
link = self->hid_links[0];
- /* we might not be using the new code path where hid_bpf_attach_prog()
- * returns a link.
- */
- if (!link)
- link = bpf_program__fd(self->skel->progs.hid_first_event);
+ ASSERT_GT(link, 0) TH_LOG("HID-BPF link not created");
/* inject one event */
buf[0] = 1;
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (6 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 7/9] selftests: hid: enforce new attach API Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
[not found] ` <202301062140.zfdqzE9b-lkp@intel.com>
2023-01-06 10:23 ` [PATCH HID for-next v1 9/9] HID: bpf: reorder BPF registration Benjamin Tissoires
8 siblings, 1 reply; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
We don't need to watch for calls on bpf_prog_put_deferred(), so remove
that from the entrypoints.bpf.c file.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 9 -
.../hid/bpf/entrypoints/entrypoints.lskel.h | 188 +++++-------------
drivers/hid/bpf/hid_bpf_dispatch.c | 1 -
drivers/hid/bpf/hid_bpf_dispatch.h | 3 -
4 files changed, 53 insertions(+), 148 deletions(-)
diff --git a/drivers/hid/bpf/entrypoints/entrypoints.bpf.c b/drivers/hid/bpf/entrypoints/entrypoints.bpf.c
index 7c1895d9e5c0..c22921125a1a 100644
--- a/drivers/hid/bpf/entrypoints/entrypoints.bpf.c
+++ b/drivers/hid/bpf/entrypoints/entrypoints.bpf.c
@@ -7,8 +7,6 @@
#define HID_BPF_MAX_PROGS 1024
-extern void call_hid_bpf_prog_put_deferred(struct work_struct *work) __ksym;
-
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, HID_BPF_MAX_PROGS);
@@ -24,11 +22,4 @@ int BPF_PROG(hid_tail_call, struct hid_bpf_ctx *hctx)
return 0;
}
-SEC("fentry/bpf_prog_put_deferred")
-int BPF_PROG(hid_bpf_prog_put_deferred, struct work_struct *work)
-{
- call_hid_bpf_prog_put_deferred(work);
- return 0;
-}
-
char LICENSE[] SEC("license") = "GPL";
diff --git a/drivers/hid/bpf/entrypoints/entrypoints.lskel.h b/drivers/hid/bpf/entrypoints/entrypoints.lskel.h
index 9ffb991b3e6f..35618051598c 100644
--- a/drivers/hid/bpf/entrypoints/entrypoints.lskel.h
+++ b/drivers/hid/bpf/entrypoints/entrypoints.lskel.h
@@ -12,11 +12,9 @@ struct entrypoints_bpf {
} maps;
struct {
struct bpf_prog_desc hid_tail_call;
- struct bpf_prog_desc hid_bpf_prog_put_deferred;
} progs;
struct {
int hid_tail_call_fd;
- int hid_bpf_prog_put_deferred_fd;
} links;
};
@@ -31,24 +29,12 @@ entrypoints_bpf__hid_tail_call__attach(struct entrypoints_bpf *skel)
return fd;
}
-static inline int
-entrypoints_bpf__hid_bpf_prog_put_deferred__attach(struct entrypoints_bpf *skel)
-{
- int prog_fd = skel->progs.hid_bpf_prog_put_deferred.prog_fd;
- int fd = skel_raw_tracepoint_open(NULL, prog_fd);
-
- if (fd > 0)
- skel->links.hid_bpf_prog_put_deferred_fd = fd;
- return fd;
-}
-
static inline int
entrypoints_bpf__attach(struct entrypoints_bpf *skel)
{
int ret = 0;
ret = ret < 0 ? ret : entrypoints_bpf__hid_tail_call__attach(skel);
- ret = ret < 0 ? ret : entrypoints_bpf__hid_bpf_prog_put_deferred__attach(skel);
return ret < 0 ? ret : 0;
}
@@ -56,7 +42,6 @@ static inline void
entrypoints_bpf__detach(struct entrypoints_bpf *skel)
{
skel_closenz(skel->links.hid_tail_call_fd);
- skel_closenz(skel->links.hid_bpf_prog_put_deferred_fd);
}
static void
entrypoints_bpf__destroy(struct entrypoints_bpf *skel)
@@ -65,7 +50,6 @@ entrypoints_bpf__destroy(struct entrypoints_bpf *skel)
return;
entrypoints_bpf__detach(skel);
skel_closenz(skel->progs.hid_tail_call.prog_fd);
- skel_closenz(skel->progs.hid_bpf_prog_put_deferred.prog_fd);
skel_closenz(skel->maps.hid_jmp_table.map_fd);
skel_free(skel);
}
@@ -91,7 +75,7 @@ entrypoints_bpf__load(struct entrypoints_bpf *skel)
int err;
opts.ctx = (struct bpf_loader_ctx *)skel;
- opts.data_sz = 3792;
+ opts.data_sz = 2856;
opts.data = (void *)"\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
@@ -126,7 +110,7 @@ entrypoints_bpf__load(struct entrypoints_bpf *skel)
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x9f\xeb\x01\0\
-\x18\0\0\0\0\0\0\0\xa4\x03\0\0\xa4\x03\0\0\x54\x03\0\0\0\0\0\0\0\0\0\x02\x03\0\
+\x18\0\0\0\0\0\0\0\x60\x02\0\0\x60\x02\0\0\x12\x02\0\0\0\0\0\0\0\0\0\x02\x03\0\
\0\0\x01\0\0\0\0\0\0\x01\x04\0\0\0\x20\0\0\x01\0\0\0\0\0\0\0\x03\0\0\0\0\x02\0\
\0\0\x04\0\0\0\x03\0\0\0\x05\0\0\0\0\0\0\x01\x04\0\0\0\x20\0\0\0\0\0\0\0\0\0\0\
\x02\x06\0\0\0\0\0\0\0\0\0\0\x03\0\0\0\0\x02\0\0\0\x04\0\0\0\0\x04\0\0\0\0\0\0\
@@ -139,25 +123,14 @@ entrypoints_bpf__load(struct entrypoints_bpf *skel)
\0\0\0\0\0\0\0\x1b\x01\0\0\x12\0\0\0\x40\0\0\0\x1f\x01\0\0\x10\0\0\0\x80\0\0\0\
\x2e\x01\0\0\x14\0\0\0\xa0\0\0\0\0\0\0\0\x15\0\0\0\xc0\0\0\0\x3a\x01\0\0\0\0\0\
\x08\x11\0\0\0\x40\x01\0\0\0\0\0\x01\x04\0\0\0\x20\0\0\0\0\0\0\0\0\0\0\x02\x13\
-\0\0\0\0\0\0\0\0\0\0\x0a\x2d\0\0\0\x4d\x01\0\0\x04\0\0\x06\x04\0\0\0\x5d\x01\0\
+\0\0\0\0\0\0\0\0\0\0\x0a\x1c\0\0\0\x4d\x01\0\0\x04\0\0\x06\x04\0\0\0\x5d\x01\0\
\0\0\0\0\0\x6e\x01\0\0\x01\0\0\0\x80\x01\0\0\x02\0\0\0\x93\x01\0\0\x03\0\0\0\0\
\0\0\0\x02\0\0\x05\x04\0\0\0\xa4\x01\0\0\x16\0\0\0\0\0\0\0\xab\x01\0\0\x16\0\0\
-\0\0\0\0\0\xb0\x01\0\0\0\0\0\x08\x02\0\0\0\0\0\0\0\x01\0\0\x0d\x02\0\0\0\x5f\0\
-\0\0\x0b\0\0\0\xec\x01\0\0\x01\0\0\x0c\x17\0\0\0\0\0\0\0\x01\0\0\x0d\0\0\0\0\
-\x49\x03\0\0\x1a\0\0\0\0\0\0\0\0\0\0\x02\x1b\0\0\0\x8c\x02\0\0\x03\0\0\x04\x20\
-\0\0\0\x98\x02\0\0\x1c\0\0\0\0\0\0\0\x9d\x02\0\0\x22\0\0\0\x40\0\0\0\xa3\x02\0\
-\0\x24\0\0\0\xc0\0\0\0\xa8\x02\0\0\0\0\0\x08\x1d\0\0\0\xb6\x02\0\0\0\0\0\x08\
-\x1e\0\0\0\0\0\0\0\x01\0\0\x04\x08\0\0\0\xc1\x02\0\0\x1f\0\0\0\0\0\0\0\xc9\x02\
-\0\0\0\0\0\x08\x20\0\0\0\xcd\x02\0\0\0\0\0\x08\x21\0\0\0\xd3\x02\0\0\0\0\0\x01\
-\x08\0\0\0\x40\0\0\x01\xdd\x02\0\0\x02\0\0\x04\x10\0\0\0\xe7\x02\0\0\x23\0\0\0\
-\0\0\0\0\xec\x02\0\0\x23\0\0\0\x40\0\0\0\0\0\0\0\0\0\0\x02\x22\0\0\0\xf1\x02\0\
-\0\0\0\0\x08\x25\0\0\0\0\0\0\0\0\0\0\x02\x19\0\0\0\xfd\x02\0\0\x01\0\0\x0c\x19\
-\0\0\0\x1c\x03\0\0\0\0\0\x01\x01\0\0\0\x08\0\0\x01\0\0\0\0\0\0\0\x03\0\0\0\0\
-\x27\0\0\0\x04\0\0\0\x04\0\0\0\x21\x03\0\0\0\0\0\x0e\x28\0\0\0\x01\0\0\0\x29\
-\x03\0\0\x01\0\0\x0f\x04\0\0\0\x2e\0\0\0\0\0\0\0\x04\0\0\0\x30\x03\0\0\x01\0\0\
-\x0f\x20\0\0\0\x0a\0\0\0\0\0\0\0\x20\0\0\0\x36\x03\0\0\x01\0\0\x0f\x04\0\0\0\
-\x29\0\0\0\0\0\0\0\x04\0\0\0\x3e\x03\0\0\0\0\0\x07\0\0\0\0\x49\x03\0\0\0\0\0\
-\x0e\x02\0\0\0\x01\0\0\0\0\x69\x6e\x74\0\x5f\x5f\x41\x52\x52\x41\x59\x5f\x53\
+\0\0\0\0\0\xb0\x01\0\0\0\0\0\x08\x02\0\0\0\xec\x01\0\0\0\0\0\x01\x01\0\0\0\x08\
+\0\0\x01\0\0\0\0\0\0\0\x03\0\0\0\0\x17\0\0\0\x04\0\0\0\x04\0\0\0\xf1\x01\0\0\0\
+\0\0\x0e\x18\0\0\0\x01\0\0\0\xf9\x01\0\0\x01\0\0\x0f\x20\0\0\0\x0a\0\0\0\0\0\0\
+\0\x20\0\0\0\xff\x01\0\0\x01\0\0\x0f\x04\0\0\0\x19\0\0\0\0\0\0\0\x04\0\0\0\x07\
+\x02\0\0\0\0\0\x07\0\0\0\0\0\x69\x6e\x74\0\x5f\x5f\x41\x52\x52\x41\x59\x5f\x53\
\x49\x5a\x45\x5f\x54\x59\x50\x45\x5f\x5f\0\x74\x79\x70\x65\0\x6d\x61\x78\x5f\
\x65\x6e\x74\x72\x69\x65\x73\0\x6b\x65\x79\x5f\x73\x69\x7a\x65\0\x76\x61\x6c\
\x75\x65\x5f\x73\x69\x7a\x65\0\x68\x69\x64\x5f\x6a\x6d\x70\x5f\x74\x61\x62\x6c\
@@ -182,119 +155,64 @@ entrypoints_bpf__load(struct entrypoints_bpf *skel)
\x5f\x5f\x73\x33\x32\0\x30\x3a\x30\0\x09\x62\x70\x66\x5f\x74\x61\x69\x6c\x5f\
\x63\x61\x6c\x6c\x28\x63\x74\x78\x2c\x20\x26\x68\x69\x64\x5f\x6a\x6d\x70\x5f\
\x74\x61\x62\x6c\x65\x2c\x20\x68\x63\x74\x78\x2d\x3e\x69\x6e\x64\x65\x78\x29\
-\x3b\0\x68\x69\x64\x5f\x62\x70\x66\x5f\x70\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\
-\x65\x66\x65\x72\x72\x65\x64\0\x66\x65\x6e\x74\x72\x79\x2f\x62\x70\x66\x5f\x70\
-\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\x65\x66\x65\x72\x72\x65\x64\0\x69\x6e\x74\
-\x20\x42\x50\x46\x5f\x50\x52\x4f\x47\x28\x68\x69\x64\x5f\x62\x70\x66\x5f\x70\
-\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\x65\x66\x65\x72\x72\x65\x64\x2c\x20\x73\
-\x74\x72\x75\x63\x74\x20\x77\x6f\x72\x6b\x5f\x73\x74\x72\x75\x63\x74\x20\x2a\
-\x77\x6f\x72\x6b\x29\0\x09\x63\x61\x6c\x6c\x5f\x68\x69\x64\x5f\x62\x70\x66\x5f\
-\x70\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\x65\x66\x65\x72\x72\x65\x64\x28\x77\
-\x6f\x72\x6b\x29\x3b\0\x77\x6f\x72\x6b\x5f\x73\x74\x72\x75\x63\x74\0\x64\x61\
-\x74\x61\0\x65\x6e\x74\x72\x79\0\x66\x75\x6e\x63\0\x61\x74\x6f\x6d\x69\x63\x5f\
-\x6c\x6f\x6e\x67\x5f\x74\0\x61\x74\x6f\x6d\x69\x63\x36\x34\x5f\x74\0\x63\x6f\
-\x75\x6e\x74\x65\x72\0\x73\x36\x34\0\x5f\x5f\x73\x36\x34\0\x6c\x6f\x6e\x67\x20\
-\x6c\x6f\x6e\x67\0\x6c\x69\x73\x74\x5f\x68\x65\x61\x64\0\x6e\x65\x78\x74\0\x70\
-\x72\x65\x76\0\x77\x6f\x72\x6b\x5f\x66\x75\x6e\x63\x5f\x74\0\x63\x61\x6c\x6c\
-\x5f\x68\x69\x64\x5f\x62\x70\x66\x5f\x70\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\
-\x65\x66\x65\x72\x72\x65\x64\0\x63\x68\x61\x72\0\x4c\x49\x43\x45\x4e\x53\x45\0\
-\x2e\x6b\x73\x79\x6d\x73\0\x2e\x6d\x61\x70\x73\0\x6c\x69\x63\x65\x6e\x73\x65\0\
-\x68\x69\x64\x5f\x64\x65\x76\x69\x63\x65\0\x64\x75\x6d\x6d\x79\x5f\x6b\x73\x79\
-\x6d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x10\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x03\
+\x3b\0\x63\x68\x61\x72\0\x4c\x49\x43\x45\x4e\x53\x45\0\x2e\x6d\x61\x70\x73\0\
+\x6c\x69\x63\x65\x6e\x73\x65\0\x68\x69\x64\x5f\x64\x65\x76\x69\x63\x65\0\0\0\0\
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x8a\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x03\
\0\0\0\x04\0\0\0\x04\0\0\0\0\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x68\x69\x64\x5f\
\x6a\x6d\x70\x5f\x74\x61\x62\x6c\x65\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\x47\x50\x4c\0\0\0\0\0\x79\x12\0\0\0\0\0\0\x61\x23\0\0\0\0\
\0\0\x18\x52\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x85\0\0\0\x0c\0\0\0\xb7\0\0\0\0\0\0\0\
-\x95\0\0\0\0\0\0\0\0\0\0\0\x0e\0\0\0\0\0\0\0\x8e\0\0\0\xd3\0\0\0\x05\x50\0\0\
-\x01\0\0\0\x8e\0\0\0\xba\x01\0\0\x02\x58\0\0\x05\0\0\0\x8e\0\0\0\xd3\0\0\0\x05\
-\x50\0\0\x08\0\0\0\x0f\0\0\0\xb6\x01\0\0\0\0\0\0\x1a\0\0\0\x07\0\0\0\0\0\0\0\0\
+\x95\0\0\0\0\0\0\0\0\0\0\0\x0e\0\0\0\0\0\0\0\x8e\0\0\0\xd3\0\0\0\x05\x48\0\0\
+\x01\0\0\0\x8e\0\0\0\xba\x01\0\0\x02\x50\0\0\x05\0\0\0\x8e\0\0\0\xd3\0\0\0\x05\
+\x48\0\0\x08\0\0\0\x0f\0\0\0\xb6\x01\0\0\0\0\0\0\x1a\0\0\0\x07\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x68\x69\
\x64\x5f\x74\x61\x69\x6c\x5f\x63\x61\x6c\x6c\0\0\0\0\0\0\0\x1a\0\0\0\0\0\0\0\
\x08\0\0\0\0\0\0\0\0\0\0\0\x01\0\0\0\x10\0\0\0\0\0\0\0\0\0\0\0\x03\0\0\0\x01\0\
\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x10\0\0\0\0\0\0\0\x5f\
\x5f\x68\x69\x64\x5f\x62\x70\x66\x5f\x74\x61\x69\x6c\x5f\x63\x61\x6c\x6c\0\0\0\
-\0\0\x47\x50\x4c\0\0\0\0\0\x79\x11\0\0\0\0\0\0\x85\x20\0\0\0\0\0\0\xb7\0\0\0\0\
-\0\0\0\x95\0\0\0\0\0\0\0\0\0\0\0\x18\0\0\0\0\0\0\0\x8e\0\0\0\x23\x02\0\0\x05\
-\x70\0\0\x01\0\0\0\x8e\0\0\0\x65\x02\0\0\x02\x78\0\0\x02\0\0\0\x8e\0\0\0\x23\
-\x02\0\0\x05\x70\0\0\x1a\0\0\0\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
-\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x68\x69\x64\x5f\x62\x70\x66\x5f\x70\
-\x72\x6f\x67\x5f\x70\x75\0\0\0\0\0\x18\0\0\0\0\0\0\0\x08\0\0\0\0\0\0\0\0\0\0\0\
-\x01\0\0\0\x10\0\0\0\0\0\0\0\0\0\0\0\x03\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
-\0\0\0\0\0\0\0\0\0\0\0\0\0\x10\0\0\0\0\0\0\0\x62\x70\x66\x5f\x70\x72\x6f\x67\
-\x5f\x70\x75\x74\x5f\x64\x65\x66\x65\x72\x72\x65\x64\0\0\0\x63\x61\x6c\x6c\x5f\
-\x68\x69\x64\x5f\x62\x70\x66\x5f\x70\x72\x6f\x67\x5f\x70\x75\x74\x5f\x64\x65\
-\x66\x65\x72\x72\x65\x64\0\0";
- opts.insns_sz = 2056;
+\0\0";
+ opts.insns_sz = 1192;
opts.insns = (void *)"\
\xbf\x16\0\0\0\0\0\0\xbf\xa1\0\0\0\0\0\0\x07\x01\0\0\x78\xff\xff\xff\xb7\x02\0\
-\0\x88\0\0\0\xb7\x03\0\0\0\0\0\0\x85\0\0\0\x71\0\0\0\x05\0\x14\0\0\0\0\0\x61\
+\0\x88\0\0\0\xb7\x03\0\0\0\0\0\0\x85\0\0\0\x71\0\0\0\x05\0\x11\0\0\0\0\0\x61\
\xa1\x78\xff\0\0\0\0\xd5\x01\x01\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x61\xa1\x7c\xff\
\0\0\0\0\xd5\x01\x01\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x61\xa1\x80\xff\0\0\0\0\xd5\
-\x01\x01\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x61\xa1\x84\xff\0\0\0\0\xd5\x01\x01\0\0\
-\0\0\0\x85\0\0\0\xa8\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x61\x01\0\0\0\0\
-\0\0\xd5\x01\x02\0\0\0\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\xbf\x70\0\0\
-\0\0\0\0\x95\0\0\0\0\0\0\0\x61\x60\x08\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\
-\x28\x0c\0\0\x63\x01\0\0\0\0\0\0\x61\x60\x0c\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\
-\0\0\x24\x0c\0\0\x63\x01\0\0\0\0\0\0\x79\x60\x10\0\0\0\0\0\x18\x61\0\0\0\0\0\0\
-\0\0\0\0\x18\x0c\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\x05\0\0\
-\x18\x61\0\0\0\0\0\0\0\0\0\0\x10\x0c\0\0\x7b\x01\0\0\0\0\0\0\xb7\x01\0\0\x12\0\
-\0\0\x18\x62\0\0\0\0\0\0\0\0\0\0\x10\x0c\0\0\xb7\x03\0\0\x1c\0\0\0\x85\0\0\0\
-\xa6\0\0\0\xbf\x07\0\0\0\0\0\0\xc5\x07\xd4\xff\0\0\0\0\x63\x7a\x78\xff\0\0\0\0\
-\x61\x60\x1c\0\0\0\0\0\x15\0\x03\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x3c\x0c\
-\0\0\x63\x01\0\0\0\0\0\0\xb7\x01\0\0\0\0\0\0\x18\x62\0\0\0\0\0\0\0\0\0\0\x30\
-\x0c\0\0\xb7\x03\0\0\x48\0\0\0\x85\0\0\0\xa6\0\0\0\xbf\x07\0\0\0\0\0\0\xc5\x07\
-\xc7\xff\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x63\x71\0\0\0\0\0\0\x18\
-\x60\0\0\0\0\0\0\0\0\0\0\x78\x0c\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x10\x0d\0\0\
-\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x80\x0c\0\0\x18\x61\0\0\0\0\0\
-\0\0\0\0\0\x08\x0d\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xb8\x0c\
-\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x50\x0d\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\
-\0\0\0\0\0\0\0\xc0\x0c\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x60\x0d\0\0\x7b\x01\0\0\
-\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xf0\x0c\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\
-\x80\x0d\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x18\x61\0\
-\0\0\0\0\0\0\0\0\0\x78\x0d\0\0\x7b\x01\0\0\0\0\0\0\x61\x60\x08\0\0\0\0\0\x18\
-\x61\0\0\0\0\0\0\0\0\0\0\x18\x0d\0\0\x63\x01\0\0\0\0\0\0\x61\x60\x0c\0\0\0\0\0\
-\x18\x61\0\0\0\0\0\0\0\0\0\0\x1c\x0d\0\0\x63\x01\0\0\0\0\0\0\x79\x60\x10\0\0\0\
-\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x20\x0d\0\0\x7b\x01\0\0\0\0\0\0\x61\xa0\x78\
-\xff\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x48\x0d\0\0\x63\x01\0\0\0\0\0\0\x18\
-\x61\0\0\0\0\0\0\0\0\0\0\x90\x0d\0\0\xb7\x02\0\0\x14\0\0\0\xb7\x03\0\0\x0c\0\0\
-\0\xb7\x04\0\0\0\0\0\0\x85\0\0\0\xa7\0\0\0\xbf\x07\0\0\0\0\0\0\xc5\x07\x8e\xff\
-\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\x0d\0\0\x63\x70\x6c\0\0\0\0\0\x77\x07\0\
-\0\x20\0\0\0\x63\x70\x70\0\0\0\0\0\xb7\x01\0\0\x05\0\0\0\x18\x62\0\0\0\0\0\0\0\
-\0\0\0\0\x0d\0\0\xb7\x03\0\0\x8c\0\0\0\x85\0\0\0\xa6\0\0\0\xbf\x07\0\0\0\0\0\0\
-\x18\x60\0\0\0\0\0\0\0\0\0\0\x70\x0d\0\0\x61\x01\0\0\0\0\0\0\xd5\x01\x02\0\0\0\
-\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\xc5\x07\x7c\xff\0\0\0\0\x63\x7a\
-\x80\xff\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xa8\x0d\0\0\x18\x61\0\0\0\0\0\0\0\
-\0\0\0\x18\x0e\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xb0\x0d\0\0\
-\x18\x61\0\0\0\0\0\0\0\0\0\0\x10\x0e\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\
-\0\0\0\0\0\xd0\x0d\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x58\x0e\0\0\x7b\x01\0\0\0\0\
-\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xd8\x0d\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x68\
-\x0e\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x08\x0e\0\0\x18\x61\0\
-\0\0\0\0\0\0\0\0\0\x88\x0e\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\
-\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x80\x0e\0\0\x7b\x01\0\0\0\0\0\0\x61\x60\
-\x08\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x20\x0e\0\0\x63\x01\0\0\0\0\0\0\x61\
-\x60\x0c\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x24\x0e\0\0\x63\x01\0\0\0\0\0\0\
-\x79\x60\x10\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x28\x0e\0\0\x7b\x01\0\0\0\0\
-\0\0\x61\xa0\x78\xff\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x50\x0e\0\0\x63\x01\0\
-\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x98\x0e\0\0\xb7\x02\0\0\x16\0\0\0\xb7\
-\x03\0\0\x0c\0\0\0\xb7\x04\0\0\0\0\0\0\x85\0\0\0\xa7\0\0\0\xbf\x07\0\0\0\0\0\0\
-\xc5\x07\x45\xff\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x08\x0e\0\0\x63\x70\x6c\0\
-\0\0\0\0\x77\x07\0\0\x20\0\0\0\x63\x70\x70\0\0\0\0\0\x18\x68\0\0\0\0\0\0\0\0\0\
-\0\xb8\x0d\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\xb0\x0e\0\0\xb7\x02\0\0\x1f\0\0\0\
-\xb7\x03\0\0\x0c\0\0\0\xb7\x04\0\0\0\0\0\0\x85\0\0\0\xa7\0\0\0\xbf\x07\0\0\0\0\
-\0\0\xc5\x07\x36\xff\0\0\0\0\x75\x07\x03\0\0\0\0\0\x62\x08\x04\0\0\0\0\0\x6a\
-\x08\x02\0\0\0\0\0\x05\0\x0a\0\0\0\0\0\x63\x78\x04\0\0\0\0\0\xbf\x79\0\0\0\0\0\
-\0\x77\x09\0\0\x20\0\0\0\x55\x09\x02\0\0\0\0\0\x6a\x08\x02\0\0\0\0\0\x05\0\x04\
-\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\x01\0\0\x63\x90\0\0\0\0\0\0\x6a\x08\
-\x02\0\x40\0\0\0\xb7\x01\0\0\x05\0\0\0\x18\x62\0\0\0\0\0\0\0\0\0\0\x08\x0e\0\0\
-\xb7\x03\0\0\x8c\0\0\0\x85\0\0\0\xa6\0\0\0\xbf\x07\0\0\0\0\0\0\x18\x60\0\0\0\0\
-\0\0\0\0\0\0\0\x01\0\0\x61\x01\0\0\0\0\0\0\xd5\x01\x02\0\0\0\0\0\xbf\x19\0\0\0\
-\0\0\0\x85\0\0\0\xa8\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x78\x0e\0\0\x61\x01\0\0\
-\0\0\0\0\xd5\x01\x02\0\0\0\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\xc5\x07\
-\x15\xff\0\0\0\0\x63\x7a\x84\xff\0\0\0\0\x61\xa1\x78\xff\0\0\0\0\xd5\x01\x02\0\
-\0\0\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x61\xa0\x80\xff\0\0\0\0\x63\
-\x06\x28\0\0\0\0\0\x61\xa0\x84\xff\0\0\0\0\x63\x06\x2c\0\0\0\0\0\x18\x61\0\0\0\
-\0\0\0\0\0\0\0\0\0\0\0\x61\x10\0\0\0\0\0\0\x63\x06\x18\0\0\0\0\0\xb7\0\0\0\0\0\
-\0\0\x95\0\0\0\0\0\0\0";
+\x01\x01\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x61\
+\x01\0\0\0\0\0\0\xd5\x01\x02\0\0\0\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\
+\xbf\x70\0\0\0\0\0\0\x95\0\0\0\0\0\0\0\x61\x60\x08\0\0\0\0\0\x18\x61\0\0\0\0\0\
+\0\0\0\0\0\xa8\x09\0\0\x63\x01\0\0\0\0\0\0\x61\x60\x0c\0\0\0\0\0\x18\x61\0\0\0\
+\0\0\0\0\0\0\0\xa4\x09\0\0\x63\x01\0\0\0\0\0\0\x79\x60\x10\0\0\0\0\0\x18\x61\0\
+\0\0\0\0\0\0\0\0\0\x98\x09\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\
+\0\x05\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x90\x09\0\0\x7b\x01\0\0\0\0\0\0\xb7\x01\
+\0\0\x12\0\0\0\x18\x62\0\0\0\0\0\0\0\0\0\0\x90\x09\0\0\xb7\x03\0\0\x1c\0\0\0\
+\x85\0\0\0\xa6\0\0\0\xbf\x07\0\0\0\0\0\0\xc5\x07\xd7\xff\0\0\0\0\x63\x7a\x78\
+\xff\0\0\0\0\x61\x60\x1c\0\0\0\0\0\x15\0\x03\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\
+\0\0\xbc\x09\0\0\x63\x01\0\0\0\0\0\0\xb7\x01\0\0\0\0\0\0\x18\x62\0\0\0\0\0\0\0\
+\0\0\0\xb0\x09\0\0\xb7\x03\0\0\x48\0\0\0\x85\0\0\0\xa6\0\0\0\xbf\x07\0\0\0\0\0\
+\0\xc5\x07\xca\xff\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x63\x71\0\0\0\0\
+\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xf8\x09\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x90\
+\x0a\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\x0a\0\0\x18\x61\0\0\
+\0\0\0\0\0\0\0\0\x88\x0a\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\
+\x38\x0a\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\xd0\x0a\0\0\x7b\x01\0\0\0\0\0\0\x18\
+\x60\0\0\0\0\0\0\0\0\0\0\x40\x0a\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\xe0\x0a\0\0\
+\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x70\x0a\0\0\x18\x61\0\0\0\0\0\
+\0\0\0\0\0\0\x0b\0\0\x7b\x01\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
+\x18\x61\0\0\0\0\0\0\0\0\0\0\xf8\x0a\0\0\x7b\x01\0\0\0\0\0\0\x61\x60\x08\0\0\0\
+\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x98\x0a\0\0\x63\x01\0\0\0\0\0\0\x61\x60\x0c\0\
+\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x9c\x0a\0\0\x63\x01\0\0\0\0\0\0\x79\x60\
+\x10\0\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\xa0\x0a\0\0\x7b\x01\0\0\0\0\0\0\x61\
+\xa0\x78\xff\0\0\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\xc8\x0a\0\0\x63\x01\0\0\0\0\0\
+\0\x18\x61\0\0\0\0\0\0\0\0\0\0\x10\x0b\0\0\xb7\x02\0\0\x14\0\0\0\xb7\x03\0\0\
+\x0c\0\0\0\xb7\x04\0\0\0\0\0\0\x85\0\0\0\xa7\0\0\0\xbf\x07\0\0\0\0\0\0\xc5\x07\
+\x91\xff\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\x80\x0a\0\0\x63\x70\x6c\0\0\0\0\0\
+\x77\x07\0\0\x20\0\0\0\x63\x70\x70\0\0\0\0\0\xb7\x01\0\0\x05\0\0\0\x18\x62\0\0\
+\0\0\0\0\0\0\0\0\x80\x0a\0\0\xb7\x03\0\0\x8c\0\0\0\x85\0\0\0\xa6\0\0\0\xbf\x07\
+\0\0\0\0\0\0\x18\x60\0\0\0\0\0\0\0\0\0\0\xf0\x0a\0\0\x61\x01\0\0\0\0\0\0\xd5\
+\x01\x02\0\0\0\0\0\xbf\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\xc5\x07\x7f\xff\0\0\
+\0\0\x63\x7a\x80\xff\0\0\0\0\x61\xa1\x78\xff\0\0\0\0\xd5\x01\x02\0\0\0\0\0\xbf\
+\x19\0\0\0\0\0\0\x85\0\0\0\xa8\0\0\0\x61\xa0\x80\xff\0\0\0\0\x63\x06\x28\0\0\0\
+\0\0\x18\x61\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x61\x10\0\0\0\0\0\0\x63\x06\x18\0\0\0\
+\0\0\xb7\0\0\0\0\0\0\0\x95\0\0\0\0\0\0\0";
err = bpf_load_and_run(&opts);
if (err < 0)
return err;
diff --git a/drivers/hid/bpf/hid_bpf_dispatch.c b/drivers/hid/bpf/hid_bpf_dispatch.c
index 8d29fd361ab9..26117b4ec016 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.c
+++ b/drivers/hid/bpf/hid_bpf_dispatch.c
@@ -173,7 +173,6 @@ hid_bpf_get_data(struct hid_bpf_ctx *ctx, unsigned int offset, const size_t rdwr
* can use.
*/
BTF_SET8_START(hid_bpf_kfunc_ids)
-BTF_ID_FLAGS(func, call_hid_bpf_prog_put_deferred)
BTF_ID_FLAGS(func, hid_bpf_get_data, KF_RET_NULL)
BTF_SET8_END(hid_bpf_kfunc_ids)
diff --git a/drivers/hid/bpf/hid_bpf_dispatch.h b/drivers/hid/bpf/hid_bpf_dispatch.h
index 2eeab1f746dd..63dfc8605cd2 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.h
+++ b/drivers/hid/bpf/hid_bpf_dispatch.h
@@ -22,7 +22,4 @@ int hid_bpf_reconnect(struct hid_device *hdev);
struct bpf_prog;
-/* HID-BPF internal kfuncs API */
-void call_hid_bpf_prog_put_deferred(struct work_struct *work);
-
#endif
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH HID for-next v1 9/9] HID: bpf: reorder BPF registration
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
` (7 preceding siblings ...)
2023-01-06 10:23 ` [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint Benjamin Tissoires
@ 2023-01-06 10:23 ` Benjamin Tissoires
8 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 10:23 UTC (permalink / raw)
To: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov
Cc: Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest, Benjamin Tissoires
Given that our initial BPF program is not using any kfuncs anymore,
we can reorder the initialization to first try to load it and then
register the kfuncs. This has the advantage of not exporting kfuncs
when HID-BPF is not working.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/hid/bpf/hid_bpf_dispatch.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/bpf/hid_bpf_dispatch.c b/drivers/hid/bpf/hid_bpf_dispatch.c
index 26117b4ec016..8a034a555d4c 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.c
+++ b/drivers/hid/bpf/hid_bpf_dispatch.c
@@ -514,15 +514,16 @@ static int __init hid_bpf_init(void)
return 0;
}
- err = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &hid_bpf_kfunc_set);
+ err = hid_bpf_preload_skel();
if (err) {
- pr_warn("error while setting HID BPF tracing kfuncs: %d", err);
+ pr_warn("error while preloading HID BPF dispatcher: %d", err);
return 0;
}
- err = hid_bpf_preload_skel();
+ /* register tracing kfuncs after we are sure we can load our preloaded bpf program */
+ err = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &hid_bpf_kfunc_set);
if (err) {
- pr_warn("error while preloading HID BPF dispatcher: %d", err);
+ pr_warn("error while setting HID BPF tracing kfuncs: %d", err);
return 0;
}
--
2.38.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint
[not found] ` <202301062140.zfdqzE9b-lkp@intel.com>
@ 2023-01-06 14:37 ` Benjamin Tissoires
0 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-06 14:37 UTC (permalink / raw)
To: kernel test robot
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, llvm, oe-kbuild-all,
Tero Kristo, linux-kernel, linux-input, netdev, bpf,
linux-kselftest
On Fri, Jan 6, 2023 at 2:42 PM kernel test robot <lkp@intel.com> wrote:
>
> Hi Benjamin,
>
> I love your patch! Perhaps something to improve:
>
> [auto build test WARNING on hid/for-next]
> [also build test WARNING on next-20230106]
> [cannot apply to shuah-kselftest/next shuah-kselftest/fixes char-misc/char-misc-testing char-misc/char-misc-next char-misc/char-misc-linus linus/master v6.2-rc2]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Benjamin-Tissoires/selftests-hid-add-vmtest-sh/20230106-182823
> base: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next
> patch link: https://lore.kernel.org/r/20230106102332.1019632-9-benjamin.tissoires%40redhat.com
> patch subject: [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint
> config: i386-randconfig-a013
> compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
> reproduce (this is a W=1 build):
> wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # https://github.com/intel-lab-lkp/linux/commit/46336953b47885c5111b7c1a92403b3d94cf3d41
> git remote add linux-review https://github.com/intel-lab-lkp/linux
> git fetch --no-tags linux-review Benjamin-Tissoires/selftests-hid-add-vmtest-sh/20230106-182823
> git checkout 46336953b47885c5111b7c1a92403b3d94cf3d41
> # save the config file
> mkdir build_dir && cp config build_dir/.config
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 olddefconfig
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/hid/bpf/
>
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@intel.com>
>
> All warnings (new ones prefixed by >>):
>
> >> drivers/hid/bpf/hid_bpf_jmp_table.c:502:6: warning: no previous prototype for function 'call_hid_bpf_prog_put_deferred' [-Wmissing-prototypes]
> void call_hid_bpf_prog_put_deferred(struct work_struct *work)
> ^
> drivers/hid/bpf/hid_bpf_jmp_table.c:502:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
> void call_hid_bpf_prog_put_deferred(struct work_struct *work)
> ^
> static
> 1 warning generated.
>
>
> vim +/call_hid_bpf_prog_put_deferred +502 drivers/hid/bpf/hid_bpf_jmp_table.c
>
> f5c27da4e3c8a2 Benjamin Tissoires 2022-11-03 501
> 0baef37335dd4d Benjamin Tissoires 2022-11-03 @502 void call_hid_bpf_prog_put_deferred(struct work_struct *work)
> f5c27da4e3c8a2 Benjamin Tissoires 2022-11-03 503 {
> ade9207f04dc40 Benjamin Tissoires 2023-01-06 504 /* kept around for patch readability, to be dropped in the next commmit */
> f5c27da4e3c8a2 Benjamin Tissoires 2022-11-03 505 }
> f5c27da4e3c8a2 Benjamin Tissoires 2022-11-03 506
>
Oops, this function should have been dropped in 8/9 "HID: bpf: clean
up entrypoint". It's now dead code. I'll fix it in v2.
Cheers,
Benjamin
> --
> 0-DAY CI Kernel Test Service
> https://github.com/intel/lkp-tests
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh
2023-01-06 10:23 ` [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh Benjamin Tissoires
@ 2023-01-09 17:46 ` sdf
2023-01-09 17:56 ` sdf
0 siblings, 1 reply; 17+ messages in thread
From: sdf @ 2023-01-09 17:46 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On 01/06, Benjamin Tissoires wrote:
> Similar-ish in many points from the script in selftests/bpf, with a few
> differences:
> - relies on boot2container instead of a plain qemu image (meaning that
> we can take any container in a registry as a base)
> - runs in the hid selftest dir, and such uses the test program from there
> - the working directory to store the config is in
> tools/selftests/hid/results
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Sorry, I've completely missed this. I wasn't on CC and assumed
that was some sort of a repost. Going through the changes right now.
One question here: is it worth it extending bpf/vmtest.sh instead
to support boot2container? Why new script with a bunch of copy-paste
is a better deal?
> ---
> tools/testing/selftests/hid/.gitignore | 1 +
> tools/testing/selftests/hid/config.common | 241 ++++++++++++++++++
> tools/testing/selftests/hid/config.x86_64 | 4 +
> tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++++++
> 4 files changed, 530 insertions(+)
> create mode 100644 tools/testing/selftests/hid/config.common
> create mode 100644 tools/testing/selftests/hid/config.x86_64
> create mode 100755 tools/testing/selftests/hid/vmtest.sh
> diff --git a/tools/testing/selftests/hid/.gitignore
> b/tools/testing/selftests/hid/.gitignore
> index a462ca6ab2c0..995af0670f69 100644
> --- a/tools/testing/selftests/hid/.gitignore
> +++ b/tools/testing/selftests/hid/.gitignore
> @@ -2,3 +2,4 @@ bpftool
> *.skel.h
> /tools
> hid_bpf
> +results
> diff --git a/tools/testing/selftests/hid/config.common
> b/tools/testing/selftests/hid/config.common
> new file mode 100644
> index 000000000000..0617275d93cc
> --- /dev/null
> +++ b/tools/testing/selftests/hid/config.common
> @@ -0,0 +1,241 @@
> +CONFIG_9P_FS_POSIX_ACL=y
> +CONFIG_9P_FS_SECURITY=y
> +CONFIG_9P_FS=y
> +CONFIG_AUDIT=y
> +CONFIG_BINFMT_MISC=y
> +CONFIG_BLK_CGROUP_IOLATENCY=y
> +CONFIG_BLK_CGROUP=y
> +CONFIG_BLK_DEV_BSGLIB=y
> +CONFIG_BLK_DEV_IO_TRACE=y
> +CONFIG_BLK_DEV_RAM_SIZE=16384
> +CONFIG_BLK_DEV_RAM=y
> +CONFIG_BLK_DEV_THROTTLING=y
> +CONFIG_BONDING=y
> +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
> +CONFIG_BOOTTIME_TRACING=y
> +CONFIG_BSD_DISKLABEL=y
> +CONFIG_BSD_PROCESS_ACCT=y
> +CONFIG_CFS_BANDWIDTH=y
> +CONFIG_CGROUP_CPUACCT=y
> +CONFIG_CGROUP_DEBUG=y
> +CONFIG_CGROUP_DEVICE=y
> +CONFIG_CGROUP_FREEZER=y
> +CONFIG_CGROUP_HUGETLB=y
> +CONFIG_CGROUP_NET_CLASSID=y
> +CONFIG_CGROUP_NET_PRIO=y
> +CONFIG_CGROUP_PERF=y
> +CONFIG_CGROUP_PIDS=y
> +CONFIG_CGROUP_RDMA=y
> +CONFIG_CGROUP_SCHED=y
> +CONFIG_CGROUPS=y
> +CONFIG_CGROUP_WRITEBACK=y
> +CONFIG_CMA_AREAS=7
> +CONFIG_CMA=y
> +CONFIG_COMPAT_32BIT_TIME=y
> +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
> +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
> +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
> +CONFIG_CPU_FREQ_GOV_USERSPACE=y
> +CONFIG_CPU_FREQ_STAT=y
> +CONFIG_CPU_IDLE_GOV_LADDER=y
> +CONFIG_CPUSETS=y
> +CONFIG_CRC_T10DIF=y
> +CONFIG_CRYPTO_BLAKE2B=y
> +CONFIG_CRYPTO_DEV_VIRTIO=y
> +CONFIG_CRYPTO_SEQIV=y
> +CONFIG_CRYPTO_XXHASH=y
> +CONFIG_DCB=y
> +CONFIG_DEBUG_ATOMIC_SLEEP=y
> +CONFIG_DEBUG_CREDENTIALS=y
> +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
> +CONFIG_DEBUG_MEMORY_INIT=y
> +CONFIG_DEFAULT_FQ_CODEL=y
> +CONFIG_DEFAULT_RENO=y
> +CONFIG_DEFAULT_SECURITY_DAC=y
> +CONFIG_DEVTMPFS_MOUNT=y
> +CONFIG_DEVTMPFS=y
> +CONFIG_DMA_CMA=y
> +CONFIG_DNS_RESOLVER=y
> +CONFIG_EFI_STUB=y
> +CONFIG_EFI=y
> +CONFIG_EXPERT=y
> +CONFIG_EXT4_FS_POSIX_ACL=y
> +CONFIG_EXT4_FS_SECURITY=y
> +CONFIG_EXT4_FS=y
> +CONFIG_FAIL_FUNCTION=y
> +CONFIG_FAULT_INJECTION_DEBUG_FS=y
> +CONFIG_FAULT_INJECTION=y
> +CONFIG_FB_MODE_HELPERS=y
> +CONFIG_FB_TILEBLITTING=y
> +CONFIG_FB_VESA=y
> +CONFIG_FB=y
> +CONFIG_FONT_8x16=y
> +CONFIG_FONT_MINI_4x6=y
> +CONFIG_FONTS=y
> +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
> +CONFIG_FRAMEBUFFER_CONSOLE=y
> +CONFIG_FUSE_FS=y
> +CONFIG_FW_LOADER_USER_HELPER=y
> +CONFIG_GART_IOMMU=y
> +CONFIG_GENERIC_PHY=y
> +CONFIG_HARDLOCKUP_DETECTOR=y
> +CONFIG_HIGH_RES_TIMERS=y
> +CONFIG_HPET=y
> +CONFIG_HUGETLBFS=y
> +CONFIG_HUGETLB_PAGE=y
> +CONFIG_HWPOISON_INJECT=y
> +CONFIG_HZ_1000=y
> +CONFIG_INET=y
> +CONFIG_INTEL_POWERCLAMP=y
> +CONFIG_IP6_NF_FILTER=y
> +CONFIG_IP6_NF_IPTABLES=y
> +CONFIG_IP6_NF_NAT=y
> +CONFIG_IP6_NF_TARGET_MASQUERADE=y
> +CONFIG_IP_ADVANCED_ROUTER=y
> +CONFIG_IP_MROUTE=y
> +CONFIG_IP_MULTICAST=y
> +CONFIG_IP_MULTIPLE_TABLES=y
> +CONFIG_IP_NF_FILTER=y
> +CONFIG_IP_NF_IPTABLES=y
> +CONFIG_IP_NF_NAT=y
> +CONFIG_IP_NF_TARGET_MASQUERADE=y
> +CONFIG_IP_PIMSM_V1=y
> +CONFIG_IP_PIMSM_V2=y
> +CONFIG_IP_ROUTE_MULTIPATH=y
> +CONFIG_IP_ROUTE_VERBOSE=y
> +CONFIG_IPV6_MIP6=y
> +CONFIG_IPV6_ROUTE_INFO=y
> +CONFIG_IPV6_ROUTER_PREF=y
> +CONFIG_IPV6_SEG6_LWTUNNEL=y
> +CONFIG_IPV6_SUBTREES=y
> +CONFIG_IRQ_POLL=y
> +CONFIG_JUMP_LABEL=y
> +CONFIG_KARMA_PARTITION=y
> +CONFIG_KEXEC=y
> +CONFIG_KPROBES=y
> +CONFIG_KSM=y
> +CONFIG_LEGACY_VSYSCALL_NONE=y
> +CONFIG_LOG_BUF_SHIFT=21
> +CONFIG_LOG_CPU_MAX_BUF_SHIFT=0
> +CONFIG_LOGO=y
> +CONFIG_LSM="selinux,bpf,integrity"
> +CONFIG_MAC_PARTITION=y
> +CONFIG_MAGIC_SYSRQ=y
> +CONFIG_MCORE2=y
> +CONFIG_MEMCG=y
> +CONFIG_MEMORY_FAILURE=y
> +CONFIG_MINIX_SUBPARTITION=y
> +CONFIG_MODULES=y
> +CONFIG_NAMESPACES=y
> +CONFIG_NET_9P_VIRTIO=y
> +CONFIG_NET_9P=y
> +CONFIG_NET_ACT_BPF=y
> +CONFIG_NET_CLS_CGROUP=y
> +CONFIG_NETDEVICES=y
> +CONFIG_NET_EMATCH=y
> +CONFIG_NETFILTER_NETLINK_LOG=y
> +CONFIG_NETFILTER_NETLINK_QUEUE=y
> +CONFIG_NETFILTER_XTABLES=y
> +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
> +CONFIG_NETFILTER_XT_MATCH_BPF=y
> +CONFIG_NETFILTER_XT_MATCH_COMMENT=y
> +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
> +CONFIG_NETFILTER_XT_MATCH_MARK=y
> +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
> +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
> +CONFIG_NETFILTER_XT_NAT=y
> +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
> +CONFIG_NET_IPGRE_BROADCAST=y
> +CONFIG_NET_L3_MASTER_DEV=y
> +CONFIG_NETLABEL=y
> +CONFIG_NET_SCH_DEFAULT=y
> +CONFIG_NET_SCHED=y
> +CONFIG_NET_SCH_FQ_CODEL=y
> +CONFIG_NET_TC_SKB_EXT=y
> +CONFIG_NET_VRF=y
> +CONFIG_NET=y
> +CONFIG_NF_CONNTRACK=y
> +CONFIG_NF_NAT_MASQUERADE=y
> +CONFIG_NF_NAT=y
> +CONFIG_NLS_ASCII=y
> +CONFIG_NLS_CODEPAGE_437=y
> +CONFIG_NLS_DEFAULT="utf8"
> +CONFIG_NO_HZ=y
> +CONFIG_NR_CPUS=128
> +CONFIG_NUMA_BALANCING=y
> +CONFIG_NUMA=y
> +CONFIG_NVMEM=y
> +CONFIG_OSF_PARTITION=y
> +CONFIG_OVERLAY_FS_INDEX=y
> +CONFIG_OVERLAY_FS_METACOPY=y
> +CONFIG_OVERLAY_FS_XINO_AUTO=y
> +CONFIG_OVERLAY_FS=y
> +CONFIG_PACKET=y
> +CONFIG_PANIC_ON_OOPS=y
> +CONFIG_PARTITION_ADVANCED=y
> +CONFIG_PCIEPORTBUS=y
> +CONFIG_PCI_IOV=y
> +CONFIG_PCI_MSI=y
> +CONFIG_PCI=y
> +CONFIG_PHYSICAL_ALIGN=0x1000000
> +CONFIG_POSIX_MQUEUE=y
> +CONFIG_POWER_SUPPLY=y
> +CONFIG_PREEMPT=y
> +CONFIG_PRINTK_TIME=y
> +CONFIG_PROC_KCORE=y
> +CONFIG_PROFILING=y
> +CONFIG_PROVE_LOCKING=y
> +CONFIG_PTP_1588_CLOCK=y
> +CONFIG_RC_DEVICES=y
> +CONFIG_RC_LOOPBACK=y
> +CONFIG_RCU_CPU_STALL_TIMEOUT=60
> +CONFIG_SCHED_STACK_END_CHECK=y
> +CONFIG_SCHEDSTATS=y
> +CONFIG_SECURITY_NETWORK=y
> +CONFIG_SECURITY_SELINUX=y
> +CONFIG_SERIAL_8250_CONSOLE=y
> +CONFIG_SERIAL_8250_DETECT_IRQ=y
> +CONFIG_SERIAL_8250_EXTENDED=y
> +CONFIG_SERIAL_8250_MANY_PORTS=y
> +CONFIG_SERIAL_8250_NR_UARTS=32
> +CONFIG_SERIAL_8250_RSA=y
> +CONFIG_SERIAL_8250_SHARE_IRQ=y
> +CONFIG_SERIAL_8250=y
> +CONFIG_SERIAL_NONSTANDARD=y
> +CONFIG_SERIO_LIBPS2=y
> +CONFIG_SGI_PARTITION=y
> +CONFIG_SMP=y
> +CONFIG_SOCK_CGROUP_DATA=y
> +CONFIG_SOLARIS_X86_PARTITION=y
> +CONFIG_SUN_PARTITION=y
> +CONFIG_SYNC_FILE=y
> +CONFIG_SYSVIPC=y
> +CONFIG_TASK_DELAY_ACCT=y
> +CONFIG_TASK_IO_ACCOUNTING=y
> +CONFIG_TASKSTATS=y
> +CONFIG_TASK_XACCT=y
> +CONFIG_TCP_CONG_ADVANCED=y
> +CONFIG_TCP_MD5SIG=y
> +CONFIG_TLS=y
> +CONFIG_TMPFS_POSIX_ACL=y
> +CONFIG_TMPFS=y
> +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
> +CONFIG_TRANSPARENT_HUGEPAGE=y
> +CONFIG_TUN=y
> +CONFIG_UNIXWARE_DISKLABEL=y
> +CONFIG_UNIX=y
> +CONFIG_USER_NS=y
> +CONFIG_VALIDATE_FS_PARSER=y
> +CONFIG_VETH=y
> +CONFIG_VIRT_DRIVERS=y
> +CONFIG_VIRTIO_BALLOON=y
> +CONFIG_VIRTIO_BLK=y
> +CONFIG_VIRTIO_CONSOLE=y
> +CONFIG_VIRTIO_FS=y
> +CONFIG_VIRTIO_NET=y
> +CONFIG_VIRTIO_PCI=y
> +CONFIG_VLAN_8021Q=y
> +CONFIG_XFRM_SUB_POLICY=y
> +CONFIG_XFRM_USER=y
> +CONFIG_ZEROPLUS_FF=y
> diff --git a/tools/testing/selftests/hid/config.x86_64
> b/tools/testing/selftests/hid/config.x86_64
> new file mode 100644
> index 000000000000..a8721f403c21
> --- /dev/null
> +++ b/tools/testing/selftests/hid/config.x86_64
> @@ -0,0 +1,4 @@
> +CONFIG_X86_ACPI_CPUFREQ=y
> +CONFIG_X86_CPUID=y
> +CONFIG_X86_MSR=y
> +CONFIG_X86_POWERNOW_K8=y
> diff --git a/tools/testing/selftests/hid/vmtest.sh
> b/tools/testing/selftests/hid/vmtest.sh
> new file mode 100755
> index 000000000000..90f34150f257
> --- /dev/null
> +++ b/tools/testing/selftests/hid/vmtest.sh
> @@ -0,0 +1,284 @@
> +#!/bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +
> +set -u
> +set -e
> +
> +# This script currently only works for x86_64
> +ARCH="$(uname -m)"
> +case "${ARCH}" in
> +x86_64)
> + QEMU_BINARY=qemu-system-x86_64
> + BZIMAGE="arch/x86/boot/bzImage"
> + ;;
> +*)
> + echo "Unsupported architecture"
> + exit 1
> + ;;
> +esac
> +DEFAULT_COMMAND="./hid_bpf"
> +SCRIPT_DIR="$(dirname $(realpath $0))"
> +OUTPUT_DIR="$SCRIPT_DIR/results"
> +KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")
> +B2C_URL="https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/master/vm2c.py"
> +NUM_COMPILE_JOBS="$(nproc)"
> +LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"
> +LOG_FILE="${LOG_FILE_BASE}.log"
> +EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"
> +CONTAINER_IMAGE="registry.fedoraproject.org/fedora:36"
> +
> +usage()
> +{
> + cat <<EOF
> +Usage: $0 [-i] [-s] [-d <output_dir>] -- [<command>]
> +
> +<command> is the command you would normally run when you are in
> +tools/testing/selftests/bpf. e.g:
> +
> + $0 -- ./hid_bpf
> +
> +If no command is specified and a debug shell (-s) is not requested,
> +"${DEFAULT_COMMAND}" will be run by default.
> +
> +If you build your kernel using KBUILD_OUTPUT= or O= options, these
> +can be passed as environment variables to the script:
> +
> + O=<kernel_build_path> $0 -- ./hid_bpf
> +
> +or
> +
> + KBUILD_OUTPUT=<kernel_build_path> $0 -- ./hid_bpf
> +
> +Options:
> +
> + -u) Update the boot2container script to a newer version.
> + -d) Update the output directory (default: ${OUTPUT_DIR})
> + -j) Number of jobs for compilation, similar to -j in make
> + (default: ${NUM_COMPILE_JOBS})
> + -s) Instead of powering off the VM, start an interactive
> + shell. If <command> is specified, the shell runs after
> + the command finishes executing
> +EOF
> +}
> +
> +download()
> +{
> + local file="$1"
> +
> + echo "Downloading $file..." >&2
> + curl -Lsf "$file" -o "${@:2}"
> +}
> +
> +recompile_kernel()
> +{
> + local kernel_checkout="$1"
> + local make_command="$2"
> +
> + cd "${kernel_checkout}"
> +
> + ${make_command} olddefconfig
> + ${make_command}
> +}
> +
> +update_selftests()
> +{
> + local kernel_checkout="$1"
> + local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"
> +
> + cd "${selftests_dir}"
> + ${make_command}
> +}
> +
> +run_vm()
> +{
> + local b2c="$1"
> + local kernel_bzimage="$2"
> + local command="$3"
> + local post_command=""
> +
> + if ! which "${QEMU_BINARY}" &> /dev/null; then
> + cat <<EOF
> +Could not find ${QEMU_BINARY}
> +Please install qemu or set the QEMU_BINARY environment variable.
> +EOF
> + exit 1
> + fi
> +
> + # alpine (used in post-container requires the PATH to have /bin
> + export PATH=$PATH:/bin
> +
> + if [[ "${debug_shell}" != "yes" ]]
> + then
> + touch ${OUTPUT_DIR}/${LOG_FILE}
> + command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ; ${command}
> 2>&1 | tee ${OUTPUT_DIR}/${LOG_FILE}"
> + post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"
> + else
> + command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"
> + fi
> +
> + set +e
> + $b2c --command "${command}" \
> + --kernel ${kernel_bzimage} \
> + --workdir ${OUTPUT_DIR} \
> + --image ${CONTAINER_IMAGE}
> +
> + echo $? > ${OUTPUT_DIR}/${EXIT_STATUS_FILE}
> +
> + set -e
> +
> + ${post_command}
> +}
> +
> +is_rel_path()
> +{
> + local path="$1"
> +
> + [[ ${path:0:1} != "/" ]]
> +}
> +
> +do_update_kconfig()
> +{
> + local kernel_checkout="$1"
> + local kconfig_file="$2"
> +
> + rm -f "$kconfig_file" 2> /dev/null
> +
> + for config in "${KCONFIG_REL_PATHS[@]}"; do
> + local kconfig_src="${config}"
> + cat "$kconfig_src" >> "$kconfig_file"
> + done
> +}
> +
> +update_kconfig()
> +{
> + local kernel_checkout="$1"
> + local kconfig_file="$2"
> +
> + if [[ -f "${kconfig_file}" ]]; then
> + local local_modified="$(stat -c %Y "${kconfig_file}")"
> +
> + for config in "${KCONFIG_REL_PATHS[@]}"; do
> + local kconfig_src="${config}"
> + local src_modified="$(stat -c %Y "${kconfig_src}")"
> + # Only update the config if it has been updated after the
> + # previously cached config was created. This avoids
> + # unnecessarily compiling the kernel and selftests.
> + if [[ "${src_modified}" -gt "${local_modified}" ]]; then
> + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> + # Once we have found one outdated configuration
> + # there is no need to check other ones.
> + break
> + fi
> + done
> + else
> + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> + fi
> +}
> +
> +main()
> +{
> + local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd
> -P)"
> + local kernel_checkout=$(realpath "${script_dir}"/../../../../)
> + # By default the script searches for the kernel in the checkout
> directory but
> + # it also obeys environment variables O= and KBUILD_OUTPUT=
> + local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"
> + local command="${DEFAULT_COMMAND}"
> + local update_b2c="no"
> + local debug_shell="no"
> +
> + while getopts ':hsud:j:' opt; do
> + case ${opt} in
> + u)
> + update_b2c="yes"
> + ;;
> + d)
> + OUTPUT_DIR="$OPTARG"
> + ;;
> + j)
> + NUM_COMPILE_JOBS="$OPTARG"
> + ;;
> + s)
> + command="/bin/sh"
> + debug_shell="yes"
> + ;;
> + h)
> + usage
> + exit 0
> + ;;
> + \? )
> + echo "Invalid Option: -$OPTARG"
> + usage
> + exit 1
> + ;;
> + : )
> + echo "Invalid Option: -$OPTARG requires an argument"
> + usage
> + exit 1
> + ;;
> + esac
> + done
> + shift $((OPTIND -1))
> +
> + # trap 'catch "$?"' EXIT
> +
> + if [[ "${debug_shell}" == "no" ]]; then
> + if [[ $# -eq 0 ]]; then
> + echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"
> + else
> + command="$@"
> +
> + if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]
> + then
> + debug_shell="yes"
> + fi
> + fi
> + fi
> +
> + local kconfig_file="${OUTPUT_DIR}/latest.config"
> + local make_command="make -j ${NUM_COMPILE_JOBS}
> KCONFIG_CONFIG=${kconfig_file}"
> +
> + # Figure out where the kernel is being built.
> + # O takes precedence over KBUILD_OUTPUT.
> + if [[ "${O:=""}" != "" ]]; then
> + if is_rel_path "${O}"; then
> + O="$(realpath "${PWD}/${O}")"
> + fi
> + kernel_bzimage="${O}/${BZIMAGE}"
> + make_command="${make_command} O=${O}"
> + elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then
> + if is_rel_path "${KBUILD_OUTPUT}"; then
> + KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"
> + fi
> + kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"
> + make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
> + fi
> +
> + local b2c="${OUTPUT_DIR}/vm2c.py"
> +
> + echo "Output directory: ${OUTPUT_DIR}"
> +
> + mkdir -p "${OUTPUT_DIR}"
> + update_kconfig "${kernel_checkout}" "${kconfig_file}"
> +
> + recompile_kernel "${kernel_checkout}" "${make_command}"
> +
> + if [[ "${update_b2c}" == "no" && ! -f "${b2c}" ]]; then
> + echo "vm2c script not found in ${b2c}"
> + update_b2c="yes"
> + fi
> +
> + if [[ "${update_b2c}" == "yes" ]]; then
> + download $B2C_URL $b2c
> + chmod +x $b2c
> + fi
> +
> + update_selftests "${kernel_checkout}" "${make_command}"
> + run_vm $b2c "${kernel_bzimage}" "${command}"
> + if [[ "${debug_shell}" != "yes" ]]; then
> + echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"
> + fi
> +
> + exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})
> +}
> +
> +main "$@"
> --
> 2.38.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh
2023-01-09 17:46 ` sdf
@ 2023-01-09 17:56 ` sdf
2023-01-10 9:43 ` Benjamin Tissoires
0 siblings, 1 reply; 17+ messages in thread
From: sdf @ 2023-01-09 17:56 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On 01/09, Stanislav Fomichev wrote:
> On 01/06, Benjamin Tissoires wrote:
> > Similar-ish in many points from the script in selftests/bpf, with a few
> > differences:
> > - relies on boot2container instead of a plain qemu image (meaning that
> > we can take any container in a registry as a base)
> > - runs in the hid selftest dir, and such uses the test program from
> there
> > - the working directory to store the config is in
> > tools/selftests/hid/results
> >
> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Sorry, I've completely missed this. I wasn't on CC and assumed
> that was some sort of a repost. Going through the changes right now.
Hmmm, or maybe I shouldn't? This seems to be bases on some other tree;
can't find tools/testing/selftests/hid/Makefile (from patch #2) in neither
bpf nor bpf-next.
Alexei/Daniel/Andrii, what's the process with these series?
> One question here: is it worth it extending bpf/vmtest.sh instead
> to support boot2container? Why new script with a bunch of copy-paste
> is a better deal?
> > ---
> > tools/testing/selftests/hid/.gitignore | 1 +
> > tools/testing/selftests/hid/config.common | 241 ++++++++++++++++++
> > tools/testing/selftests/hid/config.x86_64 | 4 +
> > tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++++++
> > 4 files changed, 530 insertions(+)
> > create mode 100644 tools/testing/selftests/hid/config.common
> > create mode 100644 tools/testing/selftests/hid/config.x86_64
> > create mode 100755 tools/testing/selftests/hid/vmtest.sh
> >
> > diff --git a/tools/testing/selftests/hid/.gitignore
> b/tools/testing/selftests/hid/.gitignore
> > index a462ca6ab2c0..995af0670f69 100644
> > --- a/tools/testing/selftests/hid/.gitignore
> > +++ b/tools/testing/selftests/hid/.gitignore
> > @@ -2,3 +2,4 @@ bpftool
> > *.skel.h
> > /tools
> > hid_bpf
> > +results
> > diff --git a/tools/testing/selftests/hid/config.common
> b/tools/testing/selftests/hid/config.common
> > new file mode 100644
> > index 000000000000..0617275d93cc
> > --- /dev/null
> > +++ b/tools/testing/selftests/hid/config.common
> > @@ -0,0 +1,241 @@
> > +CONFIG_9P_FS_POSIX_ACL=y
> > +CONFIG_9P_FS_SECURITY=y
> > +CONFIG_9P_FS=y
> > +CONFIG_AUDIT=y
> > +CONFIG_BINFMT_MISC=y
> > +CONFIG_BLK_CGROUP_IOLATENCY=y
> > +CONFIG_BLK_CGROUP=y
> > +CONFIG_BLK_DEV_BSGLIB=y
> > +CONFIG_BLK_DEV_IO_TRACE=y
> > +CONFIG_BLK_DEV_RAM_SIZE=16384
> > +CONFIG_BLK_DEV_RAM=y
> > +CONFIG_BLK_DEV_THROTTLING=y
> > +CONFIG_BONDING=y
> > +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
> > +CONFIG_BOOTTIME_TRACING=y
> > +CONFIG_BSD_DISKLABEL=y
> > +CONFIG_BSD_PROCESS_ACCT=y
> > +CONFIG_CFS_BANDWIDTH=y
> > +CONFIG_CGROUP_CPUACCT=y
> > +CONFIG_CGROUP_DEBUG=y
> > +CONFIG_CGROUP_DEVICE=y
> > +CONFIG_CGROUP_FREEZER=y
> > +CONFIG_CGROUP_HUGETLB=y
> > +CONFIG_CGROUP_NET_CLASSID=y
> > +CONFIG_CGROUP_NET_PRIO=y
> > +CONFIG_CGROUP_PERF=y
> > +CONFIG_CGROUP_PIDS=y
> > +CONFIG_CGROUP_RDMA=y
> > +CONFIG_CGROUP_SCHED=y
> > +CONFIG_CGROUPS=y
> > +CONFIG_CGROUP_WRITEBACK=y
> > +CONFIG_CMA_AREAS=7
> > +CONFIG_CMA=y
> > +CONFIG_COMPAT_32BIT_TIME=y
> > +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
> > +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
> > +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
> > +CONFIG_CPU_FREQ_GOV_USERSPACE=y
> > +CONFIG_CPU_FREQ_STAT=y
> > +CONFIG_CPU_IDLE_GOV_LADDER=y
> > +CONFIG_CPUSETS=y
> > +CONFIG_CRC_T10DIF=y
> > +CONFIG_CRYPTO_BLAKE2B=y
> > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > +CONFIG_CRYPTO_SEQIV=y
> > +CONFIG_CRYPTO_XXHASH=y
> > +CONFIG_DCB=y
> > +CONFIG_DEBUG_ATOMIC_SLEEP=y
> > +CONFIG_DEBUG_CREDENTIALS=y
> > +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
> > +CONFIG_DEBUG_MEMORY_INIT=y
> > +CONFIG_DEFAULT_FQ_CODEL=y
> > +CONFIG_DEFAULT_RENO=y
> > +CONFIG_DEFAULT_SECURITY_DAC=y
> > +CONFIG_DEVTMPFS_MOUNT=y
> > +CONFIG_DEVTMPFS=y
> > +CONFIG_DMA_CMA=y
> > +CONFIG_DNS_RESOLVER=y
> > +CONFIG_EFI_STUB=y
> > +CONFIG_EFI=y
> > +CONFIG_EXPERT=y
> > +CONFIG_EXT4_FS_POSIX_ACL=y
> > +CONFIG_EXT4_FS_SECURITY=y
> > +CONFIG_EXT4_FS=y
> > +CONFIG_FAIL_FUNCTION=y
> > +CONFIG_FAULT_INJECTION_DEBUG_FS=y
> > +CONFIG_FAULT_INJECTION=y
> > +CONFIG_FB_MODE_HELPERS=y
> > +CONFIG_FB_TILEBLITTING=y
> > +CONFIG_FB_VESA=y
> > +CONFIG_FB=y
> > +CONFIG_FONT_8x16=y
> > +CONFIG_FONT_MINI_4x6=y
> > +CONFIG_FONTS=y
> > +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> > +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
> > +CONFIG_FRAMEBUFFER_CONSOLE=y
> > +CONFIG_FUSE_FS=y
> > +CONFIG_FW_LOADER_USER_HELPER=y
> > +CONFIG_GART_IOMMU=y
> > +CONFIG_GENERIC_PHY=y
> > +CONFIG_HARDLOCKUP_DETECTOR=y
> > +CONFIG_HIGH_RES_TIMERS=y
> > +CONFIG_HPET=y
> > +CONFIG_HUGETLBFS=y
> > +CONFIG_HUGETLB_PAGE=y
> > +CONFIG_HWPOISON_INJECT=y
> > +CONFIG_HZ_1000=y
> > +CONFIG_INET=y
> > +CONFIG_INTEL_POWERCLAMP=y
> > +CONFIG_IP6_NF_FILTER=y
> > +CONFIG_IP6_NF_IPTABLES=y
> > +CONFIG_IP6_NF_NAT=y
> > +CONFIG_IP6_NF_TARGET_MASQUERADE=y
> > +CONFIG_IP_ADVANCED_ROUTER=y
> > +CONFIG_IP_MROUTE=y
> > +CONFIG_IP_MULTICAST=y
> > +CONFIG_IP_MULTIPLE_TABLES=y
> > +CONFIG_IP_NF_FILTER=y
> > +CONFIG_IP_NF_IPTABLES=y
> > +CONFIG_IP_NF_NAT=y
> > +CONFIG_IP_NF_TARGET_MASQUERADE=y
> > +CONFIG_IP_PIMSM_V1=y
> > +CONFIG_IP_PIMSM_V2=y
> > +CONFIG_IP_ROUTE_MULTIPATH=y
> > +CONFIG_IP_ROUTE_VERBOSE=y
> > +CONFIG_IPV6_MIP6=y
> > +CONFIG_IPV6_ROUTE_INFO=y
> > +CONFIG_IPV6_ROUTER_PREF=y
> > +CONFIG_IPV6_SEG6_LWTUNNEL=y
> > +CONFIG_IPV6_SUBTREES=y
> > +CONFIG_IRQ_POLL=y
> > +CONFIG_JUMP_LABEL=y
> > +CONFIG_KARMA_PARTITION=y
> > +CONFIG_KEXEC=y
> > +CONFIG_KPROBES=y
> > +CONFIG_KSM=y
> > +CONFIG_LEGACY_VSYSCALL_NONE=y
> > +CONFIG_LOG_BUF_SHIFT=21
> > +CONFIG_LOG_CPU_MAX_BUF_SHIFT=0
> > +CONFIG_LOGO=y
> > +CONFIG_LSM="selinux,bpf,integrity"
> > +CONFIG_MAC_PARTITION=y
> > +CONFIG_MAGIC_SYSRQ=y
> > +CONFIG_MCORE2=y
> > +CONFIG_MEMCG=y
> > +CONFIG_MEMORY_FAILURE=y
> > +CONFIG_MINIX_SUBPARTITION=y
> > +CONFIG_MODULES=y
> > +CONFIG_NAMESPACES=y
> > +CONFIG_NET_9P_VIRTIO=y
> > +CONFIG_NET_9P=y
> > +CONFIG_NET_ACT_BPF=y
> > +CONFIG_NET_CLS_CGROUP=y
> > +CONFIG_NETDEVICES=y
> > +CONFIG_NET_EMATCH=y
> > +CONFIG_NETFILTER_NETLINK_LOG=y
> > +CONFIG_NETFILTER_NETLINK_QUEUE=y
> > +CONFIG_NETFILTER_XTABLES=y
> > +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
> > +CONFIG_NETFILTER_XT_MATCH_BPF=y
> > +CONFIG_NETFILTER_XT_MATCH_COMMENT=y
> > +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
> > +CONFIG_NETFILTER_XT_MATCH_MARK=y
> > +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
> > +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
> > +CONFIG_NETFILTER_XT_NAT=y
> > +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
> > +CONFIG_NET_IPGRE_BROADCAST=y
> > +CONFIG_NET_L3_MASTER_DEV=y
> > +CONFIG_NETLABEL=y
> > +CONFIG_NET_SCH_DEFAULT=y
> > +CONFIG_NET_SCHED=y
> > +CONFIG_NET_SCH_FQ_CODEL=y
> > +CONFIG_NET_TC_SKB_EXT=y
> > +CONFIG_NET_VRF=y
> > +CONFIG_NET=y
> > +CONFIG_NF_CONNTRACK=y
> > +CONFIG_NF_NAT_MASQUERADE=y
> > +CONFIG_NF_NAT=y
> > +CONFIG_NLS_ASCII=y
> > +CONFIG_NLS_CODEPAGE_437=y
> > +CONFIG_NLS_DEFAULT="utf8"
> > +CONFIG_NO_HZ=y
> > +CONFIG_NR_CPUS=128
> > +CONFIG_NUMA_BALANCING=y
> > +CONFIG_NUMA=y
> > +CONFIG_NVMEM=y
> > +CONFIG_OSF_PARTITION=y
> > +CONFIG_OVERLAY_FS_INDEX=y
> > +CONFIG_OVERLAY_FS_METACOPY=y
> > +CONFIG_OVERLAY_FS_XINO_AUTO=y
> > +CONFIG_OVERLAY_FS=y
> > +CONFIG_PACKET=y
> > +CONFIG_PANIC_ON_OOPS=y
> > +CONFIG_PARTITION_ADVANCED=y
> > +CONFIG_PCIEPORTBUS=y
> > +CONFIG_PCI_IOV=y
> > +CONFIG_PCI_MSI=y
> > +CONFIG_PCI=y
> > +CONFIG_PHYSICAL_ALIGN=0x1000000
> > +CONFIG_POSIX_MQUEUE=y
> > +CONFIG_POWER_SUPPLY=y
> > +CONFIG_PREEMPT=y
> > +CONFIG_PRINTK_TIME=y
> > +CONFIG_PROC_KCORE=y
> > +CONFIG_PROFILING=y
> > +CONFIG_PROVE_LOCKING=y
> > +CONFIG_PTP_1588_CLOCK=y
> > +CONFIG_RC_DEVICES=y
> > +CONFIG_RC_LOOPBACK=y
> > +CONFIG_RCU_CPU_STALL_TIMEOUT=60
> > +CONFIG_SCHED_STACK_END_CHECK=y
> > +CONFIG_SCHEDSTATS=y
> > +CONFIG_SECURITY_NETWORK=y
> > +CONFIG_SECURITY_SELINUX=y
> > +CONFIG_SERIAL_8250_CONSOLE=y
> > +CONFIG_SERIAL_8250_DETECT_IRQ=y
> > +CONFIG_SERIAL_8250_EXTENDED=y
> > +CONFIG_SERIAL_8250_MANY_PORTS=y
> > +CONFIG_SERIAL_8250_NR_UARTS=32
> > +CONFIG_SERIAL_8250_RSA=y
> > +CONFIG_SERIAL_8250_SHARE_IRQ=y
> > +CONFIG_SERIAL_8250=y
> > +CONFIG_SERIAL_NONSTANDARD=y
> > +CONFIG_SERIO_LIBPS2=y
> > +CONFIG_SGI_PARTITION=y
> > +CONFIG_SMP=y
> > +CONFIG_SOCK_CGROUP_DATA=y
> > +CONFIG_SOLARIS_X86_PARTITION=y
> > +CONFIG_SUN_PARTITION=y
> > +CONFIG_SYNC_FILE=y
> > +CONFIG_SYSVIPC=y
> > +CONFIG_TASK_DELAY_ACCT=y
> > +CONFIG_TASK_IO_ACCOUNTING=y
> > +CONFIG_TASKSTATS=y
> > +CONFIG_TASK_XACCT=y
> > +CONFIG_TCP_CONG_ADVANCED=y
> > +CONFIG_TCP_MD5SIG=y
> > +CONFIG_TLS=y
> > +CONFIG_TMPFS_POSIX_ACL=y
> > +CONFIG_TMPFS=y
> > +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
> > +CONFIG_TRANSPARENT_HUGEPAGE=y
> > +CONFIG_TUN=y
> > +CONFIG_UNIXWARE_DISKLABEL=y
> > +CONFIG_UNIX=y
> > +CONFIG_USER_NS=y
> > +CONFIG_VALIDATE_FS_PARSER=y
> > +CONFIG_VETH=y
> > +CONFIG_VIRT_DRIVERS=y
> > +CONFIG_VIRTIO_BALLOON=y
> > +CONFIG_VIRTIO_BLK=y
> > +CONFIG_VIRTIO_CONSOLE=y
> > +CONFIG_VIRTIO_FS=y
> > +CONFIG_VIRTIO_NET=y
> > +CONFIG_VIRTIO_PCI=y
> > +CONFIG_VLAN_8021Q=y
> > +CONFIG_XFRM_SUB_POLICY=y
> > +CONFIG_XFRM_USER=y
> > +CONFIG_ZEROPLUS_FF=y
> > diff --git a/tools/testing/selftests/hid/config.x86_64
> b/tools/testing/selftests/hid/config.x86_64
> > new file mode 100644
> > index 000000000000..a8721f403c21
> > --- /dev/null
> > +++ b/tools/testing/selftests/hid/config.x86_64
> > @@ -0,0 +1,4 @@
> > +CONFIG_X86_ACPI_CPUFREQ=y
> > +CONFIG_X86_CPUID=y
> > +CONFIG_X86_MSR=y
> > +CONFIG_X86_POWERNOW_K8=y
> > diff --git a/tools/testing/selftests/hid/vmtest.sh
> b/tools/testing/selftests/hid/vmtest.sh
> > new file mode 100755
> > index 000000000000..90f34150f257
> > --- /dev/null
> > +++ b/tools/testing/selftests/hid/vmtest.sh
> > @@ -0,0 +1,284 @@
> > +#!/bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +
> > +set -u
> > +set -e
> > +
> > +# This script currently only works for x86_64
> > +ARCH="$(uname -m)"
> > +case "${ARCH}" in
> > +x86_64)
> > + QEMU_BINARY=qemu-system-x86_64
> > + BZIMAGE="arch/x86/boot/bzImage"
> > + ;;
> > +*)
> > + echo "Unsupported architecture"
> > + exit 1
> > + ;;
> > +esac
> > +DEFAULT_COMMAND="./hid_bpf"
> > +SCRIPT_DIR="$(dirname $(realpath $0))"
> > +OUTPUT_DIR="$SCRIPT_DIR/results"
> >
> +KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")
> >
> +B2C_URL="https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/master/vm2c.py"
> > +NUM_COMPILE_JOBS="$(nproc)"
> > +LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"
> > +LOG_FILE="${LOG_FILE_BASE}.log"
> > +EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"
> > +CONTAINER_IMAGE="registry.fedoraproject.org/fedora:36"
> > +
> > +usage()
> > +{
> > + cat <<EOF
> > +Usage: $0 [-i] [-s] [-d <output_dir>] -- [<command>]
> > +
> > +<command> is the command you would normally run when you are in
> > +tools/testing/selftests/bpf. e.g:
> > +
> > + $0 -- ./hid_bpf
> > +
> > +If no command is specified and a debug shell (-s) is not requested,
> > +"${DEFAULT_COMMAND}" will be run by default.
> > +
> > +If you build your kernel using KBUILD_OUTPUT= or O= options, these
> > +can be passed as environment variables to the script:
> > +
> > + O=<kernel_build_path> $0 -- ./hid_bpf
> > +
> > +or
> > +
> > + KBUILD_OUTPUT=<kernel_build_path> $0 -- ./hid_bpf
> > +
> > +Options:
> > +
> > + -u) Update the boot2container script to a newer version.
> > + -d) Update the output directory (default: ${OUTPUT_DIR})
> > + -j) Number of jobs for compilation, similar to -j in make
> > + (default: ${NUM_COMPILE_JOBS})
> > + -s) Instead of powering off the VM, start an interactive
> > + shell. If <command> is specified, the shell runs after
> > + the command finishes executing
> > +EOF
> > +}
> > +
> > +download()
> > +{
> > + local file="$1"
> > +
> > + echo "Downloading $file..." >&2
> > + curl -Lsf "$file" -o "${@:2}"
> > +}
> > +
> > +recompile_kernel()
> > +{
> > + local kernel_checkout="$1"
> > + local make_command="$2"
> > +
> > + cd "${kernel_checkout}"
> > +
> > + ${make_command} olddefconfig
> > + ${make_command}
> > +}
> > +
> > +update_selftests()
> > +{
> > + local kernel_checkout="$1"
> > + local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"
> > +
> > + cd "${selftests_dir}"
> > + ${make_command}
> > +}
> > +
> > +run_vm()
> > +{
> > + local b2c="$1"
> > + local kernel_bzimage="$2"
> > + local command="$3"
> > + local post_command=""
> > +
> > + if ! which "${QEMU_BINARY}" &> /dev/null; then
> > + cat <<EOF
> > +Could not find ${QEMU_BINARY}
> > +Please install qemu or set the QEMU_BINARY environment variable.
> > +EOF
> > + exit 1
> > + fi
> > +
> > + # alpine (used in post-container requires the PATH to have /bin
> > + export PATH=$PATH:/bin
> > +
> > + if [[ "${debug_shell}" != "yes" ]]
> > + then
> > + touch ${OUTPUT_DIR}/${LOG_FILE}
> > + command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ;
> ${command} 2>&1 | tee ${OUTPUT_DIR}/${LOG_FILE}"
> > + post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"
> > + else
> > + command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"
> > + fi
> > +
> > + set +e
> > + $b2c --command "${command}" \
> > + --kernel ${kernel_bzimage} \
> > + --workdir ${OUTPUT_DIR} \
> > + --image ${CONTAINER_IMAGE}
> > +
> > + echo $? > ${OUTPUT_DIR}/${EXIT_STATUS_FILE}
> > +
> > + set -e
> > +
> > + ${post_command}
> > +}
> > +
> > +is_rel_path()
> > +{
> > + local path="$1"
> > +
> > + [[ ${path:0:1} != "/" ]]
> > +}
> > +
> > +do_update_kconfig()
> > +{
> > + local kernel_checkout="$1"
> > + local kconfig_file="$2"
> > +
> > + rm -f "$kconfig_file" 2> /dev/null
> > +
> > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > + local kconfig_src="${config}"
> > + cat "$kconfig_src" >> "$kconfig_file"
> > + done
> > +}
> > +
> > +update_kconfig()
> > +{
> > + local kernel_checkout="$1"
> > + local kconfig_file="$2"
> > +
> > + if [[ -f "${kconfig_file}" ]]; then
> > + local local_modified="$(stat -c %Y "${kconfig_file}")"
> > +
> > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > + local kconfig_src="${config}"
> > + local src_modified="$(stat -c %Y "${kconfig_src}")"
> > + # Only update the config if it has been updated after the
> > + # previously cached config was created. This avoids
> > + # unnecessarily compiling the kernel and selftests.
> > + if [[ "${src_modified}" -gt "${local_modified}" ]]; then
> > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > + # Once we have found one outdated configuration
> > + # there is no need to check other ones.
> > + break
> > + fi
> > + done
> > + else
> > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > + fi
> > +}
> > +
> > +main()
> > +{
> > + local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" &&
> pwd -P)"
> > + local kernel_checkout=$(realpath "${script_dir}"/../../../../)
> > + # By default the script searches for the kernel in the checkout
> directory but
> > + # it also obeys environment variables O= and KBUILD_OUTPUT=
> > + local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"
> > + local command="${DEFAULT_COMMAND}"
> > + local update_b2c="no"
> > + local debug_shell="no"
> > +
> > + while getopts ':hsud:j:' opt; do
> > + case ${opt} in
> > + u)
> > + update_b2c="yes"
> > + ;;
> > + d)
> > + OUTPUT_DIR="$OPTARG"
> > + ;;
> > + j)
> > + NUM_COMPILE_JOBS="$OPTARG"
> > + ;;
> > + s)
> > + command="/bin/sh"
> > + debug_shell="yes"
> > + ;;
> > + h)
> > + usage
> > + exit 0
> > + ;;
> > + \? )
> > + echo "Invalid Option: -$OPTARG"
> > + usage
> > + exit 1
> > + ;;
> > + : )
> > + echo "Invalid Option: -$OPTARG requires an argument"
> > + usage
> > + exit 1
> > + ;;
> > + esac
> > + done
> > + shift $((OPTIND -1))
> > +
> > + # trap 'catch "$?"' EXIT
> > +
> > + if [[ "${debug_shell}" == "no" ]]; then
> > + if [[ $# -eq 0 ]]; then
> > + echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"
> > + else
> > + command="$@"
> > +
> > + if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]
> > + then
> > + debug_shell="yes"
> > + fi
> > + fi
> > + fi
> > +
> > + local kconfig_file="${OUTPUT_DIR}/latest.config"
> > + local make_command="make -j ${NUM_COMPILE_JOBS}
> KCONFIG_CONFIG=${kconfig_file}"
> > +
> > + # Figure out where the kernel is being built.
> > + # O takes precedence over KBUILD_OUTPUT.
> > + if [[ "${O:=""}" != "" ]]; then
> > + if is_rel_path "${O}"; then
> > + O="$(realpath "${PWD}/${O}")"
> > + fi
> > + kernel_bzimage="${O}/${BZIMAGE}"
> > + make_command="${make_command} O=${O}"
> > + elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then
> > + if is_rel_path "${KBUILD_OUTPUT}"; then
> > + KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"
> > + fi
> > + kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"
> > + make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
> > + fi
> > +
> > + local b2c="${OUTPUT_DIR}/vm2c.py"
> > +
> > + echo "Output directory: ${OUTPUT_DIR}"
> > +
> > + mkdir -p "${OUTPUT_DIR}"
> > + update_kconfig "${kernel_checkout}" "${kconfig_file}"
> > +
> > + recompile_kernel "${kernel_checkout}" "${make_command}"
> > +
> > + if [[ "${update_b2c}" == "no" && ! -f "${b2c}" ]]; then
> > + echo "vm2c script not found in ${b2c}"
> > + update_b2c="yes"
> > + fi
> > +
> > + if [[ "${update_b2c}" == "yes" ]]; then
> > + download $B2C_URL $b2c
> > + chmod +x $b2c
> > + fi
> > +
> > + update_selftests "${kernel_checkout}" "${make_command}"
> > + run_vm $b2c "${kernel_bzimage}" "${command}"
> > + if [[ "${debug_shell}" != "yes" ]]; then
> > + echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"
> > + fi
> > +
> > + exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})
> > +}
> > +
> > +main "$@"
> > --
> > 2.38.1
> >
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh
2023-01-09 17:56 ` sdf
@ 2023-01-10 9:43 ` Benjamin Tissoires
2023-01-10 18:52 ` Stanislav Fomichev
0 siblings, 1 reply; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-10 9:43 UTC (permalink / raw)
To: sdf
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On Mon, Jan 9, 2023 at 6:56 PM <sdf@google.com> wrote:
>
> On 01/09, Stanislav Fomichev wrote:
> > On 01/06, Benjamin Tissoires wrote:
> > > Similar-ish in many points from the script in selftests/bpf, with a few
> > > differences:
> > > - relies on boot2container instead of a plain qemu image (meaning that
> > > we can take any container in a registry as a base)
> > > - runs in the hid selftest dir, and such uses the test program from
> > there
> > > - the working directory to store the config is in
> > > tools/selftests/hid/results
> > >
> > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
>
> > Sorry, I've completely missed this. I wasn't on CC and assumed
> > that was some sort of a repost. Going through the changes right now.
>
> Hmmm, or maybe I shouldn't? This seems to be bases on some other tree;
> can't find tools/testing/selftests/hid/Makefile (from patch #2) in neither
> bpf nor bpf-next.
These changes are based on
https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/ branch
for-6.3/hid-bpf, so going through the HID tree, not the bpf one.
I Cce-ed the bpf mailing list for visibility, in case I made an
obvious error, but this doesn't impact bpf core, so reviews are
appreciated, but not mandatory from the bpf side of things :)
>
>
> Alexei/Daniel/Andrii, what's the process with these series?
>
> > One question here: is it worth it extending bpf/vmtest.sh instead
> > to support boot2container? Why new script with a bunch of copy-paste
> > is a better deal?
Good question. There were a few things that made me copy/paste part of
the script:
- the bpf one is relying on the bpf rootfs image that, as a subsystem
maintainer of another subsystem than bpf don't control
- the bpf one is hardcoding which program to launch, and I want another one
- the bpf one is in a different directory which would feel weird to
call when running selftests/hid
- I want a minimum control over the script so that a change in the bpf
tree doesn't accidentally break the hid tree
I think using the boot2container initramfs solves the rootfs issue,
because the initramfs is generic and just consists of a script around
podman to start a container. This way I can run the test suite on any
distribution without having to build any distro image. I should also
be able to start a scratch container without anything in it given that
the only thing that matters is the binary we start as a command
(though we won't be able to start a shell in the target VM).
Solving the second and third point could probably be done by
encapsulating the call to bpf/vmtest.sh from hid.
But for the fourth point, I believe that the bpf script is not generic
enough to be reused by other subsystems as it relies on the bpf CI,
mostly to generate the rootfs.
Also note that boot2container is a little bit more verbose in terms of
logs, as it's not just a plain qemu boot to a known rootfs, but it
starts podman and another container at the end to gather the results.
So maybe a solution would be to add a vmtest make target at the
selftests root directory, that would be generic enough to be run in
any subsystem. There are a few other users of qemu in selftests, but
each of them has a slightly different use of qemu.
Also, FWIW, boot2container is currently only providing initramfs for
x86_64 and arm64. Thus, using boot2container now for bpf means that we
would drop s390x, which is probably not the best move forward. We can
surely extend the targets, but not sure what plans Martin has on this
side.
For reference, boot2container project:
https://gitlab.freedesktop.org/mupuf/boot2container/
Cheers,
Benjamin
>
> > > ---
> > > tools/testing/selftests/hid/.gitignore | 1 +
> > > tools/testing/selftests/hid/config.common | 241 ++++++++++++++++++
> > > tools/testing/selftests/hid/config.x86_64 | 4 +
> > > tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++++++
> > > 4 files changed, 530 insertions(+)
> > > create mode 100644 tools/testing/selftests/hid/config.common
> > > create mode 100644 tools/testing/selftests/hid/config.x86_64
> > > create mode 100755 tools/testing/selftests/hid/vmtest.sh
> > >
> > > diff --git a/tools/testing/selftests/hid/.gitignore
> > b/tools/testing/selftests/hid/.gitignore
> > > index a462ca6ab2c0..995af0670f69 100644
> > > --- a/tools/testing/selftests/hid/.gitignore
> > > +++ b/tools/testing/selftests/hid/.gitignore
> > > @@ -2,3 +2,4 @@ bpftool
> > > *.skel.h
> > > /tools
> > > hid_bpf
> > > +results
> > > diff --git a/tools/testing/selftests/hid/config.common
> > b/tools/testing/selftests/hid/config.common
> > > new file mode 100644
> > > index 000000000000..0617275d93cc
> > > --- /dev/null
> > > +++ b/tools/testing/selftests/hid/config.common
> > > @@ -0,0 +1,241 @@
> > > +CONFIG_9P_FS_POSIX_ACL=y
> > > +CONFIG_9P_FS_SECURITY=y
> > > +CONFIG_9P_FS=y
> > > +CONFIG_AUDIT=y
> > > +CONFIG_BINFMT_MISC=y
> > > +CONFIG_BLK_CGROUP_IOLATENCY=y
> > > +CONFIG_BLK_CGROUP=y
> > > +CONFIG_BLK_DEV_BSGLIB=y
> > > +CONFIG_BLK_DEV_IO_TRACE=y
> > > +CONFIG_BLK_DEV_RAM_SIZE=16384
> > > +CONFIG_BLK_DEV_RAM=y
> > > +CONFIG_BLK_DEV_THROTTLING=y
> > > +CONFIG_BONDING=y
> > > +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
> > > +CONFIG_BOOTTIME_TRACING=y
> > > +CONFIG_BSD_DISKLABEL=y
> > > +CONFIG_BSD_PROCESS_ACCT=y
> > > +CONFIG_CFS_BANDWIDTH=y
> > > +CONFIG_CGROUP_CPUACCT=y
> > > +CONFIG_CGROUP_DEBUG=y
> > > +CONFIG_CGROUP_DEVICE=y
> > > +CONFIG_CGROUP_FREEZER=y
> > > +CONFIG_CGROUP_HUGETLB=y
> > > +CONFIG_CGROUP_NET_CLASSID=y
> > > +CONFIG_CGROUP_NET_PRIO=y
> > > +CONFIG_CGROUP_PERF=y
> > > +CONFIG_CGROUP_PIDS=y
> > > +CONFIG_CGROUP_RDMA=y
> > > +CONFIG_CGROUP_SCHED=y
> > > +CONFIG_CGROUPS=y
> > > +CONFIG_CGROUP_WRITEBACK=y
> > > +CONFIG_CMA_AREAS=7
> > > +CONFIG_CMA=y
> > > +CONFIG_COMPAT_32BIT_TIME=y
> > > +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
> > > +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
> > > +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
> > > +CONFIG_CPU_FREQ_GOV_USERSPACE=y
> > > +CONFIG_CPU_FREQ_STAT=y
> > > +CONFIG_CPU_IDLE_GOV_LADDER=y
> > > +CONFIG_CPUSETS=y
> > > +CONFIG_CRC_T10DIF=y
> > > +CONFIG_CRYPTO_BLAKE2B=y
> > > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > > +CONFIG_CRYPTO_SEQIV=y
> > > +CONFIG_CRYPTO_XXHASH=y
> > > +CONFIG_DCB=y
> > > +CONFIG_DEBUG_ATOMIC_SLEEP=y
> > > +CONFIG_DEBUG_CREDENTIALS=y
> > > +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
> > > +CONFIG_DEBUG_MEMORY_INIT=y
> > > +CONFIG_DEFAULT_FQ_CODEL=y
> > > +CONFIG_DEFAULT_RENO=y
> > > +CONFIG_DEFAULT_SECURITY_DAC=y
> > > +CONFIG_DEVTMPFS_MOUNT=y
> > > +CONFIG_DEVTMPFS=y
> > > +CONFIG_DMA_CMA=y
> > > +CONFIG_DNS_RESOLVER=y
> > > +CONFIG_EFI_STUB=y
> > > +CONFIG_EFI=y
> > > +CONFIG_EXPERT=y
> > > +CONFIG_EXT4_FS_POSIX_ACL=y
> > > +CONFIG_EXT4_FS_SECURITY=y
> > > +CONFIG_EXT4_FS=y
> > > +CONFIG_FAIL_FUNCTION=y
> > > +CONFIG_FAULT_INJECTION_DEBUG_FS=y
> > > +CONFIG_FAULT_INJECTION=y
> > > +CONFIG_FB_MODE_HELPERS=y
> > > +CONFIG_FB_TILEBLITTING=y
> > > +CONFIG_FB_VESA=y
> > > +CONFIG_FB=y
> > > +CONFIG_FONT_8x16=y
> > > +CONFIG_FONT_MINI_4x6=y
> > > +CONFIG_FONTS=y
> > > +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> > > +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
> > > +CONFIG_FRAMEBUFFER_CONSOLE=y
> > > +CONFIG_FUSE_FS=y
> > > +CONFIG_FW_LOADER_USER_HELPER=y
> > > +CONFIG_GART_IOMMU=y
> > > +CONFIG_GENERIC_PHY=y
> > > +CONFIG_HARDLOCKUP_DETECTOR=y
> > > +CONFIG_HIGH_RES_TIMERS=y
> > > +CONFIG_HPET=y
> > > +CONFIG_HUGETLBFS=y
> > > +CONFIG_HUGETLB_PAGE=y
> > > +CONFIG_HWPOISON_INJECT=y
> > > +CONFIG_HZ_1000=y
> > > +CONFIG_INET=y
> > > +CONFIG_INTEL_POWERCLAMP=y
> > > +CONFIG_IP6_NF_FILTER=y
> > > +CONFIG_IP6_NF_IPTABLES=y
> > > +CONFIG_IP6_NF_NAT=y
> > > +CONFIG_IP6_NF_TARGET_MASQUERADE=y
> > > +CONFIG_IP_ADVANCED_ROUTER=y
> > > +CONFIG_IP_MROUTE=y
> > > +CONFIG_IP_MULTICAST=y
> > > +CONFIG_IP_MULTIPLE_TABLES=y
> > > +CONFIG_IP_NF_FILTER=y
> > > +CONFIG_IP_NF_IPTABLES=y
> > > +CONFIG_IP_NF_NAT=y
> > > +CONFIG_IP_NF_TARGET_MASQUERADE=y
> > > +CONFIG_IP_PIMSM_V1=y
> > > +CONFIG_IP_PIMSM_V2=y
> > > +CONFIG_IP_ROUTE_MULTIPATH=y
> > > +CONFIG_IP_ROUTE_VERBOSE=y
> > > +CONFIG_IPV6_MIP6=y
> > > +CONFIG_IPV6_ROUTE_INFO=y
> > > +CONFIG_IPV6_ROUTER_PREF=y
> > > +CONFIG_IPV6_SEG6_LWTUNNEL=y
> > > +CONFIG_IPV6_SUBTREES=y
> > > +CONFIG_IRQ_POLL=y
> > > +CONFIG_JUMP_LABEL=y
> > > +CONFIG_KARMA_PARTITION=y
> > > +CONFIG_KEXEC=y
> > > +CONFIG_KPROBES=y
> > > +CONFIG_KSM=y
> > > +CONFIG_LEGACY_VSYSCALL_NONE=y
> > > +CONFIG_LOG_BUF_SHIFT=21
> > > +CONFIG_LOG_CPU_MAX_BUF_SHIFT=0
> > > +CONFIG_LOGO=y
> > > +CONFIG_LSM="selinux,bpf,integrity"
> > > +CONFIG_MAC_PARTITION=y
> > > +CONFIG_MAGIC_SYSRQ=y
> > > +CONFIG_MCORE2=y
> > > +CONFIG_MEMCG=y
> > > +CONFIG_MEMORY_FAILURE=y
> > > +CONFIG_MINIX_SUBPARTITION=y
> > > +CONFIG_MODULES=y
> > > +CONFIG_NAMESPACES=y
> > > +CONFIG_NET_9P_VIRTIO=y
> > > +CONFIG_NET_9P=y
> > > +CONFIG_NET_ACT_BPF=y
> > > +CONFIG_NET_CLS_CGROUP=y
> > > +CONFIG_NETDEVICES=y
> > > +CONFIG_NET_EMATCH=y
> > > +CONFIG_NETFILTER_NETLINK_LOG=y
> > > +CONFIG_NETFILTER_NETLINK_QUEUE=y
> > > +CONFIG_NETFILTER_XTABLES=y
> > > +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
> > > +CONFIG_NETFILTER_XT_MATCH_BPF=y
> > > +CONFIG_NETFILTER_XT_MATCH_COMMENT=y
> > > +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
> > > +CONFIG_NETFILTER_XT_MATCH_MARK=y
> > > +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
> > > +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
> > > +CONFIG_NETFILTER_XT_NAT=y
> > > +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
> > > +CONFIG_NET_IPGRE_BROADCAST=y
> > > +CONFIG_NET_L3_MASTER_DEV=y
> > > +CONFIG_NETLABEL=y
> > > +CONFIG_NET_SCH_DEFAULT=y
> > > +CONFIG_NET_SCHED=y
> > > +CONFIG_NET_SCH_FQ_CODEL=y
> > > +CONFIG_NET_TC_SKB_EXT=y
> > > +CONFIG_NET_VRF=y
> > > +CONFIG_NET=y
> > > +CONFIG_NF_CONNTRACK=y
> > > +CONFIG_NF_NAT_MASQUERADE=y
> > > +CONFIG_NF_NAT=y
> > > +CONFIG_NLS_ASCII=y
> > > +CONFIG_NLS_CODEPAGE_437=y
> > > +CONFIG_NLS_DEFAULT="utf8"
> > > +CONFIG_NO_HZ=y
> > > +CONFIG_NR_CPUS=128
> > > +CONFIG_NUMA_BALANCING=y
> > > +CONFIG_NUMA=y
> > > +CONFIG_NVMEM=y
> > > +CONFIG_OSF_PARTITION=y
> > > +CONFIG_OVERLAY_FS_INDEX=y
> > > +CONFIG_OVERLAY_FS_METACOPY=y
> > > +CONFIG_OVERLAY_FS_XINO_AUTO=y
> > > +CONFIG_OVERLAY_FS=y
> > > +CONFIG_PACKET=y
> > > +CONFIG_PANIC_ON_OOPS=y
> > > +CONFIG_PARTITION_ADVANCED=y
> > > +CONFIG_PCIEPORTBUS=y
> > > +CONFIG_PCI_IOV=y
> > > +CONFIG_PCI_MSI=y
> > > +CONFIG_PCI=y
> > > +CONFIG_PHYSICAL_ALIGN=0x1000000
> > > +CONFIG_POSIX_MQUEUE=y
> > > +CONFIG_POWER_SUPPLY=y
> > > +CONFIG_PREEMPT=y
> > > +CONFIG_PRINTK_TIME=y
> > > +CONFIG_PROC_KCORE=y
> > > +CONFIG_PROFILING=y
> > > +CONFIG_PROVE_LOCKING=y
> > > +CONFIG_PTP_1588_CLOCK=y
> > > +CONFIG_RC_DEVICES=y
> > > +CONFIG_RC_LOOPBACK=y
> > > +CONFIG_RCU_CPU_STALL_TIMEOUT=60
> > > +CONFIG_SCHED_STACK_END_CHECK=y
> > > +CONFIG_SCHEDSTATS=y
> > > +CONFIG_SECURITY_NETWORK=y
> > > +CONFIG_SECURITY_SELINUX=y
> > > +CONFIG_SERIAL_8250_CONSOLE=y
> > > +CONFIG_SERIAL_8250_DETECT_IRQ=y
> > > +CONFIG_SERIAL_8250_EXTENDED=y
> > > +CONFIG_SERIAL_8250_MANY_PORTS=y
> > > +CONFIG_SERIAL_8250_NR_UARTS=32
> > > +CONFIG_SERIAL_8250_RSA=y
> > > +CONFIG_SERIAL_8250_SHARE_IRQ=y
> > > +CONFIG_SERIAL_8250=y
> > > +CONFIG_SERIAL_NONSTANDARD=y
> > > +CONFIG_SERIO_LIBPS2=y
> > > +CONFIG_SGI_PARTITION=y
> > > +CONFIG_SMP=y
> > > +CONFIG_SOCK_CGROUP_DATA=y
> > > +CONFIG_SOLARIS_X86_PARTITION=y
> > > +CONFIG_SUN_PARTITION=y
> > > +CONFIG_SYNC_FILE=y
> > > +CONFIG_SYSVIPC=y
> > > +CONFIG_TASK_DELAY_ACCT=y
> > > +CONFIG_TASK_IO_ACCOUNTING=y
> > > +CONFIG_TASKSTATS=y
> > > +CONFIG_TASK_XACCT=y
> > > +CONFIG_TCP_CONG_ADVANCED=y
> > > +CONFIG_TCP_MD5SIG=y
> > > +CONFIG_TLS=y
> > > +CONFIG_TMPFS_POSIX_ACL=y
> > > +CONFIG_TMPFS=y
> > > +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
> > > +CONFIG_TRANSPARENT_HUGEPAGE=y
> > > +CONFIG_TUN=y
> > > +CONFIG_UNIXWARE_DISKLABEL=y
> > > +CONFIG_UNIX=y
> > > +CONFIG_USER_NS=y
> > > +CONFIG_VALIDATE_FS_PARSER=y
> > > +CONFIG_VETH=y
> > > +CONFIG_VIRT_DRIVERS=y
> > > +CONFIG_VIRTIO_BALLOON=y
> > > +CONFIG_VIRTIO_BLK=y
> > > +CONFIG_VIRTIO_CONSOLE=y
> > > +CONFIG_VIRTIO_FS=y
> > > +CONFIG_VIRTIO_NET=y
> > > +CONFIG_VIRTIO_PCI=y
> > > +CONFIG_VLAN_8021Q=y
> > > +CONFIG_XFRM_SUB_POLICY=y
> > > +CONFIG_XFRM_USER=y
> > > +CONFIG_ZEROPLUS_FF=y
> > > diff --git a/tools/testing/selftests/hid/config.x86_64
> > b/tools/testing/selftests/hid/config.x86_64
> > > new file mode 100644
> > > index 000000000000..a8721f403c21
> > > --- /dev/null
> > > +++ b/tools/testing/selftests/hid/config.x86_64
> > > @@ -0,0 +1,4 @@
> > > +CONFIG_X86_ACPI_CPUFREQ=y
> > > +CONFIG_X86_CPUID=y
> > > +CONFIG_X86_MSR=y
> > > +CONFIG_X86_POWERNOW_K8=y
> > > diff --git a/tools/testing/selftests/hid/vmtest.sh
> > b/tools/testing/selftests/hid/vmtest.sh
> > > new file mode 100755
> > > index 000000000000..90f34150f257
> > > --- /dev/null
> > > +++ b/tools/testing/selftests/hid/vmtest.sh
> > > @@ -0,0 +1,284 @@
> > > +#!/bin/bash
> > > +# SPDX-License-Identifier: GPL-2.0
> > > +
> > > +set -u
> > > +set -e
> > > +
> > > +# This script currently only works for x86_64
> > > +ARCH="$(uname -m)"
> > > +case "${ARCH}" in
> > > +x86_64)
> > > + QEMU_BINARY=qemu-system-x86_64
> > > + BZIMAGE="arch/x86/boot/bzImage"
> > > + ;;
> > > +*)
> > > + echo "Unsupported architecture"
> > > + exit 1
> > > + ;;
> > > +esac
> > > +DEFAULT_COMMAND="./hid_bpf"
> > > +SCRIPT_DIR="$(dirname $(realpath $0))"
> > > +OUTPUT_DIR="$SCRIPT_DIR/results"
> > >
> > +KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")
> > >
> > +B2C_URL="https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/master/vm2c.py"
> > > +NUM_COMPILE_JOBS="$(nproc)"
> > > +LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"
> > > +LOG_FILE="${LOG_FILE_BASE}.log"
> > > +EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"
> > > +CONTAINER_IMAGE="registry.fedoraproject.org/fedora:36"
> > > +
> > > +usage()
> > > +{
> > > + cat <<EOF
> > > +Usage: $0 [-i] [-s] [-d <output_dir>] -- [<command>]
> > > +
> > > +<command> is the command you would normally run when you are in
> > > +tools/testing/selftests/bpf. e.g:
> > > +
> > > + $0 -- ./hid_bpf
> > > +
> > > +If no command is specified and a debug shell (-s) is not requested,
> > > +"${DEFAULT_COMMAND}" will be run by default.
> > > +
> > > +If you build your kernel using KBUILD_OUTPUT= or O= options, these
> > > +can be passed as environment variables to the script:
> > > +
> > > + O=<kernel_build_path> $0 -- ./hid_bpf
> > > +
> > > +or
> > > +
> > > + KBUILD_OUTPUT=<kernel_build_path> $0 -- ./hid_bpf
> > > +
> > > +Options:
> > > +
> > > + -u) Update the boot2container script to a newer version.
> > > + -d) Update the output directory (default: ${OUTPUT_DIR})
> > > + -j) Number of jobs for compilation, similar to -j in make
> > > + (default: ${NUM_COMPILE_JOBS})
> > > + -s) Instead of powering off the VM, start an interactive
> > > + shell. If <command> is specified, the shell runs after
> > > + the command finishes executing
> > > +EOF
> > > +}
> > > +
> > > +download()
> > > +{
> > > + local file="$1"
> > > +
> > > + echo "Downloading $file..." >&2
> > > + curl -Lsf "$file" -o "${@:2}"
> > > +}
> > > +
> > > +recompile_kernel()
> > > +{
> > > + local kernel_checkout="$1"
> > > + local make_command="$2"
> > > +
> > > + cd "${kernel_checkout}"
> > > +
> > > + ${make_command} olddefconfig
> > > + ${make_command}
> > > +}
> > > +
> > > +update_selftests()
> > > +{
> > > + local kernel_checkout="$1"
> > > + local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"
> > > +
> > > + cd "${selftests_dir}"
> > > + ${make_command}
> > > +}
> > > +
> > > +run_vm()
> > > +{
> > > + local b2c="$1"
> > > + local kernel_bzimage="$2"
> > > + local command="$3"
> > > + local post_command=""
> > > +
> > > + if ! which "${QEMU_BINARY}" &> /dev/null; then
> > > + cat <<EOF
> > > +Could not find ${QEMU_BINARY}
> > > +Please install qemu or set the QEMU_BINARY environment variable.
> > > +EOF
> > > + exit 1
> > > + fi
> > > +
> > > + # alpine (used in post-container requires the PATH to have /bin
> > > + export PATH=$PATH:/bin
> > > +
> > > + if [[ "${debug_shell}" != "yes" ]]
> > > + then
> > > + touch ${OUTPUT_DIR}/${LOG_FILE}
> > > + command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ;
> > ${command} 2>&1 | tee ${OUTPUT_DIR}/${LOG_FILE}"
> > > + post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"
> > > + else
> > > + command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"
> > > + fi
> > > +
> > > + set +e
> > > + $b2c --command "${command}" \
> > > + --kernel ${kernel_bzimage} \
> > > + --workdir ${OUTPUT_DIR} \
> > > + --image ${CONTAINER_IMAGE}
> > > +
> > > + echo $? > ${OUTPUT_DIR}/${EXIT_STATUS_FILE}
> > > +
> > > + set -e
> > > +
> > > + ${post_command}
> > > +}
> > > +
> > > +is_rel_path()
> > > +{
> > > + local path="$1"
> > > +
> > > + [[ ${path:0:1} != "/" ]]
> > > +}
> > > +
> > > +do_update_kconfig()
> > > +{
> > > + local kernel_checkout="$1"
> > > + local kconfig_file="$2"
> > > +
> > > + rm -f "$kconfig_file" 2> /dev/null
> > > +
> > > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > > + local kconfig_src="${config}"
> > > + cat "$kconfig_src" >> "$kconfig_file"
> > > + done
> > > +}
> > > +
> > > +update_kconfig()
> > > +{
> > > + local kernel_checkout="$1"
> > > + local kconfig_file="$2"
> > > +
> > > + if [[ -f "${kconfig_file}" ]]; then
> > > + local local_modified="$(stat -c %Y "${kconfig_file}")"
> > > +
> > > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > > + local kconfig_src="${config}"
> > > + local src_modified="$(stat -c %Y "${kconfig_src}")"
> > > + # Only update the config if it has been updated after the
> > > + # previously cached config was created. This avoids
> > > + # unnecessarily compiling the kernel and selftests.
> > > + if [[ "${src_modified}" -gt "${local_modified}" ]]; then
> > > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > > + # Once we have found one outdated configuration
> > > + # there is no need to check other ones.
> > > + break
> > > + fi
> > > + done
> > > + else
> > > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > > + fi
> > > +}
> > > +
> > > +main()
> > > +{
> > > + local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" &&
> > pwd -P)"
> > > + local kernel_checkout=$(realpath "${script_dir}"/../../../../)
> > > + # By default the script searches for the kernel in the checkout
> > directory but
> > > + # it also obeys environment variables O= and KBUILD_OUTPUT=
> > > + local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"
> > > + local command="${DEFAULT_COMMAND}"
> > > + local update_b2c="no"
> > > + local debug_shell="no"
> > > +
> > > + while getopts ':hsud:j:' opt; do
> > > + case ${opt} in
> > > + u)
> > > + update_b2c="yes"
> > > + ;;
> > > + d)
> > > + OUTPUT_DIR="$OPTARG"
> > > + ;;
> > > + j)
> > > + NUM_COMPILE_JOBS="$OPTARG"
> > > + ;;
> > > + s)
> > > + command="/bin/sh"
> > > + debug_shell="yes"
> > > + ;;
> > > + h)
> > > + usage
> > > + exit 0
> > > + ;;
> > > + \? )
> > > + echo "Invalid Option: -$OPTARG"
> > > + usage
> > > + exit 1
> > > + ;;
> > > + : )
> > > + echo "Invalid Option: -$OPTARG requires an argument"
> > > + usage
> > > + exit 1
> > > + ;;
> > > + esac
> > > + done
> > > + shift $((OPTIND -1))
> > > +
> > > + # trap 'catch "$?"' EXIT
> > > +
> > > + if [[ "${debug_shell}" == "no" ]]; then
> > > + if [[ $# -eq 0 ]]; then
> > > + echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"
> > > + else
> > > + command="$@"
> > > +
> > > + if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]
> > > + then
> > > + debug_shell="yes"
> > > + fi
> > > + fi
> > > + fi
> > > +
> > > + local kconfig_file="${OUTPUT_DIR}/latest.config"
> > > + local make_command="make -j ${NUM_COMPILE_JOBS}
> > KCONFIG_CONFIG=${kconfig_file}"
> > > +
> > > + # Figure out where the kernel is being built.
> > > + # O takes precedence over KBUILD_OUTPUT.
> > > + if [[ "${O:=""}" != "" ]]; then
> > > + if is_rel_path "${O}"; then
> > > + O="$(realpath "${PWD}/${O}")"
> > > + fi
> > > + kernel_bzimage="${O}/${BZIMAGE}"
> > > + make_command="${make_command} O=${O}"
> > > + elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then
> > > + if is_rel_path "${KBUILD_OUTPUT}"; then
> > > + KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"
> > > + fi
> > > + kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"
> > > + make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
> > > + fi
> > > +
> > > + local b2c="${OUTPUT_DIR}/vm2c.py"
> > > +
> > > + echo "Output directory: ${OUTPUT_DIR}"
> > > +
> > > + mkdir -p "${OUTPUT_DIR}"
> > > + update_kconfig "${kernel_checkout}" "${kconfig_file}"
> > > +
> > > + recompile_kernel "${kernel_checkout}" "${make_command}"
> > > +
> > > + if [[ "${update_b2c}" == "no" && ! -f "${b2c}" ]]; then
> > > + echo "vm2c script not found in ${b2c}"
> > > + update_b2c="yes"
> > > + fi
> > > +
> > > + if [[ "${update_b2c}" == "yes" ]]; then
> > > + download $B2C_URL $b2c
> > > + chmod +x $b2c
> > > + fi
> > > +
> > > + update_selftests "${kernel_checkout}" "${make_command}"
> > > + run_vm $b2c "${kernel_bzimage}" "${command}"
> > > + if [[ "${debug_shell}" != "yes" ]]; then
> > > + echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"
> > > + fi
> > > +
> > > + exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})
> > > +}
> > > +
> > > +main "$@"
> > > --
> > > 2.38.1
> > >
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh
2023-01-10 9:43 ` Benjamin Tissoires
@ 2023-01-10 18:52 ` Stanislav Fomichev
0 siblings, 0 replies; 17+ messages in thread
From: Stanislav Fomichev @ 2023-01-10 18:52 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On Tue, Jan 10, 2023 at 1:43 AM Benjamin Tissoires
<benjamin.tissoires@redhat.com> wrote:
>
> On Mon, Jan 9, 2023 at 6:56 PM <sdf@google.com> wrote:
> >
> > On 01/09, Stanislav Fomichev wrote:
> > > On 01/06, Benjamin Tissoires wrote:
> > > > Similar-ish in many points from the script in selftests/bpf, with a few
> > > > differences:
> > > > - relies on boot2container instead of a plain qemu image (meaning that
> > > > we can take any container in a registry as a base)
> > > > - runs in the hid selftest dir, and such uses the test program from
> > > there
> > > > - the working directory to store the config is in
> > > > tools/selftests/hid/results
> > > >
> > > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> >
> > > Sorry, I've completely missed this. I wasn't on CC and assumed
> > > that was some sort of a repost. Going through the changes right now.
> >
> > Hmmm, or maybe I shouldn't? This seems to be bases on some other tree;
> > can't find tools/testing/selftests/hid/Makefile (from patch #2) in neither
> > bpf nor bpf-next.
>
>
> These changes are based on
> https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/ branch
> for-6.3/hid-bpf, so going through the HID tree, not the bpf one.
>
> I Cce-ed the bpf mailing list for visibility, in case I made an
> obvious error, but this doesn't impact bpf core, so reviews are
> appreciated, but not mandatory from the bpf side of things :)
Cool, thanks, in this case I'm not feeling guilty about missing it on Friday :-)
> >
> > Alexei/Daniel/Andrii, what's the process with these series?
> >
> > > One question here: is it worth it extending bpf/vmtest.sh instead
> > > to support boot2container? Why new script with a bunch of copy-paste
> > > is a better deal?
>
> Good question. There were a few things that made me copy/paste part of
> the script:
> - the bpf one is relying on the bpf rootfs image that, as a subsystem
> maintainer of another subsystem than bpf don't control
> - the bpf one is hardcoding which program to launch, and I want another one
> - the bpf one is in a different directory which would feel weird to
> call when running selftests/hid
> - I want a minimum control over the script so that a change in the bpf
> tree doesn't accidentally break the hid tree
>
> I think using the boot2container initramfs solves the rootfs issue,
> because the initramfs is generic and just consists of a script around
> podman to start a container. This way I can run the test suite on any
> distribution without having to build any distro image. I should also
> be able to start a scratch container without anything in it given that
> the only thing that matters is the binary we start as a command
> (though we won't be able to start a shell in the target VM).
>
> Solving the second and third point could probably be done by
> encapsulating the call to bpf/vmtest.sh from hid.
>
> But for the fourth point, I believe that the bpf script is not generic
> enough to be reused by other subsystems as it relies on the bpf CI,
> mostly to generate the rootfs.
>
> Also note that boot2container is a little bit more verbose in terms of
> logs, as it's not just a plain qemu boot to a known rootfs, but it
> starts podman and another container at the end to gather the results.
[..]
> So maybe a solution would be to add a vmtest make target at the
> selftests root directory, that would be generic enough to be run in
> any subsystem. There are a few other users of qemu in selftests, but
> each of them has a slightly different use of qemu.
Agreed, that seems like the ideal place to put it. Maybe we can unify
them all at some point. And maybe the bpf subsystem can also benefit
by simplifying our images, idk.
(but, obviously, not willing to block your changes, this is all "nice
to have" category)
> Also, FWIW, boot2container is currently only providing initramfs for
> x86_64 and arm64. Thus, using boot2container now for bpf means that we
> would drop s390x, which is probably not the best move forward. We can
> surely extend the targets, but not sure what plans Martin has on this
> side.
Noted. Although I have no background on why we run s390x and whether
we really want to continue to run it..
> For reference, boot2container project:
> https://gitlab.freedesktop.org/mupuf/boot2container/
>
> Cheers,
> Benjamin
>
> >
> > > > ---
> > > > tools/testing/selftests/hid/.gitignore | 1 +
> > > > tools/testing/selftests/hid/config.common | 241 ++++++++++++++++++
> > > > tools/testing/selftests/hid/config.x86_64 | 4 +
> > > > tools/testing/selftests/hid/vmtest.sh | 284 ++++++++++++++++++++++
> > > > 4 files changed, 530 insertions(+)
> > > > create mode 100644 tools/testing/selftests/hid/config.common
> > > > create mode 100644 tools/testing/selftests/hid/config.x86_64
> > > > create mode 100755 tools/testing/selftests/hid/vmtest.sh
> > > >
> > > > diff --git a/tools/testing/selftests/hid/.gitignore
> > > b/tools/testing/selftests/hid/.gitignore
> > > > index a462ca6ab2c0..995af0670f69 100644
> > > > --- a/tools/testing/selftests/hid/.gitignore
> > > > +++ b/tools/testing/selftests/hid/.gitignore
> > > > @@ -2,3 +2,4 @@ bpftool
> > > > *.skel.h
> > > > /tools
> > > > hid_bpf
> > > > +results
> > > > diff --git a/tools/testing/selftests/hid/config.common
> > > b/tools/testing/selftests/hid/config.common
> > > > new file mode 100644
> > > > index 000000000000..0617275d93cc
> > > > --- /dev/null
> > > > +++ b/tools/testing/selftests/hid/config.common
> > > > @@ -0,0 +1,241 @@
> > > > +CONFIG_9P_FS_POSIX_ACL=y
> > > > +CONFIG_9P_FS_SECURITY=y
> > > > +CONFIG_9P_FS=y
> > > > +CONFIG_AUDIT=y
> > > > +CONFIG_BINFMT_MISC=y
> > > > +CONFIG_BLK_CGROUP_IOLATENCY=y
> > > > +CONFIG_BLK_CGROUP=y
> > > > +CONFIG_BLK_DEV_BSGLIB=y
> > > > +CONFIG_BLK_DEV_IO_TRACE=y
> > > > +CONFIG_BLK_DEV_RAM_SIZE=16384
> > > > +CONFIG_BLK_DEV_RAM=y
> > > > +CONFIG_BLK_DEV_THROTTLING=y
> > > > +CONFIG_BONDING=y
> > > > +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
> > > > +CONFIG_BOOTTIME_TRACING=y
> > > > +CONFIG_BSD_DISKLABEL=y
> > > > +CONFIG_BSD_PROCESS_ACCT=y
> > > > +CONFIG_CFS_BANDWIDTH=y
> > > > +CONFIG_CGROUP_CPUACCT=y
> > > > +CONFIG_CGROUP_DEBUG=y
> > > > +CONFIG_CGROUP_DEVICE=y
> > > > +CONFIG_CGROUP_FREEZER=y
> > > > +CONFIG_CGROUP_HUGETLB=y
> > > > +CONFIG_CGROUP_NET_CLASSID=y
> > > > +CONFIG_CGROUP_NET_PRIO=y
> > > > +CONFIG_CGROUP_PERF=y
> > > > +CONFIG_CGROUP_PIDS=y
> > > > +CONFIG_CGROUP_RDMA=y
> > > > +CONFIG_CGROUP_SCHED=y
> > > > +CONFIG_CGROUPS=y
> > > > +CONFIG_CGROUP_WRITEBACK=y
> > > > +CONFIG_CMA_AREAS=7
> > > > +CONFIG_CMA=y
> > > > +CONFIG_COMPAT_32BIT_TIME=y
> > > > +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
> > > > +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
> > > > +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
> > > > +CONFIG_CPU_FREQ_GOV_USERSPACE=y
> > > > +CONFIG_CPU_FREQ_STAT=y
> > > > +CONFIG_CPU_IDLE_GOV_LADDER=y
> > > > +CONFIG_CPUSETS=y
> > > > +CONFIG_CRC_T10DIF=y
> > > > +CONFIG_CRYPTO_BLAKE2B=y
> > > > +CONFIG_CRYPTO_DEV_VIRTIO=y
> > > > +CONFIG_CRYPTO_SEQIV=y
> > > > +CONFIG_CRYPTO_XXHASH=y
> > > > +CONFIG_DCB=y
> > > > +CONFIG_DEBUG_ATOMIC_SLEEP=y
> > > > +CONFIG_DEBUG_CREDENTIALS=y
> > > > +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
> > > > +CONFIG_DEBUG_MEMORY_INIT=y
> > > > +CONFIG_DEFAULT_FQ_CODEL=y
> > > > +CONFIG_DEFAULT_RENO=y
> > > > +CONFIG_DEFAULT_SECURITY_DAC=y
> > > > +CONFIG_DEVTMPFS_MOUNT=y
> > > > +CONFIG_DEVTMPFS=y
> > > > +CONFIG_DMA_CMA=y
> > > > +CONFIG_DNS_RESOLVER=y
> > > > +CONFIG_EFI_STUB=y
> > > > +CONFIG_EFI=y
> > > > +CONFIG_EXPERT=y
> > > > +CONFIG_EXT4_FS_POSIX_ACL=y
> > > > +CONFIG_EXT4_FS_SECURITY=y
> > > > +CONFIG_EXT4_FS=y
> > > > +CONFIG_FAIL_FUNCTION=y
> > > > +CONFIG_FAULT_INJECTION_DEBUG_FS=y
> > > > +CONFIG_FAULT_INJECTION=y
> > > > +CONFIG_FB_MODE_HELPERS=y
> > > > +CONFIG_FB_TILEBLITTING=y
> > > > +CONFIG_FB_VESA=y
> > > > +CONFIG_FB=y
> > > > +CONFIG_FONT_8x16=y
> > > > +CONFIG_FONT_MINI_4x6=y
> > > > +CONFIG_FONTS=y
> > > > +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
> > > > +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
> > > > +CONFIG_FRAMEBUFFER_CONSOLE=y
> > > > +CONFIG_FUSE_FS=y
> > > > +CONFIG_FW_LOADER_USER_HELPER=y
> > > > +CONFIG_GART_IOMMU=y
> > > > +CONFIG_GENERIC_PHY=y
> > > > +CONFIG_HARDLOCKUP_DETECTOR=y
> > > > +CONFIG_HIGH_RES_TIMERS=y
> > > > +CONFIG_HPET=y
> > > > +CONFIG_HUGETLBFS=y
> > > > +CONFIG_HUGETLB_PAGE=y
> > > > +CONFIG_HWPOISON_INJECT=y
> > > > +CONFIG_HZ_1000=y
> > > > +CONFIG_INET=y
> > > > +CONFIG_INTEL_POWERCLAMP=y
> > > > +CONFIG_IP6_NF_FILTER=y
> > > > +CONFIG_IP6_NF_IPTABLES=y
> > > > +CONFIG_IP6_NF_NAT=y
> > > > +CONFIG_IP6_NF_TARGET_MASQUERADE=y
> > > > +CONFIG_IP_ADVANCED_ROUTER=y
> > > > +CONFIG_IP_MROUTE=y
> > > > +CONFIG_IP_MULTICAST=y
> > > > +CONFIG_IP_MULTIPLE_TABLES=y
> > > > +CONFIG_IP_NF_FILTER=y
> > > > +CONFIG_IP_NF_IPTABLES=y
> > > > +CONFIG_IP_NF_NAT=y
> > > > +CONFIG_IP_NF_TARGET_MASQUERADE=y
> > > > +CONFIG_IP_PIMSM_V1=y
> > > > +CONFIG_IP_PIMSM_V2=y
> > > > +CONFIG_IP_ROUTE_MULTIPATH=y
> > > > +CONFIG_IP_ROUTE_VERBOSE=y
> > > > +CONFIG_IPV6_MIP6=y
> > > > +CONFIG_IPV6_ROUTE_INFO=y
> > > > +CONFIG_IPV6_ROUTER_PREF=y
> > > > +CONFIG_IPV6_SEG6_LWTUNNEL=y
> > > > +CONFIG_IPV6_SUBTREES=y
> > > > +CONFIG_IRQ_POLL=y
> > > > +CONFIG_JUMP_LABEL=y
> > > > +CONFIG_KARMA_PARTITION=y
> > > > +CONFIG_KEXEC=y
> > > > +CONFIG_KPROBES=y
> > > > +CONFIG_KSM=y
> > > > +CONFIG_LEGACY_VSYSCALL_NONE=y
> > > > +CONFIG_LOG_BUF_SHIFT=21
> > > > +CONFIG_LOG_CPU_MAX_BUF_SHIFT=0
> > > > +CONFIG_LOGO=y
> > > > +CONFIG_LSM="selinux,bpf,integrity"
> > > > +CONFIG_MAC_PARTITION=y
> > > > +CONFIG_MAGIC_SYSRQ=y
> > > > +CONFIG_MCORE2=y
> > > > +CONFIG_MEMCG=y
> > > > +CONFIG_MEMORY_FAILURE=y
> > > > +CONFIG_MINIX_SUBPARTITION=y
> > > > +CONFIG_MODULES=y
> > > > +CONFIG_NAMESPACES=y
> > > > +CONFIG_NET_9P_VIRTIO=y
> > > > +CONFIG_NET_9P=y
> > > > +CONFIG_NET_ACT_BPF=y
> > > > +CONFIG_NET_CLS_CGROUP=y
> > > > +CONFIG_NETDEVICES=y
> > > > +CONFIG_NET_EMATCH=y
> > > > +CONFIG_NETFILTER_NETLINK_LOG=y
> > > > +CONFIG_NETFILTER_NETLINK_QUEUE=y
> > > > +CONFIG_NETFILTER_XTABLES=y
> > > > +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
> > > > +CONFIG_NETFILTER_XT_MATCH_BPF=y
> > > > +CONFIG_NETFILTER_XT_MATCH_COMMENT=y
> > > > +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
> > > > +CONFIG_NETFILTER_XT_MATCH_MARK=y
> > > > +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
> > > > +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
> > > > +CONFIG_NETFILTER_XT_NAT=y
> > > > +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
> > > > +CONFIG_NET_IPGRE_BROADCAST=y
> > > > +CONFIG_NET_L3_MASTER_DEV=y
> > > > +CONFIG_NETLABEL=y
> > > > +CONFIG_NET_SCH_DEFAULT=y
> > > > +CONFIG_NET_SCHED=y
> > > > +CONFIG_NET_SCH_FQ_CODEL=y
> > > > +CONFIG_NET_TC_SKB_EXT=y
> > > > +CONFIG_NET_VRF=y
> > > > +CONFIG_NET=y
> > > > +CONFIG_NF_CONNTRACK=y
> > > > +CONFIG_NF_NAT_MASQUERADE=y
> > > > +CONFIG_NF_NAT=y
> > > > +CONFIG_NLS_ASCII=y
> > > > +CONFIG_NLS_CODEPAGE_437=y
> > > > +CONFIG_NLS_DEFAULT="utf8"
> > > > +CONFIG_NO_HZ=y
> > > > +CONFIG_NR_CPUS=128
> > > > +CONFIG_NUMA_BALANCING=y
> > > > +CONFIG_NUMA=y
> > > > +CONFIG_NVMEM=y
> > > > +CONFIG_OSF_PARTITION=y
> > > > +CONFIG_OVERLAY_FS_INDEX=y
> > > > +CONFIG_OVERLAY_FS_METACOPY=y
> > > > +CONFIG_OVERLAY_FS_XINO_AUTO=y
> > > > +CONFIG_OVERLAY_FS=y
> > > > +CONFIG_PACKET=y
> > > > +CONFIG_PANIC_ON_OOPS=y
> > > > +CONFIG_PARTITION_ADVANCED=y
> > > > +CONFIG_PCIEPORTBUS=y
> > > > +CONFIG_PCI_IOV=y
> > > > +CONFIG_PCI_MSI=y
> > > > +CONFIG_PCI=y
> > > > +CONFIG_PHYSICAL_ALIGN=0x1000000
> > > > +CONFIG_POSIX_MQUEUE=y
> > > > +CONFIG_POWER_SUPPLY=y
> > > > +CONFIG_PREEMPT=y
> > > > +CONFIG_PRINTK_TIME=y
> > > > +CONFIG_PROC_KCORE=y
> > > > +CONFIG_PROFILING=y
> > > > +CONFIG_PROVE_LOCKING=y
> > > > +CONFIG_PTP_1588_CLOCK=y
> > > > +CONFIG_RC_DEVICES=y
> > > > +CONFIG_RC_LOOPBACK=y
> > > > +CONFIG_RCU_CPU_STALL_TIMEOUT=60
> > > > +CONFIG_SCHED_STACK_END_CHECK=y
> > > > +CONFIG_SCHEDSTATS=y
> > > > +CONFIG_SECURITY_NETWORK=y
> > > > +CONFIG_SECURITY_SELINUX=y
> > > > +CONFIG_SERIAL_8250_CONSOLE=y
> > > > +CONFIG_SERIAL_8250_DETECT_IRQ=y
> > > > +CONFIG_SERIAL_8250_EXTENDED=y
> > > > +CONFIG_SERIAL_8250_MANY_PORTS=y
> > > > +CONFIG_SERIAL_8250_NR_UARTS=32
> > > > +CONFIG_SERIAL_8250_RSA=y
> > > > +CONFIG_SERIAL_8250_SHARE_IRQ=y
> > > > +CONFIG_SERIAL_8250=y
> > > > +CONFIG_SERIAL_NONSTANDARD=y
> > > > +CONFIG_SERIO_LIBPS2=y
> > > > +CONFIG_SGI_PARTITION=y
> > > > +CONFIG_SMP=y
> > > > +CONFIG_SOCK_CGROUP_DATA=y
> > > > +CONFIG_SOLARIS_X86_PARTITION=y
> > > > +CONFIG_SUN_PARTITION=y
> > > > +CONFIG_SYNC_FILE=y
> > > > +CONFIG_SYSVIPC=y
> > > > +CONFIG_TASK_DELAY_ACCT=y
> > > > +CONFIG_TASK_IO_ACCOUNTING=y
> > > > +CONFIG_TASKSTATS=y
> > > > +CONFIG_TASK_XACCT=y
> > > > +CONFIG_TCP_CONG_ADVANCED=y
> > > > +CONFIG_TCP_MD5SIG=y
> > > > +CONFIG_TLS=y
> > > > +CONFIG_TMPFS_POSIX_ACL=y
> > > > +CONFIG_TMPFS=y
> > > > +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
> > > > +CONFIG_TRANSPARENT_HUGEPAGE=y
> > > > +CONFIG_TUN=y
> > > > +CONFIG_UNIXWARE_DISKLABEL=y
> > > > +CONFIG_UNIX=y
> > > > +CONFIG_USER_NS=y
> > > > +CONFIG_VALIDATE_FS_PARSER=y
> > > > +CONFIG_VETH=y
> > > > +CONFIG_VIRT_DRIVERS=y
> > > > +CONFIG_VIRTIO_BALLOON=y
> > > > +CONFIG_VIRTIO_BLK=y
> > > > +CONFIG_VIRTIO_CONSOLE=y
> > > > +CONFIG_VIRTIO_FS=y
> > > > +CONFIG_VIRTIO_NET=y
> > > > +CONFIG_VIRTIO_PCI=y
> > > > +CONFIG_VLAN_8021Q=y
> > > > +CONFIG_XFRM_SUB_POLICY=y
> > > > +CONFIG_XFRM_USER=y
> > > > +CONFIG_ZEROPLUS_FF=y
> > > > diff --git a/tools/testing/selftests/hid/config.x86_64
> > > b/tools/testing/selftests/hid/config.x86_64
> > > > new file mode 100644
> > > > index 000000000000..a8721f403c21
> > > > --- /dev/null
> > > > +++ b/tools/testing/selftests/hid/config.x86_64
> > > > @@ -0,0 +1,4 @@
> > > > +CONFIG_X86_ACPI_CPUFREQ=y
> > > > +CONFIG_X86_CPUID=y
> > > > +CONFIG_X86_MSR=y
> > > > +CONFIG_X86_POWERNOW_K8=y
> > > > diff --git a/tools/testing/selftests/hid/vmtest.sh
> > > b/tools/testing/selftests/hid/vmtest.sh
> > > > new file mode 100755
> > > > index 000000000000..90f34150f257
> > > > --- /dev/null
> > > > +++ b/tools/testing/selftests/hid/vmtest.sh
> > > > @@ -0,0 +1,284 @@
> > > > +#!/bin/bash
> > > > +# SPDX-License-Identifier: GPL-2.0
> > > > +
> > > > +set -u
> > > > +set -e
> > > > +
> > > > +# This script currently only works for x86_64
> > > > +ARCH="$(uname -m)"
> > > > +case "${ARCH}" in
> > > > +x86_64)
> > > > + QEMU_BINARY=qemu-system-x86_64
> > > > + BZIMAGE="arch/x86/boot/bzImage"
> > > > + ;;
> > > > +*)
> > > > + echo "Unsupported architecture"
> > > > + exit 1
> > > > + ;;
> > > > +esac
> > > > +DEFAULT_COMMAND="./hid_bpf"
> > > > +SCRIPT_DIR="$(dirname $(realpath $0))"
> > > > +OUTPUT_DIR="$SCRIPT_DIR/results"
> > > >
> > > +KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")
> > > >
> > > +B2C_URL="https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/master/vm2c.py"
> > > > +NUM_COMPILE_JOBS="$(nproc)"
> > > > +LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"
> > > > +LOG_FILE="${LOG_FILE_BASE}.log"
> > > > +EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"
> > > > +CONTAINER_IMAGE="registry.fedoraproject.org/fedora:36"
> > > > +
> > > > +usage()
> > > > +{
> > > > + cat <<EOF
> > > > +Usage: $0 [-i] [-s] [-d <output_dir>] -- [<command>]
> > > > +
> > > > +<command> is the command you would normally run when you are in
> > > > +tools/testing/selftests/bpf. e.g:
> > > > +
> > > > + $0 -- ./hid_bpf
> > > > +
> > > > +If no command is specified and a debug shell (-s) is not requested,
> > > > +"${DEFAULT_COMMAND}" will be run by default.
> > > > +
> > > > +If you build your kernel using KBUILD_OUTPUT= or O= options, these
> > > > +can be passed as environment variables to the script:
> > > > +
> > > > + O=<kernel_build_path> $0 -- ./hid_bpf
> > > > +
> > > > +or
> > > > +
> > > > + KBUILD_OUTPUT=<kernel_build_path> $0 -- ./hid_bpf
> > > > +
> > > > +Options:
> > > > +
> > > > + -u) Update the boot2container script to a newer version.
> > > > + -d) Update the output directory (default: ${OUTPUT_DIR})
> > > > + -j) Number of jobs for compilation, similar to -j in make
> > > > + (default: ${NUM_COMPILE_JOBS})
> > > > + -s) Instead of powering off the VM, start an interactive
> > > > + shell. If <command> is specified, the shell runs after
> > > > + the command finishes executing
> > > > +EOF
> > > > +}
> > > > +
> > > > +download()
> > > > +{
> > > > + local file="$1"
> > > > +
> > > > + echo "Downloading $file..." >&2
> > > > + curl -Lsf "$file" -o "${@:2}"
> > > > +}
> > > > +
> > > > +recompile_kernel()
> > > > +{
> > > > + local kernel_checkout="$1"
> > > > + local make_command="$2"
> > > > +
> > > > + cd "${kernel_checkout}"
> > > > +
> > > > + ${make_command} olddefconfig
> > > > + ${make_command}
> > > > +}
> > > > +
> > > > +update_selftests()
> > > > +{
> > > > + local kernel_checkout="$1"
> > > > + local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"
> > > > +
> > > > + cd "${selftests_dir}"
> > > > + ${make_command}
> > > > +}
> > > > +
> > > > +run_vm()
> > > > +{
> > > > + local b2c="$1"
> > > > + local kernel_bzimage="$2"
> > > > + local command="$3"
> > > > + local post_command=""
> > > > +
> > > > + if ! which "${QEMU_BINARY}" &> /dev/null; then
> > > > + cat <<EOF
> > > > +Could not find ${QEMU_BINARY}
> > > > +Please install qemu or set the QEMU_BINARY environment variable.
> > > > +EOF
> > > > + exit 1
> > > > + fi
> > > > +
> > > > + # alpine (used in post-container requires the PATH to have /bin
> > > > + export PATH=$PATH:/bin
> > > > +
> > > > + if [[ "${debug_shell}" != "yes" ]]
> > > > + then
> > > > + touch ${OUTPUT_DIR}/${LOG_FILE}
> > > > + command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ;
> > > ${command} 2>&1 | tee ${OUTPUT_DIR}/${LOG_FILE}"
> > > > + post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"
> > > > + else
> > > > + command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"
> > > > + fi
> > > > +
> > > > + set +e
> > > > + $b2c --command "${command}" \
> > > > + --kernel ${kernel_bzimage} \
> > > > + --workdir ${OUTPUT_DIR} \
> > > > + --image ${CONTAINER_IMAGE}
> > > > +
> > > > + echo $? > ${OUTPUT_DIR}/${EXIT_STATUS_FILE}
> > > > +
> > > > + set -e
> > > > +
> > > > + ${post_command}
> > > > +}
> > > > +
> > > > +is_rel_path()
> > > > +{
> > > > + local path="$1"
> > > > +
> > > > + [[ ${path:0:1} != "/" ]]
> > > > +}
> > > > +
> > > > +do_update_kconfig()
> > > > +{
> > > > + local kernel_checkout="$1"
> > > > + local kconfig_file="$2"
> > > > +
> > > > + rm -f "$kconfig_file" 2> /dev/null
> > > > +
> > > > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > > > + local kconfig_src="${config}"
> > > > + cat "$kconfig_src" >> "$kconfig_file"
> > > > + done
> > > > +}
> > > > +
> > > > +update_kconfig()
> > > > +{
> > > > + local kernel_checkout="$1"
> > > > + local kconfig_file="$2"
> > > > +
> > > > + if [[ -f "${kconfig_file}" ]]; then
> > > > + local local_modified="$(stat -c %Y "${kconfig_file}")"
> > > > +
> > > > + for config in "${KCONFIG_REL_PATHS[@]}"; do
> > > > + local kconfig_src="${config}"
> > > > + local src_modified="$(stat -c %Y "${kconfig_src}")"
> > > > + # Only update the config if it has been updated after the
> > > > + # previously cached config was created. This avoids
> > > > + # unnecessarily compiling the kernel and selftests.
> > > > + if [[ "${src_modified}" -gt "${local_modified}" ]]; then
> > > > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > > > + # Once we have found one outdated configuration
> > > > + # there is no need to check other ones.
> > > > + break
> > > > + fi
> > > > + done
> > > > + else
> > > > + do_update_kconfig "$kernel_checkout" "$kconfig_file"
> > > > + fi
> > > > +}
> > > > +
> > > > +main()
> > > > +{
> > > > + local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" &&
> > > pwd -P)"
> > > > + local kernel_checkout=$(realpath "${script_dir}"/../../../../)
> > > > + # By default the script searches for the kernel in the checkout
> > > directory but
> > > > + # it also obeys environment variables O= and KBUILD_OUTPUT=
> > > > + local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"
> > > > + local command="${DEFAULT_COMMAND}"
> > > > + local update_b2c="no"
> > > > + local debug_shell="no"
> > > > +
> > > > + while getopts ':hsud:j:' opt; do
> > > > + case ${opt} in
> > > > + u)
> > > > + update_b2c="yes"
> > > > + ;;
> > > > + d)
> > > > + OUTPUT_DIR="$OPTARG"
> > > > + ;;
> > > > + j)
> > > > + NUM_COMPILE_JOBS="$OPTARG"
> > > > + ;;
> > > > + s)
> > > > + command="/bin/sh"
> > > > + debug_shell="yes"
> > > > + ;;
> > > > + h)
> > > > + usage
> > > > + exit 0
> > > > + ;;
> > > > + \? )
> > > > + echo "Invalid Option: -$OPTARG"
> > > > + usage
> > > > + exit 1
> > > > + ;;
> > > > + : )
> > > > + echo "Invalid Option: -$OPTARG requires an argument"
> > > > + usage
> > > > + exit 1
> > > > + ;;
> > > > + esac
> > > > + done
> > > > + shift $((OPTIND -1))
> > > > +
> > > > + # trap 'catch "$?"' EXIT
> > > > +
> > > > + if [[ "${debug_shell}" == "no" ]]; then
> > > > + if [[ $# -eq 0 ]]; then
> > > > + echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"
> > > > + else
> > > > + command="$@"
> > > > +
> > > > + if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]
> > > > + then
> > > > + debug_shell="yes"
> > > > + fi
> > > > + fi
> > > > + fi
> > > > +
> > > > + local kconfig_file="${OUTPUT_DIR}/latest.config"
> > > > + local make_command="make -j ${NUM_COMPILE_JOBS}
> > > KCONFIG_CONFIG=${kconfig_file}"
> > > > +
> > > > + # Figure out where the kernel is being built.
> > > > + # O takes precedence over KBUILD_OUTPUT.
> > > > + if [[ "${O:=""}" != "" ]]; then
> > > > + if is_rel_path "${O}"; then
> > > > + O="$(realpath "${PWD}/${O}")"
> > > > + fi
> > > > + kernel_bzimage="${O}/${BZIMAGE}"
> > > > + make_command="${make_command} O=${O}"
> > > > + elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then
> > > > + if is_rel_path "${KBUILD_OUTPUT}"; then
> > > > + KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"
> > > > + fi
> > > > + kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"
> > > > + make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"
> > > > + fi
> > > > +
> > > > + local b2c="${OUTPUT_DIR}/vm2c.py"
> > > > +
> > > > + echo "Output directory: ${OUTPUT_DIR}"
> > > > +
> > > > + mkdir -p "${OUTPUT_DIR}"
> > > > + update_kconfig "${kernel_checkout}" "${kconfig_file}"
> > > > +
> > > > + recompile_kernel "${kernel_checkout}" "${make_command}"
> > > > +
> > > > + if [[ "${update_b2c}" == "no" && ! -f "${b2c}" ]]; then
> > > > + echo "vm2c script not found in ${b2c}"
> > > > + update_b2c="yes"
> > > > + fi
> > > > +
> > > > + if [[ "${update_b2c}" == "yes" ]]; then
> > > > + download $B2C_URL $b2c
> > > > + chmod +x $b2c
> > > > + fi
> > > > +
> > > > + update_selftests "${kernel_checkout}" "${make_command}"
> > > > + run_vm $b2c "${kernel_bzimage}" "${command}"
> > > > + if [[ "${debug_shell}" != "yes" ]]; then
> > > > + echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"
> > > > + fi
> > > > +
> > > > + exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})
> > > > +}
> > > > +
> > > > +main "$@"
> > > > --
> > > > 2.38.1
> > > >
> >
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel
2023-01-06 10:23 ` [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel Benjamin Tissoires
@ 2023-01-11 6:10 ` Alexei Starovoitov
2023-01-11 9:47 ` Benjamin Tissoires
0 siblings, 1 reply; 17+ messages in thread
From: Alexei Starovoitov @ 2023-01-11 6:10 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On Fri, Jan 06, 2023 at 11:23:29AM +0100, Benjamin Tissoires wrote:
>
> +static void hid_bpf_link_release(struct bpf_link *link)
> +{
> + struct hid_bpf_link *hid_link =
> + container_of(link, struct hid_bpf_link, link);
> +
> + __clear_bit(hid_link->index, jmp_table.enabled);
> + schedule_work(&release_work);
> +}
...
> + link->index = prog_idx;
I was super confused that you use prog_idx as a bit in jmp_table
and had to look into your tree what hid_bpf_jmp_table.c is doing.
Looks like it's not prog_id (which is prog->aux->id) that we know.
It's hid specific prog idx in that jmp table.
Maybe would be good to rename your prog_idx to something with 'hid' suffix or prefix?
or 'table' suffix or prefix ?
prog_table_idx ?
Other than that the patch set looking great.
I'm assuming removing call_hid_bpf_prog_put_deferred() and everything related
comes in the next set?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel
2023-01-11 6:10 ` Alexei Starovoitov
@ 2023-01-11 9:47 ` Benjamin Tissoires
0 siblings, 0 replies; 17+ messages in thread
From: Benjamin Tissoires @ 2023-01-11 9:47 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Greg KH, Jiri Kosina, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Dmitry Torokhov, Tero Kristo, linux-kernel,
linux-input, netdev, bpf, linux-kselftest
On Wed, Jan 11, 2023 at 7:11 AM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Fri, Jan 06, 2023 at 11:23:29AM +0100, Benjamin Tissoires wrote:
> >
> > +static void hid_bpf_link_release(struct bpf_link *link)
> > +{
> > + struct hid_bpf_link *hid_link =
> > + container_of(link, struct hid_bpf_link, link);
> > +
> > + __clear_bit(hid_link->index, jmp_table.enabled);
> > + schedule_work(&release_work);
> > +}
>
> ...
>
> > + link->index = prog_idx;
>
> I was super confused that you use prog_idx as a bit in jmp_table
> and had to look into your tree what hid_bpf_jmp_table.c is doing.
> Looks like it's not prog_id (which is prog->aux->id) that we know.
> It's hid specific prog idx in that jmp table.
> Maybe would be good to rename your prog_idx to something with 'hid' suffix or prefix?
> or 'table' suffix or prefix ?
> prog_table_idx ?
prog_table_idx sounds good :)
>
> Other than that the patch set looking great.
great, thanks!
> I'm assuming removing call_hid_bpf_prog_put_deferred() and everything related
> comes in the next set?
>
Yep. I'll probably send it tomorrow. I have a bunch of urgent
corporate stuff to do today so won't have time for the fun part of the
job :(
Cheers,
Benjamin
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-01-11 9:51 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-06 10:23 [PATCH HID for-next v1 0/9] HID-BPF LLVM fixes, no more hacks Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 1/9] selftests: hid: add vmtest.sh Benjamin Tissoires
2023-01-09 17:46 ` sdf
2023-01-09 17:56 ` sdf
2023-01-10 9:43 ` Benjamin Tissoires
2023-01-10 18:52 ` Stanislav Fomichev
2023-01-06 10:23 ` [PATCH HID for-next v1 2/9] selftests: hid: allow to compile hid_bpf with LLVM Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 3/9] selftests: hid: attach/detach 2 bpf programs, not just one Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 4/9] selftests: hid: ensure the program is correctly pinned Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 5/9] selftests: hid: prepare tests for HID_BPF API change Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 6/9] HID: bpf: rework how programs are attached and stored in the kernel Benjamin Tissoires
2023-01-11 6:10 ` Alexei Starovoitov
2023-01-11 9:47 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 7/9] selftests: hid: enforce new attach API Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 8/9] HID: bpf: clean up entrypoint Benjamin Tissoires
[not found] ` <202301062140.zfdqzE9b-lkp@intel.com>
2023-01-06 14:37 ` Benjamin Tissoires
2023-01-06 10:23 ` [PATCH HID for-next v1 9/9] HID: bpf: reorder BPF registration Benjamin Tissoires
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).