Merge branch 'main' into fix-4547

firecracker-microvm · Dec 5, 2024 · 659b0ec · 659b0ec
2 parents 7b22116 + 81bae9f
commit 659b0ec
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 23 deletions.
diff --git a/.buildkite/pipeline_perf.py b/.buildkite/pipeline_perf.py
@@ -124,6 +124,8 @@
 pins = {
     # TODO: Unpin when performance instability on m6i/5.10 has gone.
     "linux_5.10-pinned": {"instance": "m6i.metal", "kv": "linux_5.10"},
+    # TODO: Unpin when performance instability on m6i/6.1 has gone.
+    "linux_6.1-pinned": {"instance": "m6i.metal", "kv": "linux_6.1"},
 }
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -14,7 +14,7 @@ clap = { version = "4.5.21", features = ["derive"] }
 itertools = "0.13.0"
 proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
 quote = "1.0.37"
-syn = { version = "2.0.89", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+syn = { version = "2.0.90", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

diff --git a/src/log-instrument-macros/Cargo.toml b/src/log-instrument-macros/Cargo.toml
@@ -13,7 +13,7 @@ bench = false
 [dependencies]
 proc-macro2 = "1.0.92"
 quote = "1.0.37"
-syn = { version = "2.0.89", features = ["full", "extra-traits"] }
+syn = { version = "2.0.90", features = ["full", "extra-traits"] }
 
 [lints]
 workspace = true
diff --git a/tests/framework/utils_cpuid.py b/tests/framework/utils_cpuid.py
@@ -25,6 +25,7 @@ class CpuModel(str, Enum):
     """CPU models"""
 
     AMD_MILAN = "AMD_MILAN"
+    AMD_GENOA = "AMD_GENOA"
     ARM_NEOVERSE_N1 = "ARM_NEOVERSE_N1"
     ARM_NEOVERSE_V1 = "ARM_NEOVERSE_V1"
     INTEL_SKYLAKE = "INTEL_SKYLAKE"
@@ -39,9 +40,7 @@ class CpuModel(str, Enum):
         "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
         "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
     },
-    CpuVendor.AMD: {
-        "AMD EPYC 7R13": "AMD_MILAN",
-    },
+    CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
     CpuVendor.ARM: {"0xd0c": "ARM_NEOVERSE_N1", "0xd40": "ARM_NEOVERSE_V1"},
 }
 

diff --git a/tests/integration_tests/functional/test_cpu_features_x86_64.py b/tests/integration_tests/functional/test_cpu_features_x86_64.py
@@ -486,9 +486,14 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
                 "hypervisor",
                 "tsc_known_freq",
             }
+        case CpuModel.AMD_GENOA:
+            # Return here to allow the test to pass until CPU features to enable are confirmed
+            return
         case _:
             if os.environ.get("BUILDKITE") is not None:
-                assert False, f"Cpu model {cpu_model} is not supported"
+                assert (
+                    guest_feats == host_feats
+                ), f"Cpu model {cpu_model} is not supported"
 
 
 # From the `Intel® 64 Architecture x2APIC Specification`

diff --git a/tools/devtool b/tools/devtool
@@ -127,10 +127,6 @@ PRIV_KEY_PATH=/root/.ssh/id_rsa
 # Path to the linux kernel directory, as bind-mounted in the container.
 CTR_KERNEL_DIR="${CTR_FC_ROOT_DIR}/.kernel"
 
-# Global options received by $0
-# These options are not command-specific, so we store them as global vars
-OPT_UNATTENDED=false
-
 # Get the target prefix to avoid repeated calls to uname -m
 TARGET_PREFIX="$(uname -m)-unknown-linux-"
 
@@ -195,7 +191,6 @@ ensure_devctr() {
     # download it, if we don't.
     [[ $(docker images -q "$DEVCTR_IMAGE" | wc -l) -gt 0 ]] || {
         say "About to pull docker image $DEVCTR_IMAGE"
-        get_user_confirmation || die "Aborted."
 
         # Run docker pull 5 times in case it fails - sleep 3 seconds
         # between attempts
@@ -1235,7 +1230,8 @@ main() {
     while [ $# -gt 0 ]; do
         case "$1" in
             -h|--help)              { cmd_help; exit 1;     } ;;
-            -y|--unattended)        { OPT_UNATTENDED=true;  } ;;
+            -y|--unattended)        # purposefully ignored
+                ;;
             -*)
                 die "Unknown arg: $1. Please use \`$0 help\` for help."
             ;;

diff --git a/tools/functions b/tools/functions
@@ -71,12 +71,7 @@ function SGR {
 #   exit code 0 for successful confirmation
 #   exit code != 0 if the user declined
 #
-OPT_UNATTENDED=false
 get_user_confirmation() {
-
-    # Pass if running unattended
-    [[ "$OPT_UNATTENDED" = true ]] && return 0
-
     # Fail if STDIN is not a terminal (there's no user to confirm anything)
     [[ -t 0 ]] || return 1