This will be used for additional pre-configuration of the SCTP performance test.

Signed-off-by: Jan Tluka jtluka@redhat.com --- .../Perf/Measurements/BaseFlowMeasurement.py | 18 ++++++++++++++++-- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py index 8c74c610..856eeba3 100644 --- a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py +++ b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py @@ -8,15 +8,17 @@ from lnst.RecipeCommon.Perf.Results import SequentialPerfResult class Flow(object): def __init__(self, type, - generator, generator_bind, - receiver, receiver_bind, + generator, generator_bind, generator_nic, + receiver, receiver_bind, receiver_nic, msg_size, duration, parallel_streams, cpupin): self._type = type

self._generator = generator self._generator_bind = generator_bind + self._generator_nic = generator_nic self._receiver = receiver self._receiver_bind = receiver_bind + self._receiver_nic = receiver_nic

self._msg_size = msg_size self._duration = duration @@ -35,6 +37,10 @@ class Flow(object): def generator_bind(self): return self._generator_bind

+ @property + def generator_nic(self): + return self._generator_nic + @property def receiver(self): return self._receiver @@ -43,6 +49,10 @@ class Flow(object): def receiver_bind(self): return self._receiver_bind

+ @property + def receiver_nic(self): + return self._receiver_nic + @property def msg_size(self): return self._msg_size @@ -65,8 +75,10 @@ class Flow(object): type={type}, generator={generator}, generator_bind={generator_bind}, + generator_nic={generator_nic}, receiver={receiver}, receiver_bind={receiver_bind}, + receiver_nic={receiver_nic}, msg_size={msg_size}, duration={duration}, parallel_streams={parallel_streams}, @@ -75,8 +87,10 @@ class Flow(object): type=self.type, generator=str(self.generator), generator_bind=self.generator_bind, + generator_nic=self.generator_nic, receiver=str(self.receiver), receiver_bind=self.receiver_bind, + receiver_nic=self.receiver_nic, msg_size=self.msg_size, duration=self.duration, parallel_streams=self.parallel_streams, diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 6a287ada..f8fafc80 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -508,7 +508,9 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): cpupin = self.params.perf_tool_cpu if "perf_tool_cpu" in self.params else None return PerfFlow(type=perf_test, generator=client_nic.netns, generator_bind=client_bind, + generator_nic=client_nic, receiver=server_nic.netns, receiver_bind=server_bind, + receiver_nic=server_nic, msg_size=msg_size, duration=self.params.perf_duration, parallel_streams=self.params.perf_parallel_streams,

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

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index f8fafc80..46cc09ea 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -13,6 +13,7 @@ from lnst.Common.Parameters import ( from lnst.Common.IpAddress import AF_INET, AF_INET6

from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin +from lnst.Recipes.ENRT.PerfTestMixins import SctpFirewallPerfTestMixin

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

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

This class defines the shared *test* method defining the common test @@ -343,7 +345,9 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): methods to execute, report and evaluate the results. """ for perf_config in self.generate_perf_configurations(recipe_config): + self.apply_perf_test_tweak(perf_config) result = self.perf_test(perf_config) + self.remove_perf_test_tweak(perf_config) self.perf_report_and_evaluate(result)

def generate_ping_configurations(self, config):

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

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 46cc09ea..438128a2 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -337,6 +337,10 @@ class BaseEnrtRecipe(SctpFirewallPerfTestMixin, BaseSubConfigMixin, result = self.ping_test(ping_configs) self.ping_report_and_evaluate(result)

+ def describe_perf_test_tweak(self, perf_config): + description = self.generate_perf_test_tweak_description(perf_config) + self.add_result(True, "\n".join(description)) + def do_perf_tests(self, recipe_config): """Performance testing loop

@@ -346,6 +350,7 @@ class BaseEnrtRecipe(SctpFirewallPerfTestMixin, BaseSubConfigMixin, """ for perf_config in self.generate_perf_configurations(recipe_config): self.apply_perf_test_tweak(perf_config) + self.describe_perf_test_tweak(perf_config) result = self.perf_test(perf_config) self.remove_perf_test_tweak(perf_config) self.perf_report_and_evaluate(result)

On Mon, Jul 27, 2020 at 05:51:30PM +0200, Jan Tluka wrote:

It does not make sense to have this setup just for offloaded tests. A follow up patch will add this to proper place.

Signed-off-by: Jan Tluka jtluka@redhat.com

.../ENRT/ConfigMixins/OffloadSubConfigMixin.py | 12 ------------ 1 file changed, 12 deletions(-)

diff --git a/lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py b/lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py index 989743a8..3250a6af 100644 --- a/lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py +++ b/lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py @@ -45,12 +45,6 @@ class OffloadSubConfigMixin(BaseSubConfigMixin): ethtool_offload_string += " %s %s" % (name, value)

         for nic in self.offload_nics:

•            if "sctp_stream" in self.params.perf_tests:
  

•                nic.netns.run(
  

•                    "iptables -I OUTPUT ! -o %s -p sctp -j DROP" % nic.name,
  

•                    job_level=ResultLevel.NORMAL,
  

•                )
  

•            nic.netns.run(
                 "ethtool -K {} {}".format(nic.name, ethtool_offload_string),
                 job_level=ResultLevel.NORMAL,
  

@@ -78,12 +72,6 @@ class OffloadSubConfigMixin(BaseSubConfigMixin): ethtool_offload_string += " %s %s" % (name, "on")

         for nic in self.offload_nics:

•            if "sctp_stream" in self.params.perf_tests:
  

•                nic.netns.run(
  

•                    "iptables -D OUTPUT ! -o %s -p sctp -j DROP" % nic.name,
  

•                    job_level=ResultLevel.NORMAL,
  

•                )
  

•            # set all the offloads back to 'on' state
             nic.netns.run(
                 "ethtool -K {} {}".format(nic.name, ethtool_offload_string),
  

-- 2.21.3 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...

Looks good to me, pushing to master.

-Ondrej