Pavel Emelyanov a écrit :
quoted text
> This add the inuse_idx to struct proto and generates one in proto_register.
> The ++ in generator is protected with write-locked proto_list_lock.
>
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
>
> ---
>  include/net/sock.h |    1 +
>  net/core/sock.c    |   10 ++++++++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/include/net/sock.h b/include/net/sock.h
> index 1c9d059..abc6341 100644
> --- a/include/net/sock.h
> +++ b/include/net/sock.h
> @@ -562,6 +562,7 @@ struct proto {
>  
>  	/* Keeping track of sockets in use */
>  #ifdef CONFIG_PROC_FS
> +	unsigned int		inuse_idx;
>  	struct pcounter		inuse;
>  #endif
>  
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 3ee9506..a7faf30 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -1940,6 +1940,15 @@ EXPORT_SYMBOL(sk_common_release);
>  static DEFINE_RWLOCK(proto_list_lock);
>  static LIST_HEAD(proto_list);
>  
> +static void assign_proto_idx(struct proto *prot)
> +{
> +#ifdef CONFIG_PROC_FS
> +	static unsigned int idx = 0;
> +
>   
I believe some protocols can be registered, then unregistered, then 
re-registered (module loads, unloads, ...)

So you probably want to use a bitmap instead of a counter that will 
eventually reach PROTO_INUSE_NR

assign_proto_idx() should find a zero bit, and you should free this bit 
at proto_unregister() time

quoted text
> +	prot->inuse_idx = idx++;
> +#endif
> +}
> +
>  int proto_register(struct proto *prot, int alloc_slab)
>  {
>  	char *request_sock_slab_name = NULL;
> @@ -2000,6 +2009,7 @@ int proto_register(struct proto *prot, int alloc_slab)
>  
>  	write_lock(&proto_list_lock);
>  	list_add(&prot->node, &proto_list);
> +	assign_proto_idx(prot);
>  	write_unlock(&proto_list_lock);
>  	return 0;
>  
>   




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html