From 82cf738ee6ec357abc38315dbd6b2ad431b98a48 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 27 Jan 2022 15:25:59 +0100 Subject: dashboard/config/linux: update upstream configs Update mainline and linux-next revisions to the latest tags and fix configs that broke. NF_FLOW_TABLE_IPV4/6 were removed in: commit c42ba4290b2147aa033d17f22151494515655d77 netfilter: flowtable: remove ipv4/ipv6 modules CONFIG_DAX_DRIVER was removed in: commit afd586f0d06ce3d81b7c474499630fec88833828 dax: remove CONFIG_DAX_DRIVER BLK_DEV_CRYPTOLOOP was removed in: commit 47e9624616c80c9879feda536c48c6a3a0ed9835 block: remove support for cryptoloop and the xor transfer NFT_COUNTER was removed in: commit 023223dfbfb34fcc9b7dd41e21fbf9a5d5237989 netfilter: nf_tables: make counter support built-in ICST was renamed to CLK_ICST in: commit 323fd5955f844d1b6acf1a1af488da460f657ff2 clk: versatile: Rename ICST to CLK_ICST APPARMOR_INTROSPECT_POLICY was added as requirement for other configs we enabled in: commit abfb9c0725f274c75ca2a51684c2dd842a8dc254 apparmor: make export of raw binary profile to userspace optional --- dashboard/config/linux/bits/base.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'dashboard/config/linux/bits/base.yml') diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index 95e4ef7ff..2b0931082 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -94,6 +94,9 @@ config: # Added in 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") and should appear in v5.13. - PCPU_DEV_REFCNT: [n, v5.13] + - NET_DEV_REFCNT_TRACKER: [v5.17] + - NET_NS_REFCNT_TRACKER: [v5.17] + # This config does not add any debug checks (only debug output). - DEBUG_KOBJECT: n @@ -109,9 +112,11 @@ config: # KCOV slows down execution too much with KASAN_HW_TAGS and in qemu emulation in general. # KCOV crashes on Arm: # https://lore.kernel.org/linux-arm-kernel/20210119130010.GA2338@C02TD0UTHF1T.local/T/#m78fdfcc41ae831f91c93ad5dabe63f7ccfb482f0 - - KCOV: [-arm64, -arm] - - KCOV_INSTRUMENT_ALL: [-arm64, -arm] - - KCOV_ENABLE_COMPARISONS: [-arm64, -arm] + # KCOV is not supported on s390 with our toolchain now, config depends on: + # (!ARCH_WANTS_NO_INSTR [=y] || STACK_VALIDATION [=n] || GCC_VERSION [=110200]>=120000 || CLANG_VERSION [=0]>=130000) + - KCOV: [-arm64, -arm, -s390] + - KCOV_INSTRUMENT_ALL: [-arm64, -arm, -s390] + - KCOV_ENABLE_COMPARISONS: [-arm64, -arm, -s390] - DEBUG_FS # Required for KCOV but also eliminates unnecessary non-determinism. @@ -168,6 +173,9 @@ config: # Don't test/need this (may be enabled via HID_HYPERV_MOUSE in USB/HID configs). - HYPERV: n + # Don't test/need this. + - XEN: n + # These are legacy gadget drivers that we don't reach/test and some of these break boot: # https://github.com/google/syzkaller/pull/1975#issuecomment-712807462 - USB_G_NCM: n -- cgit mrf-deployment