Merge pull request #8178 from khdo/ocpbugs26216

openshift-merge-bot[bot] · web-flow · commit 1cb86cb552e9 · 2024-05-03T11:22:05.000Z
OCPBUGS-26216: Fix parameter used to disable smt for ppc64 systems
diff --git a/pkg/asset/machines/machineconfig/hyperthreading.go b/pkg/asset/machines/machineconfig/hyperthreading.go
@@ -37,7 +37,7 @@ func ForHyperthreadingDisabled(role string) (*mcfgv1.MachineConfig, error) {
 		},
 		Spec: mcfgv1.MachineConfigSpec{
 			Config:          rawExt,
-			KernelArguments: []string{"nosmt"},
+			KernelArguments: []string{"nosmt", "smt-enabled=off"},
 		},
 	}, nil
 }
diff --git a/pkg/asset/machines/master_test.go b/pkg/asset/machines/master_test.go
@@ -79,6 +79,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `},
@@ -103,6 +104,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `, `apiVersion: machineconfiguration.openshift.io/v1
diff --git a/pkg/asset/machines/worker_test.go b/pkg/asset/machines/worker_test.go
@@ -73,6 +73,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `},
@@ -97,6 +98,7 @@ spec:
   fips: false
   kernelArguments:
   - nosmt
+  - smt-enabled=off
   kernelType: ""
   osImageURL: ""
 `, `apiVersion: machineconfiguration.openshift.io/v1

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func ForHyperthreadingDisabled(role string) (*mcfgv1.MachineConfig, error) {`
`37`	`37`	`},`
`38`	`38`	`Spec: mcfgv1.MachineConfigSpec{`
`39`	`39`	`Config: rawExt,`
`40`		`- KernelArguments: []string{"nosmt"},`
	`40`	`+ KernelArguments: []string{"nosmt", "smt-enabled=off"},`
`41`	`41`	`},`
`42`	`42`	`}, nil`
`43`	`43`	`}`