Skip to content

Commit

Permalink
Merge pull request #511 from linl-rh/master
Browse files Browse the repository at this point in the history 
Add case test_check_tpm and update test_check_dmesg_sev/snp/tdx cases.
  • Loading branch information
@linl-rh
linl-rh authored Jan 26, 2025
2 parents fc5ac28 + 9a6f9ce commit 77e2ebe
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 28 deletions.
12 changes: 12 additions & 0 deletions os_tests/libs/resources_gcp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,8 @@ def check_confidential_type(self):
confidential_type = confidential_config.get('confidentialInstanceType')
if confidential_type:
return confidential_type
if confidential_config.get('enableConfidentialCompute'):
return 'SEV'
return False

def is_sev_enabled(self):
Expand All @@ -375,6 +377,16 @@ def is_sev_enabled(self):
return True
return sev

def is_vtpm_enabled(self):
if not self._data:
raise ValueError("Instance data (_data) is not initialized.")
instance_data = self._data
shielded_config = instance_data.get('shieldedInstanceConfig', {})
vtpm_status = shielded_config.get('enableVtpm')
if vtpm_status:
return True
return False

def get_console_log(self):
response = self.service_v1.instances().getSerialPortOutput(
project=self.project, zone=self.zone,
Expand Down
10 changes: 10 additions & 0 deletions os_tests/libs/utils_lib.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,7 @@ def confidential_instance_type(test_instance):
if not test_instance.vm:
test_instance.skipTest("Skip as no VM provisioned.")
if test_instance.vm.provider == 'google':
test_instance.log.info("print {}".format(test_instance.vm.data))
if test_instance.vm.check_confidential_type():
test_instance.log.info("Confidential instance type: {}".format(test_instance.vm.check_confidential_type()))
return test_instance.vm.check_confidential_type()
Expand Down Expand Up @@ -911,6 +912,15 @@ def is_sev_enabled(test_instance):
test_instance.skipTest("Skip as unable to determine sev status")
return False

def is_tpm_enabled(test_instance):
if not test_instance.vm:
test_instance.skipTest("Skip as no VM provisioned.")
if test_instance.vm.provider == 'google':
return test_instance.vm.is_vtpm_enabled()
else:
test_instance.skipTest("Skip as unable to determine Vtpm status")
return False

def is_arch(test_instance, arch="", action=None):
'''
Check whether system is specific system.
Expand Down
121 changes: 93 additions & 28 deletions os_tests/tests/test_general_check.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2112,34 +2112,43 @@ def test_check_dmesg_sev(self):
try:
if not self.vm or utils_lib.confidential_instance_type(self) == 'SEV' or utils_lib.is_sev_enabled(self):
# https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/875/diffs?commit_id=ea66ccfe756058c054f6c32b30f79e69e2b77c08#1314bf7c9c25b9572d0a973f6be52499f0478e85
cmd = 'dmesg | grep -v os_tests | grep -i sev'
cmd = 'sudo dmesg | grep -v os_tests | grep -i sev'
ret = utils_lib.run_cmd(self, cmd, ret_status=True, msg="Check if there is SEV in dmesg")
if ret == 0:
v = utils_lib.get_product_id(self)
x = int(v.split(".")[0])
y = int(v.split(".")[1])
if x < 8 or (x == 8 and y >= 8) or (x == 9 and y >= 2) or x > 9:
utils_lib.run_cmd(self, 'dmesg | grep -v os_tests | grep -i sev', expect_ret=0,
expect_kw='Memory Encryption Features active: AMD SEV',
msg="Check there is 'Memory Encryption Features active: AMD SEV' in dmesg before run 'perf top'")
ret = utils_lib.run_cmd(self, 'sudo dmesg | grep -i sev-snp', ret_status=True, msg="Check if there is 'SEV-SNP' in dmesg")
if ret ==0:
self.fail('SEV-SNP feature but not SEV is enabled in vm.')
else:
utils_lib.run_cmd(self, 'dmesg | grep -v os_tests | grep -i sev', expect_ret=0,
expect_kw='AMD Memory Encryption Features active: SEV',
msg="Check there is 'AMD Memory Encryption Features active: SEV' in dmesg before run 'perf top'")
v = utils_lib.get_product_id(self)
x = int(v.split(".")[0])
y = int(v.split(".")[1])
if x < 8 or (x == 8 and y >= 8) or (x == 9 and y >= 2) or x > 9:
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i sev', expect_ret=0,
expect_kw='Memory Encryption Features active: AMD SEV',
expect_not_kw='SEV-SNP',
msg="Check there is 'Memory Encryption Features active: AMD SEV' in dmesg before run 'perf top'")
else:
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i sev', expect_ret=0,
expect_kw='AMD Memory Encryption Features active: SEV',
expect_not_kw='SEV-SNP',
msg="Check there is 'AMD Memory Encryption Features active: SEV' in dmesg before run 'perf top'")
else:
self.fail('SEV is not enabled, please check the if it is configured when launching or an issue')

if not self.vm:
fail_log = 'Please check if SEV is enabled in vm'
else:
fail_log = 'SEV is enabled but no SEV keyword in dmesg, please check this issue'
self.fail('%s' % fail_log)
else:
self.skipTest('SEV is not enabled')
except NotImplementedError:
self.skipTest('SEV check is not implemented on %s' % self.vm.provider)

def test_check_dmesg_sevsnp(self):
def test_check_dmesg_snp(self):
"""
case_name:
test_check_dmesg_sevsnp
test_check_dmesg_snp
case_file:
os_tests.tests.test_general_check.TestGeneralCheck.test_check_dmesg_sevsnp
os_tests.tests.test_general_check.TestGeneralCheck.test_check_dmesg_snp
component:
kernel
bugzilla_id:
Expand All @@ -2161,15 +2170,18 @@ def test_check_dmesg_sevsnp(self):
"""
try:
if not self.vm or utils_lib.confidential_instance_type(self) == 'SEV_SNP':
cmd = 'dmesg | grep -v os_tests | grep -i SEV-SNP'
cmd = 'sudo dmesg | grep -v os_tests | grep -i SEV-SNP'
ret = utils_lib.run_cmd(self, cmd, ret_status=True, msg="Check if there is SEV-SNP in dmesg")
if ret == 0:
utils_lib.run_cmd(self, 'dmesg | grep -v os_tests | grep -i SEV-SNP', expect_ret=0,
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i SEV-SNP', expect_ret=0,
expect_kw='Memory Encryption Features active: AMD SEV SEV-ES SEV-SNP',
msg="Check there is 'Memory Encryption Features active: AMD SEV SEV-ES SEV-SNP' in dmesg before run 'perf top'")
else:
self.fail('SEV-SNP is not enabled, please check the if it is configured when launching or an issue')

if not self.vm:
fail_log = 'Please check if SEV-SNP is enabled in vm'
else:
fail_log = 'SEV-SNP is enabled but no SEV-SNP keyword in dmesg, please check this issue'
self.fail('%s' % fail_log)
else:
self.skipTest('SEV-SNP is not enabled')
except NotImplementedError:
Expand Down Expand Up @@ -2202,27 +2214,80 @@ def test_check_dmesg_tdx(self):
"""
try:
if not self.vm or utils_lib.confidential_instance_type(self) == 'TDX':
cmd = 'dmesg | grep -v os_tests | grep -i tdx'
cmd = 'sudo dmesg | grep -v os_tests | grep -i tdx'
ret = utils_lib.run_cmd(self, cmd, ret_status=True, msg="Check if there is TDX in dmesg")
if ret == 0:
utils_lib.run_cmd(self, 'dmesg | grep -v os_tests | grep -i tdx', expect_ret=0,
expect_kw='Memory Encryption Features active: Intel TDX',
msg="Check there is 'Memory Encryption Features active: Intel TDX' in dmesg before run 'perf top'")
v = utils_lib.get_product_id(self)
x = int(v.split(".")[0])
y = int(v.split(".")[1])
if x<9:
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i tdx', expect_ret=0,
expect_kw='Intel TDX',
msg="Check there is 'Intel TDX' in dmesg before run 'perf top'")
else:
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i tdx', expect_ret=0,
expect_kw='Memory Encryption Features active: Intel TDX',
msg="Check there is 'Memory Encryption Features active: Intel TDX' in dmesg before run 'perf top'")
if x >9 or (x == 9 and y > 5):
utils_lib.run_cmd(self, 'dmesg | grep -v os_tests | grep -i tdx', expect_ret=0,
utils_lib.run_cmd(self, 'sudo dmesg | grep -v os_tests | grep -i tdx', expect_ret=0,
expect_not_kw='TECH PREVIEW',
msg="TDX is full supported after RHEL 9.5.")
else:
self.fail('TDX is not enabled, please check the if it is configured when launching or an issue')

if not self.vm:
fail_log = 'Please check if TDX is enabled in vm'
else:
fail_log = 'TDX is enabled but no TDX keyword in dmesg, please check this issue'
self.fail('%s' % fail_log)
else:
self.skipTest('TDX is not enabled')
except NotImplementedError:
self.skipTest('TDX check is not implemented on %s' % self.vm.provider)

def test_check_tpm(self):
"""
case_name:
test_check_tpm
case_file:
os_tests.tests.test_general_check.TestGeneralCheck.test_check_tpm
component:
kernel
bugzilla_id:
RHEL-75512
customer_case_id:
False
testplan:
N/A
maintainer:
[email protected]
description:
Make sure there is tpm keyword from dmesg output and tpm in /dev.
key_steps:
# sudo dmesg|grep -i tpm
# ls /dev/tpm*
expect_result:
"tpm"
debug_want:
# dmesg
"""
try:
if not self.vm or utils_lib.is_tpm_enabled(self):
cmd = 'sudo dmesg | grep -v os_tests | grep -i tpm'
ret = utils_lib.run_cmd(self, cmd, ret_status=True, msg="Check if there is tpm in dmesg")
if ret == 0:
ret = utils_lib.run_cmd(self, 'ls /dev/tpm*', ret_status=True, msg="Check if there is tpm dev")
if ret != 0:
self.fail('TPM feature is enabled but there is no /dev/tpm*, please check the issue.')
else:
if not self.vm:
fail_log = 'Please check if the TPM feature is enabled in vm'
else:
fail_log = 'The TPM feature is enabled, please check if it is an issue'
self.fail('%s' % fail_log)
else:
self.skipTest('TPM feature is not enabled')
except NotImplementedError:
self.skipTest('TPM check is not implemented on %s' % self.vm.provider)

def test_check_secure_ioerror(self):
"""
case_tag:
Expand Down

0 comments on commit 77e2ebe

Please sign in to comment.