Skip to content

Commit 95a3c12

Browse files
authored
OCPBUGS-52853: Do not add iommu.passthrough to ARM by default (#1354)
Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>
1 parent f304f27 commit 95a3c12

File tree

11 files changed

+9
-35
lines changed

11 files changed

+9
-35
lines changed

assets/performanceprofile/tuned/openshift-node-performance-arm-aarch64

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ summary=Platform specific tuning for aarch64
55
# No cstate for ARM
66
# No pstate args for ARM
77

8-
# aarch64 specific tuning options
9-
cmdline_iommu_arm=iommu.passthrough=1

pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,12 +645,6 @@ var _ = Describe("Tuned", func() {
645645
Expect(err).ToNot(HaveOccurred())
646646
Expect(bootloaderSection.Key("cmdline_pstate").String()).To(Equal(""))
647647
})
648-
It("should set iommu passthrough", func() {
649-
tunedData := getTunedStructuredData(profile, components.ProfileNameArmAarch64)
650-
bootloaderSection, err := tunedData.GetSection("bootloader")
651-
Expect(err).ToNot(HaveOccurred())
652-
Expect(bootloaderSection.Key("cmdline_iommu_arm").String()).To(Equal("iommu.passthrough=1"))
653-
})
654648
})
655649
})
656650

test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ spec:
8484
8585
8686
name: openshift-node-performance-amd-x86-openshift-bootstrap-master
87-
- data: |
87+
- data: |+
8888
[main]
8989
summary=Platform specific tuning for aarch64
9090
9191
[bootloader]
9292
# No cstate for ARM
9393
# No pstate args for ARM
9494
95-
# aarch64 specific tuning options
96-
cmdline_iommu_arm=iommu.passthrough=1
9795
name: openshift-node-performance-arm-aarch64-openshift-bootstrap-master
9896
- data: |+
9997
[main]

test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ spec:
8484
8585
8686
name: openshift-node-performance-amd-x86-openshift-bootstrap-worker
87-
- data: |
87+
- data: |+
8888
[main]
8989
summary=Platform specific tuning for aarch64
9090
9191
[bootloader]
9292
# No cstate for ARM
9393
# No pstate args for ARM
9494
95-
# aarch64 specific tuning options
96-
cmdline_iommu_arm=iommu.passthrough=1
9795
name: openshift-node-performance-arm-aarch64-openshift-bootstrap-worker
9896
- data: |+
9997
[main]

test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ spec:
8484
8585
8686
name: openshift-node-performance-amd-x86-openshift-bootstrap-master
87-
- data: |
87+
- data: |+
8888
[main]
8989
summary=Platform specific tuning for aarch64
9090
9191
[bootloader]
9292
# No cstate for ARM
9393
# No pstate args for ARM
9494
95-
# aarch64 specific tuning options
96-
cmdline_iommu_arm=iommu.passthrough=1
9795
name: openshift-node-performance-arm-aarch64-openshift-bootstrap-master
9896
- data: |+
9997
[main]

test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ spec:
8484
8585
8686
name: openshift-node-performance-amd-x86-openshift-bootstrap-worker
87-
- data: |
87+
- data: |+
8888
[main]
8989
summary=Platform specific tuning for aarch64
9090
9191
[bootloader]
9292
# No cstate for ARM
9393
# No pstate args for ARM
9494
95-
# aarch64 specific tuning options
96-
cmdline_iommu_arm=iommu.passthrough=1
9795
name: openshift-node-performance-arm-aarch64-openshift-bootstrap-worker
9896
- data: |+
9997
[main]

test/e2e/performanceprofile/testdata/render-expected-output/default/arm/manual_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,14 @@ spec:
8383
8484
8585
name: openshift-node-performance-amd-x86-manual
86-
- data: |
86+
- data: |+
8787
[main]
8888
summary=Platform specific tuning for aarch64
8989
9090
[bootloader]
9191
# No cstate for ARM
9292
# No pstate args for ARM
9393
94-
# aarch64 specific tuning options
95-
cmdline_iommu_arm=iommu.passthrough=1
9694
name: openshift-node-performance-arm-aarch64-manual
9795
- data: |+
9896
[main]

test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ spec:
8484
8585
8686
name: openshift-node-performance-amd-x86-manual
87-
- data: |
87+
- data: |+
8888
[main]
8989
summary=Platform specific tuning for aarch64
9090
9191
[bootloader]
9292
# No cstate for ARM
9393
# No pstate args for ARM
9494
95-
# aarch64 specific tuning options
96-
cmdline_iommu_arm=iommu.passthrough=1
9795
name: openshift-node-performance-arm-aarch64-manual
9896
- data: |+
9997
[main]

test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,14 @@ spec:
8585
8686
8787
name: openshift-node-performance-amd-x86-manual
88-
- data: |
88+
- data: |+
8989
[main]
9090
summary=Platform specific tuning for aarch64
9191
9292
[bootloader]
9393
# No cstate for ARM
9494
# No pstate args for ARM
9595
96-
# aarch64 specific tuning options
97-
cmdline_iommu_arm=iommu.passthrough=1
9896
name: openshift-node-performance-arm-aarch64-manual
9997
- data: |+
10098
[main]

test/e2e/performanceprofile/testdata/render-expected-output/default/pp-norps/manual_tuned.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,14 @@ spec:
8585
8686
8787
name: openshift-node-performance-amd-x86-manual
88-
- data: |
88+
- data: |+
8989
[main]
9090
summary=Platform specific tuning for aarch64
9191
9292
[bootloader]
9393
# No cstate for ARM
9494
# No pstate args for ARM
9595
96-
# aarch64 specific tuning options
97-
cmdline_iommu_arm=iommu.passthrough=1
9896
name: openshift-node-performance-arm-aarch64-manual
9997
- data: |+
10098
[main]

0 commit comments

Comments
 (0)