From 20c6796eafda905158fa7ec0f6fa6d160003c28f Mon Sep 17 00:00:00 2001 From: Jaroslaw Chachulski Date: Thu, 23 Mar 2023 05:46:54 -0400 Subject: [PATCH] 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: Jaroslaw Chachulski Change-Id: I93f56ba0c7a562afd86a2bbb961f961ef30a2ae0 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17293 Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Pawel Piatek Reviewed-by: Michal Berger Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber --- scripts/perf/nvmf/run_nvmf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index c0e2d5ff2..b35b03d13 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -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()