github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1115 from nitkon/P9SMT

Browse Source 
runtime: Fix TestCCCheckCLIFunction on P9 system
This commit is contained in:
James O. D. Hunt 2019-01-23 10:34:21 +00:00 committed by GitHub
commit 1353499e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
cli/kata-check_data_ppc64le_test.go
View File

@ -5,110 +5,20 @@
package main package main
const testCPUInfoTemplate = ` import (
processor : 0 "github.com/sirupsen/logrus"
cpu : POWER8E (raw), altivec supported "io/ioutil"
clock : 3690.000000MHz )
revision : 2.1 (pvr 004b 0201)
processor : 8 var testCPUInfoTemplate = setTestCPUInfoTemplate()
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 16 func setTestCPUInfoTemplate() string {
cpu : POWER8E (raw), altivec supported
clock : 2360.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 24 var kataLog *logrus.Entry
cpu : POWER8E (raw), altivec supported content, err := ioutil.ReadFile("/proc/cpuinfo")
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 32 if err != nil {
cpu : POWER8E (raw), altivec supported kataLog.WithError(err).Error("failed to read file /proc/cpuinfo")
clock : 3690.000000MHz }
revision : 2.1 (pvr 004b 0201) return string(content)
}
processor : 40
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 48
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 56
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 64
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 72
cpu : POWER8E (raw), altivec supported
clock : 3059.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 80
cpu : POWER8E (raw), altivec supported
clock : 2693.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 88
cpu : POWER8E (raw), altivec supported
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 96
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 104
cpu : POWER8E (raw), altivec supported
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 112
cpu : POWER8E (raw), altivec supported
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 120
cpu : POWER8E (raw), altivec supported
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 128
cpu : POWER8E (raw), altivec supported
clock : 3690.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 136
cpu : POWER8E (raw), altivec supported
clock : 2061.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 144
cpu : POWER8E (raw), altivec supported
clock : 2294.000000MHz
revision : 2.1 (pvr 004b 0201)
processor : 152
cpu : POWER8E (raw), altivec supported
clock : 2560.000000MHz
revision : 2.1 (pvr 004b 0201)
timebase : 512000000
platform : PowerNV
model : 8247-22L
machine : PowerNV 8247-22L
firmware : OPAL v3
`

11
cli/kata-check_ppc64le.go
View File

@ -12,6 +12,8 @@ import (
"github.com/kata-containers/runtime/pkg/katautils" "github.com/kata-containers/runtime/pkg/katautils"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"regexp"
"strconv"
) )
const ( const (
@ -69,7 +71,14 @@ func hostIsVMContainerCapable(details vmContainerCapableDetails) error {
return err return err
} }
if strings.Contains(text, "POWER8") { ae := regexp.MustCompile("[0-9]+")
re := regexp.MustCompile("POWER[0-9]")
powerProcessor, err := strconv.Atoi(ae.FindString(re.FindString(text)))
if err != nil {
kataLog.WithError(err).Error("Failed to find Power Processor number from ", details.cpuInfoFile)
}
if powerProcessor <= 8 {
if !isSMTOff() { if !isSMTOff() {
return fmt.Errorf("SMT is not Off. %s", failMessage) return fmt.Errorf("SMT is not Off. %s", failMessage)
} }