diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2021-10-27 08:35:20 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-10-29 10:10:32 +0200 |
| commit | 8c6353c9c6cd9e174e575dde95e040fc4f6dd678 (patch) | |
| tree | 6fb12465a93ed7cb02ee938caf19f6c87993cd63 /dashboard/config/linux/bits | |
| parent | 96a31541954f67fa12c6b8361fa77d9c7a3b7665 (diff) | |
dashboard/config: enable binderfs
Also, create only 2 binder devices at binderfs creation - we don't need
32 devices anymore, as a separate binderfs instance is now created per
each syz-executor.
Diffstat (limited to 'dashboard/config/linux/bits')
| -rw-r--r-- | dashboard/config/linux/bits/android-subsystems.yml | 1 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/chromeos-subsystems.yml | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/subsystems.yml | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/dashboard/config/linux/bits/android-subsystems.yml b/dashboard/config/linux/bits/android-subsystems.yml index c716cb80a..34d8a6102 100644 --- a/dashboard/config/linux/bits/android-subsystems.yml +++ b/dashboard/config/linux/bits/android-subsystems.yml @@ -29,3 +29,4 @@ config: - USB_CONFIGFS_F_HID - USB_CONFIGFS_F_UVC - USB_CONFIGFS_F_PRINTER + - ANDROID_BINDER_DEVICES: "binder0,binder1" diff --git a/dashboard/config/linux/bits/chromeos-subsystems.yml b/dashboard/config/linux/bits/chromeos-subsystems.yml index 7d83b7bcc..b1a58edf7 100644 --- a/dashboard/config/linux/bits/chromeos-subsystems.yml +++ b/dashboard/config/linux/bits/chromeos-subsystems.yml @@ -34,3 +34,5 @@ config: - USB_CONFIGFS_F_HID - USB_CONFIGFS_F_UVC - USB_CONFIGFS_F_PRINTER + - ANDROID_BINDERFS + - ANDROID_BINDER_DEVICES: "binder0,binder1" diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index 4cd339c57..45aef769c 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -939,12 +939,10 @@ config: - INTEL_IOMMU: [x86_64] - ANDROID_BINDER_IPC # Create binder device per test process for isolation. - - ANDROID_BINDER_DEVICES: "binder0,binder1,binder2,binder3,binder4,binder5,binder6,binder7,binder8,binder9,binder10,binder11,binder12,binder13,binder14,binder15,binder16,binder17,binder18,binder19,binder20,binder21,binder22,binder23,binder24,binder25,binder26,binder27,binder28,binder29,binder30,binder31" - # This should be disabled so that /dev/binder* devices are created, - # otherwise they won't be created. BinderFS actually provides a better way - # to create isolated instances, but if we enable it we also need to mount binderfs - # in executors/reproducers, etc. - - ANDROID_BINDERFS: n + # Earlier we defined here 32 devices and syzkaller allocated one per test process. + # When binderfs is used, we don't need that many - 2 is enough. + - ANDROID_BINDER_DEVICES: "binder0,binder1" + - ANDROID_BINDERFS - COUNTER - VALIDATE_FS_PARSER - PSTORE |