0

Revert "Reland "[fuchsia] Remove use of ambient VMEX capabilities""

This reverts commit c11a4d7497.

Reason for revert: Breaks web-based tests on core.x64-release-chromium_latest (e.g. text-input-test), due to tests not offering
VmexResource in the service-directory of the test web contexts.

Original change's description:
> Reland "[fuchsia] Remove use of ambient VMEX capabilities"
>
> This is a reland of commit 32d1466c6d,
> after addressing security policy & routing issues up-stream.
>
> - Remove job_policy_ambient_mark_vmo_exec from all component
>   manifests.
> - Remove most usage of the ambient-VMEX-capable ELF test runner.
>
> Some use of the ambient-VMEX ELF runner remains, to support tests
> which run SwiftShader in-process, which requires ambient-VMEX for its
> shader JIT.
>
> The test CML fragment for the VMEX-capable ELF test runner is also
> still required by out-of-tree dependencies, notably ANGLE.
>
> Bug: 1290907, 1185811, 1022542
> Cq-Include-Trybots: luci.chrome.try:fuchsia-smoke-astro,fuchsia-smoke-sherlock
> Change-Id: I3c8265ed3ed4bd3b2bdca154c7bd81f0a5ef31c7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4589192
> Commit-Queue: Wez <wez@chromium.org>
> Owners-Override: Wez <wez@chromium.org>
> Reviewed-by: David Dorwin <ddorwin@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1159323}

Bug: 1290907, 1185811, 1022542
Change-Id: I0a8d2bac20430de8f18243559a552221c1c8814e
Cq-Include-Trybots: luci.chrome.try:fuchsia-smoke-astro,fuchsia-smoke-sherlock
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4622610
Quick-Run: Wez <wez@chromium.org>
Owners-Override: Wez <wez@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1159417}
This commit is contained in:
Wez
2023-06-18 21:43:03 +00:00
committed by Chromium LUCI CQ
parent f6f12056b5
commit 0191f219e9
25 changed files with 77 additions and 43 deletions

@ -932,15 +932,12 @@ cc_test("cc_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1022542): Some of these tests use SwiftShader,
# which requires ambient VMEX.
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",
]

@ -19,6 +19,9 @@
// now.
forward_stdout_to: "log",
forward_stderr_to: "log",
// Required to allow JIT in child processes such as renderers.
job_policy_ambient_mark_vmo_exec: "true",
},
capabilities: [
{

@ -4887,6 +4887,7 @@ if (!is_android) {
if (is_fuchsia) {
use_test_server = true
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
excluded_paths = fuchsia_package_exclusions
additional_manifest_fragments = [
"//build/config/fuchsia/test/audio_output.shard.test-cml",
@ -9404,11 +9405,11 @@ test("unit_tests") {
data += [ "//testing/buildbot/filters/fuchsia.unit_tests.filter" ]
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",
@ -10933,6 +10934,7 @@ if (!is_android) {
if (is_fuchsia) {
use_test_server = true
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
@ -11001,6 +11003,7 @@ if (!is_android) {
if (is_fuchsia) {
use_test_server = true
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/network.shard.test-cml",
"//build/config/fuchsia/test/present_view.shard.test-cml",

@ -106,11 +106,12 @@ test("components_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//build/config/fuchsia/test/present_view.shard.test-cml",
@ -1024,6 +1025,7 @@ if (use_blink) {
}
if (is_fuchsia) {
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/present_view.shard.test-cml",
"//build/config/fuchsia/test/fonts.shard.test-cml",

@ -41,8 +41,8 @@ viz_test("viz_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1022542): Some of these tests use SwiftShader,
# which requires ambient VMEX.
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [

@ -5,7 +5,7 @@
include: [
"syslog/client.shard.cml",
"vulkan/client.shard.cml",
"//build/config/fuchsia/test/elf_test_runner.shard.test-cml",
"//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml",
"//build/config/fuchsia/test/chromium_test_facet.shard.test-cml",
"//build/config/fuchsia/test/test_fonts.shard.test-cml",
],

@ -2171,6 +2171,7 @@ test("content_browsertests") {
if (is_fuchsia) {
use_test_server = true
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/audio_output.shard.test-cml",
"//build/config/fuchsia/test/fonts.shard.test-cml",
@ -2779,11 +2780,12 @@ test("content_unittests") {
"../browser/renderer_host/media/fuchsia_media_codec_provider_impl_unittest.cc",
]
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//build/config/fuchsia/test/platform_video_codecs.shard.test-cml",

@ -279,9 +279,11 @@ test("extensions_unittests") {
]
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",

@ -237,6 +237,8 @@ test("cast_runner_browsertests") {
"//testing/gtest",
"//ui/ozone",
]
test_runner_shard =
"//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",

@ -10,7 +10,7 @@
// to function correctly.
// TODO(crbug.com/1410937): Run as a non-test component.
"//build/config/fuchsia/test/chromium_system_test_facet.shard.test-cml",
"//build/config/fuchsia/test/elf_test_runner.shard.test-cml",
"//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml",
"sys/component/realm_builder_absolute.shard.cml",
"syslog/client.shard.cml",

@ -19,6 +19,9 @@
// component is running only as a launcher of this child.
"--no-relaunch",
],
// Required to allow JIT in child processes such as renderers.
job_policy_ambient_mark_vmo_exec: "true",
},
use: [
{

@ -10,7 +10,7 @@
// to function correctly.
// TODO(crbug.com/1410937): Run as a non-test component.
"//build/config/fuchsia/test/chromium_system_test_facet.shard.test-cml",
"//build/config/fuchsia/test/elf_test_runner.shard.test-cml",
"//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml",
"sys/component/realm_builder_absolute.shard.cml",
"syslog/client.shard.cml",

@ -19,6 +19,9 @@
// is running only as a launcher of this child.
"--no-relaunch",
],
// Required to allow JIT in child processes such as renderers.
job_policy_ambient_mark_vmo_exec: "true",
},
use: [
// Required if not run with --headless.

@ -616,6 +616,8 @@ test("web_engine_browsertests") {
"//ui/ozone",
]
test_runner_shard =
"//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",

@ -5,6 +5,9 @@
program: {
runner: "elf",
binary: "web_engine_exe",
// Required to allow JIT in child processes such as renderers.
job_policy_ambient_mark_vmo_exec: "true",
},
capabilities: [
{

@ -247,6 +247,9 @@ test("gin_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments =
[ "//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml" ]
}

@ -749,11 +749,12 @@ test("headless_browsertests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",

@ -91,6 +91,8 @@ test("services_unittests") {
}
if (is_fuchsia) {
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",

@ -382,9 +382,11 @@ test("blink_common_unittests") {
if (is_ios) {
bundle_deps = [ ":blink_common_unittests_pak_bundle_data" ]
}
if (is_fuchsia) {
additional_manifest_fragments =
[ "//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml" ]
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
}
data_deps = [ ":common_unittests_data" ]

@ -177,12 +177,12 @@ test("blink_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/fonts.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
]
}

@ -1994,6 +1994,10 @@ test("blink_platform_unittests") {
"//build/config/fuchsia/test/test_fonts.shard.test-cml",
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
]
# Oilpan reuses V8's v8::PageAllocator which generally requires JIT
# permissions.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
}
if (is_android) {
@ -2490,6 +2494,7 @@ test("blink_fuzzer_unittests") {
}
if (is_fuchsia) {
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
"//build/config/fuchsia/test/test_fonts.shard.test-cml",
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",

@ -127,11 +127,12 @@ test("blink_heap_unittests") {
if (is_fuchsia) {
additional_manifest_fragments = [
"//build/config/fuchsia/test/test_fonts.shard.test-cml",
# Oilpan reuses V8's v8::PageAllocator which generally requires JIT
# permissions.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
]
# Oilpan reuses V8's v8::PageAllocator which generally requires JIT
# permissions.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
}
}
@ -194,6 +195,7 @@ test("blink_heap_perftests") {
# permissions.
additional_manifest_fragments =
[ "//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml" ]
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
}
}

@ -337,9 +337,11 @@ test("accessibility_unittests") {
configs += [ "//v8:external_startup_data" ]
if (is_fuchsia) {
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/network.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",

@ -276,13 +276,10 @@ test("compositor_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1022542): Some of these tests use SwiftShader,
# which requires ambient VMEX.
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/present_view.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",

@ -129,13 +129,11 @@ test("snapshot_unittests") {
}
if (is_fuchsia) {
# TODO(https://crbug.com/1022542): Some of these tests use SwiftShader,
# which requires ambient VMEX.
# TODO(https://crbug.com/1185811): Investigate removing the requirement for
# job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
additional_manifest_fragments = [
# TODO(https://crbug.com/1185811): Investigate removing the requirement
# for VmexResource.
"//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
"//build/config/fuchsia/test/present_view.shard.test-cml",
"//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",