* [PATCH net-next] net: add devm version of alloc_etherdev_mqs function
@ 2017-01-28 14:15 Rafał Miłecki
2017-01-30 0:24 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Rafał Miłecki @ 2017-01-28 14:15 UTC (permalink / raw)
To: David S . Miller
Cc: Pablo Neira Ayuso, Andrew Lunn, Joe Perches, Tom Herbert,
Alexander Duyck, Jesper Dangaard Brouer, Jarod Wilson,
Sabrina Dubroca, netdev, linux-kernel, Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
macro. These can be used for simpler netdev allocation without having to
care about calling free_netdev.
Thanks to this change drivers, their error paths and removal paths may
get simpler by a bit.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
I'm working on V2 of:
[PATCH 0/3] net-next: use one struct bgmac & add PHY support
and I just realized I could get a way simpler error path in bgmac with a
devm_alloc_etherdev helper. So there is my suggestion for adding it.
---
include/linux/etherdevice.h | 5 +++++
net/ethernet/eth.c | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 42add77ae47d..c62b709b1ce0 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -54,6 +54,11 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
#define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
#define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)
+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
+ unsigned int txqs,
+ unsigned int rxqs);
+#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1)
+
struct sk_buff **eth_gro_receive(struct sk_buff **head,
struct sk_buff *skb);
int eth_gro_complete(struct sk_buff *skb, int nhoff);
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 8c5a479681ca..efdaaab735fc 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -392,6 +392,34 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
}
EXPORT_SYMBOL(alloc_etherdev_mqs);
+static void devm_free_netdev(struct device *dev, void *res)
+{
+ free_netdev(*(struct net_device **)res);
+}
+
+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
+ unsigned int txqs, unsigned int rxqs)
+{
+ struct net_device **dr;
+ struct net_device *netdev;
+
+ dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);
+ if (!dr)
+ return NULL;
+
+ netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);
+ if (!netdev) {
+ devres_free(dr);
+ return NULL;
+ }
+
+ *dr = netdev;
+ devres_add(dev, dr);
+
+ return netdev;
+}
+EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
+
ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
{
return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: add devm version of alloc_etherdev_mqs function
2017-01-28 14:15 [PATCH net-next] net: add devm version of alloc_etherdev_mqs function Rafał Miłecki
@ 2017-01-30 0:24 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-01-30 0:24 UTC (permalink / raw)
To: zajec5
Cc: pablo, andrew, joe, tom, aduyck, brouer, jarod, sd, netdev,
linux-kernel, rafal
From: Rafał Miłecki <zajec5@gmail.com>
Date: Sat, 28 Jan 2017 15:15:42 +0100
> From: Rafał Miłecki <rafal@milecki.pl>
>
> This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
> macro. These can be used for simpler netdev allocation without having to
> care about calling free_netdev.
>
> Thanks to this change drivers, their error paths and removal paths may
> get simpler by a bit.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This looks fine, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-30 0:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-28 14:15 [PATCH net-next] net: add devm version of alloc_etherdev_mqs function Rafał Miłecki
2017-01-30 0:24 ` David Miller
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 NNTP newsgroup(s).