This mixin class extends BaseEnrtRecipe with ability to control the CPU idle states before running the tests.

The class adds 'minimal_idlestates_latency' parameter that is passed as the latency argument (-D) of the 'cpupower idle-set' that will disable all idle states with an equal or higher latency than the specified value.

If the value is 0 this will effectively disable all CPU idle states.

Signed-off-by: Jan Tluka jtluka@redhat.com --- .../ConfigMixins/DisableIdleStatesMixin.py | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py

diff --git a/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py b/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py new file mode 100644 index 00000000..ca45dfb3 --- /dev/null +++ b/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py @@ -0,0 +1,42 @@ +from lnst.Common.Parameters import IntParam +from lnst.Recipes.ENRT.ConfigMixins import BaseSubConfigMixin + +class DisableIdleStatesMixin(BaseSubConfigMixin): + minimal_idlestates_latency = IntParam() + + @property + def disable_idlestates_host_list(self): + """ + The value of this property is a list of hosts for which the CPU idle + states should be turned off. Derived class can override this property. + """ + return [] + + def apply_sub_configuration(self, config): + super().apply_sub_configuration(config) + + latency = getattr(self.params, "minimal_idlestates_latency", None) + if latency is not None: + for host in self.disable_idlestates_host_list: + # TODO: save previous state + host.run("cpupower idle-set -D {}".format(latency)) + + def generate_sub_configuration_description(self, config): + description = super().generate_sub_configuration_description(config) + + latency = getattr(self.params, "minimal_idlestates_latency", None) + if latency is not None: + for host in self.disable_idlestates_host_list: + description.append("disabled idle states with latency higher than "\ + "{} on host {}".format(latency, host.hostid) + ) + else: + description.append("configuration of idle states skipped") + + return description + + def remove_sub_configuration(self, config): + for host in self.disable_idlestates_host_list: + host.run("cpupower idle-set -E") + + return super().remove_sub_configuration(config)

This class currently inherits from SctpFirewallPerfTestMixin only but can be extended in the future with other mixin classes for a user convenience.

Signed-off-by: Jan Tluka jtluka@redhat.com --- .../Recipes/ENRT/PerfTestMixins/CommonPerfTestTweakMixin.py | 6 ++++++ lnst/Recipes/ENRT/PerfTestMixins/__init__.py | 1 + 2 files changed, 7 insertions(+) create mode 100644 lnst/Recipes/ENRT/PerfTestMixins/CommonPerfTestTweakMixin.py

diff --git a/lnst/Recipes/ENRT/PerfTestMixins/CommonPerfTestTweakMixin.py b/lnst/Recipes/ENRT/PerfTestMixins/CommonPerfTestTweakMixin.py new file mode 100644 index 00000000..7606ef90 --- /dev/null +++ b/lnst/Recipes/ENRT/PerfTestMixins/CommonPerfTestTweakMixin.py @@ -0,0 +1,6 @@ +from lnst.Recipes.ENRT.PerfTestMixins import ( + SctpFirewallPerfTestMixin, + ) + +class CommonPerfTestTweakMixin(SctpFirewallPerfTestMixin): + pass diff --git a/lnst/Recipes/ENRT/PerfTestMixins/__init__.py b/lnst/Recipes/ENRT/PerfTestMixins/__init__.py index 9f320118..8a109ad0 100644 --- a/lnst/Recipes/ENRT/PerfTestMixins/__init__.py +++ b/lnst/Recipes/ENRT/PerfTestMixins/__init__.py @@ -1,2 +1,3 @@ from lnst.Recipes.ENRT.PerfTestMixins.BasePerfTestTweakMixin import BasePerfTestTweakMixin from lnst.Recipes.ENRT.PerfTestMixins.SctpFirewallPerfTestMixin import SctpFirewallPerfTestMixin +from lnst.Recipes.ENRT.PerfTestMixins.CommonPerfTestTweakMixin import CommonPerfTestTweakMixin

All of the tests that inherit from BaseEnrtRecipe will make use of these mixins so instead of adding them to individual recipes they are included in the base class.

To control the behaviour on a specific recipe level the recipes can override the disable_turboboost_host_list and disable_idlestates_host_list properties and relevant mixin recipe parameters.

Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 38 ++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index a5296e94..d629b726 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -14,6 +14,10 @@ from lnst.Common.IpAddress import AF_INET, AF_INET6

from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin from lnst.Recipes.ENRT.PerfTestMixins import CommonPerfTestTweakMixin +from lnst.Recipes.ENRT.ConfigMixins.DisableTurboboostMixin import ( + DisableTurboboostMixin) +from lnst.Recipes.ENRT.ConfigMixins.DisableIdleStatesMixin import ( + DisableIdleStatesMixin)

from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate, PingConf from lnst.RecipeCommon.Perf.Recipe import Recipe as PerfRecipe @@ -33,7 +37,9 @@ class EnrtConfiguration(object): """ pass

-class BaseEnrtRecipe(CommonPerfTestTweakMixin, BaseSubConfigMixin, +class BaseEnrtRecipe(CommonPerfTestTweakMixin, + DisableTurboboostMixin, DisableIdleStatesMixin, + BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): """Base Recipe class for the ENRT recipe package

@@ -582,3 +588,33 @@ class BaseEnrtRecipe(CommonPerfTestTweakMixin, BaseSubConfigMixin, interval = pconf.ping_interval, size = pconf.ping_psize, ) + + @property + def disable_turboboost_host_list(self): + """ + The `disable_turboboost_host_list` property value is the list of all + matched hosts for the recipe. If a specific recipe needs to change + this it should override the :any:`baremetal_hosts` property. + + For detailed explanation of this property see + :any:`DisableTurboboostMixin` and + :any:`DisableTurboboostMixin.disable_turboboost_host_list`. + """ + return self.baremetal_hosts + + @property + def disable_idlestates_host_list(self): + """ + The `disable_idlestates_host_list` property value is the list of all + matched hosts for the recipe. If a specific recipe needs to change + this it should override the :any:`baremetal_hosts` property. + + For detailed explanation of this property see + :any:`DisableIdleStatesMixin` and + :any:`DisableIdleStatesMixin.disable_idlestates_host_list`. + """ + return self.baremetal_hosts + + @property + def baremetal_hosts(self): + return self.matched

Signed-off-by: Jan Tluka jtluka@redhat.com --- .../disable_idlestates_mixin.rst | 6 ++++++ docs/source/config_mixins.rst | 1 + .../ENRT/ConfigMixins/DisableIdleStatesMixin.py | 15 +++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 docs/source/config_mixin_classes/disable_idlestates_mixin.rst

diff --git a/docs/source/config_mixin_classes/disable_idlestates_mixin.rst b/docs/source/config_mixin_classes/disable_idlestates_mixin.rst new file mode 100644 index 00000000..48042da9 --- /dev/null +++ b/docs/source/config_mixin_classes/disable_idlestates_mixin.rst @@ -0,0 +1,6 @@ +DisableIdleStatesMixin +====================== + +.. autoclass:: lnst.Recipes.ENRT.ConfigMixins.DisableIdleStatesMixin.DisableIdleStatesMixin + :members: + :show-inheritance: diff --git a/docs/source/config_mixins.rst b/docs/source/config_mixins.rst index 53451190..240f3f9d 100644 --- a/docs/source/config_mixins.rst +++ b/docs/source/config_mixins.rst @@ -14,3 +14,4 @@ ENRT Config Mixins config_mixin_classes/pause_frames_mixin config_mixin_classes/perf_reverse_mixin.rst config_mixin_classes/disable_turboboost_mixin.rst + config_mixin_classes/disable_idlestates_mixin.rst diff --git a/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py b/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py index ca45dfb3..45fc95a8 100644 --- a/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py +++ b/lnst/Recipes/ENRT/ConfigMixins/DisableIdleStatesMixin.py @@ -2,6 +2,21 @@ from lnst.Common.Parameters import IntParam from lnst.Recipes.ENRT.ConfigMixins import BaseSubConfigMixin

class DisableIdleStatesMixin(BaseSubConfigMixin): + """ + This mixin class is an extension to the :any:`BaseEnrtRecipe` class that can + be used to control the CPU idle states before running the tests. + + Any recipe that wants to use the mixin must define the + :attr:`disable_idlestates_host_list` property first. + + :param minimal_idlestates_latency: + (optional test parameter) an integer, the value is passed as the latency + argument of the **'cpupower idle-set -D'** command that will disable + all idle states with an equal or higher latency than the specified value + on all hosts defined by :attr:`disable_idlestates_host_list` property. + If the value is 0 this will effectively disable all CPU idle states. + """ + minimal_idlestates_latency = IntParam()

@property