Commit 20c6796e authored by Jaroslaw Chachulski's avatar Jaroslaw Chachulski Committed by Konrad Sztyber
Browse files

scripts/nvmf_perf: fix for check_rdma_protocol function 



Roce_ena object is already a string so you cant use decode() on it.
Added more log information

Signed-off-by: default avatarJaroslaw Chachulski <jaroslawx.chachulski@intel.com>
Change-Id: I93f56ba0c7a562afd86a2bbb961f961ef30a2ae0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17293


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 2b246375

scripts/perf/nvmf/run_nvmf.py

+3 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class Server: 
    def check_rdma_protocol(self):

        try:

            roce_ena = self.exec_cmd(["cat", "/sys/module/irdma/parameters/roce_ena"])

            roce_ena = roce_ena.decode().strip()

            roce_ena = roce_ena.strip()

            if roce_ena == "0":

                return self.RDMA_PROTOCOL_IWARP

            else:
@@ -157,10 +157,12 @@ class Server: 
            return

        if self.irdma_roce_enable and current_mode == self.RDMA_PROTOCOL_IWARP:

            self.reload_driver("irdma", "roce_ena=1")

            self.log.info("Loaded irdma driver with RoCE enabled")

        elif self.irdma_roce_enable and current_mode == self.RDMA_PROTOCOL_ROCE:

            self.log.info("Leaving irdma driver with RoCE enabled")

        else:

            self.reload_driver("irdma", "roce_ena=0")

            self.log.info("Loaded irdma driver with iWARP enabled")



    def configure_adq(self):

        self.adq_load_modules()