RDMA/mana_ib: Add device statistics support
Subsystems (2)
PATCH 1/1 RDMA/mana_ib: Add device statistics support
From: Shiraz Saleem <[email protected]>
Add support for mana device level statistics.
Co-developed-by Solom Tamawy <[email protected]>
Signed-off-by Solom Tamawy <[email protected]>
Signed-off-by Shiraz Saleem <[email protected]>
Signed-off-by Konstantin Taranov <[email protected]>
--- drivers/infiniband/hw/mana/counters.c | 60 ++++++++++++++++++++++++++- drivers/infiniband/hw/mana/counters.h | 10 +++++ drivers/infiniband/hw/mana/device.c | 6 +++ drivers/infiniband/hw/mana/mana_ib.h | 19 +++++++++ 4 files changed, 93 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mana/counters.c +58 -2
@@ -34,6 +34,22 @@ static const struct rdma_stat_desc mana_ib_port_stats_desc[] = { [MANA_IB_CURRENT_RATE].name = "current_rate", }; +static const struct rdma_stat_desc mana_ib_device_stats_desc[] = { + [MANA_IB_SENT_CNPS ].name ="sent_cnps" , + [MANA_IB_RECEIVED_ECNS ].name ="received_ecns" , + [MANA_IB_RECEIVED_CNP_COUNT ].name ="received_cnp_count" , + [MANA_IB_QP_CONGESTED_EVENTS ].name ="qp_congested_events" , + [MANA_IB_QP_RECOVERED_EVENTS ].name ="qp_recovered_events" , + [MANA_IB_DEV_RATE_INC_EVENTS ].name ="rate_inc_events" , +}; + +struct rdma_hw_stats *mana_ib_alloc_hw_device_stats (struct ib_device *ibdev) +{ +return rdma_alloc_hw_stats_struct (mana_ib_device_stats_desc, +ARRAY_SIZE (mana_ib_device_stats_desc), +RDMA_HW_STATS_DEFAULT_LIFESPAN ); +} +struct rdma_hw_stats *mana_ib_alloc_hw_port_stats (struct ib_device *ibdev,u32 port_num) {
@@ -42,8 +58,39 @@ struct rdma_hw_stats *mana_ib_alloc_hw_port_stats(struct ib_device *ibdev, RDMA_HW_STATS_DEFAULT_LIFESPAN); } -int mana_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u32 port_num,int index) +static int mana_ib_get_hw_device_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats) +{ + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, + ib_dev); +struct mana_rnic_query_device_cntrs_resp resp = {}; +struct mana_rnic_query_device_cntrs_req req = {}; +int err; + +mana_gd_init_req_hdr (&req.hdr,MANA_IB_QUERY_DEVICE_COUNTERS , +sizeof (req),sizeof (resp)); + req.hdr.dev_id = mdev->gdma_dev->dev_id; + req.adapter = mdev->adapter_handle; + + err =mana_gd_send_request (mdev_to_gc (mdev),sizeof (req), &req, +sizeof (resp), &resp); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to query device counters err %d" , + err); +return err; + } + + stats->value[MANA_IB_SENT_CNPS ] = resp.sent_cnps; + stats->value[MANA_IB_RECEIVED_ECNS ] = resp.received_ecns; + stats->value[MANA_IB_RECEIVED_CNP_COUNT ] = resp.received_cnp_count; + stats->value[MANA_IB_QP_CONGESTED_EVENTS ] = resp.qp_congested_events; + stats->value[MANA_IB_QP_RECOVERED_EVENTS ] = resp.qp_recovered_events; + stats->value[MANA_IB_DEV_RATE_INC_EVENTS ] = resp.rate_inc_events; + +return ARRAY_SIZE (mana_ib_device_stats_desc); +} + +static int mana_ib_get_hw_port_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, +u32 port_num) { struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
@@ -103,3 +150,12 @@ int mana_ib_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats,return ARRAY_SIZE (mana_ib_port_stats_desc); } + +int mana_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, +u32 port_num,int index) +{ +if (!port_num) +return mana_ib_get_hw_device_stats (ibdev, stats); +else +return mana_ib_get_hw_port_stats (ibdev, stats, port_num); +}
drivers/infiniband/hw/mana/counters.h +10 -0
@@ -37,8 +37,18 @@ enum mana_ib_port_counters { MANA_IB_CURRENT_RATE, }; +enum mana_ib_device_counters { +MANA_IB_SENT_CNPS , +MANA_IB_RECEIVED_ECNS , +MANA_IB_RECEIVED_CNP_COUNT , +MANA_IB_QP_CONGESTED_EVENTS , +MANA_IB_QP_RECOVERED_EVENTS , +MANA_IB_DEV_RATE_INC_EVENTS , +}; +struct rdma_hw_stats *mana_ib_alloc_hw_port_stats (struct ib_device *ibdev,u32 port_num); +struct rdma_hw_stats *mana_ib_alloc_hw_device_stats (struct ib_device *ibdev);int mana_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats,u32 port_num,int index);#endif /* _COUNTERS_H_ */
drivers/infiniband/hw/mana/device.c +6 -0
@@ -65,6 +65,10 @@ static const struct ib_device_ops mana_ib_stats_ops = { .get_hw_stats = mana_ib_get_hw_stats, }; +static const struct ib_device_ops mana_ib_device_stats_ops = { + .alloc_hw_device_stats = mana_ib_alloc_hw_device_stats, +}; +static int mana_ib_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) {
@@ -153,6 +157,8 @@ static int mana_ib_probe(struct auxiliary_device *adev, }ib_set_device_ops (&dev->ib_dev, &mana_ib_stats_ops); +if (dev->adapter_caps.feature_flags &MANA_IB_FEATURE_DEV_COUNTERS_SUPPORT ) +ib_set_device_ops (&dev->ib_dev, &mana_ib_device_stats_ops); ret =mana_ib_create_eqs (dev);if (ret) {
drivers/infiniband/hw/mana/mana_ib.h +19 -0
@@ -210,6 +210,7 @@ enum mana_ib_command_code {MANA_IB_DESTROY_RC_QP =0x3000b ,MANA_IB_SET_QP_STATE =0x3000d ,MANA_IB_QUERY_VF_COUNTERS =0x30022 , + MANA_IB_QUERY_DEVICE_COUNTERS = 0x30023, }; struct mana_ib_query_adapter_caps_req {
@@ -218,6 +219,7 @@ struct mana_ib_query_adapter_caps_req {enum mana_ib_adapter_features {MANA_IB_FEATURE_CLIENT_ERROR_CQE_SUPPORT =BIT (4 ), +MANA_IB_FEATURE_DEV_COUNTERS_SUPPORT =BIT (5 ), };struct mana_ib_query_adapter_caps_resp {
@@ -516,6 +518,23 @@ struct mana_rnic_query_vf_cntrs_resp {u64 current_rate; };/* HW Data */ +struct mana_rnic_query_device_cntrs_req { +struct gdma_req_hdr hdr; +mana_handle_t adapter; +};/* HW Data */ + +struct mana_rnic_query_device_cntrs_resp { +struct gdma_resp_hdr hdr; +u32 sent_cnps; +u32 received_ecns; +u32 reserved1; +u32 received_cnp_count; +u32 qp_congested_events; +u32 qp_recovered_events; +u32 rate_inc_events; +u32 reserved2; +};/* HW Data */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context;
Signature · 1 line
2.43.0
Quoted 10 lines
Subject: [PATCH rdma-next 1/1] RDMA/mana_ib: Add device statistics support
From: Shiraz Saleem <[email protected]>
Add support for mana device level statistics.
Co-developed-by Solom Tamawy <[email protected]>Signed-off-by Solom Tamawy <[email protected]>Signed-off-by Shiraz Saleem <[email protected]>Signed-off-by Konstantin Taranov <[email protected]>
Reviewed-by Long Li <[email protected]>
Quoted 196 lines
--- drivers/infiniband/hw/mana/counters.c | 60 ++++++++++++++++++++++++++- drivers/infiniband/hw/mana/counters.h | 10 +++++ drivers/infiniband/hw/mana/device.c | 6 +++ drivers/infiniband/hw/mana/mana_ib.h | 19 +++++++++ 4 files changed, 93 insertions(+), 2 deletions(-)drivers/infiniband/hw/mana/counters.c +38
-2@@ -34,6 +34,22 @@ static const struct rdma_stat_desc mana_ib_port_stats_desc[] = { [MANA_IB_CURRENT_RATE ].name ="current_rate" , }; +static const struct rdma_stat_desc mana_ib_device_stats_desc[] = { + [MANA_IB_SENT_CNPS ].name ="sent_cnps" , + [MANA_IB_RECEIVED_ECNS ].name ="received_ecns" , + [MANA_IB_RECEIVED_CNP_COUNT ].name ="received_cnp_count" , + [MANA_IB_QP_CONGESTED_EVENTS ].name ="qp_congested_events" , + [MANA_IB_QP_RECOVERED_EVENTS ].name ="qp_recovered_events" , + [MANA_IB_DEV_RATE_INC_EVENTS ].name ="rate_inc_events" , }; + +struct rdma_hw_stats *mana_ib_alloc_hw_device_stats (struct ib_device +*ibdev) { +return rdma_alloc_hw_stats_struct (mana_ib_device_stats_desc, +ARRAY_SIZE (mana_ib_device_stats_desc), +RDMA_HW_STATS_DEFAULT_LIFESPAN ); } +struct rdma_hw_stats *mana_ib_alloc_hw_port_stats (struct ib_device *ibdev,u32 port_num) {@@ -42,8 +58,39 @@ struct rdma_hw_stats *mana_ib_alloc_hw_port_stats(struct ib_device *ibdev,RDMA_HW_STATS_DEFAULT_LIFESPAN ); } -int mana_ib_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats, - u32 port_num, int index) +static int mana_ib_get_hw_device_stats (struct ib_device *ibdev,struct +rdma_hw_stats *stats) { + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, + ib_dev); +struct mana_rnic_query_device_cntrs_resp resp = {}; +struct mana_rnic_query_device_cntrs_req req = {}; +int err; + +mana_gd_init_req_hdr (&req.hdr,MANA_IB_QUERY_DEVICE_COUNTERS , +sizeof (req),sizeof (resp)); + req.hdr.dev_id = mdev->gdma_dev->dev_id; + req.adapter = mdev->adapter_handle; + + err =mana_gd_send_request (mdev_to_gc (mdev),sizeof (req), &req, +sizeof (resp), &resp); +if (err) { + ibdev_err(&mdev->ib_dev, "Failed to query device counters err %d", + err); +return err; + } + + stats->value[MANA_IB_SENT_CNPS ] = resp.sent_cnps; + stats->value[MANA_IB_RECEIVED_ECNS ] = resp.received_ecns; + stats->value[MANA_IB_RECEIVED_CNP_COUNT] =resp.received_cnp_count;
drivers/infiniband/hw/mana/counters.c +1
-0+ stats->value[MANA_IB_QP_CONGESTED_EVENTS] =resp.qp_congested_events;
drivers/infiniband/hw/mana/counters.c +1
-0+ stats->value[MANA_IB_QP_RECOVERED_EVENTS] =resp.qp_recovered_events;
drivers/infiniband/hw/mana/counters.c +1
-0+ stats->value[MANA_IB_DEV_RATE_INC_EVENTS] =resp.rate_inc_events;
drivers/infiniband/hw/mana/counters.c +5
-0+ +return ARRAY_SIZE (mana_ib_device_stats_desc); +} + +static int mana_ib_get_hw_port_stats(struct ib_device *ibdev, struct
rdma_hw_stats*stats,drivers/infiniband/hw/mana/counters.c +3
-0+ u32 port_num) { struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);@@ -103,3 +150,12 @@ int mana_ib_get_hw_stats(struct ib_device *ibdev,struct rdma_hw_stats *stats, return ARRAY_SIZE(mana_ib_port_stats_desc); } + +int mana_ib_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats*stats,
drivers/infiniband/hw/mana/counters.c +6
-0+ u32 port_num, int index) +{ +if (!port_num) +return mana_ib_get_hw_device_stats (ibdev, stats); +else +return mana_ib_get_hw_port_stats (ibdev, stats, port_num); }drivers/infiniband/hw/mana/counters.h +11
-0@@ -37,8 +37,18 @@ enum mana_ib_port_counters { MANA_IB_CURRENT_RATE, }; +enum mana_ib_device_counters { +MANA_IB_SENT_CNPS , +MANA_IB_RECEIVED_ECNS , +MANA_IB_RECEIVED_CNP_COUNT , +MANA_IB_QP_CONGESTED_EVENTS , +MANA_IB_QP_RECOVERED_EVENTS , +MANA_IB_DEV_RATE_INC_EVENTS , +}; +struct rdma_hw_stats *mana_ib_alloc_hw_port_stats (struct ib_device *ibdev,u32 port_num); +struct rdma_hw_stats *mana_ib_alloc_hw_device_stats (struct ib_device +*ibdev);int mana_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats,u32 port_num,int index);#endif /* _COUNTERS_H_ */ drivers/infiniband/hw/mana/device.c +5
-0@@ -65,6 +65,10 @@ static const struct ib_device_ops mana_ib_stats_ops = { .get_hw_stats = mana_ib_get_hw_stats, }; +static const struct ib_device_ops mana_ib_device_stats_ops = { + .alloc_hw_device_stats = mana_ib_alloc_hw_device_stats, }; +static int mana_ib_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) {@@ -153,6 +157,8 @@ static int mana_ib_probe(struct auxiliary_device *adev, }ib_set_device_ops (&dev->ib_dev, &mana_ib_stats_ops); +if (dev->adapter_caps.feature_flags &MANA_IB_FEATURE_DEV_COUNTERS_SUPPORT ) +ib_set_device_ops (&dev->ib_dev, &mana_ib_device_stats_ops);drivers/infiniband/hw/mana/device.c +0
-0ret =mana_ib_create_eqs (dev);if (ret) {drivers/infiniband/hw/mana/mana_ib.h +1
-0@@ -210,6 +210,7 @@ enum mana_ib_command_code {MANA_IB_DESTROY_RC_QP =0x3000b ,MANA_IB_SET_QP_STATE =0x3000d ,MANA_IB_QUERY_VF_COUNTERS =0x30022 , + MANA_IB_QUERY_DEVICE_COUNTERS = 0x30023, }; struct mana_ib_query_adapter_caps_req { @@ -218,6 +219,7 @@ struct
mana_ib_query_adapter_caps_req{enum
mana_ib_adapter_features{drivers/infiniband/hw/mana/mana_ib.h +1
-0MANA_IB_FEATURE_CLIENT_ERROR_CQE_SUPPORT =BIT (4 ), + MANA_IB_FEATURE_DEV_COUNTERS_SUPPORT = BIT(5), }; struct mana_ib_query_adapter_caps_resp { @@ -516,6 +518,23 @@ struct
mana_rnic_query_vf_cntrs_resp{drivers/infiniband/hw/mana/mana_ib.h +17
-1u64 current_rate; };/* HW Data */ +struct mana_rnic_query_device_cntrs_req { +struct gdma_req_hdr hdr; +mana_handle_t adapter; +};/* HW Data */ + +struct mana_rnic_query_device_cntrs_resp { +struct gdma_resp_hdr hdr; +u32 sent_cnps; +u32 received_ecns; +u32 reserved1; +u32 received_cnp_count; +u32 qp_congested_events; +u32 qp_recovered_events; +u32 rate_inc_events; +u32 reserved2; +};/* HW Data */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context; --2.43.0
Leon Romanovsky
AppliedQuoted 3 lines · Konstantin Taranov
Add support for mana device level statistics.
Applied, thanks!
[1/1] RDMA/mana_ib: Add device statistics support
https://git.kernel.org/rdma/rdma/c/baa640d924e55e
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>