Skip to content

Commit 475ac07

Browse files
Basel-Nassarrleon
Basel-Nassar
authored and
rleon
committed
RDMA/efa: Add Network HW statistics counters
Update device API and request network counters. Expose newly added counters through ib core counters mechanism. Reviewed-by: David Shoolman <shoolman@amazon.com> Reviewed-by: Yonatan Nachum <ynachum@amazon.com> Signed-off-by: Basel Nassar <baselna@amazon.com> Signed-off-by: Michael Margolin <mrgolin@amazon.com> Link: https://patch.msgid.link/20250706070740.22534-1-mrgolin@amazon.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 8ab05a5 commit 475ac07

4 files changed

Lines changed: 79 additions & 20 deletions

File tree

‎drivers/infiniband/hw/efa/efa_admin_cmds_defs.h‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
22
/*
3-
* Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
3+
* Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
44
*/
55

66
#ifndef _EFA_ADMIN_CMDS_H_
@@ -68,6 +68,7 @@ enum efa_admin_get_stats_type {
6868
EFA_ADMIN_GET_STATS_TYPE_MESSAGES = 1,
6969
EFA_ADMIN_GET_STATS_TYPE_RDMA_READ = 2,
7070
EFA_ADMIN_GET_STATS_TYPE_RDMA_WRITE = 3,
71+
EFA_ADMIN_GET_STATS_TYPE_NETWORK = 4,
7172
};
7273

7374
enum efa_admin_get_stats_scope {
@@ -651,6 +652,18 @@ struct efa_admin_rdma_write_stats {
651652
u64 write_recv_bytes;
652653
};
653654

655+
struct efa_admin_network_stats {
656+
u64 retrans_bytes;
657+
658+
u64 retrans_pkts;
659+
660+
u64 retrans_timeout_events;
661+
662+
u64 unresponsive_remote_events;
663+
664+
u64 impaired_remote_conn_events;
665+
};
666+
654667
struct efa_admin_acq_get_stats_resp {
655668
struct efa_admin_acq_common_desc acq_common_desc;
656669

@@ -662,6 +675,8 @@ struct efa_admin_acq_get_stats_resp {
662675
struct efa_admin_rdma_read_stats rdma_read_stats;
663676

664677
struct efa_admin_rdma_write_stats rdma_write_stats;
678+
679+
struct efa_admin_network_stats network_stats;
665680
} u;
666681
};
667682

‎drivers/infiniband/hw/efa/efa_com_cmd.c‎

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
22
/*
3-
* Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
3+
* Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
44
*/
55

66
#include "efa_com.h"
@@ -769,6 +769,11 @@ int efa_com_get_stats(struct efa_com_dev *edev,
769769
struct efa_com_admin_queue *aq = &edev->aq;
770770
struct efa_admin_aq_get_stats_cmd cmd = {};
771771
struct efa_admin_acq_get_stats_resp resp;
772+
struct efa_admin_rdma_write_stats *rws;
773+
struct efa_admin_rdma_read_stats *rrs;
774+
struct efa_admin_messages_stats *ms;
775+
struct efa_admin_network_stats *ns;
776+
struct efa_admin_basic_stats *bs;
772777
int err;
773778

774779
cmd.aq_common_descriptor.opcode = EFA_ADMIN_GET_STATS;
@@ -791,29 +796,41 @@ int efa_com_get_stats(struct efa_com_dev *edev,
791796

792797
switch (cmd.type) {
793798
case EFA_ADMIN_GET_STATS_TYPE_BASIC:
794-
result->basic_stats.tx_bytes = resp.u.basic_stats.tx_bytes;
795-
result->basic_stats.tx_pkts = resp.u.basic_stats.tx_pkts;
796-
result->basic_stats.rx_bytes = resp.u.basic_stats.rx_bytes;
797-
result->basic_stats.rx_pkts = resp.u.basic_stats.rx_pkts;
798-
result->basic_stats.rx_drops = resp.u.basic_stats.rx_drops;
799+
bs = &resp.u.basic_stats;
800+
result->basic_stats.tx_bytes = bs->tx_bytes;
801+
result->basic_stats.tx_pkts = bs->tx_pkts;
802+
result->basic_stats.rx_bytes = bs->rx_bytes;
803+
result->basic_stats.rx_pkts = bs->rx_pkts;
804+
result->basic_stats.rx_drops = bs->rx_drops;
799805
break;
800806
case EFA_ADMIN_GET_STATS_TYPE_MESSAGES:
801-
result->messages_stats.send_bytes = resp.u.messages_stats.send_bytes;
802-
result->messages_stats.send_wrs = resp.u.messages_stats.send_wrs;
803-
result->messages_stats.recv_bytes = resp.u.messages_stats.recv_bytes;
804-
result->messages_stats.recv_wrs = resp.u.messages_stats.recv_wrs;
807+
ms = &resp.u.messages_stats;
808+
result->messages_stats.send_bytes = ms->send_bytes;
809+
result->messages_stats.send_wrs = ms->send_wrs;
810+
result->messages_stats.recv_bytes = ms->recv_bytes;
811+
result->messages_stats.recv_wrs = ms->recv_wrs;
805812
break;
806813
case EFA_ADMIN_GET_STATS_TYPE_RDMA_READ:
807-
result->rdma_read_stats.read_wrs = resp.u.rdma_read_stats.read_wrs;
808-
result->rdma_read_stats.read_bytes = resp.u.rdma_read_stats.read_bytes;
809-
result->rdma_read_stats.read_wr_err = resp.u.rdma_read_stats.read_wr_err;
810-
result->rdma_read_stats.read_resp_bytes = resp.u.rdma_read_stats.read_resp_bytes;
814+
rrs = &resp.u.rdma_read_stats;
815+
result->rdma_read_stats.read_wrs = rrs->read_wrs;
816+
result->rdma_read_stats.read_bytes = rrs->read_bytes;
817+
result->rdma_read_stats.read_wr_err = rrs->read_wr_err;
818+
result->rdma_read_stats.read_resp_bytes = rrs->read_resp_bytes;
811819
break;
812820
case EFA_ADMIN_GET_STATS_TYPE_RDMA_WRITE:
813-
result->rdma_write_stats.write_wrs = resp.u.rdma_write_stats.write_wrs;
814-
result->rdma_write_stats.write_bytes = resp.u.rdma_write_stats.write_bytes;
815-
result->rdma_write_stats.write_wr_err = resp.u.rdma_write_stats.write_wr_err;
816-
result->rdma_write_stats.write_recv_bytes = resp.u.rdma_write_stats.write_recv_bytes;
821+
rws = &resp.u.rdma_write_stats;
822+
result->rdma_write_stats.write_wrs = rws->write_wrs;
823+
result->rdma_write_stats.write_bytes = rws->write_bytes;
824+
result->rdma_write_stats.write_wr_err = rws->write_wr_err;
825+
result->rdma_write_stats.write_recv_bytes = rws->write_recv_bytes;
826+
break;
827+
case EFA_ADMIN_GET_STATS_TYPE_NETWORK:
828+
ns = &resp.u.network_stats;
829+
result->network_stats.retrans_bytes = ns->retrans_bytes;
830+
result->network_stats.retrans_pkts = ns->retrans_pkts;
831+
result->network_stats.retrans_timeout_events = ns->retrans_timeout_events;
832+
result->network_stats.unresponsive_remote_events = ns->unresponsive_remote_events;
833+
result->network_stats.impaired_remote_conn_events = ns->impaired_remote_conn_events;
817834
break;
818835
}
819836

‎drivers/infiniband/hw/efa/efa_com_cmd.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
22
/*
3-
* Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
3+
* Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
44
*/
55

66
#ifndef _EFA_COM_CMD_H_
@@ -283,11 +283,20 @@ struct efa_com_rdma_write_stats {
283283
u64 write_recv_bytes;
284284
};
285285

286+
struct efa_com_network_stats {
287+
u64 retrans_bytes;
288+
u64 retrans_pkts;
289+
u64 retrans_timeout_events;
290+
u64 unresponsive_remote_events;
291+
u64 impaired_remote_conn_events;
292+
};
293+
286294
union efa_com_get_stats_result {
287295
struct efa_com_basic_stats basic_stats;
288296
struct efa_com_messages_stats messages_stats;
289297
struct efa_com_rdma_read_stats rdma_read_stats;
290298
struct efa_com_rdma_write_stats rdma_write_stats;
299+
struct efa_com_network_stats network_stats;
291300
};
292301

293302
int efa_com_create_qp(struct efa_com_dev *edev,

‎drivers/infiniband/hw/efa/efa_verbs.c‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ struct efa_user_mmap_entry {
6464
op(EFA_RDMA_WRITE_BYTES, "rdma_write_bytes") \
6565
op(EFA_RDMA_WRITE_WR_ERR, "rdma_write_wr_err") \
6666
op(EFA_RDMA_WRITE_RECV_BYTES, "rdma_write_recv_bytes") \
67+
op(EFA_RETRANS_BYTES, "retrans_bytes") \
68+
op(EFA_RETRANS_PKTS, "retrans_pkts") \
69+
op(EFA_RETRANS_TIMEOUT_EVENS, "retrans_timeout_events") \
70+
op(EFA_UNRESPONSIVE_REMOTE_EVENTS, "unresponsive_remote_events") \
71+
op(EFA_IMPAIRED_REMOTE_CONN_EVENTS, "impaired_remote_conn_events") \
6772

6873
#define EFA_STATS_ENUM(ename, name) ename,
6974
#define EFA_STATS_STR(ename, nam) \
@@ -2186,6 +2191,7 @@ static int efa_fill_port_stats(struct efa_dev *dev, struct rdma_hw_stats *stats,
21862191
struct efa_com_rdma_write_stats *rws;
21872192
struct efa_com_rdma_read_stats *rrs;
21882193
struct efa_com_messages_stats *ms;
2194+
struct efa_com_network_stats *ns;
21892195
struct efa_com_basic_stats *bs;
21902196
int err;
21912197

@@ -2238,6 +2244,18 @@ static int efa_fill_port_stats(struct efa_dev *dev, struct rdma_hw_stats *stats,
22382244
stats->value[EFA_RDMA_WRITE_RECV_BYTES] = rws->write_recv_bytes;
22392245
}
22402246

2247+
params.type = EFA_ADMIN_GET_STATS_TYPE_NETWORK;
2248+
err = efa_com_get_stats(&dev->edev, &params, &result);
2249+
if (err)
2250+
return err;
2251+
2252+
ns = &result.network_stats;
2253+
stats->value[EFA_RETRANS_BYTES] = ns->retrans_bytes;
2254+
stats->value[EFA_RETRANS_PKTS] = ns->retrans_pkts;
2255+
stats->value[EFA_RETRANS_TIMEOUT_EVENS] = ns->retrans_timeout_events;
2256+
stats->value[EFA_UNRESPONSIVE_REMOTE_EVENTS] = ns->unresponsive_remote_events;
2257+
stats->value[EFA_IMPAIRED_REMOTE_CONN_EVENTS] = ns->impaired_remote_conn_events;
2258+
22412259
return ARRAY_SIZE(efa_port_stats_descs);
22422260
}
22432261

0 commit comments

Comments
 (0)