Upstreaming of proxy-wasm Part 1.

bazel/repositories.bzl

@@ -146,6 +146,8 @@ def envoy_dependencies(skip_targets = []):
     _io_opentracing_cpp()
     _net_zlib()
     _upb()
+    _proxy_wasm_cpp_sdk()
+    _proxy_wasm_cpp_host()
     _repository_impl("com_googlesource_code_re2")
     _com_google_cel_cpp()
     _repository_impl("bazel_toolchains")
@@ -741,6 +743,16 @@ def _com_github_gperftools_gperftools():
         actual = "@envoy//bazel/foreign_cc:gperftools",
     )
 
+def _proxy_wasm_cpp_sdk():
+    _repository_impl(
+        name = "proxy_wasm_cpp_host",
+    )
+
+def _proxy_wasm_cpp_host():
+    _repository_impl(
+        name = "proxy_wasm_cpp_sdk",
+    )
+
 def _kafka_deps():
     # This archive contains Kafka client source code.
     # We are using request/response message format files to generate parser code.

bazel/repository_locations.bzl

@@ -319,4 +319,14 @@ REPOSITORY_LOCATIONS = dict(
         strip_prefix = "kafka-python-2.0.0",
         urls = ["https://github.com/dpkp/kafka-python/archive/2.0.0.tar.gz"],
     ),
+    proxy_wasm_cpp_sdk = dict(
+        sha256 = "14f66f67e8f37ec81d28d7f5307be4407d206ac5f0daaf6d22fa5536797bcac1",
+        strip_prefix = "proxy-wasm-cpp-sdk-31f1fc5b7e09f231fa532d2d296e479a113c3e10",
+        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/31f1fc5b7e09f231fa532d2d296e479a113c3e10.tar.gz"],
+    ),
+    proxy_wasm_cpp_host = dict(
+        sha256 = "d1fb98a40b38b99393b56b3509dac5f01a769512aebc86dcc37782ba29549517",
+        strip_prefix = "proxy-wasm-cpp-host-8c33ecf3784b00d0bc6b88bbe9de6d4e51239f88",
+        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/8c33ecf3784b00d0bc6b88bbe9de6d4e51239f88.tar.gz"],
+    ),
 )

include/abi/wasm/proxy_wasm_exports.h

@@ -28,7 +28,7 @@
  * Called when the VM starts by the first plugin to use the VM.
  * @param root_context_id is an identifier for one or more related plugins.
  * @param vm_configuration_size is the size of any configuration available via
- * proxy_get_configuration during the lifetime of this call.
+ * proxy_get_buffer_bytes() during the lifetime of this call.
  * @return non-zero on success and zero on failure (e.g. bad configuration).
  */
 enum class WasmOnVmStartResult : uint32_t {
@@ -44,7 +44,7 @@ extern "C" WasmOnVmStartResult proxy_on_vm_start(uint32_t root_context_id,
  * configuration.
  * @param root_context_id is a unique identifier for the configuration verification context.
  * @param configuration_size is the size of any configuration available via
- * proxy_get_configuration().
+ * proxy_get_buffer_bytes().
  * @return non-zero on success and zero on failure (i.e. bad configuration).
  */
 enum class WasmOnValidateConfigurationResult : uint32_t {
@@ -57,7 +57,7 @@ proxy_validate_configuration(uint32_t root_context_id, uint32_t configuration_si
  * Called when a plugin loads or when plugin configuration changes dynamically.
  * @param root_context_id is an identifier for one or more related plugins.
  * @param plugin_configuration_size is the size of any configuration available via
- * proxy_get_configuration().
+ * proxy_get_buffer_bytes().
  * @return non-zero on success and zero on failure (e.g. bad configuration).
  */
 enum class WasmOnConfigureResult : uint32_t {
@@ -73,7 +73,7 @@ extern "C" WasmOnConfigureResult proxy_on_configure(uint32_t root_context_id,
  * Called when a request, stream or other ephemeral context is created.
  * @param context_id is an identifier of the ephemeral context.
  * @param configuration_size is the size of any configuration available via
- * proxy_get_configuration().
+ * proxy_get_buffer_bytes().
  */
 extern "C" void proxy_on_context_create(uint32_t context_id, uint32_t root_context_id);
 

include/abi/wasm/proxy_wasm_imports.h

@@ -15,23 +15,25 @@
 // Configuration and Status
 
 /**
- * Called from the VM to get any configuration. Valid only when in proxy_on_start() (where it will
- * return a VM configuration), proxy_on_configure() (where it will return a plugin configuration) or
- * in proxy_validate_configuration() (where it will return a VM configuration before
- * proxy_on_start() has been called and a plugin configuration after).
+ * Called from the VM to get bytes from a buffer (e.g. a vm or plugin configuration).
  * @param start is the offset of the first byte to retrieve.
  * @param length is the number of the bytes to retrieve. If start + length exceeds the number of
  * bytes available then configuration_size will be set to the number of bytes returned.
- * @param configuration_ptr a pointer to a location which will be filled with either nullptr (if no
- * configuration is available) or a pointer to a allocated block containing the configuration
+ * @param ptr a pointer to a location which will be filled with either nullptr (if no
+ * data is available) or a pointer to a allocated block containing the configuration
  * bytes.
- * @param configuration_size a pointer to a location containing the size (or zero) of any returned
- * configuration byte block.
- * @return a WasmResult: OK, InvalidMemoryAccess. Note: if OK is returned  *configuration_ptr may
+ * @param size a pointer to a location containing the size (or zero) of any returned
+ * byte block.
+ * @return a WasmResult: OK, InvalidArgument, InvalidMemoryAccess. Note: if OK is returned *ptr may
  * be nullptr.
  */
-extern "C" WasmResult proxy_get_configuration((uint32_t start, uint32_t length,
-      const char** configuration_ptr, size_t* configuration_size);
+enum class WasmBufferType : int32_t {
+  VmConfiguration = 0,
+  PluginConfiguration = 1,
+  MAX = 2,
+};
+extern "C" WasmResult proxy_get_buffer_bytes(WasmBufferType type, uint32_t start, uint32_t length,
+                                             const char** ptr, size_t* size);
 
 // Logging
 //

source/extensions/common/wasm/BUILD

@@ -17,29 +17,60 @@ envoy_cc_library(
 )
 
 envoy_cc_library(
-    name = "wasm_vm_interface",
-    hdrs = ["wasm_vm.h"],
+    name = "wasm_vm_lib",
+    srcs = ["wasm_vm.cc"],
     deps = [
-        ":well_known_names",
-        "//source/common/common:minimal_logger_lib",
+        ":wasm_hdr",
+        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_sdk//:common_lib",
+        "//source/common/common:assert_lib",
+        "//source/common/stats:stats_lib",
     ],
 )
 
+# NB: Used to break the circular dependency between wasm_lib and null_plugin_lib.
 envoy_cc_library(
-    name = "wasm_vm_base",
-    hdrs = ["wasm_vm_base.h"],
+    name = "wasm_hdr",
+    hdrs = [
+        "context.h",
+        "wasm.h",
+        "wasm_vm.h",
+    ],
     deps = [
+        "@proxy_wasm_cpp_host//:include",
+        "@proxy_wasm_cpp_sdk//:common_lib",
+        ":well_known_names",
+        "//include/envoy/upstream:cluster_manager_interface",
+        "//source/common/config:datasource_lib",
         "//source/common/stats:stats_lib",
+        "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto",
     ],
 )
 
 envoy_cc_library(
-    name = "wasm_vm_lib",
-    srcs = ["wasm_vm.cc"],
+    name = "wasm_interoperation_lib",
+    srcs = ["wasm_state.cc"],
+    hdrs = ["wasm_state.h"],
     deps = [
-        ":wasm_vm_interface",
-        "//source/common/common:assert_lib",
-        "//source/extensions/common/wasm/null:null_lib",
-        "//source/extensions/common/wasm/v8:v8_lib",
+        "//include/envoy/stream_info:filter_state_interface",
+        "//source/common/protobuf",
+    ],
+)
+
+envoy_cc_library(
+    name = "wasm_lib",
+    srcs = [
+        "context.cc",
+        "wasm.cc",
+    ],
+    deps = [
+        ":wasm_hdr",
+        ":wasm_interoperation_lib",
+        ":wasm_vm_lib",
+        "//external:abseil_base",
+        "//external:abseil_node_hash_map",
+        "//source/common/common:base64_lib",
+        "//source/common/common:enum_to_int",
+        "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto",
     ],
 )