[PATCH net-next] net: netdev_kobject_init: annotate with __init

[PATCH net-next] net: netdev_kobject_init: annotate with __init

[Daniel Borkmann]

netdev_kobject_init() is only being called from __init context,
that is, net_dev_init(), so annotate it with __init as well, thus
the kernel can take this as a hint that the function is used only
during the initialization phase and free up used memory resources
after its invocation.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 net/core/net-sysfs.c | 2 +-
 net/core/net-sysfs.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 1a7b7b1..49843bf 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1358,7 +1358,7 @@ void netdev_class_remove_file_ns(struct class_attribute *class_attr,
 }
 EXPORT_SYMBOL(netdev_class_remove_file_ns);
 
-int netdev_kobject_init(void)
+int __init netdev_kobject_init(void)
 {
 	kobj_ns_type_register(&net_ns_type_operations);
 	return class_register(&net_class);
diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
index bd7751e..2745a1b 100644
--- a/net/core/net-sysfs.h
+++ b/net/core/net-sysfs.h
@@ -1,7 +1,7 @@
 #ifndef __NET_SYSFS_H__
 #define __NET_SYSFS_H__
 
-int netdev_kobject_init(void);
+int __init netdev_kobject_init(void);
 int netdev_register_kobject(struct net_device *);
 void netdev_unregister_kobject(struct net_device *);
 int net_rx_queue_update_kobjects(struct net_device *, int old_num, int new_num);
-- 
1.7.11.7

Re: [PATCH net-next] net: netdev_kobject_init: annotate with __init

[David Miller]

From: Daniel Borkmann <dborkman@redhat.com>
Date: Mon,  6 Jan 2014 01:20:11 +0100

> netdev_kobject_init() is only being called from __init context,
> that is, net_dev_init(), so annotate it with __init as well, thus
> the kernel can take this as a hint that the function is used only
> during the initialization phase and free up used memory resources
> after its invocation.
> 
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

Applied.

Re: [PATCH net-next] net: netdev_kobject_init: annotate with __init

[Sergei Shtylyov]

Hello.

On 06-01-2014 4:20, Daniel Borkmann wrote:

> netdev_kobject_init() is only being called from __init context,
> that is, net_dev_init(), so annotate it with __init as well, thus
> the kernel can take this as a hint that the function is used only
> during the initialization phase and free up used memory resources
> after its invocation.

> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
[...]

> diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
> index bd7751e..2745a1b 100644
> --- a/net/core/net-sysfs.h
> +++ b/net/core/net-sysfs.h
> @@ -1,7 +1,7 @@
>   #ifndef __NET_SYSFS_H__
>   #define __NET_SYSFS_H__
>
> -int netdev_kobject_init(void);
> +int __init netdev_kobject_init(void);

    There's no need to also annotate function prototype.

WBR, Sergei

Re: [PATCH net-next] net: netdev_kobject_init: annotate with __init

[Daniel Borkmann]

On 01/06/2014 04:13 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 06-01-2014 4:20, Daniel Borkmann wrote:
>
>> netdev_kobject_init() is only being called from __init context,
>> that is, net_dev_init(), so annotate it with __init as well, thus
>> the kernel can take this as a hint that the function is used only
>> during the initialization phase and free up used memory resources
>> after its invocation.
>
>> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
> [...]
>
>> diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
>> index bd7751e..2745a1b 100644
>> --- a/net/core/net-sysfs.h
>> +++ b/net/core/net-sysfs.h
>> @@ -1,7 +1,7 @@
>>   #ifndef __NET_SYSFS_H__
>>   #define __NET_SYSFS_H__
>>
>> -int netdev_kobject_init(void);
>> +int __init netdev_kobject_init(void);
>
>     There's no need to also annotate function prototype.

Hm, is that general convention? Having this in a header file
annotated (even if not strictly necessary) would probably
better prevent from possible misuse resp. section mismatches
if people forget to look into the actual c file where the
function is being defined.

> WBR, Sergei
>

Re: [PATCH net-next] net: netdev_kobject_init: annotate with __init

[Sergei Shtylyov]

On 06.01.2014 20:18, Daniel Borkmann wrote:

>>> netdev_kobject_init() is only being called from __init context,
>>> that is, net_dev_init(), so annotate it with __init as well, thus
>>> the kernel can take this as a hint that the function is used only
>>> during the initialization phase and free up used memory resources
>>> after its invocation.

>>> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
>> [...]

>>> diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
>>> index bd7751e..2745a1b 100644
>>> --- a/net/core/net-sysfs.h
>>> +++ b/net/core/net-sysfs.h
>>> @@ -1,7 +1,7 @@
>>>   #ifndef __NET_SYSFS_H__
>>>   #define __NET_SYSFS_H__
>>>
>>> -int netdev_kobject_init(void);
>>> +int __init netdev_kobject_init(void);

>>     There's no need to also annotate function prototype.

> Hm, is that general convention?

    More or less, though I've seen some prototypes annotated.

> Having this in a header file
> annotated (even if not strictly necessary) would probably
> better prevent from possible misuse resp. section mismatches
> if people forget to look into the actual c file where the
> function is being defined.

    Dunno about vi users, I'm using Alt-. in EMACS when I want to find a 
function, and it gets me right to the definition, not the prototype.

>> WBR, Sergei

PS: The patch was merged already, so my comment seems to have been posted too 
late anyway.

WBR, Sergei