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,
angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com
Subject: [PATCH net-next v7 06/10] net: ipa: allocate dummy net_device dynamically
Date: Mon, 22 Apr 2024 05:38:59 -0700 [thread overview]
Message-ID: <20240422123921.854943-7-leitao@debian.org> (raw)
In-Reply-To: <20240422123921.854943-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>
---
drivers/net/ipa/gsi.c | 12 ++++++++----
drivers/net/ipa/gsi.h | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 6c8feb640a97..4c3227e77898 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1728,10 +1728,10 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)
gsi_channel_program(channel, true);
if (channel->toward_ipa)
- netif_napi_add_tx(&gsi->dummy_dev, &channel->napi,
+ netif_napi_add_tx(gsi->dummy_dev, &channel->napi,
gsi_channel_poll);
else
- netif_napi_add(&gsi->dummy_dev, &channel->napi,
+ netif_napi_add(gsi->dummy_dev, &channel->napi,
gsi_channel_poll);
return 0;
@@ -2367,12 +2367,14 @@ int gsi_init(struct gsi *gsi, struct platform_device *pdev,
/* GSI uses NAPI on all channels. Create a dummy network device
* for the channel NAPI contexts to be associated with.
*/
- init_dummy_netdev(&gsi->dummy_dev);
+ gsi->dummy_dev = alloc_netdev_dummy(0);
+ if (!gsi->dummy_dev)
+ return -ENOMEM;
init_completion(&gsi->completion);
ret = gsi_reg_init(gsi, pdev);
if (ret)
- return ret;
+ goto err_reg_exit;
ret = gsi_irq_init(gsi, pdev); /* No matching exit required */
if (ret)
@@ -2387,6 +2389,7 @@ int gsi_init(struct gsi *gsi, struct platform_device *pdev,
return 0;
err_reg_exit:
+ free_netdev(gsi->dummy_dev);
gsi_reg_exit(gsi);
return ret;
@@ -2397,6 +2400,7 @@ void gsi_exit(struct gsi *gsi)
{
mutex_destroy(&gsi->mutex);
gsi_channel_exit(gsi);
+ free_netdev(gsi->dummy_dev);
gsi_reg_exit(gsi);
}
diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 833135b35380..9d8e05d950e3 100644
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -151,7 +151,7 @@ struct gsi {
struct mutex mutex; /* protects commands, programming */
struct gsi_channel channel[GSI_CHANNEL_COUNT_MAX];
struct gsi_evt_ring evt_ring[GSI_EVT_RING_COUNT_MAX];
- struct net_device dummy_dev; /* needed for NAPI */
+ struct net_device *dummy_dev; /* needed for NAPI */
};
/**
--
2.43.0
next prev parent reply other threads:[~2024-04-22 12:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 12:38 [PATCH net-next v7 00/10] allocate dummy device dynamically Breno Leitao
2024-04-22 12:38 ` [PATCH net-next v7 01/10] net: core: Fix documentation Breno Leitao
2024-04-22 12:38 ` [PATCH net-next v7 02/10] net: free_netdev: exit earlier if dummy Breno Leitao
2024-04-22 12:38 ` [PATCH net-next v7 03/10] net: create a dummy net_device allocator Breno Leitao
2024-04-22 12:38 ` [PATCH net-next v7 04/10] net: marvell: prestera: allocate dummy net_device dynamically Breno Leitao
2024-04-22 12:38 ` [PATCH net-next v7 05/10] net: mediatek: mtk_eth_sock: " Breno Leitao
2024-04-22 12:38 ` Breno Leitao [this message]
2024-04-22 12:39 ` [PATCH net-next v7 07/10] net: ibm/emac: " Breno Leitao
2024-04-22 12:39 ` [PATCH net-next v7 08/10] wifi: qtnfmac: Use netdev dummy allocator helper Breno Leitao
2024-04-22 13:07 ` Kalle Valo
2024-04-22 12:39 ` [PATCH net-next v7 09/10] wifi: ath10k: allocate dummy net_device dynamically Breno Leitao
2024-04-22 13:08 ` Kalle Valo
2024-04-22 12:39 ` [PATCH net-next v7 10/10] wifi: ath11k: " Breno Leitao
2024-04-22 13:08 ` Kalle Valo
2024-04-24 11:10 ` [PATCH net-next v7 00/10] allocate dummy device dynamically patchwork-bot+netdevbpf
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=20240422123921.854943-7-leitao@debian.org \
--to=leitao@debian.org \
--cc=Mark-MC.Lee@mediatek.com \
--cc=aleksander.lobakin@intel.com \
--cc=angelogioacchino.delregno@collabora.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=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=matthias.bgg@gmail.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).