Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions resources/seccomp/aarch64-unknown-linux-musl.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -319,6 +323,10 @@
}
]
},
{
"syscall": "sendto",
"comment": "Rust std uses it to write to unix socket"
},
{
"syscall": "tkill",
"comment": "tkill is used by libc::abort during a panic to raise SIGABRT",
Expand Down Expand Up @@ -511,6 +519,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -651,19 +663,6 @@
}
]
},
{
"syscall": "madvise",
"comment": "Triggered on some deallocation paths in musl free()",
"args": [
{
"index": 2,
"type": "dword",
"op": "eq",
"val": 8,
"comment": "libc::MADV_FREE"
}
]
},
{
"syscall": "mmap",
"comment": "Used for reading the timezone in LocalTime::now()",
Expand Down Expand Up @@ -729,6 +728,10 @@
}
]
},
{
"syscall": "sendto",
"comment": "Rust std uses it to write to unix socket"
},
{
"syscall": "tkill",
"comment": "tkill is used by libc::abort during a panic to raise SIGABRT",
Expand Down Expand Up @@ -792,6 +795,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -894,19 +901,6 @@
}
]
},
{
"syscall": "madvise",
"comment": "Triggered on some deallocation paths in musl free()",
"args": [
{
"index": 2,
"type": "dword",
"op": "eq",
"val": 8,
"comment": "libc::MADV_FREE"
}
]
},
{
"syscall": "mmap",
"comment": "Used for reading the timezone in LocalTime::now()",
Expand Down
46 changes: 20 additions & 26 deletions resources/seccomp/x86_64-unknown-linux-musl.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -319,6 +323,10 @@
}
]
},
{
"syscall": "sendto",
"comment": "Rust std uses it to write to unix socket"
},
{
"syscall": "tkill",
"comment": "tkill is used by libc::abort during a panic to raise SIGABRT",
Expand Down Expand Up @@ -523,6 +531,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -663,19 +675,6 @@
}
]
},
{
"syscall": "madvise",
"comment": "Triggered on some deallocation paths in musl free()",
"args": [
{
"index": 2,
"type": "dword",
"op": "eq",
"val": 8,
"comment": "libc::MADV_FREE"
}
]
},
{
"syscall": "mmap",
"comment": "Used for large buffers sent to api_server",
Expand Down Expand Up @@ -741,6 +740,10 @@
}
]
},
{
"syscall": "sendto",
"comment": "Rust std uses it to write to unix socket"
},
{
"syscall": "tkill",
"comment": "tkill is used by libc::abort during a panic to raise SIGABRT",
Expand Down Expand Up @@ -804,6 +807,10 @@
"syscall": "brk",
"comment": "Called for expanding the heap"
},
{
"syscall": "gettid",
"comment": "Rust std uses it during panic to print the thread id."
},
{
"syscall": "clock_gettime",
"comment": "Used for metrics and logging, via the helpers in utils/src/time.rs. It's not called on some platforms, because of vdso optimisations."
Expand Down Expand Up @@ -906,19 +913,6 @@
}
]
},
{
"syscall": "madvise",
"comment": "Triggered on some deallocation paths in musl free()",
"args": [
{
"index": 2,
"type": "dword",
"op": "eq",
"val": 8,
"comment": "libc::MADV_FREE"
}
]
},
{
"syscall": "mmap",
"comment": "Used for reading the timezone in LocalTime::now()",
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# allowlisted using a toolchain that requires it, causing the A/B-test to
# always fail.
[toolchain]
channel = "1.89.0"
channel = "1.93.0"
targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
profile = "minimal"

2 changes: 1 addition & 1 deletion tests/framework/microvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ def spawn(
self,
log_file="fc.log",
serial_out_path="serial.log",
log_level="Debug",
log_level="Info",
log_show_level=False,
log_show_origin=False,
metrics_path="fc.ndjson",
Expand Down
Loading