Skip to content

Commit b4f4d21

Browse files
phlaxRiverPhillipsPiotrSikorakeithdio
authored
[backport/1.22] deps: Bump com_github_wasmtime -> 2.0.2 (#24086) (#24089)
* deps: bump `com_github_wasmtime` -> 1.0.0 (#23232) Signed-off-by: river phillips <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * wasm: update WAVM to nightly/2022-05-14. (#22491) Signed-off-by: Piotr Sikora <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * wasm: update Proxy-Wasm C++ Host to latest. (#22575) Signed-off-by: Piotr Sikora <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * deps: Bump `com_github_wasmtime` -> 1.0.2 (#24086) Fix: - CVE-2022-39392 - CVE-2022-39393 - CVE-2022-39394 Signed-off-by: Ryan Northey <[email protected]> * bazel: update rules_rust This gets us on rust 1.60 Signed-off-by: Keith Smiley <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * deps: Bump `rules_rust` -> 0.8.1 (#22253) Fix #22073 Signed-off-by: Ryan Northey <[email protected]> * wasm: fix V8 build on older versions of Linux. (#22228) wasm: fix build on older versions of Linux. Signed-off-by: Piotr Sikora <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * backport: macOS: Allow to load .wasm on Apple silicon (#23299) backport: macOS: Enable wasm and allow to load .wasm on Apple silicon This applies https://chromium-review.googlesource.com/c/v8/v8/+/3700352 as a fix for MemoryAllocator::PartialFreeMemory() which shouldn't try to change permissions of RWX pages. This mainly affects macOS > 11.2 due to mprotect behavior changes (#23243) on Apple silicon. This is cherry-picked from: 63f27a6 Signed-off-by: Dhi Aurrahman <[email protected]> Signed-off-by: Dhi Aurrahman <[email protected]> Signed-off-by: Ryan Northey <[email protected]> * deps: Bump `v8` to 10.7.193.13 and `proxy_wasm_cpp_host` to b0a0594 (#23434) Signed-off-by: Dhi Aurrahman <[email protected]> * ci: Disable wasm coverage tests (#24169) and adjust-coverage-total Signed-off-by: Ryan Northey <[email protected]> Signed-off-by: phlax <[email protected]> * deps: Bump `com_github_wasmtime` -> 2.0.2 (+related) (#24150) deps: Bump `com_github_wasmtime` -> 2.0.2 - `proxy_wasm_cpp_host` - `proxy_wasm_rust_sdk` Signed-off-by: Ryan Northey <[email protected]> Signed-off-by: river phillips <[email protected]> Signed-off-by: Ryan Northey <[email protected]> Signed-off-by: Piotr Sikora <[email protected]> Signed-off-by: Dhi Aurrahman <[email protected]> Signed-off-by: phlax <[email protected]> Co-authored-by: River <[email protected]> Co-authored-by: Piotr Sikora <[email protected]> Co-authored-by: Keith Smiley <[email protected]> Co-authored-by: Dhi Aurrahman <[email protected]>
1 parent dcf0599 commit b4f4d21

File tree

9 files changed

+76
-350
lines changed

9 files changed

+76
-350
lines changed

‎bazel/envoy_select.bzl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ def envoy_select_wasm_cpp_tests(xs):
5252
def envoy_select_wasm_rust_tests(xs):
5353
return select({
5454
"@envoy//bazel:wasm_disabled": [],
55+
# TODO(phlax): re-enable once issues with llvm profiler are resolved
56+
# (see https://github.com/envoyproxy/envoy/issues/24164)
57+
"@envoy//bazel:coverage_build": [],
5558
"//conditions:default": xs,
5659
})
5760

@@ -63,6 +66,9 @@ def envoy_select_wasm_v8(xs):
6366
"@envoy//bazel:wasm_wasmtime": [],
6467
"@envoy//bazel:wasm_wavm": [],
6568
"@envoy//bazel:wasm_disabled": [],
69+
# TODO(phlax): re-enable once issues with llvm profiler are resolved
70+
# (see https://github.com/envoyproxy/envoy/issues/24164)
71+
"@envoy//bazel:coverage_build": [],
6672
"//conditions:default": xs, # implicit default (v8)
6773
})
6874

@@ -74,6 +80,9 @@ def envoy_select_wasm_v8_bool():
7480
"@envoy//bazel:wasm_wasmtime": False,
7581
"@envoy//bazel:wasm_wavm": False,
7682
"@envoy//bazel:wasm_disabled": False,
83+
# TODO(phlax): re-enable once issues with llvm profiler are resolved
84+
# (see https://github.com/envoyproxy/envoy/issues/24164)
85+
"@envoy//bazel:coverage_build": False,
7786
"//conditions:default": True, # implicit default (v8)
7887
})
7988

‎bazel/repositories.bzl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ def envoy_dependencies(skip_targets = []):
197197
_com_github_envoyproxy_sqlparser()
198198
_v8()
199199
_com_googlesource_chromium_base_trace_event_common()
200-
_com_googlesource_chromium_zlib()
201200
_com_github_google_quiche()
202201
_com_googlesource_googleurl()
203202
_com_lightstep_tracer_cpp()
@@ -875,16 +874,6 @@ def _com_googlesource_chromium_base_trace_event_common():
875874
actual = "@com_googlesource_chromium_base_trace_event_common//:trace_event_common",
876875
)
877876

878-
def _com_googlesource_chromium_zlib():
879-
external_http_archive(
880-
name = "com_googlesource_chromium_zlib",
881-
build_file = "@v8//:bazel/BUILD.zlib",
882-
)
883-
native.bind(
884-
name = "zlib_compression_utils",
885-
actual = "@com_googlesource_chromium_zlib//:zlib_compression_utils",
886-
)
887-
888877
def _com_github_google_quiche():
889878
external_http_archive(
890879
name = "com_github_google_quiche",

‎bazel/repository_locations.bzl

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -788,11 +788,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
788788
project_name = "WAVM",
789789
project_desc = "WebAssembly Virtual Machine",
790790
project_url = "https://wavm.github.io",
791-
version = "c8997ebf154f3b42e688e670a7d0fa045b7a32a0",
792-
sha256 = "bf2b2aec8a4c6a5413081c0527cb40dd16cb67e9c74a91f8a82fe1cf27a3c5d5",
791+
version = "3f9a150cac7faf28eab357a2c5b83d2ec740c7d9",
792+
sha256 = "82e05ade03fdac60cf863972d3e7420a771ef4a18afad26ac442554ab0be1207",
793793
strip_prefix = "WAVM-{version}",
794794
urls = ["https://github.com/WAVM/WAVM/archive/{version}.tar.gz"],
795-
release_date = "2021-12-15",
795+
release_date = "2022-05-14",
796796
use_category = ["dataplane_ext"],
797797
extensions = ["envoy.wasm.runtime.wavm"],
798798
cpe = "cpe:2.3:a:webassembly_virtual_machine_project:webassembly_virtual_machine:*",
@@ -801,11 +801,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
801801
project_name = "wasmtime",
802802
project_desc = "A standalone runtime for WebAssembly",
803803
project_url = "https://github.com/bytecodealliance/wasmtime",
804-
version = "0.39.1",
805-
sha256 = "6ef70886da14245f575c6ff8c7c999ae22579257eba5ebf382e066598c1e381c",
804+
version = "2.0.2",
805+
sha256 = "f850c7d2480e71b587a7102d8814e127dc9bf8370ffa0e382fe86ec80d629190",
806806
strip_prefix = "wasmtime-{version}",
807807
urls = ["https://github.com/bytecodealliance/wasmtime/archive/v{version}.tar.gz"],
808-
release_date = "2022-07-21",
808+
release_date = "2022-11-10",
809809
use_category = ["dataplane_ext"],
810810
extensions = ["envoy.wasm.runtime.wasmtime"],
811811
cpe = "cpe:2.3:a:bytecodealliance:wasmtime:*",
@@ -861,44 +861,29 @@ REPOSITORY_LOCATIONS_SPEC = dict(
861861
project_name = "V8",
862862
project_desc = "Google’s open source high-performance JavaScript and WebAssembly engine, written in C++",
863863
project_url = "https://v8.dev",
864-
# NOTE: Update together with com_googlesource_chromium_base_trace_event_common and com_googlesource_chromium_zlib.
865-
version = "10.4.132.18",
864+
# NOTE: Update together with com_googlesource_chromium_base_trace_event_common.
865+
version = "10.7.193.13",
866866
# Static snapshot created using https://storage.googleapis.com/envoyproxy-wee8/wee8-fetch-deps.sh.
867-
sha256 = "154223731091f531a3cb1a95ab9c14225983891240220a9e232c729358badd2c",
867+
sha256 = "2170df76ce5d7ecd7fb8d131370d210152f200273cba126f06d8b88fb53c9fbc",
868868
urls = ["https://storage.googleapis.com/envoyproxy-wee8/v8-{version}.tar.gz"],
869869
use_category = ["dataplane_ext"],
870870
extensions = ["envoy.wasm.runtime.v8"],
871-
release_date = "2022-07-11",
871+
release_date = "2022-10-12",
872872
cpe = "cpe:2.3:a:google:v8:*",
873873
),
874874
com_googlesource_chromium_base_trace_event_common = dict(
875875
project_name = "Chromium's trace event headers",
876876
project_desc = "Chromium's trace event headers",
877877
project_url = "https://chromium.googlesource.com/chromium/src/base/trace_event/common/",
878-
# NOTE: Update together with v8 and com_googlesource_chromium_zlib.
878+
# NOTE: Update together with v8.
879879
# Use version and sha256 from https://storage.googleapis.com/envoyproxy-wee8/v8-<v8_version>-deps.sha256.
880-
version = "d115b033c4e53666b535cbd1985ffe60badad082",
880+
version = "521ac34ebd795939c7e16b37d9d3ddb40e8ed556",
881881
# Static snapshot created using https://storage.googleapis.com/envoyproxy-wee8/wee8-fetch-deps.sh.
882-
sha256 = "976bc8efe682d821bd112861e71da3728134609193e0d334dee1afa90d3dc027",
882+
sha256 = "d99726bd452d1dd6cd50ab33060774e8437d9f0fc6079589f657fe369c66ec09",
883883
urls = ["https://storage.googleapis.com/envoyproxy-wee8/chromium-base_trace_event_common-{version}.tar.gz"],
884884
use_category = ["dataplane_ext"],
885885
extensions = ["envoy.wasm.runtime.v8"],
886-
release_date = "2022-01-19",
887-
cpe = "N/A",
888-
),
889-
com_googlesource_chromium_zlib = dict(
890-
project_name = "Chromium's zlib",
891-
project_desc = "Chromium’s fork of zlib with compression utils",
892-
project_url = "https://chromium.googlesource.com/chromium/src/third_party/zlib/",
893-
# NOTE: Update together with v8 and com_googlesource_chromium_base_trace_event_common.
894-
# Use version and sha256 from https://storage.googleapis.com/envoyproxy-wee8/v8-<v8_version>-deps.sha256.
895-
version = "64bbf988543996eb8df9a86877b32917187eba8f",
896-
# Static snapshot created using https://storage.googleapis.com/envoyproxy-wee8/wee8-fetch-deps.sh.
897-
sha256 = "6e70bbb25ad1c567e3b44f4ad76f50fcc8fb7d34c6e2e8858e033ffd579ac1af",
898-
urls = ["https://storage.googleapis.com/envoyproxy-wee8/chromium-zlib-{version}.tar.gz"],
899-
use_category = ["dataplane_ext"],
900-
extensions = ["envoy.wasm.runtime.v8"],
901-
release_date = "2022-05-31",
886+
release_date = "2022-10-12",
902887
cpe = "N/A",
903888
),
904889
com_github_google_quiche = dict(
@@ -1090,8 +1075,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
10901075
project_name = "WebAssembly for Proxies (C++ host implementation)",
10911076
project_desc = "WebAssembly for Proxies (C++ host implementation)",
10921077
project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
1093-
version = "9387a5b77418e41bbf2b0909c68c14db42a1e743",
1094-
sha256 = "cc67ec35fe58e214ff19fb07435e6cfbf62493dbb543ca65017a8162c2baa137",
1078+
version = "624ef2edac2cdc086e0339f36b32ef1a2ed7e270",
1079+
sha256 = "06077aa78c4a0349f4887ef9910c08b22eb842b2732750d298856dbf37adf251",
10951080
strip_prefix = "proxy-wasm-cpp-host-{version}",
10961081
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
10971082
use_category = ["dataplane_ext"],
@@ -1107,19 +1092,19 @@ REPOSITORY_LOCATIONS_SPEC = dict(
11071092
"envoy.wasm.runtime.wavm",
11081093
"envoy.wasm.runtime.wasmtime",
11091094
],
1110-
release_date = "2022-08-01",
1095+
release_date = "2022-11-22",
11111096
cpe = "N/A",
11121097
),
11131098
proxy_wasm_rust_sdk = dict(
11141099
project_name = "WebAssembly for Proxies (Rust SDK)",
11151100
project_desc = "WebAssembly for Proxies (Rust SDK)",
11161101
project_url = "https://github.com/proxy-wasm/proxy-wasm-rust-sdk",
1117-
version = "0.2.0",
1118-
sha256 = "010249eac821641b32813670d0ec8a372899a70a7769de5e52e0292d8cd7e0d5",
1102+
version = "0.2.1",
1103+
sha256 = "23f3f2d8c4c8069a2e72693b350d7442b7722d334f73169eea78804ff70cde20",
11191104
strip_prefix = "proxy-wasm-rust-sdk-{version}",
11201105
urls = ["https://github.com/proxy-wasm/proxy-wasm-rust-sdk/archive/v{version}.tar.gz"],
11211106
use_category = ["test_only"],
1122-
release_date = "2022-04-08",
1107+
release_date = "2022-11-22",
11231108
cpe = "N/A",
11241109
),
11251110
emsdk = dict(
@@ -1138,12 +1123,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
11381123
project_name = "Bazel rust rules",
11391124
project_desc = "Bazel rust rules (used by Wasm)",
11401125
project_url = "https://github.com/bazelbuild/rules_rust",
1141-
version = "0.2.1",
1142-
sha256 = "b58c63a6d8221f408f8852b4f74f81bc8c7aac9273f3899a74e32e6168a2c624",
1126+
version = "0.8.1",
1127+
sha256 = "05e15e536cc1e5fd7b395d044fc2dabf73d2b27622fbc10504b7e48219bb09bc",
11431128
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-v{version}.tar.gz"],
11441129
use_category = ["dataplane_ext"],
11451130
extensions = ["envoy.wasm.runtime.wasmtime"],
1146-
release_date = "2022-04-04",
1131+
release_date = "2022-07-26",
11471132
cpe = "N/A",
11481133
),
11491134
rules_antlr = dict(

‎bazel/rules_rust.patch

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@@ -269,6 +269,13 @@ def triple_to_constraint_set(target_triple):
66
"@rules_rust//rust/platform/os:unknown",
77
]
8-
8+
99
+ # Workaround for https://github.com/bazelbuild/bazel/issues/14982
1010
+ if target_triple in ("armv7-linux-androideabi", "thumbv7neon-linux-androideabi"):
1111
+ return [
@@ -14,5 +14,18 @@
1414
+ ]
1515
+
1616
triple_struct = triple(target_triple)
17-
17+
1818
constraint_set = []
19+
20+
21+
--- rust/private/rustc.bzl
22+
+++ rust/private/rustc.bzl
23+
@@ -1024,7 +1024,7 @@ def rustc_compile_action(
24+
),
25+
]
26+
27+
- if crate_info.type in ["staticlib", "cdylib"]:
28+
+ if crate_info.type in ["staticlib", "cdylib"] and not out_binary:
29+
# These rules are not supposed to be depended on by other rust targets, and
30+
# as such they shouldn't provide a CrateInfo. However, one may still want to
31+
# write a rust_test for them, so we provide the CrateInfo wrapped in a provider

0 commit comments

Comments
 (0)