diff options
| author | Breno Leitao <[email protected]> | 2024-04-30 16:22:11 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-05-03 01:20:17 +0000 |
| commit | 1c8f43f477d92fda15bccd703b808cd46899cd3c (patch) | |
| tree | 564689bf877cffa3303fdc97ab1bb3fafb5a0ace /drivers/infiniband/hw/hfi1/netdev_rx.c | |
| parent | net/mlx5e: flower: check for unsupported control flags (diff) | |
| download | kernel-1c8f43f477d92fda15bccd703b808cd46899cd3c.tar.gz kernel-1c8f43f477d92fda15bccd703b808cd46899cd3c.zip | |
IB/hfi1: allocate dummy net_device dynamically
Embedding net_device into structures prohibits the usage of flexible
arrays in the net_device structure. For more details, see the discussion
at [1].
Un-embed the net_device from struct hfi1_netdev_rx by converting it
into a pointer. Then use the leverage alloc_netdev() to allocate the
net_device object at hfi1_alloc_rx().
[1] https://lore.kernel.org/all/[email protected]/
Acked-by: Dennis Dalessandro <[email protected]>
Signed-off-by: Breno Leitao <[email protected]>
Acked-by: Leon Romanovsky <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/netdev_rx.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/netdev_rx.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/hfi1/netdev_rx.c b/drivers/infiniband/hw/hfi1/netdev_rx.c index 720d4c85c9c9..8608044203bb 100644 --- a/drivers/infiniband/hw/hfi1/netdev_rx.c +++ b/drivers/infiniband/hw/hfi1/netdev_rx.c @@ -188,7 +188,7 @@ static int hfi1_netdev_rxq_init(struct hfi1_netdev_rx *rx) int i; int rc; struct hfi1_devdata *dd = rx->dd; - struct net_device *dev = &rx->rx_napi; + struct net_device *dev = rx->rx_napi; rx->num_rx_q = dd->num_netdev_contexts; rx->rxq = kcalloc_node(rx->num_rx_q, sizeof(*rx->rxq), @@ -360,7 +360,11 @@ int hfi1_alloc_rx(struct hfi1_devdata *dd) if (!rx) return -ENOMEM; rx->dd = dd; - init_dummy_netdev(&rx->rx_napi); + rx->rx_napi = alloc_netdev_dummy(0); + if (!rx->rx_napi) { + kfree(rx); + return -ENOMEM; + } xa_init(&rx->dev_tbl); atomic_set(&rx->enabled, 0); @@ -374,6 +378,7 @@ void hfi1_free_rx(struct hfi1_devdata *dd) { if (dd->netdev_rx) { dd_dev_info(dd, "hfi1 rx freed\n"); + free_netdev(dd->netdev_rx->rx_napi); kfree(dd->netdev_rx); dd->netdev_rx = NULL; } |