| Message ID | 20240503111333.552360-1-leitao@debian.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [net-next,1/2] IB/hfi1: Do not use custom stat allocator | expand |
On Fri, May 03, 2024 at 04:13:31AM -0700, Breno Leitao wrote: > With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and > convert veth & vrf"), stats allocation could be done on net core > instead of in this driver. > > With this new approach, the driver doesn't have to bother with error > handling (allocation failure checking, making sure free happens in the > right spot, etc). This is core responsibility now. > > Remove the allocation in the hfi1 driver and leverage the network > core allocation instead. > > Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org>
On Fri, May 03, 2024 at 04:13:31AM -0700, Breno Leitao wrote: > With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and > convert veth & vrf"), stats allocation could be done on net core > instead of in this driver. > > With this new approach, the driver doesn't have to bother with error > handling (allocation failure checking, making sure free happens in the > right spot, etc). This is core responsibility now. > > Remove the allocation in the hfi1 driver and leverage the network > core allocation instead. > > Signed-off-by: Breno Leitao <leitao@debian.org> > --- > drivers/infiniband/hw/hfi1/ipoib_main.c | 19 +++---------------- > 1 file changed, 3 insertions(+), 16 deletions(-) Please use rdma-next in the PATCH subject line, when sending patches for RDMA. Thanks
On Fri, 03 May 2024 04:13:31 -0700, Breno Leitao wrote: > With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and > convert veth & vrf"), stats allocation could be done on net core > instead of in this driver. > > With this new approach, the driver doesn't have to bother with error > handling (allocation failure checking, making sure free happens in the > right spot, etc). This is core responsibility now. > > [...] Applied, thanks! [1/2] IB/hfi1: Do not use custom stat allocator https://git.kernel.org/rdma/rdma/c/5194947e6a3966 [2/2] IB/hfi1: Remove generic .ndo_get_stats64 https://git.kernel.org/rdma/rdma/c/f483f6a29d4d70 Best regards,
Hello Leon, On Sun, May 05, 2024 at 05:10:32PM +0300, Leon Romanovsky wrote: > On Fri, May 03, 2024 at 04:13:31AM -0700, Breno Leitao wrote: > > With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and > > convert veth & vrf"), stats allocation could be done on net core > > instead of in this driver. > > > > With this new approach, the driver doesn't have to bother with error > > handling (allocation failure checking, making sure free happens in the > > right spot, etc). This is core responsibility now. > > > > Remove the allocation in the hfi1 driver and leverage the network > > core allocation instead. > > > > Signed-off-by: Breno Leitao <leitao@debian.org> > > --- > > drivers/infiniband/hw/hfi1/ipoib_main.c | 19 +++---------------- > > 1 file changed, 3 insertions(+), 16 deletions(-) > > Please use rdma-next in the PATCH subject line, when sending patches for RDMA. Thanks for the heads-up. I will make sure I use rdma-next in the next RDMA patches.
diff --git a/drivers/infiniband/hw/hfi1/ipoib_main.c b/drivers/infiniband/hw/hfi1/ipoib_main.c index 5d814afdf7f3..59c6e55f4119 100644 --- a/drivers/infiniband/hw/hfi1/ipoib_main.c +++ b/drivers/infiniband/hw/hfi1/ipoib_main.c @@ -21,36 +21,25 @@ static int hfi1_ipoib_dev_init(struct net_device *dev) struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev); int ret; - dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); - if (!dev->tstats) - return -ENOMEM; - ret = priv->netdev_ops->ndo_init(dev); if (ret) - goto out_ret; + return ret; ret = hfi1_netdev_add_data(priv->dd, qpn_from_mac(priv->netdev->dev_addr), dev); if (ret < 0) { priv->netdev_ops->ndo_uninit(dev); - goto out_ret; + return ret; } return 0; -out_ret: - free_percpu(dev->tstats); - dev->tstats = NULL; - return ret; } static void hfi1_ipoib_dev_uninit(struct net_device *dev) { struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev); - free_percpu(dev->tstats); - dev->tstats = NULL; - hfi1_netdev_remove_data(priv->dd, qpn_from_mac(priv->netdev->dev_addr)); priv->netdev_ops->ndo_uninit(dev); @@ -173,9 +162,6 @@ static void hfi1_ipoib_netdev_dtor(struct net_device *dev) hfi1_ipoib_txreq_deinit(priv); hfi1_ipoib_rxq_deinit(priv->netdev); - - free_percpu(dev->tstats); - dev->tstats = NULL; } static void hfi1_ipoib_set_id(struct net_device *dev, int id) @@ -234,6 +220,7 @@ static int hfi1_ipoib_setup_rn(struct ib_device *device, netdev->priv_destructor = hfi1_ipoib_netdev_dtor; netdev->needs_free_netdev = true; + netdev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; return 0; }
With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and convert veth & vrf"), stats allocation could be done on net core instead of in this driver. With this new approach, the driver doesn't have to bother with error handling (allocation failure checking, making sure free happens in the right spot, etc). This is core responsibility now. Remove the allocation in the hfi1 driver and leverage the network core allocation instead. Signed-off-by: Breno Leitao <leitao@debian.org> --- drivers/infiniband/hw/hfi1/ipoib_main.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)