Skip to content

Commit 08b8f72

Browse files
csagan5chirayudesai
authored andcommitted
AImageReader CFI crash mitigations
Revert "gpu/android: Remove setup for disabling AImageReader." This reverts commit dcd5a39. Revert "Remove flags to enable/disable AImageReader." This reverts commit 463fa0f. Restore GPU bug blacklist for AImageReader on ARM and Qualcomm CPUs Restore the AImageReader blacklist for ARM/Qualcomm chipsets which causes crashes on Android 9 and 10 (at different code locations). See discussions at: * bromite/bromite#445 * bromite/bromite#814 * bromite/bromite#1005 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html Change-Id: I0db87f4107c94f68e846f06f365b8eefd0076599
1 parent 3ae3736 commit 08b8f72

12 files changed

Lines changed: 66 additions & 5 deletions

‎base/android/android_image_reader_compat.cc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@
2323
namespace base {
2424
namespace android {
2525

26+
bool AndroidImageReader::disable_support_ = false;
27+
2628
AndroidImageReader& AndroidImageReader::GetInstance() {
2729
// C++11 static local variable initialization is
2830
// thread-safe.
2931
static AndroidImageReader instance;
3032
return instance;
3133
}
3234

35+
void AndroidImageReader::DisableSupport() {
36+
disable_support_ = true;
37+
}
38+
3339
bool AndroidImageReader::IsSupported() {
34-
return is_supported_;
40+
return !disable_support_ && is_supported_;
3541
}
3642

3743
AndroidImageReader::AndroidImageReader() : is_supported_(LoadFunctions()) {}

‎base/android/android_image_reader_compat.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ class BASE_EXPORT AndroidImageReader {
2424
AndroidImageReader(const AndroidImageReader&) = delete;
2525
AndroidImageReader& operator=(const AndroidImageReader&) = delete;
2626

27+
// Disable image reader support.
28+
static void DisableSupport();
29+
2730
// Check if the image reader usage is supported. This function returns TRUE
2831
// if android version is >=OREO, image reader support is not disabled and all
2932
// the required functions are loaded.
@@ -61,6 +64,7 @@ class BASE_EXPORT AndroidImageReader {
6164
jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window);
6265

6366
private:
67+
static bool disable_support_;
6468
friend class base::NoDestructor<AndroidImageReader>;
6569

6670
AndroidImageReader();

‎chrome/browser/flag-metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,9 +2957,9 @@
29572957
"expiry_milestone": 125
29582958
},
29592959
{
2960-
"name": "enable-image-reader",
2961-
"owners": [ "vikassoni", "liberato" ],
2962-
"expiry_milestone": 125
2960+
"name": "enable-image-reader", // Bromite: do not expire
2961+
"owners": [ "vikassoni", "liberato" ], // flag
2962+
"expiry_milestone": -1
29632963
},
29642964
{
29652965
"name": "enable-immersive-fullscreen-toolbar",

‎gpu/config/gpu_driver_bug_list.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,22 @@
36883688
"no_downscaled_overlay_promotion"
36893689
]
36903690
},
3691+
{
3692+
"id":335,
3693+
"cr_bugs": [1051705],
3694+
"description": "Disable AImageReader on ARM GPUs",
3695+
"os": {
3696+
"type": "android",
3697+
"version": {
3698+
"op": "<",
3699+
"value": "10"
3700+
}
3701+
},
3702+
"gl_vendor": "ARM.*|Qualcomm.*",
3703+
"features": [
3704+
"disable_aimagereader"
3705+
]
3706+
},
36913707
{
36923708
"id": 381,
36933709
"cr_bugs": [

‎gpu/config/gpu_finch_features.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
6565
#endif
6666
);
6767

68+
69+
// Use android AImageReader when playing videos with MediaPlayer.
70+
const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
71+
base::FEATURE_ENABLED_BY_DEFAULT};
72+
6873
#if BUILDFLAG(IS_ANDROID)
6974
// Use android SurfaceControl API for managing display compositor's buffer queue
7075
// and using overlays on Android. Also used by webview to disable surface

‎gpu/config/gpu_finch_features.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace features {
1717
GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
1818

1919
// All features in alphabetical order. The features should be documented
20+
GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
2021
// alongside the definition of their values in the .cc file.
2122
#if BUILDFLAG(IS_ANDROID)
2223
GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

‎gpu/config/gpu_util.cc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
122122
#if !BUILDFLAG(IS_ANDROID)
123123
return kGpuFeatureStatusDisabled;
124124
#else
125+
if (blocklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
126+
return kGpuFeatureStatusBlocklisted;
127+
125128
if (!gpu_preferences.enable_android_surface_control)
126129
return kGpuFeatureStatusDisabled;
127130

@@ -347,6 +350,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
347350
gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
348351
kGpuFeatureStatusBlocklisted;
349352
}
353+
354+
if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
355+
gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
356+
kGpuFeatureStatusBlocklisted;
357+
}
350358
}
351359

352360
// Estimates roughly user total disk space by counting in the drives where

‎gpu/config/gpu_workaround_list.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ decode_encode_srgb_for_generatemipmap
1616
depth_stencil_renderbuffer_resize_emulation
1717
disable_2d_canvas_auto_flush
1818
disable_accelerated_av1_decode
19+
disable_aimagereader
1920
disable_accelerated_av1_encode
2021
disable_accelerated_h264_decode
2122
disable_accelerated_h264_encode

‎gpu/ipc/service/gpu_init.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
628628
}
629629
#endif // BUILDFLAG(IS_WIN)
630630

631+
// Disable AImageReader if the workaround is enabled.
632+
if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
633+
base::android::AndroidImageReader::DisableSupport();
634+
}
635+
631636
if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
632637
kGpuFeatureStatusEnabled ||
633638
!InitializeVulkan()) {

‎gpu/ipc/service/stream_texture_android.cc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <string.h>
88

9+
#include "base/android/android_image_reader_compat.h"
910
#include "base/android/scoped_hardware_buffer_fence_sync.h"
1011
#include "base/feature_list.h"
1112
#include "base/functional/bind.h"
@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
5051
}
5152

5253
TextureOwner::Mode GetTextureOwnerMode() {
53-
return features::IsAImageReaderEnabled()
54+
const bool a_image_reader_supported =
55+
base::android::AndroidImageReader::GetInstance().IsSupported();
56+
57+
// TODO(vikassoni) : Currently we have 2 different flags to enable/disable
58+
// AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2
59+
// flags into a single flag. Keeping the 2 flags separate for now since finch
60+
// experiment using this flag is in progress.
61+
return a_image_reader_supported && features::IsAImageReaderEnabled() &&
62+
base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer)
5463
? TextureOwner::Mode::kAImageReaderInsecure
5564
: TextureOwner::Mode::kSurfaceTextureInsecure;
5665
}

0 commit comments

Comments
 (0)