mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rust: update wasmtime dependency

Browse Source 
The previous version of wasmtime had a vulnerability that possibly
allowed causing undefined behavior when calling UDFs.

We're directly updating to wasmtime 8.0.1, because the update only
requires a slight code modification and the Wasm UDF feature is
still experimental. As a result, we'll benefit from a number of
new optimizations.

Fixes #13807

Closes #13804
This commit is contained in:
Wojciech Mitros
2023-05-08 11:23:06 +02:00
committed by Nadav Har'El
parent 29fffaa160
commit 6bc16047ba
4 changed files with 179 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

288
rust/Cargo.lock generated
View File

@@ -4,20 +4,20 @@ version = 3
[[package]]
name = "addr2line"
version = "0.17.0"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
"gimli",
]
[[package]]
name = "ahash"
version = "0.7.6"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
"getrandom",
"cfg-if",
"once_cell",
"version_check",
]
@@ -34,12 +34,6 @@ version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "arrayvec"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "async-trait"
version = "0.1.59"
@@ -93,7 +87,7 @@ dependencies = [
"cap-primitives",
"cap-std",
"io-lifetimes",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -109,7 +103,7 @@ dependencies = [
"ipnet",
"maybe-owned",
"rustix",
"windows-sys",
"windows-sys 0.42.0",
"winx",
]
@@ -171,20 +165,19 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cb658ef043a07ea4086c65f2e3d770b5dc60b8787a9ef54cf06d792cf613d82"
checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b36618d7ab9ad5da72935623292d364b5482ef42141e0145c0090bfc7f6b8dca"
checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220"
dependencies = [
"arrayvec",
"bumpalo",
"cranelift-bforest",
"cranelift-codegen-meta",
@@ -192,7 +185,7 @@ dependencies = [
"cranelift-entity",
"cranelift-isle",
"gimli",
"hashbrown",
"hashbrown 0.13.2",
"log",
"regalloc2",
"smallvec",
@@ -201,33 +194,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb7cab168dac35a2fc53a3591ee36d145d7fc2ebbdb5c70f1f9e35764157af5a"
checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dcbdd64e35dfb910ff709e5b2d5e1348f626837685673726d985a620b9d8de5"
checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8"
[[package]]
name = "cranelift-entity"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9e39cfc857e7e539aa623e03bb6bec11f54aef3dfdef41adcfa7b594af3b54"
checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78d28039844e3f7817e5a10cbb3d9adbc7188ee9cc4ba43536f304219fcfc077"
checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d"
dependencies = [
"cranelift-codegen",
"log",
@@ -237,15 +230,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4183c68346d657c40ea06273cc0e9c3fe25f4e51e6decf534c079f34041c43c0"
checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba"
[[package]]
name = "cranelift-native"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dbf72319054ff725a26c579b4070187928ca38e55111b964723bdbacbb1993e"
checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00"
dependencies = [
"cranelift-codegen",
"libc",
@@ -254,9 +247,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
version = "0.92.1"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3632b478ca00dfad77dbef3ce284f1199930519ab744827726a8e386a6db3f5"
checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -367,7 +360,7 @@ checksum = "28c0190ff0bd3b28bfdd4d0cf9f92faa12880fb0b8ae2054723dd6c76a4efd42"
dependencies = [
"cfg-if",
"rustix",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -387,7 +380,7 @@ checksum = "e25ca26b0001154679ce0901527330e6153b670d17ccd1f86bab4e45dfba1a74"
dependencies = [
"io-lifetimes",
"rustix",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -501,9 +494,9 @@ dependencies = [
[[package]]
name = "gimli"
version = "0.26.2"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
dependencies = [
"fallible-iterator",
"indexmap",
@@ -515,6 +508,12 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
"ahash",
]
@@ -564,7 +563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
"hashbrown 0.12.3",
"serde",
]
@@ -575,7 +574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b87bc110777311d7832025f38c4ab0f089f764644009edef3b5cbadfedee8c40"
dependencies = [
"io-lifetimes",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -585,7 +584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
dependencies = [
"libc",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -603,7 +602,7 @@ dependencies = [
"hermit-abi",
"io-lifetimes",
"rustix",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -689,21 +688,21 @@ dependencies = [
[[package]]
name = "memoffset"
version = "0.6.5"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg",
]
[[package]]
name = "object"
version = "0.29.0"
version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"crc32fast",
"hashbrown",
"hashbrown 0.13.2",
"indexmap",
"memchr",
]
@@ -834,9 +833,9 @@ dependencies = [
[[package]]
name = "regalloc2"
version = "0.5.1"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621"
dependencies = [
"fxhash",
"log",
@@ -871,7 +870,7 @@ dependencies = [
"libc",
"linux-raw-sys",
"once_cell",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
@@ -953,7 +952,7 @@ dependencies = [
"fd-lock",
"io-lifetimes",
"rustix",
"windows-sys",
"windows-sys 0.42.0",
"winx",
]
@@ -1098,9 +1097,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi-cap-std-sync"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11254257c965082b671fb876e63a69c25af8d68b2b742d785593192b28df87a8"
checksum = "612510e6c7b6681f7d29ce70ef26e18349c26acd39b7d89f1727d90b7f58b20e"
dependencies = [
"anyhow",
"async-trait",
@@ -1117,42 +1116,43 @@ dependencies = [
"system-interface",
"tracing",
"wasi-common",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasi-common"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54c08c84016536b2407809253aa6c47eacf86d5b5ecd7741b50d23f18b5bb045"
checksum = "008136464e438c5049a614b6ea1bae9f6c4d354ce9ee2b4d9a1ac6e73f31aafc"
dependencies = [
"anyhow",
"bitflags",
"cap-rand",
"cap-std",
"io-extras",
"log",
"rustix",
"thiserror",
"tracing",
"wasmtime",
"wiggle",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasm-encoder"
version = "0.20.0"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05632e0a66a6ed8cca593c24223aabd6262f256c3693ad9822c315285f010614"
checksum = "d05d0b6fcd0aeb98adf16e7975331b3c17222aa815148f5b976370ce589d80ef"
dependencies = [
"leb128",
]
[[package]]
name = "wasmparser"
version = "0.96.0"
version = "0.102.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adde01ade41ab9a5d10ec8ed0bb954238cf8625b5cd5a13093d6de2ad9c2be1a"
checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
dependencies = [
"indexmap",
"url",
@@ -1160,9 +1160,9 @@ dependencies = [
[[package]]
name = "wasmtime"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49ffcc607adc9da024e87ca814592d4bc67f5c5b58e488f5608d5734a1ebc23e"
checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
dependencies = [
"anyhow",
"async-trait",
@@ -1185,24 +1185,25 @@ dependencies = [
"wasmtime-jit",
"wasmtime-runtime",
"wat",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-asm-macros"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cb5dc4d79cd7b2453c395f64e9013d2ad90bd083be556d5565cb224ebe8d57"
checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
dependencies = [
"cfg-if",
]
[[package]]
name = "wasmtime-component-macro"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db5c3d25a7d531582fbaa75ce6a86dddc8211c783cb247af053075a0fcc9d3d7"
checksum = "267096ed7cc93b4ab15d3daa4f195e04dbb7e71c7e5c6457ae7d52e9dd9c3607"
dependencies = [
"anyhow",
"proc-macro2",
"quote",
"syn",
@@ -1213,15 +1214,15 @@ dependencies = [
[[package]]
name = "wasmtime-component-util"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff0e0e3a1310cdde7db4e8634bda696ca4f80c429fbd727fa827be5f9cb35d21"
checksum = "74e02ca7a4a3c69d72b88f26f0192e333958df6892415ac9ab84dcc42c9000c2"
[[package]]
name = "wasmtime-cranelift"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a66a3f2167a7436910c6cbac2408a7b599688d7114cb8821cb10879dae451759"
checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -1235,14 +1236,30 @@ dependencies = [
"target-lexicon",
"thiserror",
"wasmparser",
"wasmtime-cranelift-shared",
"wasmtime-environ",
]
[[package]]
name = "wasmtime-cranelift-shared"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b"
dependencies = [
"anyhow",
"cranelift-codegen",
"cranelift-native",
"gimli",
"object",
"target-lexicon",
"wasmtime-environ",
]
[[package]]
name = "wasmtime-environ"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9350c919553cddf14f78f9452119c8004d7ef6bfebb79a41a21819ed0c5604d8"
checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
dependencies = [
"anyhow",
"cranelift-entity",
@@ -1259,22 +1276,22 @@ dependencies = [
[[package]]
name = "wasmtime-fiber"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7459893ae6d67f9b35b04f44df8dfc037ea7f3071d710b9f7866b79cb2c482ae"
checksum = "7ab182d5ab6273a133ab88db94d8ca86dc3e57e43d70baaa4d98f94ddbd7d10a"
dependencies = [
"cc",
"cfg-if",
"rustix",
"wasmtime-asm-macros",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-jit"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ba5779ea786386432b94c9fc9ad5597346c319e8239db0d98d5be5cc109a7e"
checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
dependencies = [
"addr2line",
"anyhow",
@@ -1290,34 +1307,34 @@ dependencies = [
"wasmtime-environ",
"wasmtime-jit-icache-coherence",
"wasmtime-runtime",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-jit-debug"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9841a44c82c74101c10ad4f215392761a2523b3c6c838597962bdb6de75fdb3"
checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
dependencies = [
"once_cell",
]
[[package]]
name = "wasmtime-jit-icache-coherence"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd4356c2493002da3b111d470c2ecea65a3017009afce8adc46eaa5758739891"
checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
dependencies = [
"cfg-if",
"libc",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-runtime"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd26efea7a790fcf430e663ba2519f0ab6eb8980adf8b0c58c62b727da77c2ec"
checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
dependencies = [
"anyhow",
"cc",
@@ -1335,14 +1352,14 @@ dependencies = [
"wasmtime-environ",
"wasmtime-fiber",
"wasmtime-jit-debug",
"windows-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-types"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86e1e4f66a2b9a114f9def450ab9971828c968db6ea6fccd613724b771fa4913"
checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
dependencies = [
"cranelift-entity",
"serde",
@@ -1352,11 +1369,12 @@ dependencies = [
[[package]]
name = "wasmtime-wasi"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd1271c6ec6585929986d059fc2e2365e7033e32ae3bc761ed4715fd47128308"
checksum = "4a3b5cb7606625ec229f0e33394a1637b34a58ad438526eba859b5fdb422ac1e"
dependencies = [
"anyhow",
"libc",
"wasi-cap-std-sync",
"wasi-common",
"wasmtime",
@@ -1365,9 +1383,9 @@ dependencies = [
[[package]]
name = "wasmtime-wit-bindgen"
version = "5.0.1"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d97566c073045a48b745f3559689295140f00fff7f2799efe8c89cc7e70ae007"
checksum = "983db9cc294d1adaa892a53ff6a0dc6605fc0ab1a4da5d8a2d2d4bde871ff7dd"
dependencies = [
"anyhow",
"heck",
@@ -1396,9 +1414,9 @@ dependencies = [
[[package]]
name = "wast"
version = "50.0.0"
version = "57.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2cbb59d4ac799842791fe7e806fa5dbbf6b5554d538e51cc8e176db6ff0ae34"
checksum = "6eb0f5ed17ac4421193c7477da05892c2edafd67f9639e3c11a82086416662dc"
dependencies = [
"leb128",
"memchr",
@@ -1408,18 +1426,18 @@ dependencies = [
[[package]]
name = "wat"
version = "1.0.52"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "584aaf7a1ecf4d383bbe1a25eeab0cbb8ff96acc6796707ff65cde48f4632f15"
checksum = "ab9ab0d87337c3be2bb6fc5cd331c4ba9fd6bcb4ee85048a0dd59ed9ecf92e53"
dependencies = [
"wast 50.0.0",
"wast 57.0.0",
]
[[package]]
name = "wiggle"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63d256f306e99e90343029170d81154319a976292c35eba68b05792532fa365e"
checksum = "6b16a7462893c46c6d3dd2a1f99925953bdbb921080606e1a4c9344864492fa4"
dependencies = [
"anyhow",
"async-trait",
@@ -1432,9 +1450,9 @@ dependencies = [
[[package]]
name = "wiggle-generate"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a0e55a87dcb350634c9f9b3ec08bfc87d7b05a0303a5fe8bb3134452ba3b62f"
checksum = "489499e186ab24c8ac6d89e9934c54ced6f19bd473730e6a74f533bd67ecd905"
dependencies = [
"anyhow",
"heck",
@@ -1447,9 +1465,9 @@ dependencies = [
[[package]]
name = "wiggle-macro"
version = "5.0.0"
version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b70901617926a441dbb03f3d208bd02b3fffbda13cadd9b17e7cf9389d9c067e"
checksum = "e9142e7fce24a4344c85a43c8b719ef434fc6155223bade553e186cb4183b6cc"
dependencies = [
"proc-macro2",
"quote",
@@ -1495,46 +1513,70 @@ dependencies = [
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.0"
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_i686_gnu"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_msvc"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.0"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "winx"
@@ -1544,20 +1586,22 @@ checksum = "9baf690e238840de84bbfad6ad72d6628c41d34c1a5e276dab7fb2c9167ca1ac"
dependencies = [
"bitflags",
"io-lifetimes",
"windows-sys",
"windows-sys 0.42.0",
]
[[package]]
name = "wit-parser"
version = "0.3.1"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "703eb1d2f89ff2c52d50f7ff002735e423cea75f0a5dc5c8a4626c4c47cd9ca6"
checksum = "f887c3da527a51b321076ebe6a7513026a4757b6d4d144259946552d6fc728b3"
dependencies = [
"anyhow",
"id-arena",
"indexmap",
"log",
"pulldown-cmark",
"unicode-xid",
"url",
]
[[package]]

4
rust/wasmtime_bindings/Cargo.toml
View File

@@ -6,11 +6,11 @@ edition = "2021"
[dependencies]
cxx = { version = "1.0.83", features = ["c++20"] }
wasmtime-wasi = "5.0.0"
wasmtime-wasi = "8.0.1"
futures = "0.3.25"
anyhow = "1.0.66"
[dependencies.wasmtime]
version = "5.0.0"
version = "8.0.1"
default-features = false
features = ["async", "wat", "cranelift"]

7
rust/wasmtime_bindings/src/memory_creator.rs
View File

@@ -7,6 +7,7 @@
*/
use anyhow::{anyhow, Result};
use std::ops::Range;
use std::{cmp, ptr, u32};
use wasmtime::LinearMemory;
@@ -84,6 +85,12 @@ unsafe impl LinearMemory for ScyllaLinearMemory {
fn as_ptr(&self) -> *mut u8 {
self.ptr
}
fn wasm_accessible(&self) -> Range<usize> {
Range {
start: self.ptr as usize,
end: self.ptr as usize + self.size,
}
}
}
// In order to use the Seastar memory allocator instead of mmap,

4
rust/wasmtime_bindings/src/test_memory_creator.rs
View File

@@ -8,6 +8,7 @@
use crate::memory_creator::ScyllaMemoryCreator;
use anyhow::{anyhow, Result};
use std::ops::Range;
use std::ptr;
use wasmtime::LinearMemory;
@@ -52,6 +53,9 @@ unsafe impl LinearMemory for TestScyllaLinearMemory {
fn as_ptr(&self) -> *mut u8 {
self.memory.as_ptr()
}
fn wasm_accessible(&self) -> Range<usize> {
self.memory.wasm_accessible()
}
}
// In order to use the Seastar memory allocator instead of mmap,