niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

IB/hfi1: allocate dummy net_device dynamically

Browse source 
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>
Acked-by: Leon Romanovsky <leon@kernel.org>
Link: https://lore.kernel.org/r/20240430162213.746492-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Breno Leitao 2024-04-30 09:22:11 -07:00 • committed by Jakub Kicinski
parent 3d549c3822
commit 1c8f43f477
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/infiniband/hw/hfi1/netdev.h
View file

@ -49,7 +49,7 @@ struct hfi1_netdev_rxq {
* When 0 receive queues will be freed. * When 0 receive queues will be freed.
*/ */
struct hfi1_netdev_rx { struct hfi1_netdev_rx {
struct net_device rx_napi; struct net_device *rx_napi;
struct hfi1_devdata *dd; struct hfi1_devdata *dd;
struct hfi1_netdev_rxq *rxq; struct hfi1_netdev_rxq *rxq;
int num_rx_q; int num_rx_q;

9
drivers/infiniband/hw/hfi1/netdev_rx.c
View file

@ -188,7 +188,7 @@ static int hfi1_netdev_rxq_init(struct hfi1_netdev_rx *rx)
int i; int i;
int rc; int rc;
struct hfi1_devdata *dd = rx->dd; 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->num_rx_q = dd->num_netdev_contexts;
rx->rxq = kcalloc_node(rx->num_rx_q, sizeof(*rx->rxq), 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) if (!rx)
return -ENOMEM; return -ENOMEM;
rx->dd = dd; 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); xa_init(&rx->dev_tbl);
atomic_set(&rx->enabled, 0); atomic_set(&rx->enabled, 0);
@ -374,6 +378,7 @@ void hfi1_free_rx(struct hfi1_devdata *dd)
{ {
if (dd->netdev_rx) { if (dd->netdev_rx) {
dd_dev_info(dd, "hfi1 rx freed\n"); dd_dev_info(dd, "hfi1 rx freed\n");
free_netdev(dd->netdev_rx->rx_napi);
kfree(dd->netdev_rx); kfree(dd->netdev_rx);
dd->netdev_rx = NULL; dd->netdev_rx = NULL;
} }