diff --git a/scripts/perf/nvmf/common.py b/scripts/perf/nvmf/common.py index bbe528829..c95044d94 100644 --- a/scripts/perf/nvmf/common.py +++ b/scripts/perf/nvmf/common.py @@ -23,14 +23,6 @@ def get_nvme_devices_bdf(): return output -def get_nvme_devices(): - print("Getting kernel NVMe names") - output = check_output("lsblk -o NAME -nlp", shell=True).decode(encoding="utf-8") - output = [x for x in output.split("\n") if "nvme" in x] - print("Done getting kernel NVMe names") - return output - - def read_json_stats(file): with open(file, "r") as json_data: data = json.load(json_data) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 9521b1f1f..bfd751d1c 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -862,6 +862,11 @@ class KernelTarget(Target): def stop(self): self.nvmet_command(self.nvmet_bin, "clear") + def get_nvme_devices(self): + output = self.exec_cmd(["lsblk", "-o", "NAME", "-nlpd"]) + output = [x for x in output.split("\n") if "nvme" in x] + return output + def nvmet_command(self, nvmet_bin, command): return self.exec_cmd([nvmet_bin, *(command.split(" "))]) @@ -925,7 +930,7 @@ class KernelTarget(Target): nvme_list = ["/dev/nullb{}".format(x) for x in range(self.null_block)] else: self.log.info("Configuring with NVMe drives.") - nvme_list = get_nvme_devices() + nvme_list = self.get_nvme_devices() self.kernel_tgt_gen_subsystem_conf(nvme_list) self.subsys_no = len(nvme_list)