From: Breno Leitao <leitao@debian.org> To: aleksander.lobakin@intel.com, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, elder@kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, nbd@nbd.name, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, taras.chornyi@plvision.eu, ath11k@lists.infradead.org, ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, geomatsi@gmail.com, kvalo@kernel.org Cc: quic_jjohnson@quicinc.com, leon@kernel.org, dennis.dalessandro@cornelisnetworks.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, idosch@idosch.org, leitao@debian.org, Elad Nachman <enachman@marvell.com> Subject: [PATCH net-next v6 04/10] net: marvell: prestera: allocate dummy net_device dynamically Date: Thu, 11 Apr 2024 06:59:28 -0700 [thread overview] Message-ID: <20240411135952.1096696-5-leitao@debian.org> (raw) In-Reply-To: <20240411135952.1096696-1-leitao@debian.org> 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 the private struct by converting it into a pointer. Then use the leverage the new alloc_netdev_dummy() helper to allocate and initialize dummy devices. [1] https://lore.kernel.org/all/20240229225910.79e224cf@kernel.org/ Signed-off-by: Breno Leitao <leitao@debian.org> Acked-by: Elad Nachman <enachman@marvell.com> --- .../net/ethernet/marvell/prestera/prestera_rxtx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c index cc2a9ae794be..39d9bf82c115 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c @@ -96,7 +96,7 @@ struct prestera_sdma { struct dma_pool *desc_pool; struct work_struct tx_work; struct napi_struct rx_napi; - struct net_device napi_dev; + struct net_device *napi_dev; u32 map_addr; u64 dma_mask; /* protect SDMA with concurrent access from multiple CPUs */ @@ -654,13 +654,21 @@ static int prestera_sdma_switch_init(struct prestera_switch *sw) if (err) goto err_evt_register; - init_dummy_netdev(&sdma->napi_dev); + sdma->napi_dev = alloc_netdev_dummy(0); + if (!sdma->napi_dev) { + dev_err(dev, "not able to initialize dummy device\n"); + err = -ENOMEM; + goto err_alloc_dummy; + } - netif_napi_add(&sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll); + netif_napi_add(sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll); napi_enable(&sdma->rx_napi); return 0; +err_alloc_dummy: + prestera_hw_event_handler_unregister(sw, PRESTERA_EVENT_TYPE_RXTX, + prestera_rxtx_handle_event); err_evt_register: err_tx_init: prestera_sdma_tx_fini(sdma); @@ -677,6 +685,7 @@ static void prestera_sdma_switch_fini(struct prestera_switch *sw) napi_disable(&sdma->rx_napi); netif_napi_del(&sdma->rx_napi); + free_netdev(sdma->napi_dev); prestera_hw_event_handler_unregister(sw, PRESTERA_EVENT_TYPE_RXTX, prestera_rxtx_handle_event); prestera_sdma_tx_fini(sdma); -- 2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Breno Leitao <leitao@debian.org> To: aleksander.lobakin@intel.com, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, elder@kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, nbd@nbd.name, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, taras.chornyi@plvision.eu, ath11k@lists.infradead.org, ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, geomatsi@gmail.com, kvalo@kernel.org Cc: quic_jjohnson@quicinc.com, leon@kernel.org, dennis.dalessandro@cornelisnetworks.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, idosch@idosch.org, leitao@debian.org, Elad Nachman <enachman@marvell.com> Subject: [PATCH net-next v6 04/10] net: marvell: prestera: allocate dummy net_device dynamically Date: Thu, 11 Apr 2024 06:59:28 -0700 [thread overview] Message-ID: <20240411135952.1096696-5-leitao@debian.org> (raw) In-Reply-To: <20240411135952.1096696-1-leitao@debian.org> 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 the private struct by converting it into a pointer. Then use the leverage the new alloc_netdev_dummy() helper to allocate and initialize dummy devices. [1] https://lore.kernel.org/all/20240229225910.79e224cf@kernel.org/ Signed-off-by: Breno Leitao <leitao@debian.org> Acked-by: Elad Nachman <enachman@marvell.com> --- .../net/ethernet/marvell/prestera/prestera_rxtx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c index cc2a9ae794be..39d9bf82c115 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c @@ -96,7 +96,7 @@ struct prestera_sdma { struct dma_pool *desc_pool; struct work_struct tx_work; struct napi_struct rx_napi; - struct net_device napi_dev; + struct net_device *napi_dev; u32 map_addr; u64 dma_mask; /* protect SDMA with concurrent access from multiple CPUs */ @@ -654,13 +654,21 @@ static int prestera_sdma_switch_init(struct prestera_switch *sw) if (err) goto err_evt_register; - init_dummy_netdev(&sdma->napi_dev); + sdma->napi_dev = alloc_netdev_dummy(0); + if (!sdma->napi_dev) { + dev_err(dev, "not able to initialize dummy device\n"); + err = -ENOMEM; + goto err_alloc_dummy; + } - netif_napi_add(&sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll); + netif_napi_add(sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll); napi_enable(&sdma->rx_napi); return 0; +err_alloc_dummy: + prestera_hw_event_handler_unregister(sw, PRESTERA_EVENT_TYPE_RXTX, + prestera_rxtx_handle_event); err_evt_register: err_tx_init: prestera_sdma_tx_fini(sdma); @@ -677,6 +685,7 @@ static void prestera_sdma_switch_fini(struct prestera_switch *sw) napi_disable(&sdma->rx_napi); netif_napi_del(&sdma->rx_napi); + free_netdev(sdma->napi_dev); prestera_hw_event_handler_unregister(sw, PRESTERA_EVENT_TYPE_RXTX, prestera_rxtx_handle_event); prestera_sdma_tx_fini(sdma); -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-11 14:00 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-11 13:59 [PATCH net-next v6 00/10] allocate dummy device dynamically Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 01/10] net: core: Fix documentation Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 02/10] net: free_netdev: exit earlier if dummy Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 03/10] net: create a dummy net_device allocator Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-13 2:16 ` Jakub Kicinski 2024-04-13 2:16 ` Jakub Kicinski 2024-04-17 10:51 ` Alexander Lobakin 2024-04-17 10:51 ` Alexander Lobakin 2024-04-17 11:11 ` Johannes Berg 2024-04-17 11:11 ` Johannes Berg 2024-04-17 11:19 ` Alexander Lobakin 2024-04-17 11:19 ` Alexander Lobakin 2024-04-17 15:29 ` Randy Dunlap 2024-04-17 15:29 ` Randy Dunlap 2024-04-11 13:59 ` Breno Leitao [this message] 2024-04-11 13:59 ` [PATCH net-next v6 04/10] net: marvell: prestera: allocate dummy net_device dynamically Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 05/10] net: mediatek: mtk_eth_sock: " Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 06/10] net: ipa: " Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 07/10] net: ibm/emac: " Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 08/10] wifi: qtnfmac: Use netdev dummy allocator helper Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 09/10] wifi: ath10k: allocate dummy net_device dynamically Breno Leitao 2024-04-11 13:59 ` Breno Leitao 2024-04-11 13:59 ` [PATCH net-next v6 10/10] wifi: ath11k: " Breno Leitao 2024-04-11 13:59 ` Breno Leitao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240411135952.1096696-5-leitao@debian.org \ --to=leitao@debian.org \ --cc=Mark-MC.Lee@mediatek.com \ --cc=aleksander.lobakin@intel.com \ --cc=ath10k@lists.infradead.org \ --cc=ath11k@lists.infradead.org \ --cc=bpf@vger.kernel.org \ --cc=davem@davemloft.net \ --cc=dennis.dalessandro@cornelisnetworks.com \ --cc=edumazet@google.com \ --cc=elder@kernel.org \ --cc=enachman@marvell.com \ --cc=geomatsi@gmail.com \ --cc=idosch@idosch.org \ --cc=kuba@kernel.org \ --cc=kvalo@kernel.org \ --cc=leon@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ --cc=lorenzo@kernel.org \ --cc=nbd@nbd.name \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=quic_jjohnson@quicinc.com \ --cc=sean.wang@mediatek.com \ --cc=taras.chornyi@plvision.eu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.