sugar/linux
1
0
Fork 0
Code Activity

Merge patch series "target: RW/num_cmds stats improvements"

Browse Source 
Mike Christie <michael.christie@oracle.com> says:

The following patches were made over Linus tree. They fix/improve the
stats used in the main IO path. The first patch fixes an issue where
I made some stats u32 when they should have stayed u64. The rest of
the patches improve the handling of RW/num_cmds stats to reduce code
duplication and improve performance.

Link: https://patch.msgid.link/20250917221338.14813-1-michael.christie@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Martin K. Petersen
2025-11-02 22:07:27 -05:00
parent 867e4b1bae bbb4900531
commit bb8222b6f3
7 changed files with 127 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/target/target_core_device.c
View File

@@ -814,6 +814,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
dev->dev_attrib.max_write_same_len = DA_MAX_WRITE_SAME_LEN; dev->dev_attrib.max_write_same_len = DA_MAX_WRITE_SAME_LEN;
dev->dev_attrib.submit_type = TARGET_FABRIC_DEFAULT_SUBMIT; dev->dev_attrib.submit_type = TARGET_FABRIC_DEFAULT_SUBMIT;
/* Skip allocating lun_stats since we can't export them. */
xcopy_lun = &dev->xcopy_lun; xcopy_lun = &dev->xcopy_lun;
rcu_assign_pointer(xcopy_lun->lun_se_dev, dev); rcu_assign_pointer(xcopy_lun->lun_se_dev, dev);
init_completion(&xcopy_lun->lun_shutdown_comp); init_completion(&xcopy_lun->lun_shutdown_comp);

2
drivers/target/target_core_fabric_configfs.c
View File

@@ -697,7 +697,7 @@ static void target_fabric_port_release(struct config_item *item)
struct se_lun *lun = container_of(to_config_group(item), struct se_lun *lun = container_of(to_config_group(item),
struct se_lun, lun_group); struct se_lun, lun_group);
kfree_rcu(lun, rcu_head); call_rcu(&lun->rcu_head, target_tpg_free_lun);
} }
static struct configfs_item_operations target_fabric_port_item_ops = { static struct configfs_item_operations target_fabric_port_item_ops = {

1
drivers/target/target_core_internal.h
View File

@@ -125,6 +125,7 @@ void core_tpg_add_node_to_devs(struct se_node_acl *, struct se_portal_group *,
struct se_lun *); struct se_lun *);
void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *); void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *);
struct se_lun *core_tpg_alloc_lun(struct se_portal_group *, u64); struct se_lun *core_tpg_alloc_lun(struct se_portal_group *, u64);
void target_tpg_free_lun(struct rcu_head *head);
int core_tpg_add_lun(struct se_portal_group *, struct se_lun *, int core_tpg_add_lun(struct se_portal_group *, struct se_lun *,
bool, struct se_device *); bool, struct se_device *);
void core_tpg_remove_lun(struct se_portal_group *, struct se_lun *); void core_tpg_remove_lun(struct se_portal_group *, struct se_lun *);

254
drivers/target/target_core_stat.c
View File

@@ -276,56 +276,39 @@ static ssize_t target_stat_lu_state_bit_show(struct config_item *item,
return snprintf(page, PAGE_SIZE, "exposed\n"); return snprintf(page, PAGE_SIZE, "exposed\n");
} }
static ssize_t target_stat_lu_num_cmds_show(struct config_item *item, #define per_cpu_stat_snprintf(stats_struct, prefix, field, shift) \
char *page) static ssize_t \
{ per_cpu_stat_##prefix##_snprintf(struct stats_struct __percpu *per_cpu_stats, \
struct se_device *dev = to_stat_lu_dev(item); char *page) \
struct se_dev_io_stats *stats; { \
unsigned int cpu; struct stats_struct *stats; \
u32 cmds = 0; unsigned int cpu; \
u64 sum = 0; \
for_each_possible_cpu(cpu) { \
stats = per_cpu_ptr(dev->stats, cpu); for_each_possible_cpu(cpu) { \
cmds += stats->total_cmds; stats = per_cpu_ptr(per_cpu_stats, cpu); \
} sum += stats->field; \
} \
/* scsiLuNumCommands */ \
return snprintf(page, PAGE_SIZE, "%u\n", cmds); return snprintf(page, PAGE_SIZE, "%llu\n", sum >> shift); \
} }
static ssize_t target_stat_lu_read_mbytes_show(struct config_item *item, #define lu_show_per_cpu_stat(prefix, field, shift) \
char *page) per_cpu_stat_snprintf(se_dev_io_stats, prefix, field, shift); \
{ static ssize_t \
struct se_device *dev = to_stat_lu_dev(item); target_stat_##prefix##_show(struct config_item *item, char *page) \
struct se_dev_io_stats *stats; { \
unsigned int cpu; struct se_device *dev = to_stat_lu_dev(item); \
u32 bytes = 0; \
return per_cpu_stat_##prefix##_snprintf(dev->stats, page); \
} \
for_each_possible_cpu(cpu) { /* scsiLuNumCommands */
stats = per_cpu_ptr(dev->stats, cpu); lu_show_per_cpu_stat(lu_num_cmds, total_cmds, 0);
bytes += stats->read_bytes; /* scsiLuReadMegaBytes */
} lu_show_per_cpu_stat(lu_read_mbytes, read_bytes, 20);
/* scsiLuWrittenMegaBytes */
/* scsiLuReadMegaBytes */ lu_show_per_cpu_stat(lu_write_mbytes, write_bytes, 20);
return snprintf(page, PAGE_SIZE, "%u\n", bytes >> 20);
}
static ssize_t target_stat_lu_write_mbytes_show(struct config_item *item,
char *page)
{
struct se_device *dev = to_stat_lu_dev(item);
struct se_dev_io_stats *stats;
unsigned int cpu;
u32 bytes = 0;
for_each_possible_cpu(cpu) {
stats = per_cpu_ptr(dev->stats, cpu);
bytes += stats->write_bytes;
}
/* scsiLuWrittenMegaBytes */
return snprintf(page, PAGE_SIZE, "%u\n", bytes >> 20);
}
static ssize_t target_stat_lu_resets_show(struct config_item *item, char *page) static ssize_t target_stat_lu_resets_show(struct config_item *item, char *page)
{ {
@@ -623,53 +606,30 @@ static ssize_t target_stat_tgt_port_port_index_show(struct config_item *item,
return ret; return ret;
} }
static ssize_t target_stat_tgt_port_in_cmds_show(struct config_item *item, #define tgt_port_show_per_cpu_stat(prefix, field, shift) \
char *page) per_cpu_stat_snprintf(scsi_port_stats, prefix, field, shift); \
{ static ssize_t \
struct se_lun *lun = to_stat_tgt_port(item); target_stat_##prefix##_show(struct config_item *item, char *page) \
struct se_device *dev; { \
ssize_t ret = -ENODEV; struct se_lun *lun = to_stat_tgt_port(item); \
struct se_device *dev; \
rcu_read_lock(); int ret; \
dev = rcu_dereference(lun->lun_se_dev); \
if (dev) rcu_read_lock(); \
ret = snprintf(page, PAGE_SIZE, "%lu\n", dev = rcu_dereference(lun->lun_se_dev); \
atomic_long_read(&lun->lun_stats.cmd_pdus)); if (!dev) { \
rcu_read_unlock(); rcu_read_unlock(); \
return ret; return -ENODEV; \
} \
\
ret = per_cpu_stat_##prefix##_snprintf(lun->lun_stats, page); \
rcu_read_unlock(); \
return ret; \
} }
static ssize_t target_stat_tgt_port_write_mbytes_show(struct config_item *item, tgt_port_show_per_cpu_stat(tgt_port_in_cmds, cmd_pdus, 0);
char *page) tgt_port_show_per_cpu_stat(tgt_port_write_mbytes, rx_data_octets, 20);
{ tgt_port_show_per_cpu_stat(tgt_port_read_mbytes, tx_data_octets, 20);
struct se_lun *lun = to_stat_tgt_port(item);
struct se_device *dev;
ssize_t ret = -ENODEV;
rcu_read_lock();
dev = rcu_dereference(lun->lun_se_dev);
if (dev)
ret = snprintf(page, PAGE_SIZE, "%u\n",
(u32)(atomic_long_read(&lun->lun_stats.rx_data_octets) >> 20));
rcu_read_unlock();
return ret;
}
static ssize_t target_stat_tgt_port_read_mbytes_show(struct config_item *item,
char *page)
{
struct se_lun *lun = to_stat_tgt_port(item);
struct se_device *dev;
ssize_t ret = -ENODEV;
rcu_read_lock();
dev = rcu_dereference(lun->lun_se_dev);
if (dev)
ret = snprintf(page, PAGE_SIZE, "%u\n",
(u32)(atomic_long_read(&lun->lun_stats.tx_data_octets) >> 20));
rcu_read_unlock();
return ret;
}
static ssize_t target_stat_tgt_port_hs_in_cmds_show(struct config_item *item, static ssize_t target_stat_tgt_port_hs_in_cmds_show(struct config_item *item,
char *page) char *page)
@@ -1035,92 +995,34 @@ static ssize_t target_stat_auth_att_count_show(struct config_item *item,
return ret; return ret;
} }
static ssize_t target_stat_auth_num_cmds_show(struct config_item *item, #define auth_show_per_cpu_stat(prefix, field, shift) \
char *page) per_cpu_stat_snprintf(se_dev_entry_io_stats, prefix, field, shift); \
{ static ssize_t \
struct se_lun_acl *lacl = auth_to_lacl(item); target_stat_##prefix##_show(struct config_item *item, char *page) \
struct se_node_acl *nacl = lacl->se_lun_nacl; { \
struct se_dev_entry_io_stats *stats; struct se_lun_acl *lacl = auth_to_lacl(item); \
struct se_dev_entry *deve; struct se_node_acl *nacl = lacl->se_lun_nacl; \
unsigned int cpu; struct se_dev_entry *deve; \
ssize_t ret; int ret; \
u32 cmds = 0; \
rcu_read_lock(); \
rcu_read_lock(); deve = target_nacl_find_deve(nacl, lacl->mapped_lun); \
deve = target_nacl_find_deve(nacl, lacl->mapped_lun); if (!deve) { \
if (!deve) { rcu_read_unlock(); \
rcu_read_unlock(); return -ENODEV; \
return -ENODEV; } \
} \
ret = per_cpu_stat_##prefix##_snprintf(deve->stats, page); \
for_each_possible_cpu(cpu) { rcu_read_unlock(); \
stats = per_cpu_ptr(deve->stats, cpu); return ret; \
cmds += stats->total_cmds;
}
/* scsiAuthIntrOutCommands */
ret = snprintf(page, PAGE_SIZE, "%u\n", cmds);
rcu_read_unlock();
return ret;
} }
static ssize_t target_stat_auth_read_mbytes_show(struct config_item *item, /* scsiAuthIntrOutCommands */
char *page) auth_show_per_cpu_stat(auth_num_cmds, total_cmds, 0);
{ /* scsiAuthIntrReadMegaBytes */
struct se_lun_acl *lacl = auth_to_lacl(item); auth_show_per_cpu_stat(auth_read_mbytes, read_bytes, 20);
struct se_node_acl *nacl = lacl->se_lun_nacl; /* scsiAuthIntrWrittenMegaBytes */
struct se_dev_entry_io_stats *stats; auth_show_per_cpu_stat(auth_write_mbytes, write_bytes, 20);
struct se_dev_entry *deve;
unsigned int cpu;
ssize_t ret;
u32 bytes = 0;
rcu_read_lock();
deve = target_nacl_find_deve(nacl, lacl->mapped_lun);
if (!deve) {
rcu_read_unlock();
return -ENODEV;
}
for_each_possible_cpu(cpu) {
stats = per_cpu_ptr(deve->stats, cpu);
bytes += stats->read_bytes;
}
/* scsiAuthIntrReadMegaBytes */
ret = snprintf(page, PAGE_SIZE, "%u\n", bytes >> 20);
rcu_read_unlock();
return ret;
}
static ssize_t target_stat_auth_write_mbytes_show(struct config_item *item,
char *page)
{
struct se_lun_acl *lacl = auth_to_lacl(item);
struct se_node_acl *nacl = lacl->se_lun_nacl;
struct se_dev_entry_io_stats *stats;
struct se_dev_entry *deve;
unsigned int cpu;
ssize_t ret;
u32 bytes = 0;
rcu_read_lock();
deve = target_nacl_find_deve(nacl, lacl->mapped_lun);
if (!deve) {
rcu_read_unlock();
return -ENODEV;
}
for_each_possible_cpu(cpu) {
stats = per_cpu_ptr(deve->stats, cpu);
bytes += stats->write_bytes;
}
/* scsiAuthIntrWrittenMegaBytes */
ret = snprintf(page, PAGE_SIZE, "%u\n", bytes >> 20);
rcu_read_unlock();
return ret;
}
static ssize_t target_stat_auth_hs_num_cmds_show(struct config_item *item, static ssize_t target_stat_auth_hs_num_cmds_show(struct config_item *item,
char *page) char *page)

23
drivers/target/target_core_tpg.c
View File

@@ -548,7 +548,7 @@ int core_tpg_register(
ret = core_tpg_add_lun(se_tpg, se_tpg->tpg_virt_lun0, ret = core_tpg_add_lun(se_tpg, se_tpg->tpg_virt_lun0,
true, g_lun0_dev); true, g_lun0_dev);
if (ret < 0) { if (ret < 0) {
kfree(se_tpg->tpg_virt_lun0); target_tpg_free_lun(&se_tpg->tpg_virt_lun0->rcu_head);
return ret; return ret;
} }
} }
@@ -595,7 +595,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
if (se_tpg->proto_id >= 0) { if (se_tpg->proto_id >= 0) {
core_tpg_remove_lun(se_tpg, se_tpg->tpg_virt_lun0); core_tpg_remove_lun(se_tpg, se_tpg->tpg_virt_lun0);
kfree_rcu(se_tpg->tpg_virt_lun0, rcu_head); call_rcu(&se_tpg->tpg_virt_lun0->rcu_head, target_tpg_free_lun);
} }
target_tpg_deregister_rtpi(se_tpg); target_tpg_deregister_rtpi(se_tpg);
@@ -615,6 +615,13 @@ struct se_lun *core_tpg_alloc_lun(
pr_err("Unable to allocate se_lun memory\n"); pr_err("Unable to allocate se_lun memory\n");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
lun->lun_stats = alloc_percpu(struct scsi_port_stats);
if (!lun->lun_stats) {
pr_err("Unable to allocate se_lun stats memory\n");
goto free_lun;
}
lun->unpacked_lun = unpacked_lun; lun->unpacked_lun = unpacked_lun;
atomic_set(&lun->lun_acl_count, 0); atomic_set(&lun->lun_acl_count, 0);
init_completion(&lun->lun_shutdown_comp); init_completion(&lun->lun_shutdown_comp);
@@ -628,6 +635,18 @@ struct se_lun *core_tpg_alloc_lun(
lun->lun_tpg = tpg; lun->lun_tpg = tpg;
return lun; return lun;
free_lun:
kfree(lun);
return ERR_PTR(-ENOMEM);
}
void target_tpg_free_lun(struct rcu_head *head)
{
struct se_lun *lun = container_of(head, struct se_lun, rcu_head);
free_percpu(lun->lun_stats);
kfree(lun);
} }
int core_tpg_add_lun( int core_tpg_add_lun(

22
drivers/target/target_core_transport.c
View File

@@ -1571,7 +1571,12 @@ target_cmd_parse_cdb(struct se_cmd *cmd)
return ret; return ret;
cmd->se_cmd_flags |= SCF_SUPPORTED_SAM_OPCODE; cmd->se_cmd_flags |= SCF_SUPPORTED_SAM_OPCODE;
atomic_long_inc(&cmd->se_lun->lun_stats.cmd_pdus); /*
* If this is the xcopy_lun then we won't have lun_stats since we
* can't export them.
*/
if (cmd->se_lun->lun_stats)
this_cpu_inc(cmd->se_lun->lun_stats->cmd_pdus);
return 0; return 0;
} }
EXPORT_SYMBOL(target_cmd_parse_cdb); EXPORT_SYMBOL(target_cmd_parse_cdb);
@@ -2597,8 +2602,9 @@ queue_rsp:
!(cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL)) !(cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL))
goto queue_status; goto queue_status;
atomic_long_add(cmd->data_length, if (cmd->se_lun->lun_stats)
&cmd->se_lun->lun_stats.tx_data_octets); this_cpu_add(cmd->se_lun->lun_stats->tx_data_octets,
cmd->data_length);
/* /*
* Perform READ_STRIP of PI using software emulation when * Perform READ_STRIP of PI using software emulation when
* backend had PI enabled, if the transport will not be * backend had PI enabled, if the transport will not be
@@ -2621,14 +2627,16 @@ queue_rsp:
goto queue_full; goto queue_full;
break; break;
case DMA_TO_DEVICE: case DMA_TO_DEVICE:
atomic_long_add(cmd->data_length, if (cmd->se_lun->lun_stats)
&cmd->se_lun->lun_stats.rx_data_octets); this_cpu_add(cmd->se_lun->lun_stats->rx_data_octets,
cmd->data_length);
/* /*
* Check if we need to send READ payload for BIDI-COMMAND * Check if we need to send READ payload for BIDI-COMMAND
*/ */
if (cmd->se_cmd_flags & SCF_BIDI) { if (cmd->se_cmd_flags & SCF_BIDI) {
atomic_long_add(cmd->data_length, if (cmd->se_lun->lun_stats)
&cmd->se_lun->lun_stats.tx_data_octets); this_cpu_add(cmd->se_lun->lun_stats->tx_data_octets,
cmd->data_length);
ret = cmd->se_tfo->queue_data_in(cmd); ret = cmd->se_tfo->queue_data_in(cmd);
if (ret) if (ret)
goto queue_full; goto queue_full;

20
include/target/target_core_base.h
View File

@@ -672,9 +672,9 @@ struct se_lun_acl {
}; };
struct se_dev_entry_io_stats { struct se_dev_entry_io_stats {
u32 total_cmds; u64 total_cmds;
u32 read_bytes; u64 read_bytes;
u32 write_bytes; u64 write_bytes;
}; };
struct se_dev_entry { struct se_dev_entry {
@@ -750,9 +750,9 @@ struct se_port_stat_grps {
}; };
struct scsi_port_stats { struct scsi_port_stats {
atomic_long_t cmd_pdus; u64 cmd_pdus;
atomic_long_t tx_data_octets; u64 tx_data_octets;
atomic_long_t rx_data_octets; u64 rx_data_octets;
}; };
struct se_lun { struct se_lun {
@@ -779,7 +779,7 @@ struct se_lun {
spinlock_t lun_tg_pt_gp_lock; spinlock_t lun_tg_pt_gp_lock;
struct se_portal_group *lun_tpg; struct se_portal_group *lun_tpg;
struct scsi_port_stats lun_stats; struct scsi_port_stats __percpu *lun_stats;
struct config_group lun_group; struct config_group lun_group;
struct se_port_stat_grps port_stat_grps; struct se_port_stat_grps port_stat_grps;
struct completion lun_shutdown_comp; struct completion lun_shutdown_comp;
@@ -812,9 +812,9 @@ struct se_device_queue {
}; };
struct se_dev_io_stats { struct se_dev_io_stats {
u32 total_cmds; u64 total_cmds;
u32 read_bytes; u64 read_bytes;
u32 write_bytes; u64 write_bytes;
}; };
struct se_device { struct se_device {