Merge branch 'aya-rs:main' into main

reviewable/pr728/r3
Mohammad Javad Pooladkhay 2 years ago committed by GitHub
commit 8718e2e650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -37,7 +37,7 @@ jobs:
run: git ls-files -- '*.c' '*.h' | xargs clang-format --dry-run --Werror run: git ls-files -- '*.c' '*.h' | xargs clang-format --dry-run --Werror
- name: Check Markdown - name: Check Markdown
uses: DavidAnson/markdownlint-cli2-action@v9 uses: DavidAnson/markdownlint-cli2-action@v13
- name: Check TOML formatting - name: Check TOML formatting
run: taplo fmt --check run: taplo fmt --check

@ -10,6 +10,8 @@ You'll need:
1. `rustup toolchain install nightly` 1. `rustup toolchain install nightly`
1. `rustup target add {aarch64,x86_64}-unknown-linux-musl` 1. `rustup target add {aarch64,x86_64}-unknown-linux-musl`
1. `cargo install bpf-linker` 1. `cargo install bpf-linker`
1. `libelf-dev` (`libelf-devel` on rpm-based distros)
1. `llvm` (for `llvm-objcopy`)
1. (virtualized only) `qemu` 1. (virtualized only) `qemu`
## Usage ## Usage
@ -25,7 +27,7 @@ cargo xtask integration-test local
### Virtualized ### Virtualized
```bash ```bash
cargo xtask integration-test vm cargo xtask integration-test vm <KERNEL IMAGE>
``` ```
### Writing an integration test ### Writing an integration test

@ -28,7 +28,7 @@ fn af_xdp() {
// So this needs to be page aligned. Pages are 4k on all mainstream architectures except for // So this needs to be page aligned. Pages are 4k on all mainstream architectures except for
// Apple Silicon which uses 16k pages. So let's align on that for tests to run natively there. // Apple Silicon which uses 16k pages. So let's align on that for tests to run natively there.
#[repr(align(16384))] #[repr(C, align(16384))]
struct PacketMap(MaybeUninit<[u8; 4096]>); struct PacketMap(MaybeUninit<[u8; 4096]>);
// Safety: don't access alloc down the line. // Safety: don't access alloc down the line.

Loading…
Cancel
Save