Merge branch 'main' into observability_plugin_crash

rachgreen33 · web-flow · commit c04e0be340f5 · 2025-09-16T15:39:42.000-04:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -99,6 +99,15 @@ jobs:
         if-no-files-found: error
         retention-days: 3
 
+    - name: remove unaccessed files from cache
+      shell: bash
+      run: >
+        find /tmp/bazel/cache
+        -type f
+        -name '*'
+        -amin +360
+        -exec rm {} \;
+
     - name: save bazel cache
       uses: actions/cache/save@v3
       if: always()
@@ -352,6 +361,15 @@ jobs:
         --per_file_copt=src/signature_util.cc,test/signature_util_test.cc@-DPROXY_WASM_VERIFY_WITH_ED25519_PUBKEY=\"$(xxd -p -c 256 test/test_data/signature_key1.pub | cut -b9-)\"
         //test:signature_util_test
 
+    - name: remove unaccessed files from cache
+      shell: bash
+      run: >
+        find /tmp/bazel/cache
+        -type f
+        -name '*'
+        -amin +360
+        -exec rm {} \;
+
     - name: save bazel cache
       uses: actions/cache/save@v3
       if: always()
diff --git a/bazel/cargo/wasmsign/Cargo.toml b/bazel/cargo/wasmsign/Cargo.toml
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 [package]
 edition = "2018"
 name = "wasmsign-bazel"
diff --git a/bazel/cargo/wasmtime/Cargo.toml b/bazel/cargo/wasmtime/Cargo.toml
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 [package]
 edition = "2021"
 name = "wasmtime-c-api-bazel"
diff --git a/bazel/external/Dockerfile.bazel b/bazel/external/Dockerfile.bazel
@@ -1,4 +1,18 @@
 # syntax=docker/dockerfile:1
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 # Prep:
 #   docker run --rm --privileged tonistiigi/binfmt --install all
diff --git a/bazel/external/dragonbox.BUILD b/bazel/external/dragonbox.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])  # Apache 2
diff --git a/bazel/external/fp16.BUILD b/bazel/external/fp16.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])  # MIT
diff --git a/bazel/external/intel_ittapi.BUILD b/bazel/external/intel_ittapi.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])
diff --git a/bazel/external/llvm.BUILD b/bazel/external/llvm.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
 licenses(["notice"])  # Apache 2
diff --git a/bazel/external/simdutf.BUILD b/bazel/external/simdutf.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])  # Apache 2
diff --git a/bazel/external/wamr.BUILD b/bazel/external/wamr.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
 licenses(["notice"])  # Apache 2
@@ -55,7 +69,7 @@ cmake(
         "@proxy_wasm_cpp_host//bazel:engine_wamr_jit": ["-ldl"],
         "//conditions:default": [],
     }),
-    out_static_libs = ["libvmlib.a"],
+    out_static_libs = ["libiwasm.a"],
     deps = select({
         "@proxy_wasm_cpp_host//bazel:engine_wamr_jit": ["@llvm-15_0_7//:llvm_wamr_lib"],
         "//conditions:default": [],
diff --git a/bazel/external/wamr_llvm.BUILD b/bazel/external/wamr_llvm.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
 licenses(["notice"])  # Apache 2
diff --git a/bazel/external/wasmedge.BUILD b/bazel/external/wasmedge.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
 licenses(["notice"])  # Apache 2
diff --git a/bazel/external/wasmtime.BUILD b/bazel/external/wasmtime.BUILD
@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rust//rust:defs.bzl", "rust_static_library")
 
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -268,10 +268,10 @@ def proxy_wasm_cpp_host_repositories():
         http_archive,
         name = "com_github_bytecodealliance_wasm_micro_runtime",
         build_file = "@proxy_wasm_cpp_host//bazel/external:wamr.BUILD",
-        # WAMR-2.1.1
-        sha256 = "a0824762abbcbb3dd6b7bb07530f198ece5d792a12a879bc2a99100590fdb151",
-        strip_prefix = "wasm-micro-runtime-WAMR-2.1.1",
-        url = "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-2.1.1.zip",
+        # WAMR-2.4.1
+        sha256 = "ca18bbf304f47287bf43707564db63b8908dd6d0d6ac40bb39271a7144def4cc",
+        strip_prefix = "wasm-micro-runtime-WAMR-2.4.1",
+        url = "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-2.4.1.zip",
     )
 
     native.bind(
diff --git a/include/proxy-wasm/null_vm.h b/include/proxy-wasm/null_vm.h
@@ -63,6 +63,8 @@ struct NullVm : public WasmVm {
   void terminate() override {}
   bool usesWasmByteOrder() override { return false; }
 
+  void warm() override {}
+
   std::string plugin_name_;
   std::unique_ptr<NullVmPlugin> plugin_;
 };
diff --git a/include/proxy-wasm/v8.h b/include/proxy-wasm/v8.h
@@ -21,6 +21,7 @@
 
 namespace proxy_wasm {
 
+bool initV8Engine();
 std::unique_ptr<WasmVm> createV8Vm();
 
 } // namespace proxy_wasm
diff --git a/include/proxy-wasm/wamr.h b/include/proxy-wasm/wamr.h
@@ -21,6 +21,7 @@
 
 namespace proxy_wasm {
 
+bool initWamrEngine();
 std::unique_ptr<WasmVm> createWamrVm();
 
 } // namespace proxy_wasm
diff --git a/include/proxy-wasm/wasm_vm.h b/include/proxy-wasm/wasm_vm.h
@@ -308,6 +308,11 @@ class WasmVm {
    */
   virtual bool usesWasmByteOrder() = 0;
 
+  /**
+   * Warm the VM such as engine and runtime.
+   */
+  virtual void warm() = 0;
+
   bool isFailed() { return failed_ != FailState::Ok; }
   void fail(FailState fail_state, std::string_view message) {
     if (fail_state == FailState::RuntimeError) {
diff --git a/include/proxy-wasm/wasmtime.h b/include/proxy-wasm/wasmtime.h
@@ -18,6 +18,7 @@
 
 namespace proxy_wasm {
 
+bool initWasmtimeEngine();
 std::unique_ptr<WasmVm> createWasmtimeVm();
 
 } // namespace proxy_wasm
diff --git a/src/pairs_util.cc b/src/pairs_util.cc
@@ -15,6 +15,7 @@
 
 #include "include/proxy-wasm/pairs_util.h"
 
+#include <cstdint>
 #include <cstring>
 #include <string_view>
 #include <vector>
@@ -25,6 +26,23 @@
 
 namespace proxy_wasm {
 
+namespace {
+
+// Read trivially copyable type from char buffer and return value. Does not
+// check if char buffer is large enough to contain instance of `T`.
+template <typename T> inline T unalignedLoad(const char *buffer) {
+  // Checking for undefined behaviour wrt std::memcpy.
+  static_assert(std::is_trivially_copyable_v<T>,
+                "type must be trivially copyable to use std::memcpy");
+  T result;
+  // Use std::memcpy to get around strict type aliasing rules.
+  std::memcpy(&result, buffer, sizeof(T));
+
+  return result;
+}
+
+} // namespace
+
 using Sizes = std::vector<std::pair<uint32_t, uint32_t>>;
 
 size_t PairsUtil::pairsSize(const Pairs &pairs) {
@@ -113,10 +131,13 @@ Pairs PairsUtil::toPairs(std::string_view buffer) {
   if (pos + sizeof(uint32_t) > end) {
     return {};
   }
-  uint32_t num_pairs = wasmtoh(*reinterpret_cast<const uint32_t *>(pos),
-                               contextOrEffectiveContext() != nullptr
-                                   ? contextOrEffectiveContext()->wasmVm()->usesWasmByteOrder()
-                                   : false);
+
+  // clang complains that this is unused when the wasmtoh macro drops its
+  // second argument on non-big-endian platforms.
+  [[maybe_unused]] const bool uses_wasm_byte_order =
+      contextOrEffectiveContext() != nullptr &&
+      contextOrEffectiveContext()->wasmVm()->usesWasmByteOrder();
+  uint32_t num_pairs = wasmtoh(unalignedLoad<uint32_t>(pos), uses_wasm_byte_order);
   pos += sizeof(uint32_t);
 
   // Check if we're not going to exceed the limit.
@@ -135,20 +156,14 @@ Pairs PairsUtil::toPairs(std::string_view buffer) {
     if (pos + sizeof(uint32_t) > end) {
       return {};
     }
-    s.first = wasmtoh(*reinterpret_cast<const uint32_t *>(pos),
-                      contextOrEffectiveContext() != nullptr
-                          ? contextOrEffectiveContext()->wasmVm()->usesWasmByteOrder()
-                          : false);
+    s.first = wasmtoh(unalignedLoad<uint32_t>(pos), uses_wasm_byte_order);
     pos += sizeof(uint32_t);
 
     // Read value length.
     if (pos + sizeof(uint32_t) > end) {
       return {};
     }
-    s.second = wasmtoh(*reinterpret_cast<const uint32_t *>(pos),
-                       contextOrEffectiveContext() != nullptr
-                           ? contextOrEffectiveContext()->wasmVm()->usesWasmByteOrder()
-                           : false);
+    s.second = wasmtoh(unalignedLoad<uint32_t>(pos), uses_wasm_byte_order);
     pos += sizeof(uint32_t);
   }
 
diff --git a/src/wamr/wamr.cc b/src/wamr/wamr.cc
diff --git a/src/wasmedge/wasmedge.cc b/src/wasmedge/wasmedge.cc
diff --git a/src/wasmtime/wasmtime.cc b/src/wasmtime/wasmtime.cc
diff --git a/test/wasm_vm_test.cc b/test/wasm_vm_test.cc
