Commit 2874d8ff authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

scripts/nvmf_perf: reload ice driver after ADQ tests 



Always reload ICE driver after tests with ADQ enabled.
This is to reset tc qdisc and filter settings and make
sure they don't affect future tests.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I70b94ef236741fe81870954f9901e02b9b5aadb9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12622


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent a39cf2d6

scripts/perf/nvmf/run_nvmf.py

+13 −6
Original line number Diff line number Diff line
@@ -173,16 +173,19 @@ class Server: 
            self.log_print(xps_cmd)

            self.exec_cmd(xps_cmd)



    def reload_driver(self, driver):

        try:

            self.exec_cmd(["sudo", "rmmod", driver])

            self.exec_cmd(["sudo", "modprobe", driver])

        except CalledProcessError as e:

            self.log_print("ERROR: failed to reload %s module!" % driver)

            self.log_print("%s resulted in error: %s" % (e.cmd, e.output))



    def adq_configure_nic(self):

        self.log_print("Configuring NIC port settings for ADQ testing...")



        # Reload the driver first, to make sure any previous settings are re-set.

        try:

            self.exec_cmd(["sudo", "rmmod", "ice"])

            self.exec_cmd(["sudo", "modprobe", "ice"])

        except CalledProcessError as e:

            self.log_print("ERROR: failed to reload ice module!")

            self.log_print("%s resulted in error: %s" % (e.cmd, e.output))

        self.reload_driver("ice")



        nic_names = [self.get_nic_name_by_ip(n) for n in self.nic_ips]

        for nic in nic_names:
@@ -1572,11 +1575,15 @@ if __name__ == "__main__": 
        target_obj.restore_tuned()

        target_obj.restore_services()

        target_obj.restore_sysctl()

        if target_obj.enable_adq:

            target_obj.reload_driver("ice")

        for i in initiators:

            i.restore_governor()

            i.restore_tuned()

            i.restore_services()

            i.restore_sysctl()

            if i.enable_adq:

                i.reload_driver("ice")

        target_obj.parse_results(args.results, args.csv_filename)

    finally:

        for i in initiators: