wasi: implement `sock_accept` and enable networking #93158

haraldh · 2022-01-21T13:29:04Z

With the addition of sock_accept() to snapshot1, simple networking via a passed TcpListener is possible. This PR implements the basics to make a simple server work.

See also:

TODO:

Discussion of SocketAddr return value for ::accept()

        Ok((
            TcpStream::from_inner(unsafe { Socket::from_raw_fd(fd as _) }),
            // WASI has no concept of SocketAddr yet
            // return an unspecified IPv4Addr
            SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
        ))

rust-highfive · 2022-01-21T13:29:07Z

r? @dtolnay

(rust-highfive has picked a reviewer for you, use r? to override)

dtolnay

Thanks, this looks good to me after the fix in decode_error_kind.

Feel free to ping anyone who would have a useful opinion about the TcpListener::accept return value. Probably any value is better than unsupported() though.

dtolnay · 2022-01-28T05:55:55Z

library/std/src/os/wasi/net/mod.rs

+
+impl TcpListenerExt for net::TcpListener {
+    fn sock_accept(&self, flags: u16) -> io::Result<u32> {
+        self.as_inner().as_inner().as_inner().sock_accept(flags)


.as_inner().as_inner().as_inner()

😱

dtolnay · 2022-01-28T05:58:13Z

library/std/src/sys/wasi/mod.rs

+        e if e == wasi::ERRNO_INVAL.raw().into() => InvalidInput,
+        e if e == wasi::ERRNO_TIMEDOUT.raw().into() => TimedOut,
+        e if e == wasi::ERRNO_EXIST.raw().into() => AlreadyExists,
+        e if e == wasi::ERRNO_AGAIN.raw().into() => WouldBlock,


Line 66 has this already.

Suggested change

e if e == wasi::ERRNO_AGAIN.raw().into() => WouldBlock,

To make use of `sock_accept()`, update the wasi crate to `0.11.0`. Signed-off-by: Harald Hoyer <harald@profian.com>

With the addition of `sock_accept()` to snapshot1, simple networking via a passed `TcpListener` is possible. This patch implements the basics to make a simple server work. Signed-off-by: Harald Hoyer <harald@profian.com>

haraldh · 2022-01-28T12:29:13Z

Thanks, this looks good to me after the fix in decode_error_kind.

@dtolnay fixed and rebased

dtolnay · 2022-01-28T13:11:33Z

@bors r+

bors · 2022-01-28T13:11:34Z

📌 Commit d2a1369 has been approved by dtolnay

wasi: implement `sock_accept` and enable networking With the addition of `sock_accept()` to snapshot1, simple networking via a passed `TcpListener` is possible. This PR implements the basics to make a simple server work. See also: * [wasmtime tracking issue](bytecodealliance/wasmtime#3730) * [wasmtime PR](bytecodealliance/wasmtime#3711) TODO: * [ ] Discussion of `SocketAddr` return value for `::accept()` ```rust Ok(( TcpStream::from_inner(unsafe { Socket::from_raw_fd(fd as _) }), // WASI has no concept of SocketAddr yet // return an unspecified IPv4Addr SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0), )) ```

…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#92611 (Add links to the reference and rust by example for asm! docs and lints) - rust-lang#93158 (wasi: implement `sock_accept` and enable networking) - rust-lang#93239 (Add os::unix::net::SocketAddr::from_path) - rust-lang#93261 (Some unwinding related cg_ssa cleanups) - rust-lang#93295 (Avoid double panics when using `TempDir` in tests) - rust-lang#93353 (Unimpl {Add,Sub,Mul,Div,Rem,BitXor,BitOr,BitAnd}<$t> for Saturating<$t>) - rust-lang#93356 (Edit docs introduction for `std::cmp::PartialOrd`) - rust-lang#93375 (fix typo `documenation`) - rust-lang#93399 (rustbuild: Fix compiletest warning when building outside of root.) - rust-lang#93404 (Fix a typo from rust-lang#92899) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

With * bytecodealliance/wasmtime#3711 * rust-lang/rust#93158 merged, mio can have limited support for networking for the `wasm32-wasi` target. Signed-off-by: Harald Hoyer <harald@profian.com>

Based on tokio-rs#1395 And with * bytecodealliance/wasmtime#3711 * rust-lang/rust#93158 merged, mio can have limited support for networking for the `wasm32-wasi` target. Co-authored-by: Thomas de Zeeuw <thomasdezeeuw@gmail.com> Signed-off-by: Harald Hoyer <harald@profian.com>

Based on #1395 And with * bytecodealliance/wasmtime#3711 * rust-lang/rust#93158 merged, mio can have limited support for networking for the `wasm32-wasi` target. Co-authored-by: Thomas de Zeeuw <thomasdezeeuw@gmail.com> Signed-off-by: Harald Hoyer <harald@profian.com>

Based on tokio-rs#1395 And with * bytecodealliance/wasmtime#3711 * rust-lang/rust#93158 merged, mio can have limited support for networking for the `wasm32-wasi` target. Co-authored-by: Thomas de Zeeuw <thomasdezeeuw@gmail.com> Signed-off-by: Harald Hoyer <harald@profian.com>

rust-highfive assigned dtolnay Jan 21, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 21, 2022

This comment has been minimized.

Sign in to view

This was referenced Jan 21, 2022

Implement sock_accept and basic networking bytecodealliance/wasmtime#3711

Merged

Enable TcpListener on Rust std for wasm32-wasi enarx/enarx#1243

Closed

haraldh force-pushed the wasi_sock_accept branch 2 times, most recently from 4ab7b43 to a0ce15c Compare January 21, 2022 14:46

This comment has been minimized.

Sign in to view

haraldh force-pushed the wasi_sock_accept branch from a0ce15c to 62b4e72 Compare January 21, 2022 15:03

haraldh changed the title ~~DRAFT: wasi: implement sock_accept and enable networking~~ wasi: implement sock_accept and enable networking Jan 21, 2022

haraldh marked this pull request as ready for review January 21, 2022 18:56

haraldh mentioned this pull request Jan 27, 2022

Tracking: Implement sock_accept and basic networking bytecodealliance/wasmtime#3730

Closed

8 tasks

dtolnay requested changes Jan 28, 2022

View reviewed changes

dtolnay added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2022

haraldh added 2 commits January 28, 2022 13:27

wasi: update to wasi 0.11.0

00cbc8d

To make use of `sock_accept()`, update the wasi crate to `0.11.0`. Signed-off-by: Harald Hoyer <harald@profian.com>

wasi: enable TcpListener and TcpStream

d2a1369

With the addition of `sock_accept()` to snapshot1, simple networking via a passed `TcpListener` is possible. This patch implements the basics to make a simple server work. Signed-off-by: Harald Hoyer <harald@profian.com>

haraldh force-pushed the wasi_sock_accept branch from 62b4e72 to d2a1369 Compare January 28, 2022 12:28

haraldh requested a review from dtolnay January 28, 2022 12:29

bjorn3 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 28, 2022

dtolnay approved these changes Jan 28, 2022

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2022

matthiaskrgr mentioned this pull request Jan 28, 2022

Rollup of 8 pull requests #93425

Closed

matthiaskrgr mentioned this pull request Jan 28, 2022

Rollup of 10 pull requests #93427

Merged

bors merged commit 9f15c4d into rust-lang:master Jan 29, 2022

rustbot added this to the 1.60.0 milestone Jan 29, 2022

This was referenced Feb 15, 2022

Add networking for target_os = "wasi" tokio-rs/mio#1548

Closed

Add TCP networking for target_os = "wasi" tokio-rs/mio#1549

Merged

rvolosatovs mentioned this pull request Sep 26, 2022

feat: add basic WASI net.Listener via sock_accept tinygo-org/tinygo#2748

Closed

bjorn3 mentioned this pull request Sep 29, 2022

Unable to run tcp socket in wasmtime bytecodealliance/wasmtime#4978

Closed

banocean mentioned this pull request Jul 28, 2023

meta: Stabilize WASI support tokio-rs/tokio#4827

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wasi: implement `sock_accept` and enable networking #93158

wasi: implement `sock_accept` and enable networking #93158

haraldh commented Jan 21, 2022 •

edited

Loading

rust-highfive commented Jan 21, 2022

This comment has been minimized.

This comment has been minimized.

dtolnay left a comment

dtolnay Jan 28, 2022

haraldh Jan 28, 2022

dtolnay Jan 28, 2022

haraldh Jan 28, 2022

haraldh Jan 28, 2022

haraldh commented Jan 28, 2022

dtolnay commented Jan 28, 2022

bors commented Jan 28, 2022

wasi: implement sock_accept and enable networking #93158

wasi: implement sock_accept and enable networking #93158

Conversation

haraldh commented Jan 21, 2022 • edited Loading

rust-highfive commented Jan 21, 2022

This comment has been minimized.

This comment has been minimized.

dtolnay left a comment

Choose a reason for hiding this comment

dtolnay Jan 28, 2022

Choose a reason for hiding this comment

haraldh Jan 28, 2022

Choose a reason for hiding this comment

dtolnay Jan 28, 2022

Choose a reason for hiding this comment

haraldh Jan 28, 2022

Choose a reason for hiding this comment

haraldh Jan 28, 2022

Choose a reason for hiding this comment

haraldh commented Jan 28, 2022

dtolnay commented Jan 28, 2022

bors commented Jan 28, 2022

wasi: implement `sock_accept` and enable networking #93158

wasi: implement `sock_accept` and enable networking #93158

haraldh commented Jan 21, 2022 •

edited

Loading