diff --git a/scripts/perf/nvmf/README.md b/scripts/perf/nvmf/README.md index 978154092..4fe54b0ac 100644 --- a/scripts/perf/nvmf/README.md +++ b/scripts/perf/nvmf/README.md @@ -54,6 +54,9 @@ by default. Not used if "mode" is set to "spdk". ### fio_bin Path to the fio binary that will be used to compile SPDK and run the test. If not specified, then the script will use /usr/src/fio/fio as the default. +### extra_params +Space separated string with additional settings for "nvme connect" command +other than -t, -s, -n and -a. ## fio Fio job parameters. diff --git a/scripts/perf/nvmf/config.json b/scripts/perf/nvmf/config.json index 680cba850..d8b16be93 100644 --- a/scripts/perf/nvmf/config.json +++ b/scripts/perf/nvmf/config.json @@ -17,7 +17,8 @@ "nic_ips": ["192.0.1.1"], "mode": "spdk", "nvmecli_dir": "/path/to/nvmecli", - "fio_dir": "/path/to/fio binary" + "fio_dir": "/path/to/fio binary", + "extra_params": "Extra nvme connect params" }, "initiator2": { "ip": "10.0.0.2", diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 55664ff42..5f216e987 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -573,6 +573,10 @@ class KernelInitiator(Initiator): super(KernelInitiator, self).__init__(name, username, password, mode, nic_ips, ip, transport, fio_bin=fio_bin) + self.extra_params = "" + if kwargs["extra_params"]: + self.extra_params = kwargs["extra_params"] + def __del__(self): self.ssh_connection.close() @@ -581,7 +585,10 @@ class KernelInitiator(Initiator): self.log_print("Below connection attempts may result in error messages, this is expected!") for subsystem in subsystems: self.log_print("Trying to connect %s %s %s" % subsystem) - self.remote_call("sudo %s connect -t %s -s %s -n %s -a %s" % (self.nvmecli_bin, self.transport, *subsystem)) + self.remote_call("sudo %s connect -t %s -s %s -n %s -a %s %s" % (self.nvmecli_bin, + self.transport, + *subsystem, + self.extra_params)) time.sleep(2) def kernel_init_disconnect(self, address_list, subsys_no):