Merge pull request #4288 from JinLiul/change_attestation_script

attestation: change to use host cpu model

Author: XueqiangWei

qemu/deps/sev-snp/regular_attestation_workflow.sh

@@ -1,6 +1,15 @@
 #!/bin/bash
 set -e
 
+# Check for the required CPU model parameter
+if [[ -z "$1" ]]; then
+    echo "Error: cpu_model parameter is required."
+    echo "Usage: $0 <cpu_model>"
+    exit 1
+fi
+
+cpu_model="$1"
+
 fetch_retry() {
     local command=$1
     local max_retries=3
@@ -23,11 +32,6 @@ fetch_retry() {
 snpguest report attestation-report.bin request-data.txt --random
 snpguest display report attestation-report.bin
 
-# Get cpu model
-cpu_familly_id=$(cat /proc/cpuinfo | grep 'cpu family' | head -1 | cut -d ":" -f 2 | tr -d " ")
-model_id=$(cat /proc/cpuinfo | grep 'model' | head -1 | cut -d ":" -f 2 | tr -d " ")
-dict_cpu=([251]="milan" [2517]="genoa" [2617]="turin")
-cpu_model=${dict_cpu[${cpu_familly_id}${model_id}]}
 
 # Fetch cert
 set +e

qemu/tests/snp_basic_config.py

@@ -1,6 +1,6 @@
 import os
 
-from avocado.utils import process
+from avocado.utils import cpu, process
 from virttest import data_dir as virttest_data_dir
 from virttest import error_context
 from virttest.utils_misc import verify_dmesg
@@ -36,6 +36,12 @@ def run(test, params, env):
         if int(process.getoutput(socket_count_cmd, shell=True)) != 1:
             test.cancel("Host cpu has more than 1 socket, skip the case.")
 
+    family_id = cpu.get_family()
+    model_id = cpu.get_model()
+    dict_cpu = {"251": "milan", "2517": "genoa", "2617": "turin"}
+    key = str(family_id) + str(model_id)
+    host_cpu_model = dict_cpu.get(key, "unknown")
+
     vm_name = params["main_vm"]
     vm = env.get_vm(vm_name)
     vm.create()
@@ -65,6 +71,7 @@ def run(test, params, env):
             session.cmd_output("chmod 755 %s" % guest_cmd)
         except Exception as e:
             test.fail("Guest test preperation fail: %s" % str(e))
+        guest_cmd = guest_cmd + " " + host_cpu_model
         s = session.cmd_status(guest_cmd, timeout=360)
         if s:
             test.fail("Guest script error")

qemu/tests/snp_multi_vm.py

@@ -1,5 +1,6 @@
 import os
 
+from avocado.utils import cpu
 from virttest import data_dir as virttest_data_dir
 from virttest import env_process, error_context
 from virttest.utils_misc import get_mem_info, normalize_data_size, verify_dmesg
@@ -23,6 +24,12 @@ def run(test, params, env):
     error_context.context("Start sev-snp test", test.log.info)
     timeout = params.get_numeric("login_timeout", 240)
 
+    family_id = cpu.get_family()
+    model_id = cpu.get_model()
+    dict_cpu = {"251": "milan", "2517": "genoa", "2617": "turin"}
+    key = str(family_id) + str(model_id)
+    host_cpu_model = dict_cpu.get(key, "unknown")
+
     snp_module_path = params["snp_module_path"]
     if os.path.exists(snp_module_path):
         with open(snp_module_path) as f:
@@ -66,6 +73,7 @@ def run(test, params, env):
                 session.cmd_output("chmod 755 %s" % guest_cmd)
             except Exception as e:
                 test.fail("Guest test preperation fail: %s" % str(e))
+            guest_cmd = guest_cmd + " " + host_cpu_model
             s = session.cmd_status(guest_cmd, timeout=360)
             if s:
                 test.fail("Guest script error")