Resolve SIGILL errors on Pixel 6 devices caused by a binary mismatch

Filter fuzzing jobs to ensure Pixel 6 compatibility for Pixel 6 devices.
Prevent Pixel 6 devices from falling back to the generic `jobs-android` queue.

Author: AYUSHMAAN-B

src/clusterfuzz/_internal/base/tasks/__init__.py

@@ -34,6 +34,7 @@
 from clusterfuzz._internal.google_cloud_utils import pubsub
 from clusterfuzz._internal.google_cloud_utils import storage
 from clusterfuzz._internal.metrics import logs
+from clusterfuzz._internal.platforms.android import constants
 from clusterfuzz._internal.system import environment
 
 # Task queue prefixes for various job types.
@@ -395,14 +396,20 @@ def get_task():
       return task
 
     if environment.is_android():
-      logs.info(f'Could not get task from {regular_queue()}. Trying from'
-                f'default android queue {default_android_queue()}.')
-      task = get_regular_task(default_android_queue())
-      if task:
-        # Log the task details for debug purposes.
-        logs.info(f'Got task with cmd {task.command} args {task.argument} '
-                  f'job {task.job} from {default_android_queue()} queue.')
-        return task
+      if environment.platform() not in \
+      constants.DEVICES_WITH_NO_FALLBACK_QUEUE_LIST:
+        logs.info(f'Could not get task from {regular_queue()}. Trying from'
+                  f'default android queue {default_android_queue()}.')
+        task = get_regular_task(default_android_queue())
+        if task:
+          # Log the task details for debug purposes.
+          logs.info(f'Got task with cmd {task.command} args {task.argument} '
+                    f'job {task.job} from {default_android_queue()} queue.')
+          return task
+      else:
+        logs.info(f'{environment.platform()} is part of devices with no '
+                  f'fallback list. Hence skipping picking up tasks from '
+                  f'default {default_android_queue()} queue.')
 
   logs.info(f'Could not get task from {regular_queue()}. Fuzzing.')
 

src/clusterfuzz/_internal/fuzzing/fuzzer_selection.py

@@ -22,6 +22,7 @@
 from clusterfuzz._internal.datastore import fuzz_target_utils
 from clusterfuzz._internal.datastore import ndb_utils
 from clusterfuzz._internal.metrics import logs
+from clusterfuzz._internal.platforms.android import constants
 from clusterfuzz._internal.system import environment
 
 # Used to prepare targets to be passed to utils.random_weighted_choice.
@@ -133,9 +134,16 @@ def get_fuzz_task_payload(platform=None):
 
   platforms = [platform]
   base_platform = platform.split(':')[0]
-  # Generalized queue for platforms with a base platform (e.g. ANDROID)
-  if base_platform != platform:
-    platforms.append(base_platform)
+
+  # Conditionally append the base platform (e.g. ANDROID) as a job filter,
+  # unless the platform is restricted or is the base platform itself.
+  if platform != base_platform:
+    if platform not in constants.DEVICES_WITH_NO_FALLBACK_QUEUE_LIST:
+      platforms.append(base_platform)
+    else:
+      logs.info(f'{platform} is part of devices with no fallback list. '
+                f'Hence skipping inclusion of the generic platform '
+                f'({base_platform}) while querying.')
 
   if environment.is_production():
     query = data_types.FuzzerJobs.query()

src/clusterfuzz/_internal/platforms/android/constants.py

@@ -82,3 +82,7 @@
     'redfin',  # Pixel 5
     'barbet',  # Pixel 5a
 ]
+
+# Restrict pixel6 from picking up generic Android jobs to avoid
+# Binary Mismatch: Hence, 'ANDROID:PIXEL6' is added to the list.
+DEVICES_WITH_NO_FALLBACK_QUEUE_LIST = ['ANDROID:PIXEL6']

src/clusterfuzz/_internal/tests/core/fuzzing/fuzzer_selection_test.py

@@ -292,6 +292,39 @@ def test_platform_restriction(self, local_development):
     argument, job = fuzzer_selection.get_fuzz_task_payload('linux')
     self.assertEqual(('right_fuzzer_1', 'job_2'), (argument, job))
 
+    android_mapping = data_types.FuzzerJob()
+    android_mapping.fuzzer = 'android_fuzzer'
+    android_mapping.job = 'job_android'
+    android_mapping.platform = 'ANDROID'
+    android_mapping.put()
+
+    pixel_mapping = data_types.FuzzerJob()
+    pixel_mapping.fuzzer = 'pixel_fuzzer'
+    pixel_mapping.job = 'job_pixel6'
+    pixel_mapping.platform = 'ANDROID:PIXEL6'
+    pixel_mapping.put()
+
+    data_types.FuzzerJobs(
+        platform='ANDROID', fuzzer_jobs=[android_mapping]).put()
+    data_types.FuzzerJobs(platform='ANDROID:PIXEL6', fuzzer_jobs=[]).put()
+
+    # Production Environment
+    if local_development == 'False':
+      argument, job = fuzzer_selection.get_fuzz_task_payload('ANDROID')
+      self.assertEqual(('android_fuzzer', 'job_android'), (argument, job))
+
+      # PIXEL6 bots must ignore jobs that are not explicitly marked as
+      # Pixel6-compatible.
+      argument, job = fuzzer_selection.get_fuzz_task_payload('ANDROID:PIXEL6')
+      self.assertEqual((None, None), (argument, job))
+    # Local Enviroment
+    else:
+      argument, job = fuzzer_selection.get_fuzz_task_payload('ANDROID')
+      self.assertEqual(('android_fuzzer', 'job_android'), (argument, job))
+
+      argument, job = fuzzer_selection.get_fuzz_task_payload('ANDROID:PIXEL6')
+      self.assertEqual(('pixel_fuzzer', 'job_pixel6'), (argument, job))
+
 
 @test_utils.with_cloud_emulators('datastore')
 class UpdatePlatformForJobTest(unittest.TestCase):