Skip to content

Commit

Permalink
Merge branch 'main' into snapshot-ab
Browse files Browse the repository at this point in the history
  • Loading branch information
@roypat
roypat authored Sep 8, 2023
2 parents 1d38675 + f67b711 commit e663f21
Show file tree
Hide file tree
Showing 22 changed files with 4,549 additions and 4,122 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline_perf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def build_group(test):
retries = test.pop("retries")
return group(
label=test.pop("label"),
command=f"./tools/devtool -y test {devtool_opts} -- -m nonci --reruns {retries} {test_path}",
command=f"./tools/devtool -y test {devtool_opts} -- -m nonci --reruns {retries} --perf-fail {test_path}",
artifacts=["./test_results/*"],
instances=test.pop("instances"),
platforms=test.pop("platforms"),
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
- Fixed the T2S CPU template to set the GDS_NO bit of the IA32_ARCH_CAPABILITIES
MSR to 1 in accordance with an Intel microcode update. To use the template
securely, users should apply the latest microcode update on the host.
- Fixed the spelling of the `nomodule` param passed in the default kernel
command line parameters. This is a **breaking change** for setups that
use the default kernel command line which also depend on being able to
load kernel modules at runtime. This may also break setups which use the
default kernel command line and which use an init binary that
inadvertently depends on the misspelled param ("nomodules") being
present at the command line, since this param will no longer be passed.

## [1.4.0]

Expand Down
2 changes: 1 addition & 1 deletion FAQ.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ line that enables the serial console (which goes in the `boot_args` field of
the `/boot-source` Firecracker API resource):

```console
console=ttyS0 reboot=k panic=1 pci=off nomodules
console=ttyS0 reboot=k panic=1 pci=off nomodule
```

### How can I configure multiple Ethernet devices through the kernel command line?
Expand Down
2 changes: 1 addition & 1 deletion src/vmm/src/resources.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ mod tests {
#[test]
fn test_set_boot_source() {
let tmp_file = TempFile::new().unwrap();
let cmdline = "reboot=k panic=1 pci=off nomodules 8250.nr_uarts=0";
let cmdline = "reboot=k panic=1 pci=off nomodule 8250.nr_uarts=0";
let expected_boot_cfg = BootSourceConfig {
kernel_image_path: String::from(tmp_file.as_path().to_str().unwrap()),
initrd_path: Some(String::from(tmp_file.as_path().to_str().unwrap())),
Expand Down
8 changes: 4 additions & 4 deletions src/vmm/src/vmm_config/boot_source.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ use versionize_derive::Versionize;
/// - `reboot=k` shut down the guest on reboot, instead of well... rebooting;
/// - `panic=1` on panic, reboot after 1 second;
/// - `pci=off` do not scan for PCI devices (save boot time);
/// - `nomodules` disable loadable kernel module support;
/// - `nomodule` disable loadable kernel module support;
/// - `8250.nr_uarts=0` disable 8250 serial interface;
/// - `i8042.noaux` do not probe the i8042 controller for an attached mouse (save boot time);
/// - `i8042.nomux` do not probe i8042 for a multiplexing controller (save boot time);
/// - `i8042.nopnp` do not use ACPIPnP to discover KBD/AUX controllers (save boot time);
/// - `i8042.dumbkbd` do not attempt to control kbd state via the i8042 (save boot time).
pub const DEFAULT_KERNEL_CMDLINE: &str = "reboot=k panic=1 pci=off nomodules 8250.nr_uarts=0 \
pub const DEFAULT_KERNEL_CMDLINE: &str = "reboot=k panic=1 pci=off nomodule 8250.nr_uarts=0 \
i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd";

/// Strongly typed data structure used to configure the boot source of the
Expand All @@ -30,8 +30,8 @@ pub struct BootSourceConfig {
pub kernel_image_path: String,
/// Path of the initrd, if there is one.
pub initrd_path: Option<String>,
/// The boot arguments to pass to the kernel. If this field is uninitialized, the default
/// kernel command line is used: `reboot=k panic=1 pci=off nomodules 8250.nr_uarts=0`.
/// The boot arguments to pass to the kernel. If this field is uninitialized,
/// DEFAULT_KERNEL_CMDLINE is used.
#[serde(skip_serializing_if = "Option::is_none")]
pub boot_args: Option<String>,
}
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/microvm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ def basic_config(
the response is within the interval [200, 300).
If boot_args is None, the default boot_args in Firecracker is
reboot=k panic=1 pci=off nomodules 8250.nr_uarts=0
reboot=k panic=1 pci=off nomodule 8250.nr_uarts=0
i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd
Reference: file:../../src/vmm/src/vmm_config/boot_source.rs::DEFAULT_KERNEL_CMDLINE
Expand Down
564 changes: 330 additions & 234 deletions tests/integration_tests/performance/configs/test_block_performance_config_4.14.json
View file

Large diffs are not rendered by default.

784 changes: 392 additions & 392 deletions tests/integration_tests/performance/configs/test_block_performance_config_5.10.json
View file

Large diffs are not rendered by default.

828 changes: 414 additions & 414 deletions tests/integration_tests/performance/configs/test_block_performance_config_6.1.json
View file

Large diffs are not rendered by default.

102 changes: 57 additions & 45 deletions tests/integration_tests/performance/configs/test_network_latency_config_4.14.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,32 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 24.1,
"target": 0.025
"delta_percentage": 42,
"target": 0.026
}
}
}
}
},
"linux-5.10-no-sve": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 16,
"target": 0.032
}
}
}
}
},
"vmlinux-5.10-no-sve.bin": {
"ubuntu-18.04.ext4": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
Expand All @@ -41,25 +53,25 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 10.1,
"target": 0.059
"delta_percentage": 10,
"target": 0.046
}
}
}
}
},
"vmlinux-5.10.bin": {
"ubuntu-18.04.ext4": {
"linux-5.10": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 7.1,
"target": 0.067
"delta_percentage": 8,
"target": 0.055
}
}
}
Expand All @@ -72,25 +84,25 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 10.1,
"target": 0.08
"delta_percentage": 11,
"target": 0.06
}
}
}
}
},
"vmlinux-5.10.bin": {
"ubuntu-18.04.ext4": {
"linux-5.10": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 6.1,
"target": 0.094
"delta_percentage": 11,
"target": 0.074
}
}
}
Expand All @@ -107,25 +119,25 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 9.1,
"target": 0.147
"delta_percentage": 12,
"target": 0.124
}
}
}
}
},
"vmlinux-5.10.bin": {
"ubuntu-18.04.ext4": {
"linux-5.10": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 8.1,
"target": 0.161
"delta_percentage": 8,
"target": 0.142
}
}
}
Expand All @@ -142,25 +154,25 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 20.1,
"target": 0.034
"delta_percentage": 9,
"target": 0.032
}
}
}
}
},
"vmlinux-5.10.bin": {
"ubuntu-18.04.ext4": {
"linux-5.10": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 12.1,
"target": 0.04
"delta_percentage": 13,
"target": 0.038
}
}
}
Expand All @@ -177,25 +189,25 @@
{
"baselines": {
"latency": {
"vmlinux-4.14.bin": {
"ubuntu-18.04.ext4": {
"linux-4.14": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 23.1,
"target": 0.105
"delta_percentage": 27,
"target": 0.078
}
}
}
}
},
"vmlinux-5.10.bin": {
"ubuntu-18.04.ext4": {
"linux-5.10": {
"ubuntu-22.04.squashfs": {
"1vcpu_1024mb.json": {
"Avg": {
"ping": {
"delta_percentage": 22.1,
"target": 0.119
"delta_percentage": 40,
"target": 0.101
}
}
}
Expand Down
Loading

0 comments on commit e663f21

Please sign in to comment.