aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dashboard/config/linux/android-5.10-base.config3
-rw-r--r--dashboard/config/linux/android-5.10.config3
-rw-r--r--dashboard/config/linux/bits/android-5.10-late.yml20
-rw-r--r--dashboard/config/linux/main.yml1
4 files changed, 23 insertions, 4 deletions
diff --git a/dashboard/config/linux/android-5.10-base.config b/dashboard/config/linux/android-5.10-base.config
index ac0c99a8d..a6b3e4112 100644
--- a/dashboard/config/linux/android-5.10-base.config
+++ b/dashboard/config/linux/android-5.10-base.config
@@ -237,7 +237,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
-CONFIG_IO_URING=y
+# CONFIG_IO_URING is not set
CONFIG_ADVISE_SYSCALLS=y
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
@@ -5890,7 +5890,6 @@ CONFIG_NLS_UTF8=y
# CONFIG_DLM is not set
CONFIG_UNICODE=y
# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
# end of File systems
#
diff --git a/dashboard/config/linux/android-5.10.config b/dashboard/config/linux/android-5.10.config
index a87201c7c..d683a339b 100644
--- a/dashboard/config/linux/android-5.10.config
+++ b/dashboard/config/linux/android-5.10.config
@@ -237,7 +237,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
-CONFIG_IO_URING=y
+# CONFIG_IO_URING is not set
CONFIG_ADVISE_SYSCALLS=y
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
@@ -6624,7 +6624,6 @@ CONFIG_NLS_UTF8=y
# CONFIG_DLM is not set
CONFIG_UNICODE=y
# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
# end of File systems
#
diff --git a/dashboard/config/linux/bits/android-5.10-late.yml b/dashboard/config/linux/bits/android-5.10-late.yml
new file mode 100644
index 000000000..2a65f2a0f
--- /dev/null
+++ b/dashboard/config/linux/bits/android-5.10-late.yml
@@ -0,0 +1,20 @@
+# Copyright 2022 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+config:
+ # 5.10 has lots of io_uring bugs that are not easy (if not impossible) to backport, e.g.:
+ #
+ # KASAN: use-after-free Read in io_uring_cancel_task_requests
+ # KASAN: use-after-free Read in io_kill_linked_timeout
+ # KASAN: invalid-free in io_dismantle_req
+ # KASAN: use-after-free Read in __fdget_raw
+ # KASAN: stack-out-of-bounds Read in iov_iter_revert
+ # general protection fault in io_prep_async_work
+ #
+ # An attempt to back-port usually fails because there is too many changes/dependencies
+ # that went in between v5.10 and v5.12, where most of the io_uring issues are fixed.
+ # After comparing io_uring related git history between 5.10 and 5.12, the diff is
+ # around 180 commits, from which half are fixes and the rest additions/new features.
+ # None of these have been marked with 'Fixes' or cc'ed to stable, so it is very
+ # unlikely that these are going to be fixed in 5.10 stable kernel.
+ - IO_URING: n
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index 8d88a3fb0..21d9f71b2 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -70,5 +70,6 @@ includes:
- kfence.yml: [kfence]
- android.yml: [android]
- android-subsystems.yml: [android, -baseline]
+ - android-5.10-late.yml: [android-5.10]
- chromeos.yml: [chromeos]
- chromeos-subsystems.yml: [chromeos, -baseline]