Skip to content

Commit

Permalink
IB/hfi1: allocate dummy net_device dynamically
Browse files Browse the repository at this point in the history
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/20240229225910.79e224cf@kernel.org/

Acked-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: NipaLocal <nipa@local>
  • Loading branch information
leitao authored and NipaLocal committed May 2, 2024
1 parent 1efb8d5 commit 9588b84
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/hfi1/netdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct hfi1_netdev_rxq {
* When 0 receive queues will be freed.
*/
struct hfi1_netdev_rx {
struct net_device rx_napi;
struct net_device *rx_napi;
struct hfi1_devdata *dd;
struct hfi1_netdev_rxq *rxq;
int num_rx_q;
Expand Down
9 changes: 7 additions & 2 deletions drivers/infiniband/hw/hfi1/netdev_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down

0 comments on commit 9588b84

Please sign in to comment.