Do not reverse bytes for nullvm, additional changes:

- moved the condition to htowasm()/wasmtoh() parameter
- added isWasmByteOrder() function to WasmVm interface
- added ByteOrder test into null_vm_test

Signed-off-by: Konstantin Maksimov <[email protected]>

Author: knm3000

include/proxy-wasm/null_vm.h

@@ -61,6 +61,7 @@ struct NullVm : public WasmVm {
 #undef _REGISTER_CALLBACK
 
   void terminate() override {}
+  bool isWasmByteOrder() override { return false; }
 
   std::string plugin_name_;
   std::unique_ptr<NullVmPlugin> plugin_;

include/proxy-wasm/pairs_util.h

@@ -45,19 +45,20 @@ class PairsUtil {
    * @param size size of the output buffer.
    * @return indicates whether serialization succeeded or not.
    */
-  static bool marshalPairs(const Pairs &pairs, char *buffer, size_t size);
+  static bool marshalPairs(const Pairs &pairs, char *buffer, size_t size, bool is_wasm_byte_order);
 
-  static bool marshalPairs(const StringPairs &stringpairs, char *buffer, size_t size) {
+  static bool marshalPairs(const StringPairs &stringpairs, char *buffer, size_t size,
+                           bool is_wasm_byte_order) {
     Pairs views(stringpairs.begin(), stringpairs.end());
-    return marshalPairs(views, buffer, size);
+    return marshalPairs(views, buffer, size, is_wasm_byte_order);
   }
 
   /**
    * toPairs deserializes input buffer to Pairs.
    * @param buffer serialized input buffer.
    * @return deserialized Pairs or an empty instance in case of deserialization failure.
    */
-  static Pairs toPairs(std::string_view buffer);
+  static Pairs toPairs(std::string_view buffer, bool is_wasm_byte_order);
 };
 
 } // namespace proxy_wasm

include/proxy-wasm/wasm_vm.h

@@ -303,6 +303,12 @@ class WasmVm {
    */
   virtual void terminate() = 0;
 
+  /**
+   * Byte order flag (host or wasm).
+   * @return 'false' for a null VM and 'true' for a wasm VM.
+   */
+  virtual bool isWasmByteOrder() = 0;
+
   bool isFailed() { return failed_ != FailState::Ok; }
   void fail(FailState fail_state, std::string_view message) {
     integration()->error(message);

include/proxy-wasm/word.h

@@ -24,11 +24,12 @@ namespace proxy_wasm {
 // Use byteswap functions only when compiling for big-endian platforms.
 #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&                                    \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define htowasm(x) __builtin_bswap32(x)
-#define wasmtoh(x) __builtin_bswap32(x)
+#define htowasm1111(x, is_null) is_null ? (x) : __builtin_bswap32(x)
+#define htowasm(x, is_wasm_byte_order) is_wasm_byte_order ? __builtin_bswap32(x) : (x)
+#define wasmtoh(x, is_wasm_byte_order) is_wasm_byte_order ? __builtin_bswap32(x) : (x)
 #else
-#define htowasm(x) (x)
-#define wasmtoh(x) (x)
+#define htowasm(x, is_wasm_byte_order) (x)
+#define wasmtoh(x, is_wasm_byte_order) (x)
 #endif
 
 // Represents a Wasm-native word-sized datum. On 32-bit VMs, the high bits are always zero.

src/exports.cc

@@ -152,7 +152,8 @@ Word send_local_response(Word response_code, Word response_code_details_ptr,
   if (!details || !body || !additional_response_header_pairs) {
     return WasmResult::InvalidMemoryAccess;
   }
-  auto additional_headers = PairsUtil::toPairs(additional_response_header_pairs.value());
+  auto additional_headers = PairsUtil::toPairs(additional_response_header_pairs.value(),
+                                               context->wasmVm()->isWasmByteOrder());
   context->sendLocalResponse(response_code, body.value(), std::move(additional_headers),
                              grpc_status, details.value());
   context->wasm()->stopNextIteration(true);
@@ -399,7 +400,7 @@ Word get_header_map_pairs(Word type, Word ptr_ptr, Word size_ptr) {
   if (buffer == nullptr) {
     return WasmResult::InvalidMemoryAccess;
   }
-  if (!PairsUtil::marshalPairs(pairs, buffer, size)) {
+  if (!PairsUtil::marshalPairs(pairs, buffer, size, context->wasmVm()->isWasmByteOrder())) {
     return WasmResult::InvalidMemoryAccess;
   }
   if (!context->wasmVm()->setWord(ptr_ptr, Word(ptr))) {
@@ -420,8 +421,9 @@ Word set_header_map_pairs(Word type, Word ptr, Word size) {
   if (!data) {
     return WasmResult::InvalidMemoryAccess;
   }
-  return context->setHeaderMapPairs(static_cast<WasmHeaderMapType>(type.u64_),
-                                    PairsUtil::toPairs(data.value()));
+  return context->setHeaderMapPairs(
+      static_cast<WasmHeaderMapType>(type.u64_),
+      PairsUtil::toPairs(data.value(), context->wasmVm()->isWasmByteOrder()));
 }
 
 Word get_header_map_size(Word type, Word result_ptr) {
@@ -519,8 +521,8 @@ Word http_call(Word uri_ptr, Word uri_size, Word header_pairs_ptr, Word header_p
   if (!uri || !body || !header_pairs || !trailer_pairs) {
     return WasmResult::InvalidMemoryAccess;
   }
-  auto headers = PairsUtil::toPairs(header_pairs.value());
-  auto trailers = PairsUtil::toPairs(trailer_pairs.value());
+  auto headers = PairsUtil::toPairs(header_pairs.value(), context->wasmVm()->isWasmByteOrder());
+  auto trailers = PairsUtil::toPairs(trailer_pairs.value(), context->wasmVm()->isWasmByteOrder());
   uint32_t token = 0;
   // NB: try to write the token to verify the memory before starting the async
   // operation.
@@ -589,7 +591,8 @@ Word grpc_call(Word service_ptr, Word service_size, Word service_name_ptr, Word
     return WasmResult::InvalidMemoryAccess;
   }
   uint32_t token = 0;
-  auto initial_metadata = PairsUtil::toPairs(initial_metadata_pairs.value());
+  auto initial_metadata =
+      PairsUtil::toPairs(initial_metadata_pairs.value(), context->wasmVm()->isWasmByteOrder());
   auto result = context->grpcCall(service.value(), service_name.value(), method_name.value(),
                                   initial_metadata, request.value(),
                                   std::chrono::milliseconds(timeout_milliseconds), &token);
@@ -615,7 +618,8 @@ Word grpc_stream(Word service_ptr, Word service_size, Word service_name_ptr, Wor
     return WasmResult::InvalidMemoryAccess;
   }
   uint32_t token = 0;
-  auto initial_metadata = PairsUtil::toPairs(initial_metadata_pairs.value());
+  auto initial_metadata =
+      PairsUtil::toPairs(initial_metadata_pairs.value(), context->wasmVm()->isWasmByteOrder());
   auto result = context->grpcStream(service.value(), service_name.value(), method_name.value(),
                                     initial_metadata, &token);
   if (result != WasmResult::Ok) {
@@ -693,8 +697,9 @@ Word writevImpl(Word fd, Word iovs, Word iovs_len, Word *nwritten_ptr) {
     }
     const auto *iovec = reinterpret_cast<const uint32_t *>(memslice.value().data());
     if (iovec[1] != 0U /* buf_len */) {
-      memslice = context->wasmVm()->getMemory(wasmtoh(iovec[0]) /* buf */,
-                                              wasmtoh(iovec[1]) /* buf_len */);
+      memslice = context->wasmVm()->getMemory(
+          wasmtoh(iovec[0], context->wasmVm()->isWasmByteOrder()) /* buf */,
+          wasmtoh(iovec[1], context->wasmVm()->isWasmByteOrder()) /* buf_len */);
       if (!memslice) {
         return 21; // __WASI_EFAULT
       }

src/pairs_util.cc

@@ -36,7 +36,8 @@ size_t PairsUtil::pairsSize(const Pairs &pairs) {
   return size;
 }
 
-bool PairsUtil::marshalPairs(const Pairs &pairs, char *buffer, size_t size) {
+bool PairsUtil::marshalPairs(const Pairs &pairs, char *buffer, size_t size,
+                             bool is_wasm_byte_order) {
   if (buffer == nullptr) {
     return false;
   }
@@ -45,7 +46,7 @@ bool PairsUtil::marshalPairs(const Pairs &pairs, char *buffer, size_t size) {
   const char *end = buffer + size;
 
   // Write number of pairs.
-  uint32_t num_pairs = htowasm(pairs.size());
+  uint32_t num_pairs = htowasm(pairs.size(), is_wasm_byte_order);
   if (pos + sizeof(uint32_t) > end) {
     return false;
   }
@@ -54,15 +55,15 @@ bool PairsUtil::marshalPairs(const Pairs &pairs, char *buffer, size_t size) {
 
   for (const auto &p : pairs) {
     // Write name length.
-    uint32_t name_len = htowasm(p.first.size());
+    uint32_t name_len = htowasm(p.first.size(), is_wasm_byte_order);
     if (pos + sizeof(uint32_t) > end) {
       return false;
     }
     ::memcpy(pos, &name_len, sizeof(uint32_t));
     pos += sizeof(uint32_t);
 
     // Write value length.
-    uint32_t value_len = htowasm(p.second.size());
+    uint32_t value_len = htowasm(p.second.size(), is_wasm_byte_order);
     if (pos + sizeof(uint32_t) > end) {
       return false;
     }
@@ -91,7 +92,7 @@ bool PairsUtil::marshalPairs(const Pairs &pairs, char *buffer, size_t size) {
   return pos == end;
 }
 
-Pairs PairsUtil::toPairs(std::string_view buffer) {
+Pairs PairsUtil::toPairs(std::string_view buffer, bool is_wasm_byte_order) {
   if (buffer.data() == nullptr || buffer.size() > PROXY_WASM_HOST_PAIRS_MAX_BYTES) {
     return {};
   }
@@ -103,7 +104,7 @@ 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));
+  uint32_t num_pairs = wasmtoh(*reinterpret_cast<const uint32_t *>(pos), is_wasm_byte_order);
   pos += sizeof(uint32_t);
 
   // Check if we're not going to exceed the limit.
@@ -122,14 +123,14 @@ Pairs PairsUtil::toPairs(std::string_view buffer) {
     if (pos + sizeof(uint32_t) > end) {
       return {};
     }
-    s.first = wasmtoh(*reinterpret_cast<const uint32_t *>(pos));
+    s.first = wasmtoh(*reinterpret_cast<const uint32_t *>(pos), is_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));
+    s.second = wasmtoh(*reinterpret_cast<const uint32_t *>(pos), is_wasm_byte_order);
     pos += sizeof(uint32_t);
   }
 

src/signature_util.cc

@@ -86,7 +86,7 @@ bool SignatureUtil::verifySignature(std::string_view bytecode, std::string &mess
 
   uint32_t alg_id;
   std::memcpy(&alg_id, payload.data(), sizeof(uint32_t));
-  alg_id = wasmtoh(alg_id);
+  alg_id = wasmtoh(alg_id, true);
 
   if (alg_id != 2) {
     message = "Signature has a wrong alg_id (want: 2, is: " + std::to_string(alg_id) + ")";

src/v8/v8.cc

@@ -105,6 +105,7 @@ class V8 : public WasmVm {
 #undef _GET_MODULE_FUNCTION
 
   void terminate() override;
+  bool isWasmByteOrder() override { return true; }
 
 private:
   wasm::own<wasm::Trap> trap(std::string message);
@@ -503,7 +504,7 @@ bool V8::getWord(uint64_t pointer, Word *word) {
   }
   uint32_t word32;
   ::memcpy(&word32, memory_->data() + pointer, size);
-  word->u64_ = wasmtoh(word32);
+  word->u64_ = wasmtoh(word32, isWasmByteOrder());
   return true;
 }
 
@@ -516,7 +517,7 @@ bool V8::setWord(uint64_t pointer, Word word) {
   if (pointer + size > memory_->data_size()) {
     return false;
   }
-  uint32_t word32 = htowasm(word.u32());
+  uint32_t word32 = htowasm(word.u32(), isWasmByteOrder());
   ::memcpy(memory_->data() + pointer, &word32, size);
   return true;
 }

src/wamr/wamr.cc

@@ -87,6 +87,7 @@ class Wamr : public WasmVm {
 #undef _GET_MODULE_FUNCTION
 
   void terminate() override {}
+  bool isWasmByteOrder() override { return true; }
 
 private:
   template <typename... Args>
@@ -368,7 +369,7 @@ bool Wamr::getWord(uint64_t pointer, Word *word) {
 
   uint32_t word32;
   ::memcpy(&word32, wasm_memory_data(memory_.get()) + pointer, size);
-  word->u64_ = wasmtoh(word32);
+  word->u64_ = wasmtoh(word32, isWasmByteOrder());
   return true;
 }
 
@@ -377,7 +378,7 @@ bool Wamr::setWord(uint64_t pointer, Word word) {
   if (pointer + size > wasm_memory_data_size(memory_.get())) {
     return false;
   }
-  uint32_t word32 = htowasm(word.u32());
+  uint32_t word32 = htowasm(word.u32(), isWasmByteOrder());
   ::memcpy(wasm_memory_data(memory_.get()) + pointer, &word32, size);
   return true;
 }

src/wasmedge/wasmedge.cc

@@ -281,6 +281,7 @@ class WasmEdge : public WasmVm {
                              std::function<R(ContextBase *, Args...)> *function);
 
   void terminate() override {}
+  bool isWasmByteOrder() override { return true; }
 
   WasmEdgeLoaderPtr loader_;
   WasmEdgeValidatorPtr validator_;