12d2338429
This patch adds a target_core_mib.c statistics conversion for backend context struct se_subsystem_dev + struct se_device config_group based statistics in target_core_device.c using CONFIGFS_EATTR() based struct config_item_types from target_core_stat.c code. The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_dev, scsi_lu, and scsi_tgt_dev output from within individual: /sys/kernel/config/target/core/$HBA/DEV/ The legacy procfs output now appear as individual configfs attributes under: *) $HBA/$DEV/statistics/scsi_dev: |-- indx |-- inst |-- ports `-- role *) $HBA/$DEV/statistics/scsi_lu: |-- creation_time |-- dev |-- dev_type |-- full_stat |-- hs_num_cmds |-- indx |-- inst |-- lu_name |-- lun |-- num_cmds |-- prod |-- read_mbytes |-- resets |-- rev |-- state_bit |-- status |-- vend `-- write_mbytes *) $HBA/$DEV/statistics/scsi_tgt_dev: |-- indx |-- inst |-- non_access_lus |-- num_lus |-- resets `-- status The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_port, scsi_tgt_port and scsi_transport output from within individual: /sys/kernel/config/target/fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/ The legacy procfs output now appear as individual configfs attributes under: *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_port |-- busy_count |-- dev |-- indx |-- inst `-- role *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_tgt_port |-- dev |-- hs_in_cmds |-- in_cmds |-- indx |-- inst |-- name |-- port_index |-- read_mbytes `-- write_mbytes *) fabric/$WWN/tpgt_$TPGT/lun/lun_$LUN_ID/statistics/scsi_transport |-- dev_name |-- device |-- indx `-- inst The conversion from backend /proc/scsi_target/mib/ context output to configfs default groups+attributes include scsi_att_intr_port and scsi_auth_intr output from within individual: /sys/kernel/config/target/fabric/$WWN/tpgt_$TPGT/acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/ The legacy procfs output now appear as individual configfs attributes under: *) acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/scsi_att_intr_port |-- dev |-- indx |-- inst |-- port |-- port_auth_indx `-- port_ident *) acls/$INITIATOR_WWN/lun_$LUN_ID/statistics/scsi_auth_intr |-- att_count |-- creation_time |-- dev |-- dev_or_port |-- hs_num_cmds |-- indx |-- inst |-- intr_name |-- map_indx |-- num_cmds |-- port |-- read_mbytes |-- row_status `-- write_mbytes Also, this includes adding struct target_fabric_configfs_template-> tfc_wwn_fabric_stats_cit and ->tfc_tpg_nacl_stat_cit respectively for use during target_core_fabric_configfs.c:target_fabric_setup_cits() Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
57 lines
2.1 KiB
C
57 lines
2.1 KiB
C
#define TARGET_CORE_CONFIGFS_VERSION TARGET_CORE_MOD_VERSION
|
|
|
|
#define TARGET_CORE_CONFIG_ROOT "/sys/kernel/config"
|
|
|
|
#define TARGET_CORE_NAME_MAX_LEN 64
|
|
#define TARGET_FABRIC_NAME_SIZE 32
|
|
|
|
extern struct target_fabric_configfs *target_fabric_configfs_init(
|
|
struct module *, const char *);
|
|
extern void target_fabric_configfs_free(struct target_fabric_configfs *);
|
|
extern int target_fabric_configfs_register(struct target_fabric_configfs *);
|
|
extern void target_fabric_configfs_deregister(struct target_fabric_configfs *);
|
|
|
|
struct target_fabric_configfs_template {
|
|
struct config_item_type tfc_discovery_cit;
|
|
struct config_item_type tfc_wwn_cit;
|
|
struct config_item_type tfc_wwn_fabric_stats_cit;
|
|
struct config_item_type tfc_tpg_cit;
|
|
struct config_item_type tfc_tpg_base_cit;
|
|
struct config_item_type tfc_tpg_lun_cit;
|
|
struct config_item_type tfc_tpg_port_cit;
|
|
struct config_item_type tfc_tpg_port_stat_cit;
|
|
struct config_item_type tfc_tpg_np_cit;
|
|
struct config_item_type tfc_tpg_np_base_cit;
|
|
struct config_item_type tfc_tpg_attrib_cit;
|
|
struct config_item_type tfc_tpg_param_cit;
|
|
struct config_item_type tfc_tpg_nacl_cit;
|
|
struct config_item_type tfc_tpg_nacl_base_cit;
|
|
struct config_item_type tfc_tpg_nacl_attrib_cit;
|
|
struct config_item_type tfc_tpg_nacl_auth_cit;
|
|
struct config_item_type tfc_tpg_nacl_param_cit;
|
|
struct config_item_type tfc_tpg_nacl_stat_cit;
|
|
struct config_item_type tfc_tpg_mappedlun_cit;
|
|
struct config_item_type tfc_tpg_mappedlun_stat_cit;
|
|
};
|
|
|
|
struct target_fabric_configfs {
|
|
char tf_name[TARGET_FABRIC_NAME_SIZE];
|
|
atomic_t tf_access_cnt;
|
|
struct list_head tf_list;
|
|
struct config_group tf_group;
|
|
struct config_group tf_disc_group;
|
|
struct config_group *tf_default_groups[2];
|
|
/* Pointer to fabric's config_item */
|
|
struct config_item *tf_fabric;
|
|
/* Passed from fabric modules */
|
|
struct config_item_type *tf_fabric_cit;
|
|
/* Pointer to target core subsystem */
|
|
struct configfs_subsystem *tf_subsys;
|
|
/* Pointer to fabric's struct module */
|
|
struct module *tf_module;
|
|
struct target_core_fabric_ops tf_ops;
|
|
struct target_fabric_configfs_template tf_cit_tmpl;
|
|
};
|
|
|
|
#define TF_CIT_TMPL(tf) (&(tf)->tf_cit_tmpl)
|