* [patch net-next] nlmon: use standard rtnetlink link api for add/del devices
@ 2013-07-01 15:07 Jiri Pirko
2013-07-01 16:23 ` Daniel Borkmann
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Pirko @ 2013-07-01 15:07 UTC (permalink / raw)
To: netdev; +Cc: davem, dborkman
It is not nice when netdev is created right after module load and with
some implicit name. So rather change nlmon to use standard rtnl link API.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
drivers/net/nlmon.c | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
index a0baf56..59fbac5 100644
--- a/drivers/net/nlmon.c
+++ b/drivers/net/nlmon.c
@@ -4,6 +4,7 @@
#include <linux/netlink.h>
#include <net/net_namespace.h>
#include <linux/if_arp.h>
+#include <net/rtnetlink.h>
struct pcpu_lstats {
u64 packets;
@@ -56,16 +57,23 @@ static void nlmon_dev_uninit(struct net_device *dev)
free_percpu(dev->lstats);
}
-static struct netlink_tap nlmon_tap;
+struct nlmon {
+ struct netlink_tap nt;
+};
static int nlmon_open(struct net_device *dev)
{
- return netlink_add_tap(&nlmon_tap);
+ struct nlmon *nlmon = netdev_priv(dev);
+
+ nlmon->nt.module = THIS_MODULE;
+ return netlink_add_tap(&nlmon->nt);
}
static int nlmon_close(struct net_device *dev)
{
- return netlink_remove_tap(&nlmon_tap);
+ struct nlmon *nlmon = netdev_priv(dev);
+
+ return netlink_remove_tap(&nlmon->nt);
}
static struct rtnl_link_stats64 *
@@ -119,10 +127,6 @@ static const struct net_device_ops nlmon_ops = {
.ndo_change_mtu = nlmon_change_mtu,
};
-static struct netlink_tap nlmon_tap __read_mostly = {
- .module = THIS_MODULE,
-};
-
static void nlmon_setup(struct net_device *dev)
{
dev->type = ARPHRD_NETLINK;
@@ -142,27 +146,28 @@ static void nlmon_setup(struct net_device *dev)
dev->mtu = NLMSG_GOODSIZE;
}
-static __init int nlmon_register(void)
+static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
{
- int err;
- struct net_device *nldev;
-
- nldev = nlmon_tap.dev = alloc_netdev(0, "netlink", nlmon_setup);
- if (unlikely(nldev == NULL))
- return -ENOMEM;
+ if (tb[IFLA_ADDRESS])
+ return -EINVAL;
+ return 0;
+}
- err = register_netdev(nldev);
- if (unlikely(err))
- free_netdev(nldev);
+static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
+ .kind = "nlmon",
+ .priv_size = sizeof(struct nlmon),
+ .setup = nlmon_setup,
+ .validate = nlmon_validate,
+};
- return err;
+static __init int nlmon_register(void)
+{
+ return rtnl_link_register(&nlmon_link_ops);
}
static __exit void nlmon_unregister(void)
{
- struct net_device *nldev = nlmon_tap.dev;
-
- unregister_netdev(nldev);
+ rtnl_link_unregister(&nlmon_link_ops);
}
module_init(nlmon_register);
@@ -172,3 +177,4 @@ MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Daniel Borkmann <dborkman@redhat.com>");
MODULE_AUTHOR("Mathieu Geli <geli@enseirb.fr>");
MODULE_DESCRIPTION("Netlink monitoring device");
+MODULE_ALIAS_RTNL_LINK("nlmon");
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch net-next] nlmon: use standard rtnetlink link api for add/del devices
2013-07-01 15:07 [patch net-next] nlmon: use standard rtnetlink link api for add/del devices Jiri Pirko
@ 2013-07-01 16:23 ` Daniel Borkmann
2013-07-01 16:46 ` Jiri Pirko
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Borkmann @ 2013-07-01 16:23 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem
On 07/01/2013 05:07 PM, Jiri Pirko wrote:
> It is not nice when netdev is created right after module load and with
> some implicit name. So rather change nlmon to use standard rtnl link API.
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> drivers/net/nlmon.c | 48 +++++++++++++++++++++++++++---------------------
> 1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
> index a0baf56..59fbac5 100644
> --- a/drivers/net/nlmon.c
> +++ b/drivers/net/nlmon.c
> @@ -4,6 +4,7 @@
> #include <linux/netlink.h>
> #include <net/net_namespace.h>
> #include <linux/if_arp.h>
> +#include <net/rtnetlink.h>
>
> struct pcpu_lstats {
> u64 packets;
> @@ -56,16 +57,23 @@ static void nlmon_dev_uninit(struct net_device *dev)
> free_percpu(dev->lstats);
> }
>
> -static struct netlink_tap nlmon_tap;
> +struct nlmon {
> + struct netlink_tap nt;
> +};
>
> static int nlmon_open(struct net_device *dev)
> {
> - return netlink_add_tap(&nlmon_tap);
> + struct nlmon *nlmon = netdev_priv(dev);
> +
> + nlmon->nt.module = THIS_MODULE;
nlmon->nt.dev = dev;
.. is missing here I think, otherwise looks good.
> + return netlink_add_tap(&nlmon->nt);
> }
>
> static int nlmon_close(struct net_device *dev)
> {
> - return netlink_remove_tap(&nlmon_tap);
> + struct nlmon *nlmon = netdev_priv(dev);
> +
> + return netlink_remove_tap(&nlmon->nt);
> }
>
> static struct rtnl_link_stats64 *
> @@ -119,10 +127,6 @@ static const struct net_device_ops nlmon_ops = {
> .ndo_change_mtu = nlmon_change_mtu,
> };
>
> -static struct netlink_tap nlmon_tap __read_mostly = {
> - .module = THIS_MODULE,
> -};
> -
> static void nlmon_setup(struct net_device *dev)
> {
> dev->type = ARPHRD_NETLINK;
> @@ -142,27 +146,28 @@ static void nlmon_setup(struct net_device *dev)
> dev->mtu = NLMSG_GOODSIZE;
> }
>
> -static __init int nlmon_register(void)
> +static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
> {
> - int err;
> - struct net_device *nldev;
> -
> - nldev = nlmon_tap.dev = alloc_netdev(0, "netlink", nlmon_setup);
> - if (unlikely(nldev == NULL))
> - return -ENOMEM;
> + if (tb[IFLA_ADDRESS])
> + return -EINVAL;
> + return 0;
> +}
>
> - err = register_netdev(nldev);
> - if (unlikely(err))
> - free_netdev(nldev);
> +static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
> + .kind = "nlmon",
> + .priv_size = sizeof(struct nlmon),
> + .setup = nlmon_setup,
> + .validate = nlmon_validate,
> +};
>
> - return err;
> +static __init int nlmon_register(void)
> +{
> + return rtnl_link_register(&nlmon_link_ops);
> }
>
> static __exit void nlmon_unregister(void)
> {
> - struct net_device *nldev = nlmon_tap.dev;
> -
> - unregister_netdev(nldev);
> + rtnl_link_unregister(&nlmon_link_ops);
> }
>
> module_init(nlmon_register);
> @@ -172,3 +177,4 @@ MODULE_LICENSE("GPL v2");
> MODULE_AUTHOR("Daniel Borkmann <dborkman@redhat.com>");
> MODULE_AUTHOR("Mathieu Geli <geli@enseirb.fr>");
> MODULE_DESCRIPTION("Netlink monitoring device");
> +MODULE_ALIAS_RTNL_LINK("nlmon");
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch net-next] nlmon: use standard rtnetlink link api for add/del devices
2013-07-01 16:23 ` Daniel Borkmann
@ 2013-07-01 16:46 ` Jiri Pirko
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2013-07-01 16:46 UTC (permalink / raw)
To: Daniel Borkmann; +Cc: netdev@vger.kernel.org, davem@davemloft.net
1. 7. 2013 v 18:23, Daniel Borkmann <dborkman@redhat.com>:
> On 07/01/2013 05:07 PM, Jiri Pirko wrote:
>> It is not nice when netdev is created right after module load and with
>> some implicit name. So rather change nlmon to use standard rtnl link API.
>>
>> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
>> ---
>> drivers/net/nlmon.c | 48 +++++++++++++++++++++++++++---------------------
>> 1 file changed, 27 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
>> index a0baf56..59fbac5 100644
>> --- a/drivers/net/nlmon.c
>> +++ b/drivers/net/nlmon.c
>> @@ -4,6 +4,7 @@
>> #include <linux/netlink.h>
>> #include <net/net_namespace.h>
>> #include <linux/if_arp.h>
>> +#include <net/rtnetlink.h>
>>
>> struct pcpu_lstats {
>> u64 packets;
>> @@ -56,16 +57,23 @@ static void nlmon_dev_uninit(struct net_device *dev)
>> free_percpu(dev->lstats);
>> }
>>
>> -static struct netlink_tap nlmon_tap;
>> +struct nlmon {
>> + struct netlink_tap nt;
>> +};
>>
>> static int nlmon_open(struct net_device *dev)
>> {
>> - return netlink_add_tap(&nlmon_tap);
>> + struct nlmon *nlmon = netdev_priv(dev);
>> +
>> + nlmon->nt.module = THIS_MODULE;
>
> nlmon->nt.dev = dev;
>
> .. is missing here I think, otherwise looks good.
>
Right, will fix that.
>> + return netlink_add_tap(&nlmon->nt);
>> }
>>
>> static int nlmon_close(struct net_device *dev)
>> {
>> - return netlink_remove_tap(&nlmon_tap);
>> + struct nlmon *nlmon = netdev_priv(dev);
>> +
>> + return netlink_remove_tap(&nlmon->nt);
>> }
>>
>> static struct rtnl_link_stats64 *
>> @@ -119,10 +127,6 @@ static const struct net_device_ops nlmon_ops = {
>> .ndo_change_mtu = nlmon_change_mtu,
>> };
>>
>> -static struct netlink_tap nlmon_tap __read_mostly = {
>> - .module = THIS_MODULE,
>> -};
>> -
>> static void nlmon_setup(struct net_device *dev)
>> {
>> dev->type = ARPHRD_NETLINK;
>> @@ -142,27 +146,28 @@ static void nlmon_setup(struct net_device *dev)
>> dev->mtu = NLMSG_GOODSIZE;
>> }
>>
>> -static __init int nlmon_register(void)
>> +static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
>> {
>> - int err;
>> - struct net_device *nldev;
>> -
>> - nldev = nlmon_tap.dev = alloc_netdev(0, "netlink", nlmon_setup);
>> - if (unlikely(nldev == NULL))
>> - return -ENOMEM;
>> + if (tb[IFLA_ADDRESS])
>> + return -EINVAL;
>> + return 0;
>> +}
>>
>> - err = register_netdev(nldev);
>> - if (unlikely(err))
>> - free_netdev(nldev);
>> +static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
>> + .kind = "nlmon",
>> + .priv_size = sizeof(struct nlmon),
>> + .setup = nlmon_setup,
>> + .validate = nlmon_validate,
>> +};
>>
>> - return err;
>> +static __init int nlmon_register(void)
>> +{
>> + return rtnl_link_register(&nlmon_link_ops);
>> }
>>
>> static __exit void nlmon_unregister(void)
>> {
>> - struct net_device *nldev = nlmon_tap.dev;
>> -
>> - unregister_netdev(nldev);
>> + rtnl_link_unregister(&nlmon_link_ops);
>> }
>>
>> module_init(nlmon_register);
>> @@ -172,3 +177,4 @@ MODULE_LICENSE("GPL v2");
>> MODULE_AUTHOR("Daniel Borkmann <dborkman@redhat.com>");
>> MODULE_AUTHOR("Mathieu Geli <geli@enseirb.fr>");
>> MODULE_DESCRIPTION("Netlink monitoring device");
>> +MODULE_ALIAS_RTNL_LINK("nlmon");
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-01 16:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-01 15:07 [patch net-next] nlmon: use standard rtnetlink link api for add/del devices Jiri Pirko
2013-07-01 16:23 ` Daniel Borkmann
2013-07-01 16:46 ` Jiri Pirko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox