> Subject: Re: [PATCH 01/13] RDMA: Split the alloc_hw_stats() ops to port and > device variants > > On Mon, May 17, 2021 at 11:06:29PM +0000, Saleem, Shiraz wrote: > > > Subject: [PATCH 01/13] RDMA: Split the alloc_hw_stats() ops to port > > > and device variants > > > > > > This is being used to implement both the port and device global > > > stats, which is causing some confusion in the drivers. For instance > > > EFA and i40iw both seem to be misusing the device stats. > > > > > > Split it into two ops so drivers that don't support one or the other > > > can leave the op NULL'd, making the calling code a little simpler to > understand. > > > > > > Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxx> > > > drivers/infiniband/core/counters.c | 4 +- > > > drivers/infiniband/core/device.c | 3 +- > > > drivers/infiniband/core/nldev.c | 2 +- > > > drivers/infiniband/core/sysfs.c | 15 +++- > > > drivers/infiniband/hw/bnxt_re/hw_counters.c | 7 +- > > > drivers/infiniband/hw/bnxt_re/hw_counters.h | 4 +- > > > drivers/infiniband/hw/bnxt_re/main.c | 2 +- > > > drivers/infiniband/hw/cxgb4/provider.c | 9 +-- > > > drivers/infiniband/hw/efa/efa.h | 3 +- > > > drivers/infiniband/hw/efa/efa_main.c | 3 +- > > > drivers/infiniband/hw/efa/efa_verbs.c | 11 ++- > > > drivers/infiniband/hw/hfi1/verbs.c | 86 ++++++++++----------- > > > drivers/infiniband/hw/i40iw/i40iw_verbs.c | 19 ++++- > > > drivers/infiniband/hw/mlx4/main.c | 25 ++++-- > > > drivers/infiniband/hw/mlx5/counters.c | 42 +++++++--- > > > drivers/infiniband/sw/rxe/rxe_hw_counters.c | 7 +- > > > drivers/infiniband/sw/rxe/rxe_hw_counters.h | 4 +- > > > drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- > > > include/rdma/ib_verbs.h | 13 ++-- > > > 19 files changed, 158 insertions(+), 103 deletions(-) > > > > > > > [...] > > > > > /** > > > - * i40iw_alloc_hw_stats - Allocate a hw stats structure > > > + * i40iw_alloc_hw_port_stats - Allocate a hw stats structure > > > * @ibdev: device pointer from stack > > > * @port_num: port number > > > */ > > > -static struct rdma_hw_stats *i40iw_alloc_hw_stats(struct ib_device *ibdev, > > > - u32 port_num) > > > +static struct rdma_hw_stats *i40iw_alloc_hw_port_stats(struct ib_device > *ibdev, > > > + u32 port_num) > > > { > > > struct i40iw_device *iwdev = to_iwdev(ibdev); > > > struct i40iw_sc_dev *dev = &iwdev->sc_dev; @@ -2468,6 +2468,16 @@ > > > static struct rdma_hw_stats *i40iw_alloc_hw_stats(struct ib_device *ibdev, > > > lifespan); > > > } > > > > > > +static struct rdma_hw_stats * > > > +i40iw_alloc_hw_device_stats(struct ib_device *ibdev) { > > > + /* > > > + * It is probably a bug that i40iw reports its port stats as device > > > + * stats > > > + */ > > > > The number of physical ports per ib device is 1. > > Does something skip the port stats in this case? I don't see anything like that? No I don't see any check perse to prevent port stats from getting initialized. > > What does the sysfs look like? Aren't there duplicated HW stats? > Yeah it is duplicated. So we are saying for phys_port_cnt = 1, we want the stats to show up in only place? # cd /sys/class/infiniband/iwp3s0f0/hw_counters; for f in *; do echo -n "$f: "; cat "$f"; done; cd - cnpHandled: 0 cnpIgnored: 0 cnpSent: 0 ip4InDiscards: 0 ip4InMcastOctets: 0 ip4InMcastPkts: 0 ip4InOctets: 5884668 ip4InPkts: 87399 ip4InReasmRqd: 0 ip4InTruncatedPkts: 0 ip4OutMcastOctets: 0 ip4OutMcastPkts: 0 ip4OutNoRoutes: 0 ip4OutOctets: 7224092 ip4OutPkts: 101959 ip4OutSegRqd: 0 ip6InDiscards: 0 ip6InMcastOctets: 0 ip6InMcastPkts: 0 ip6InOctets: 0 ip6InPkts: 0 ip6InReasmRqd: 0 ip6InTruncatedPkts: 0 ip6OutMcastOctets: 0 ip6OutMcastPkts: 0 ip6OutNoRoutes: 0 ip6OutOctets: 0 ip6OutPkts: 0 ip6OutSegRqd: 0 iwInRdmaReads: 3 iwInRdmaSends: 29127 iwInRdmaWrites: 0 iwOutRdmaReads: 14564 iwOutRdmaSends: 29126 iwOutRdmaWrites: 14562 iwRdmaBnd: 0 iwRdmaInv: 0 lifespan: 10 RxECNMrkd: 0 RxUDP: 9 rxVlanErrors: 0 tcpInOptErrors: 0 tcpInProtoErrors: 0 tcpInSegs: 87399 tcpOutSegs: 101959 tcpRetransSegs: 0 TxUDP: 0 /sys/class/infiniband/iwp3s0f0/hw_counters # cd /sys/class/infiniband/iwp3s0f0/ports/1/hw_counters; for f in *; do echo -n "$f: "; cat "$f"; done; cd - cnpHandled: 0 cnpIgnored: 0 cnpSent: 0 ip4InDiscards: 0 ip4InMcastOctets: 0 ip4InMcastPkts: 0 ip4InOctets: 5884668 ip4InPkts: 87399 ip4InReasmRqd: 0 ip4InTruncatedPkts: 0 ip4OutMcastOctets: 0 ip4OutMcastPkts: 0 ip4OutNoRoutes: 0 ip4OutOctets: 7224092 ip4OutPkts: 101959 ip4OutSegRqd: 0 ip6InDiscards: 0 ip6InMcastOctets: 0 ip6InMcastPkts: 0 ip6InOctets: 0 ip6InPkts: 0 ip6InReasmRqd: 0 ip6InTruncatedPkts: 0 ip6OutMcastOctets: 0 ip6OutMcastPkts: 0 ip6OutNoRoutes: 0 ip6OutOctets: 0 ip6OutPkts: 0 ip6OutSegRqd: 0 iwInRdmaReads: 3 iwInRdmaSends: 29127 iwInRdmaWrites: 0 iwOutRdmaReads: 14564 iwOutRdmaSends: 29126 iwOutRdmaWrites: 14562 iwRdmaBnd: 0 iwRdmaInv: 0 lifespan: 10 RxECNMrkd: 0 RxUDP: 9 rxVlanErrors: 0 tcpInOptErrors: 0 tcpInProtoErrors: 0 tcpInSegs: 87399 tcpOutSegs: 101959 tcpRetransSegs: 0 TxUDP: 0 /sys/class/infiniband/iwp3s0f0/hw_counters