kevin/linux
1
Fork 0
Code

net/smc: introduce statistics for ringbufs usage of net namespace

Browse Source 
The buffer size histograms in smc_stats, namely rx/tx_rmbsize, record
the sizes of ringbufs for all connections that have ever appeared in
the net namespace. They are incremental and we cannot know the actual
ringbufs usage from these. So here introduces statistics for current
ringbufs usage of existing smc connections in the net namespace into
smc_stats, it will be incremented when new connection uses a ringbuf
and decremented when the ringbuf is unused.

Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Wen Gu 2024-08-14 21:08:27 +08:00 committed by Paolo Abeni
parent d386d59b7c
commit e0d103542b
4 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/smc.h
View File

@ -253,6 +253,8 @@ enum {
SMC_NLA_STATS_T_TX_BYTES, /* u64 */ SMC_NLA_STATS_T_TX_BYTES, /* u64 */
SMC_NLA_STATS_T_RX_CNT, /* u64 */ SMC_NLA_STATS_T_RX_CNT, /* u64 */
SMC_NLA_STATS_T_TX_CNT, /* u64 */ SMC_NLA_STATS_T_TX_CNT, /* u64 */
SMC_NLA_STATS_T_RX_RMB_USAGE, /* uint */
SMC_NLA_STATS_T_TX_RMB_USAGE, /* uint */
__SMC_NLA_STATS_T_MAX, __SMC_NLA_STATS_T_MAX,
SMC_NLA_STATS_T_MAX = __SMC_NLA_STATS_T_MAX - 1 SMC_NLA_STATS_T_MAX = __SMC_NLA_STATS_T_MAX - 1
}; };

22
net/smc/smc_core.c
View File

@ -1203,22 +1203,30 @@ static void smcd_buf_detach(struct smc_connection *conn)
static void smc_buf_unuse(struct smc_connection *conn, static void smc_buf_unuse(struct smc_connection *conn,
struct smc_link_group *lgr) struct smc_link_group *lgr)
{ {
struct smc_sock *smc = container_of(conn, struct smc_sock, conn);
bool is_smcd = lgr->is_smcd;
int bufsize;
if (conn->sndbuf_desc) { if (conn->sndbuf_desc) {
if (!lgr->is_smcd && conn->sndbuf_desc->is_vm) { bufsize = conn->sndbuf_desc->len;
if (!is_smcd && conn->sndbuf_desc->is_vm) {
smcr_buf_unuse(conn->sndbuf_desc, false, lgr); smcr_buf_unuse(conn->sndbuf_desc, false, lgr);
} else { } else {
memzero_explicit(conn->sndbuf_desc->cpu_addr, conn->sndbuf_desc->len); memzero_explicit(conn->sndbuf_desc->cpu_addr, bufsize);
WRITE_ONCE(conn->sndbuf_desc->used, 0); WRITE_ONCE(conn->sndbuf_desc->used, 0);
} }
SMC_STAT_RMB_SIZE(smc, is_smcd, false, false, bufsize);
} }
if (conn->rmb_desc) { if (conn->rmb_desc) {
if (!lgr->is_smcd) { bufsize = conn->rmb_desc->len;
if (!is_smcd) {
smcr_buf_unuse(conn->rmb_desc, true, lgr); smcr_buf_unuse(conn->rmb_desc, true, lgr);
} else { } else {
memzero_explicit(conn->rmb_desc->cpu_addr, bufsize += sizeof(struct smcd_cdc_msg);
conn->rmb_desc->len + sizeof(struct smcd_cdc_msg)); memzero_explicit(conn->rmb_desc->cpu_addr, bufsize);
WRITE_ONCE(conn->rmb_desc->used, 0); WRITE_ONCE(conn->rmb_desc->used, 0);
} }
SMC_STAT_RMB_SIZE(smc, is_smcd, true, false, bufsize);
} }
} }
@ -2427,7 +2435,7 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)
buf_desc = smc_buf_get_slot(bufsize_comp, lock, buf_list); buf_desc = smc_buf_get_slot(bufsize_comp, lock, buf_list);
if (buf_desc) { if (buf_desc) {
buf_desc->is_dma_need_sync = 0; buf_desc->is_dma_need_sync = 0;
SMC_STAT_RMB_SIZE(smc, is_smcd, is_rmb, bufsize); SMC_STAT_RMB_SIZE(smc, is_smcd, is_rmb, true, bufsize);
SMC_STAT_BUF_REUSE(smc, is_smcd, is_rmb); SMC_STAT_BUF_REUSE(smc, is_smcd, is_rmb);
break; /* found reusable slot */ break; /* found reusable slot */
} }
@ -2448,7 +2456,7 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)
} }
SMC_STAT_RMB_ALLOC(smc, is_smcd, is_rmb); SMC_STAT_RMB_ALLOC(smc, is_smcd, is_rmb);
SMC_STAT_RMB_SIZE(smc, is_smcd, is_rmb, bufsize); SMC_STAT_RMB_SIZE(smc, is_smcd, is_rmb, true, bufsize);
buf_desc->used = 1; buf_desc->used = 1;
down_write(lock); down_write(lock);
smc_lgr_buf_list_add(lgr, is_rmb, buf_list, buf_desc); smc_lgr_buf_list_add(lgr, is_rmb, buf_list, buf_desc);

6
net/smc/smc_stats.c
View File

@ -218,6 +218,12 @@ static int smc_nl_fill_stats_tech_data(struct sk_buff *skb,
smc_tech->tx_bytes, smc_tech->tx_bytes,
SMC_NLA_STATS_PAD)) SMC_NLA_STATS_PAD))
goto errattr; goto errattr;
if (nla_put_uint(skb, SMC_NLA_STATS_T_RX_RMB_USAGE,
smc_tech->rx_rmbuse))
goto errattr;
if (nla_put_uint(skb, SMC_NLA_STATS_T_TX_RMB_USAGE,
smc_tech->tx_rmbuse))
goto errattr;
if (nla_put_u64_64bit(skb, SMC_NLA_STATS_T_RX_CNT, if (nla_put_u64_64bit(skb, SMC_NLA_STATS_T_RX_CNT,
smc_tech->rx_cnt, smc_tech->rx_cnt,
SMC_NLA_STATS_PAD)) SMC_NLA_STATS_PAD))

24
net/smc/smc_stats.h
View File

@ -79,6 +79,8 @@ struct smc_stats_tech {
u64 tx_bytes; u64 tx_bytes;
u64 rx_cnt; u64 rx_cnt;
u64 tx_cnt; u64 tx_cnt;
u64 rx_rmbuse;
u64 tx_rmbuse;
}; };
struct smc_stats { struct smc_stats {
@ -135,38 +137,46 @@ do { \
} \ } \
while (0) while (0)
#define SMC_STAT_RMB_SIZE_SUB(_smc_stats, _tech, k, _len) \ #define SMC_STAT_RMB_SIZE_SUB(_smc_stats, _tech, k, _is_add, _len) \
do { \ do { \
typeof(_smc_stats) stats = (_smc_stats); \
typeof(_is_add) is_a = (_is_add); \
typeof(_len) _l = (_len); \ typeof(_len) _l = (_len); \
typeof(_tech) t = (_tech); \ typeof(_tech) t = (_tech); \
int _pos; \ int _pos; \
int m = SMC_BUF_MAX - 1; \ int m = SMC_BUF_MAX - 1; \
if (_l <= 0) \ if (_l <= 0) \
break; \ break; \
if (is_a) { \
_pos = fls((_l - 1) >> 13); \ _pos = fls((_l - 1) >> 13); \
_pos = (_pos <= m) ? _pos : m; \ _pos = (_pos <= m) ? _pos : m; \
this_cpu_inc((*(_smc_stats)).smc[t].k ## _rmbsize.buf[_pos]); \ this_cpu_inc((*stats).smc[t].k ## _rmbsize.buf[_pos]); \
this_cpu_add((*stats).smc[t].k ## _rmbuse, _l); \
} else { \
this_cpu_sub((*stats).smc[t].k ## _rmbuse, _l); \
} \
} \ } \
while (0) while (0)
#define SMC_STAT_RMB_SUB(_smc_stats, type, t, key) \ #define SMC_STAT_RMB_SUB(_smc_stats, type, t, key) \
this_cpu_inc((*(_smc_stats)).smc[t].rmb ## _ ## key.type ## _cnt) this_cpu_inc((*(_smc_stats)).smc[t].rmb ## _ ## key.type ## _cnt)
#define SMC_STAT_RMB_SIZE(_smc, _is_smcd, _is_rx, _len) \ #define SMC_STAT_RMB_SIZE(_smc, _is_smcd, _is_rx, _is_add, _len) \
do { \ do { \
struct net *_net = sock_net(&(_smc)->sk); \ struct net *_net = sock_net(&(_smc)->sk); \
struct smc_stats __percpu *_smc_stats = _net->smc.smc_stats; \ struct smc_stats __percpu *_smc_stats = _net->smc.smc_stats; \
typeof(_is_add) is_add = (_is_add); \
typeof(_is_smcd) is_d = (_is_smcd); \ typeof(_is_smcd) is_d = (_is_smcd); \
typeof(_is_rx) is_r = (_is_rx); \ typeof(_is_rx) is_r = (_is_rx); \
typeof(_len) l = (_len); \ typeof(_len) l = (_len); \
if ((is_d) && (is_r)) \ if ((is_d) && (is_r)) \
SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_D, rx, l); \ SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_D, rx, is_add, l); \
if ((is_d) && !(is_r)) \ if ((is_d) && !(is_r)) \
SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_D, tx, l); \ SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_D, tx, is_add, l); \
if (!(is_d) && (is_r)) \ if (!(is_d) && (is_r)) \
SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_R, rx, l); \ SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_R, rx, is_add, l); \
if (!(is_d) && !(is_r)) \ if (!(is_d) && !(is_r)) \
SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_R, tx, l); \ SMC_STAT_RMB_SIZE_SUB(_smc_stats, SMC_TYPE_R, tx, is_add, l); \
} \ } \
while (0) while (0)