Commit b08206df authored by Jaroslaw Chachulski's avatar Jaroslaw Chachulski Committed by Tomasz Zawadzki
Browse files

perf/nvmf: move 'iobuf_set_options' to separate 'iobuf' subsystem 



This commit addresses a configuration in the `gen_spdk_bdev_conf`
function. Previously, `iobuf_set_options` was placed in the `bdev`
subsystem. This commit corrects this by creating a separate `iobuf`
subsystem in the configuration and moving the `iobuf_set_options`
method there.

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


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent ea941cae

scripts/perf/nvmf/run_nvmf.py

+15 −12
Original line number Diff line number Diff line
@@ -1558,11 +1558,23 @@ class SPDKInitiator(Initiator): 
        return



    def gen_spdk_bdev_conf(self, remote_subsystem_list):

        bdev_cfg_section = {

        spdk_cfg_section = {

            "subsystems": [

                {

                    "subsystem": "bdev",

                    "config": []

                },

                {

                    "subsystem": "iobuf",

                    "config": [

                        {

                            "method": "iobuf_set_options",

                            "params": {

                                "small_pool_count": self.small_pool_count,

                                "large_pool_count": self.large_pool_count

                            }

                        }

                    ]

                }

            ]

        }
@@ -1587,18 +1599,9 @@ class SPDKInitiator(Initiator): 
            if self.enable_data_digest:

                nvme_ctrl["params"].update({"ddgst": self.enable_data_digest})



            bdev_cfg_section["subsystems"][0]["config"].append(nvme_ctrl)



        iobuf = {

            "method": "iobuf_set_options",

            "params": {

                "small_pool_count": self.small_pool_count,

                "large_pool_count": self.large_pool_count

            }

        }

        bdev_cfg_section["subsystems"][0]["config"].append(iobuf)

            spdk_cfg_section["subsystems"][0]["config"].append(nvme_ctrl)



        return json.dumps(bdev_cfg_section, indent=2)

        return json.dumps(spdk_cfg_section, indent=2)



    def gen_fio_filename_conf(self, subsystems, threads, io_depth, num_jobs=1, offset=False, offset_inc=0):

        self.available_cpus = self.get_numa_cpu_map()