Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-25860: Disable managed interrupts for smartpqi #915

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

OCPBUGS-25860: Disable managed interrupts for smartpqi #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c853473
OCPBUGS-25860: Disable managed interrupts for smartpqi
MarSik Jan 12, 2024
f2d6271
Sync rendering tests
MarSik Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions assets/performanceprofile/tuned/openshift-node-performance
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ cmdline_pstate=+intel_pstate=active
cmdline_pstate=+intel_pstate=${automatic_pstate}
{{end}}

# In case a smartpqi device is present, make sure the interrupt affinity
# can be managed by userspace services. This driver does not obey
# the isolcpus=managed_irq hint and is causing interference.
# See: https://issues.redhat.com/browse/OCPBUGS-25860
cmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\bsmartpqi\b:smartpqi.disable_managed_interrupts=1:}

[rtentsk]

{{ if .HardwareTuning }}
Expand Down
5 changes: 4 additions & 1 deletion ...tdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-master
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...tdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-worker
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-master
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-worker
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...le/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-master
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...le/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
\n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n# In case a
smartpqi device is present, make sure the interrupt affinity\n# can be managed
by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-openshift-bootstrap-worker
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion ...performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=active\n\n\n[rtentsk]\n\n\n[sysfs]\n#
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=active\n\n\n#
In case a smartpqi device is present, make sure the interrupt affinity\n# can
be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n[sysfs]\n#
sets provided frequencies to isolated and reserved cpus\n\n/sys/devices/system/cpu/cpufreq/policy2/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy3/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq=2800000\n/sys/devices/system/cpu/cpufreq/policy1/scaling_max_freq=2800000\n"
name: openshift-node-performance-manual
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n#
In case a smartpqi device is present, make sure the interrupt affinity\n# can
be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-manual
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ spec:
tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded}
intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores}
tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n[rtentsk]\n\n\n"
default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=${automatic_pstate}\n\n\n#
In case a smartpqi device is present, make sure the interrupt affinity\n# can
be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq
hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n\n[rtentsk]\n\n\n"
name: openshift-node-performance-manual
- data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real
time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance
Expand Down