net/smc: Add SMC statistic support
v2 cover net/smc: Add SMC statistic support
Please apply the following patch series for smc to netdev's net-next tree.
This v2 is a resend of the code contained in v1 but with an updated cover letter to describe why we have chosen to use the generic netlink mechanism to access the smc protocol's statistic data.
The patchset adds statistic support to the SMC protocol. Per-cpu variables are used to collect the statistic information for better performance and for reducing concurrency pitfalls. The code that is collecting statistic data is implemented in macros to increase code reuse and readability.
The generic netlink mechanism in SMC is extended to provide the collected statistics to userspace.
Network namespace awareness is also part of the statistics implementation.
SMC is a protocol interacting with PCI devices (like RoCE Cards) and runs on top of the TCP protocol. As SMC is a network protocol and not an ethernet device driver, we decided to use the generic netlink interface. This should be comparable to what other protocols in the net subsystem like tipc, ncsi, ieee802154 or tcp, et al, do. There is already an established internal generic netlink interface mechanism in SMC which is used to collect SMC Protocol internal information. This patchset extends that existing mechanism.
Guvenc Gulce (4):
net/smc: Add SMC statistics support
net/smc: Add netlink support for SMC statistics net/smc: Add netlink support for SMC fallback statistics net/smc: Make SMC statistics network namespace aware
include/net/net_namespace.h | 4 + include/net/netns/smc.h | 16 ++ include/uapi/linux/smc.h | 83 ++++++++ net/smc/Makefile | 2 +- net/smc/af_smc.c | 102 +++++++-- net/smc/smc_core.c | 13 +- net/smc/smc_netlink.c | 11 + net/smc/smc_netlink.h | 2 +- net/smc/smc_rx.c | 8 + net/smc/smc_stats.c | 413 ++++++++++++++++++++++++++++++++++++ net/smc/smc_stats.h | 266 +++++++++++++++++++++++ net/smc/smc_tx.c | 18 +- 12 files changed, 917 insertions(+), 21 deletions(-) create mode 100644 include/net/netns/smc.h create mode 100644 net/smc/smc_stats.c create mode 100644 net/smc/smc_stats.h
Signature · 1 line
2.25.1
PATCH v2 1/4 net/smc: Add SMC statistics support
From: Guvenc Gulce <[email protected]>
Add the ability to collect SMC statistics information. Per-cpu variables are used to collect the statistic information for better performance and for reducing concurrency pitfalls. The code that is collecting statistic data is implemented in macros to increase code reuse and readability.
--- net/smc/Makefile | 2 +- net/smc/af_smc.c | 89 ++++++++++++---- net/smc/smc_core.c | 13 ++- net/smc/smc_rx.c | 8 ++ net/smc/smc_stats.c | 35 ++++++ net/smc/smc_stats.h | 253 ++++++++++++++++++++++++++++++++++++++++++++ net/smc/smc_tx.c | 16 ++- 7 files changed, 395 insertions(+), 21 deletions(-) create mode 100644 net/smc/smc_stats.c create mode 100644 net/smc/smc_stats.h
net/smc/Makefile +1 -1
@@ -2,4 +2,4 @@ obj-$(CONFIG_SMC) += smc.o obj-$(CONFIG_SMC_DIAG) += smc_diag.o smc-y := af_smc.o smc_pnet.o smc_ib.o smc_clc.o smc_core.o smc_wr.o smc_llc.o -smc-y += smc_cdc.o smc_tx.o smc_rx.o smc_close.o smc_ism.o smc_netlink.o +smc-y += smc_cdc.o smc_tx.o smc_rx.o smc_close.o smc_ism.o smc_netlink.o smc_stats.o
net/smc/af_smc.c +71 -18
229 lines not on this page · raw message
net/smc/smc_core.c +12 -1
@@ -33,6 +33,7 @@#include "smc_close.h" #include "smc_ism.h" #include "smc_netlink.h" +#include "smc_stats.h" #define SMC_LGR_NUM_INCR 256#define SMC_LGR_FREE_DELAY_SERV (600 * HZ)
@@ -2029,6 +2030,7 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)struct smc_link_group *lgr = conn->lgr;struct list_head *buf_list;int bufsize, bufsize_short; +bool is_dgraded = false;struct mutex *lock;/* lock buffer list */ int sk_buf_size;
@@ -2056,6 +2058,8 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)/* check for reusable slot in the link group */ buf_desc =smc_buf_get_slot (bufsize_short, lock, buf_list);if (buf_desc) { +SMC_STAT_RMB_SIZE (is_smcd, is_rmb, bufsize); +SMC_STAT_BUF_REUSE (is_smcd, is_rmb);memset (buf_desc->cpu_addr,0 , bufsize);break ;/* found reusable slot */ }
@@ -2067,9 +2071,16 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)if (PTR_ERR (buf_desc) == -ENOMEM )break ; -if (IS_ERR (buf_desc)) +if (IS_ERR (buf_desc)) { +if (!is_dgraded) { + is_dgraded = true; +SMC_STAT_RMB_DOWNGRADED (is_smcd, is_rmb); + }continue ; + } +SMC_STAT_RMB_ALLOC (is_smcd, is_rmb); +SMC_STAT_RMB_SIZE (is_smcd, is_rmb, bufsize); buf_desc->used =1 ;mutex_lock (lock);list_add (&buf_desc->list, buf_list);
net/smc/smc_rx.c +8 -0
@@ -21,6 +21,7 @@#include "smc_cdc.h" #include "smc_tx.h" /* smc_tx_consumer_update() */ #include "smc_rx.h" +#include "smc_stats.h" /* callback implementation to wakeup consumers blocked with smc_rx_wait(). * indirectly called by smc_cdc_msg_recv_action().
@@ -227,6 +228,7 @@ static int smc_rx_recv_urg(struct smc_sock *smc, struct msghdr *msg, int len, conn->urg_state == SMC_URG_READ)return -EINVAL ; +SMC_STAT_INC (!conn->lnk, urg_data_cnt);if (conn->urg_state ==SMC_URG_VALID ) {if (!(flags &MSG_PEEK )) smc->conn.urg_state =SMC_URG_READ ;
@@ -303,6 +305,12 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, timeo =sock_rcvtimeo (sk, flags &MSG_DONTWAIT ); target =sock_rcvlowat (sk, flags &MSG_WAITALL , len); + readable =atomic_read (&conn->bytes_to_rcv); +if (readable >= conn->rmb_desc->len) +SMC_STAT_RMB_RX_FULL (!conn->lnk); + +if (len < readable) +SMC_STAT_RMB_RX_SIZE_SMALL (!conn->lnk);/* we currently use 1 RMBE per RMB, so RMBE == RMB base addr */ rcvbuf_base = conn->rx_off + conn->rmb_desc->cpu_addr;
net/smc/smc_stats.c new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Shared Memory Communications over RDMA (SMC-R) and RoCE +* +* SMC statistics netlink routines +* +* Copyright IBM Corp. 2021 +* +* Author(s): Guvenc Gulce +*/ +#include <linux/init.h> +#include <linux/mutex.h> +#include <linux/percpu.h> +#include <linux/ctype.h> +#include "smc_stats.h" + +/* serialize fallback reason statistic gathering */ +DEFINE_MUTEX (smc_stat_fback_rsn); +struct smc_stats __percpu *smc_stats;/* per cpu counters for SMC */ +struct smc_stats_reason fback_rsn; + +int __init smc_stats_init (void ) +{ +memset (&fback_rsn,0 ,sizeof (fback_rsn)); + smc_stats = alloc_percpu(struct smc_stats); +if (!smc_stats) +return -ENOMEM ; + +return 0 ; +} + +void smc_stats_exit (void ) +{ +free_percpu (smc_stats); +}
net/smc/smc_stats.h new file +253 -0
253 lines not on this page · raw message
net/smc/smc_tx.c +15 -1
@@ -27,6 +27,7 @@#include "smc_close.h" #include "smc_ism.h" #include "smc_tx.h" +#include "smc_stats.h" #define SMC_TX_WORK_DELAY 0#define SMC_TX_CORK_DELAY (HZ >> 2)/* 250 ms */
@@ -45,6 +46,8 @@ static void smc_tx_write_space(struct sock *sk)/* similar to sk_stream_write_space */ if (atomic_read (&smc->conn.sndbuf_space) && sock) { +if (test_bit (SOCK_NOSPACE , &sock->flags)) +SMC_STAT_RMB_TX_FULL (!smc->conn.lnk);clear_bit (SOCK_NOSPACE , &sock->flags);rcu_read_lock (); wq =rcu_dereference (sk->sk_wq);
@@ -151,6 +154,15 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) goto out_err; } +if (len > conn->sndbuf_desc->len) +SMC_STAT_RMB_TX_SIZE_SMALL (!conn->lnk); + +if (len > conn->peer_rmbe_size) +SMC_STAT_RMB_TX_PEER_SIZE_SMALL (!conn->lnk); + +if (msg->msg_flags &MSG_OOB ) +SMC_STAT_INC (!conn->lnk, urg_data_cnt); +while (msg_data_left (msg)) {if (sk->sk_state ==SMC_INIT )return -ENOTCONN ;
@@ -419,8 +431,10 @@ static int smc_tx_rdma_writes(struct smc_connection *conn,/* destination: RMBE */ /* cf. snd_wnd */ rmbespace =atomic_read (&conn->peer_rmbe_space); -if (rmbespace <=0 ) +if (rmbespace <=0 ) { +SMC_STAT_RMB_TX_PEER_FULL (!conn->lnk);return 0 ; + }smc_curs_copy (&prod, &conn->local_tx_ctrl.prod, conn);smc_curs_copy (&cons, &conn->local_rx_ctrl.cons, conn);
Signature · 1 line
2.25.1
PATCH v2 2/4 net/smc: Add netlink support for SMC statistics
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Add the netlink function which collects the statistics information and delivers it to the userspace.
--- include/uapi/linux/smc.h | 69 ++++++++++ net/smc/smc_netlink.c | 6 + net/smc/smc_stats.c | 279 +++++++++++++++++++++++++++++++++++++++ net/smc/smc_stats.h | 1 + 4 files changed, 355 insertions(+)
include/uapi/linux/smc.h +69 -0
@@ -47,6 +47,7 @@ enum {SMC_NETLINK_GET_LGR_SMCD ,SMC_NETLINK_GET_DEV_SMCD ,SMC_NETLINK_GET_DEV_SMCR , + SMC_NETLINK_GET_STATS, };/* SMC_GENL_FAMILY top level attributes */
@@ -58,6 +59,7 @@ enum {SMC_GEN_LGR_SMCD ,/* nest */ SMC_GEN_DEV_SMCD ,/* nest */ SMC_GEN_DEV_SMCR ,/* nest */ +SMC_GEN_STATS ,/* nest */ __SMC_GEN_MAX, SMC_GEN_MAX = __SMC_GEN_MAX - 1 };
@@ -159,4 +161,71 @@ enum {SMC_NLA_DEV_MAX = __SMC_NLA_DEV_MAX -1 }; +/* SMC_NLA_STATS_T_TX(RX)_RMB_SIZE nested attributes */ +/* SMC_NLA_STATS_TX(RX)PLOAD_SIZE nested attributes */ +enum { +SMC_NLA_STATS_PLOAD_PAD , +SMC_NLA_STATS_PLOAD_8K ,/* u64 */ +SMC_NLA_STATS_PLOAD_16K ,/* u64 */ +SMC_NLA_STATS_PLOAD_32K ,/* u64 */ +SMC_NLA_STATS_PLOAD_64K ,/* u64 */ +SMC_NLA_STATS_PLOAD_128K ,/* u64 */ +SMC_NLA_STATS_PLOAD_256K ,/* u64 */ +SMC_NLA_STATS_PLOAD_512K ,/* u64 */ +SMC_NLA_STATS_PLOAD_1024K ,/* u64 */ +SMC_NLA_STATS_PLOAD_G_1024K ,/* u64 */ + __SMC_NLA_STATS_PLOAD_MAX, +SMC_NLA_STATS_PLOAD_MAX = __SMC_NLA_STATS_PLOAD_MAX -1 +}; + +/* SMC_NLA_STATS_T_TX(RX)_RMB_STATS nested attributes */ +enum { +SMC_NLA_STATS_RMB_PAD , +SMC_NLA_STATS_RMB_SIZE_SM_PEER_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_SIZE_SM_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_FULL_PEER_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_FULL_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_REUSE_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_ALLOC_CNT ,/* u64 */ +SMC_NLA_STATS_RMB_DGRADE_CNT ,/* u64 */ + __SMC_NLA_STATS_RMB_MAX, +SMC_NLA_STATS_RMB_MAX = __SMC_NLA_STATS_RMB_MAX -1 +}; + +/* SMC_NLA_STATS_SMCD_TECH and _SMCR_TECH nested attributes */ +enum { +SMC_NLA_STATS_T_PAD , +SMC_NLA_STATS_T_TX_RMB_SIZE ,/* nest */ +SMC_NLA_STATS_T_RX_RMB_SIZE ,/* nest */ +SMC_NLA_STATS_T_TXPLOAD_SIZE ,/* nest */ +SMC_NLA_STATS_T_RXPLOAD_SIZE ,/* nest */ +SMC_NLA_STATS_T_TX_RMB_STATS ,/* nest */ +SMC_NLA_STATS_T_RX_RMB_STATS ,/* nest */ +SMC_NLA_STATS_T_CLNT_V1_SUCC ,/* u64 */ +SMC_NLA_STATS_T_CLNT_V2_SUCC ,/* u64 */ +SMC_NLA_STATS_T_SRV_V1_SUCC ,/* u64 */ +SMC_NLA_STATS_T_SRV_V2_SUCC ,/* u64 */ +SMC_NLA_STATS_T_SENDPAGE_CNT ,/* u64 */ +SMC_NLA_STATS_T_SPLICE_CNT ,/* u64 */ +SMC_NLA_STATS_T_CORK_CNT ,/* u64 */ +SMC_NLA_STATS_T_NDLY_CNT ,/* u64 */ +SMC_NLA_STATS_T_URG_DATA_CNT ,/* u64 */ +SMC_NLA_STATS_T_RX_BYTES ,/* u64 */ +SMC_NLA_STATS_T_TX_BYTES ,/* u64 */ +SMC_NLA_STATS_T_RX_CNT ,/* u64 */ +SMC_NLA_STATS_T_TX_CNT ,/* u64 */ + __SMC_NLA_STATS_T_MAX, +SMC_NLA_STATS_T_MAX = __SMC_NLA_STATS_T_MAX -1 +}; + +/* SMC_GEN_STATS attributes */ +enum { +SMC_NLA_STATS_PAD , +SMC_NLA_STATS_SMCD_TECH ,/* nest */ +SMC_NLA_STATS_SMCR_TECH ,/* nest */ +SMC_NLA_STATS_CLNT_HS_ERR_CNT ,/* u64 */ +SMC_NLA_STATS_SRV_HS_ERR_CNT ,/* u64 */ + __SMC_NLA_STATS_MAX, +SMC_NLA_STATS_MAX = __SMC_NLA_STATS_MAX -1 +};#endif /* _UAPI_LINUX_SMC_H */
net/smc/smc_netlink.c +6 -0
@@ -19,6 +19,7 @@#include "smc_core.h" #include "smc_ism.h" #include "smc_ib.h" +#include "smc_stats.h" #include "smc_netlink.h" #define SMC_CMD_MAX_ATTR 1
@@ -55,6 +56,11 @@ static const struct genl_ops smc_gen_nl_ops[] = {/* can be retrieved by unprivileged users */ .dumpit = smcr_nl_get_device, }, + { + .cmd = SMC_NETLINK_GET_STATS, + /* can be retrieved by unprivileged users */ + .dumpit = smc_nl_get_stats, + }, };static const struct nla_policy smc_gen_nl_policy[2 ] = {
net/smc/smc_stats.c +279 -0
288 lines not on this page · raw message
net/smc/smc_stats.h +1 -0
@@ -247,6 +247,7 @@ do { \ } \while (0 ) +int smc_nl_get_stats(struct sk_buff *skb, struct netlink_callback *cb);int smc_stats_init (void )__init ;void smc_stats_exit (void );
Signature · 1 line
2.25.1
PATCH v2 3/4 net/smc: Add netlink support for SMC fallback statistics
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Add support to collect more detailed SMC fallback reason statistics and provide these statistics to user space on the netlink interface.
--- include/uapi/linux/smc.h | 14 ++++++ net/smc/smc_netlink.c | 5 +++ net/smc/smc_netlink.h | 2 +- net/smc/smc_stats.c | 92 ++++++++++++++++++++++++++++++++++++++++ net/smc/smc_stats.h | 1 + 5 files changed, 113 insertions(+), 1 deletion(-)
include/uapi/linux/smc.h +14 -0
@@ -48,6 +48,7 @@ enum {SMC_NETLINK_GET_DEV_SMCD ,SMC_NETLINK_GET_DEV_SMCR ,SMC_NETLINK_GET_STATS , + SMC_NETLINK_GET_FBACK_STATS, };/* SMC_GENL_FAMILY top level attributes */
@@ -60,6 +61,7 @@ enum {SMC_GEN_DEV_SMCD ,/* nest */ SMC_GEN_DEV_SMCR ,/* nest */ SMC_GEN_STATS ,/* nest */ +SMC_GEN_FBACK_STATS ,/* nest */ __SMC_GEN_MAX, SMC_GEN_MAX = __SMC_GEN_MAX - 1 };
@@ -228,4 +230,16 @@ enum { __SMC_NLA_STATS_MAX,SMC_NLA_STATS_MAX = __SMC_NLA_STATS_MAX -1 }; + +/* SMC_GEN_FBACK_STATS attributes */ +enum { +SMC_NLA_FBACK_STATS_PAD , +SMC_NLA_FBACK_STATS_TYPE ,/* u8 */ +SMC_NLA_FBACK_STATS_SRV_CNT ,/* u64 */ +SMC_NLA_FBACK_STATS_CLNT_CNT ,/* u64 */ +SMC_NLA_FBACK_STATS_RSN_CODE ,/* u32 */ +SMC_NLA_FBACK_STATS_RSN_CNT ,/* u16 */ + __SMC_NLA_FBACK_STATS_MAX, +SMC_NLA_FBACK_STATS_MAX = __SMC_NLA_FBACK_STATS_MAX -1 +};#endif /* _UAPI_LINUX_SMC_H */
net/smc/smc_netlink.c +5 -0
@@ -61,6 +61,11 @@ static const struct genl_ops smc_gen_nl_ops[] = {/* can be retrieved by unprivileged users */ .dumpit = smc_nl_get_stats, }, + { + .cmd = SMC_NETLINK_GET_FBACK_STATS, + /* can be retrieved by unprivileged users */ + .dumpit = smc_nl_get_fback_stats, + }, };static const struct nla_policy smc_gen_nl_policy[2 ] = {
net/smc/smc_netlink.h +1 -1
@@ -18,7 +18,7 @@extern struct genl_family smc_gen_nl_family;struct smc_nl_dmp_ctx { -int pos[2 ]; +int pos[3 ]; };static inline struct smc_nl_dmp_ctx *smc_nl_dmp_ctx (struct netlink_callback *c)
net/smc/smc_stats.c +92 -0
95 lines not on this page · raw message
net/smc/smc_stats.h +1 -0
@@ -248,6 +248,7 @@ do { \while (0 ) int smc_nl_get_stats(struct sk_buff *skb, struct netlink_callback *cb); +int smc_nl_get_fback_stats (struct sk_buff *skb,struct netlink_callback *cb);int smc_stats_init (void )__init ;void smc_stats_exit (void );
Signature · 1 line
2.25.1
PATCH v2 4/4 net/smc: Make SMC statistics network namespace aware
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Make the gathered SMC statistics network namespace aware, for each namespace collect an own set of statistic information.
--- include/net/net_namespace.h | 4 ++ include/net/netns/smc.h | 16 ++++++ net/smc/af_smc.c | 65 +++++++++++++-------- net/smc/smc_core.c | 10 ++-- net/smc/smc_rx.c | 6 +- net/smc/smc_stats.c | 47 ++++++++------- net/smc/smc_stats.h | 111 ++++++++++++++++++++---------------- net/smc/smc_tx.c | 12 ++-- 8 files changed, 163 insertions(+), 108 deletions(-) create mode 100644 include/net/netns/smc.h
include/net/net_namespace.h +4 -0
@@ -32,6 +32,7 @@#include <net/netns/mpls.h> #include <net/netns/can.h> #include <net/netns/xdp.h> +#include <net/netns/smc.h> #include <net/netns/bpf.h> #include <linux/ns_common.h> #include <linux/idr.h>
@@ -170,6 +171,9 @@ struct net {struct sock *crypto_nlsk;#endif struct sock *diag_nlsk; +#if IS_ENABLED (CONFIG_SMC ) +struct netns_smc smc; +#endif } __randomize_layout;#include <linux/seq_file_net.h>
include/net/netns/smc.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __NETNS_SMC_H__ +#define __NETNS_SMC_H__ +#include <linux/mutex.h> +#include <linux/percpu.h> + +struct smc_stats_rsn ; +struct smc_stats ; +struct netns_smc { +/* per cpu counters for SMC */ +struct smc_stats __percpu *smc_stats; +/* protect fback_rsn */ +struct mutex mutex_fback_rsn; +struct smc_stats_rsn *fback_rsn; +}; +#endif
net/smc/af_smc.c +40 -25
175 lines not on this page · raw message
net/smc/smc_core.c +5 -5
@@ -2058,8 +2058,8 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)/* check for reusable slot in the link group */ buf_desc =smc_buf_get_slot (bufsize_short, lock, buf_list);if (buf_desc) { -SMC_STAT_RMB_SIZE (is_smcd, is_rmb, bufsize); -SMC_STAT_BUF_REUSE (is_smcd, is_rmb); +SMC_STAT_RMB_SIZE (smc, is_smcd, is_rmb, bufsize); +SMC_STAT_BUF_REUSE (smc, is_smcd, is_rmb);memset (buf_desc->cpu_addr,0 , bufsize);break ;/* found reusable slot */ }
@@ -2074,13 +2074,13 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb)if (IS_ERR (buf_desc)) {if (!is_dgraded) { is_dgraded = true; -SMC_STAT_RMB_DOWNGRADED (is_smcd, is_rmb); +SMC_STAT_RMB_DOWNGRADED (smc, is_smcd, is_rmb); }continue ; } -SMC_STAT_RMB_ALLOC (is_smcd, is_rmb); -SMC_STAT_RMB_SIZE (is_smcd, is_rmb, bufsize); +SMC_STAT_RMB_ALLOC (smc, is_smcd, is_rmb); +SMC_STAT_RMB_SIZE (smc, is_smcd, is_rmb, bufsize); buf_desc->used =1 ;mutex_lock (lock);list_add (&buf_desc->list, buf_list);
net/smc/smc_rx.c +3 -3
@@ -228,7 +228,7 @@ static int smc_rx_recv_urg(struct smc_sock *smc, struct msghdr *msg, int len, conn->urg_state == SMC_URG_READ)return -EINVAL ; -SMC_STAT_INC (!conn->lnk, urg_data_cnt); +SMC_STAT_INC (smc, urg_data_cnt);if (conn->urg_state ==SMC_URG_VALID ) {if (!(flags &MSG_PEEK )) smc->conn.urg_state =SMC_URG_READ ;
@@ -307,10 +307,10 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, readable =atomic_read (&conn->bytes_to_rcv);if (readable >= conn->rmb_desc->len) -SMC_STAT_RMB_RX_FULL (!conn->lnk); +SMC_STAT_RMB_RX_FULL (smc, !conn->lnk);if (len < readable) -SMC_STAT_RMB_RX_SIZE_SMALL (!conn->lnk); +SMC_STAT_RMB_RX_SIZE_SMALL (smc, !conn->lnk);/* we currently use 1 RMBE per RMB, so RMBE == RMB base addr */ rcvbuf_base = conn->rx_off + conn->rmb_desc->cpu_addr;
net/smc/smc_stats.c +27 -20
109 lines not on this page · raw message
net/smc/smc_stats.h +61 -50
229 lines not on this page · raw message
net/smc/smc_tx.c +7 -5
@@ -47,7 +47,7 @@ static void smc_tx_write_space(struct sock *sk)/* similar to sk_stream_write_space */ if (atomic_read (&smc->conn.sndbuf_space) && sock) {if (test_bit (SOCK_NOSPACE , &sock->flags)) -SMC_STAT_RMB_TX_FULL (!smc->conn.lnk); +SMC_STAT_RMB_TX_FULL (smc, !smc->conn.lnk);clear_bit (SOCK_NOSPACE , &sock->flags);rcu_read_lock (); wq =rcu_dereference (sk->sk_wq);
@@ -155,13 +155,13 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) }if (len > conn->sndbuf_desc->len) -SMC_STAT_RMB_TX_SIZE_SMALL (!conn->lnk); +SMC_STAT_RMB_TX_SIZE_SMALL (smc, !conn->lnk);if (len > conn->peer_rmbe_size) -SMC_STAT_RMB_TX_PEER_SIZE_SMALL (!conn->lnk); +SMC_STAT_RMB_TX_PEER_SIZE_SMALL (smc, !conn->lnk);if (msg->msg_flags &MSG_OOB ) -SMC_STAT_INC (!conn->lnk, urg_data_cnt); +SMC_STAT_INC (smc, urg_data_cnt);while (msg_data_left (msg)) {if (sk->sk_state ==SMC_INIT )
@@ -432,7 +432,9 @@ static int smc_tx_rdma_writes(struct smc_connection *conn,/* cf. snd_wnd */ rmbespace =atomic_read (&conn->peer_rmbe_space);if (rmbespace <=0 ) { -SMC_STAT_RMB_TX_PEER_FULL (!conn->lnk); + struct smc_sock *smc = container_of(conn, struct smc_sock, + conn); +SMC_STAT_RMB_TX_PEER_FULL (smc, !conn->lnk);return 0 ; }smc_curs_copy (&prod, &conn->local_tx_ctrl.prod, conn);
Signature · 1 line
2.25.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 16 lines · On Wed, 16 Jun 2021 16:52:54 +0200 you wrote:
Please apply the following patch series for smc to netdev's net-next tree.
This v2 is a resend of the code contained in v1 but with an updated cover letter to describe why we have chosen to use the generic netlink mechanism to access the smc protocol's statistic data.
The patchset adds statistic support to the SMC protocol. Per-cpu variables are used to collect the statistic information for better performance and for reducing concurrency pitfalls. The code that is collecting statistic data is implemented in macros to increase code reuse and readability.
The generic netlink mechanism in SMC is extended to provide the collected statistics to userspace.
Network namespace awareness is also part of the statistics implementation.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,v2,1/4] net/smc: Add SMC statistics support
https://git.kernel.org/netdev/net-next/c/e0e4b8fa5338 - [net-next,v2,2/4] net/smc: Add netlink support for SMC statistics https://git.kernel.org/netdev/net-next/c/8c40602b4be1 - [net-next,v2,3/4] net/smc: Add netlink support for SMC fallback statistics https://git.kernel.org/netdev/net-next/c/f0dd7bf5e330 - [net-next,v2,4/4] net/smc: Make SMC statistics network namespace aware https://git.kernel.org/netdev/net-next/c/194730a9beb5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html