diff mbox series

[v3] net: core: annotate socks of struct sock_reuseport with __counted_by

Message ID 20240801142311.42837-1-dmantipov@yandex.ru (mailing list archive)
State Mainlined
Commit f94074687d05aea10b50c4f4055a19d9d0c3bd27
Headers show
Series [v3] net: core: annotate socks of struct sock_reuseport with __counted_by | expand

Commit Message

Dmitry Antipov Aug. 1, 2024, 2:23 p.m. UTC
According to '__reuseport_alloc()', annotate flexible array member
'sock' of 'struct sock_reuseport' with '__counted_by()' and use
convenient 'struct_size()' to simplify the math used in 'kzalloc()'.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v3: one more style nit (Jakub)
    https://lore.kernel.org/netdev/20240731165029.5f4b4e60@kernel.org
v2: style (Jakub), title and commit message (Gustavo) adjustments
    https://lore.kernel.org/netdev/20240730170142.32a6e9aa@kernel.org
    https://lore.kernel.org/netdev/c815078e-67f9-4235-b66c-29f8bdd1a9e0@embeddedor.com
---
 include/net/sock_reuseport.h | 2 +-
 net/core/sock_reuseport.c    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Gustavo A. R. Silva Aug. 1, 2024, 2:32 p.m. UTC | #1
On 01/08/24 08:23, Dmitry Antipov wrote:
> According to '__reuseport_alloc()', annotate flexible array member
> 'sock' of 'struct sock_reuseport' with '__counted_by()' and use
> convenient 'struct_size()' to simplify the math used in 'kzalloc()'.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>

Thanks
-Gustavo

> ---
> v3: one more style nit (Jakub)
>      https://lore.kernel.org/netdev/20240731165029.5f4b4e60@kernel.org
> v2: style (Jakub), title and commit message (Gustavo) adjustments
>      https://lore.kernel.org/netdev/20240730170142.32a6e9aa@kernel.org
>      https://lore.kernel.org/netdev/c815078e-67f9-4235-b66c-29f8bdd1a9e0@embeddedor.com
> ---
>   include/net/sock_reuseport.h | 2 +-
>   net/core/sock_reuseport.c    | 5 ++---
>   2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/include/net/sock_reuseport.h b/include/net/sock_reuseport.h
> index 6ec140b0a61b..6e4faf3ee76f 100644
> --- a/include/net/sock_reuseport.h
> +++ b/include/net/sock_reuseport.h
> @@ -26,7 +26,7 @@ struct sock_reuseport {
>   	unsigned int		bind_inany:1;
>   	unsigned int		has_conns:1;
>   	struct bpf_prog __rcu	*prog;		/* optional BPF sock selector */
> -	struct sock		*socks[];	/* array of sock pointers */
> +	struct sock		*socks[] __counted_by(max_socks);
>   };
>   
>   extern int reuseport_alloc(struct sock *sk, bool bind_inany);
> diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c
> index 5a165286e4d8..4211710393a8 100644
> --- a/net/core/sock_reuseport.c
> +++ b/net/core/sock_reuseport.c
> @@ -173,10 +173,9 @@ static bool __reuseport_detach_closed_sock(struct sock *sk,
>   
>   static struct sock_reuseport *__reuseport_alloc(unsigned int max_socks)
>   {
> -	unsigned int size = sizeof(struct sock_reuseport) +
> -		      sizeof(struct sock *) * max_socks;
> -	struct sock_reuseport *reuse = kzalloc(size, GFP_ATOMIC);
> +	struct sock_reuseport *reuse;
>   
> +	reuse = kzalloc(struct_size(reuse, socks, max_socks), GFP_ATOMIC);
>   	if (!reuse)
>   		return NULL;
>
Kuniyuki Iwashima Aug. 2, 2024, 12:20 a.m. UTC | #2
From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu,  1 Aug 2024 17:23:11 +0300
> According to '__reuseport_alloc()', annotate flexible array member
> 'sock' of 'struct sock_reuseport' with '__counted_by()' and use
> convenient 'struct_size()' to simplify the math used in 'kzalloc()'.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
patchwork-bot+netdevbpf@kernel.org Aug. 3, 2024, 12:30 a.m. UTC | #3
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Thu,  1 Aug 2024 17:23:11 +0300 you wrote:
> According to '__reuseport_alloc()', annotate flexible array member
> 'sock' of 'struct sock_reuseport' with '__counted_by()' and use
> convenient 'struct_size()' to simplify the math used in 'kzalloc()'.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
> ---
> v3: one more style nit (Jakub)
>     https://lore.kernel.org/netdev/20240731165029.5f4b4e60@kernel.org
> v2: style (Jakub), title and commit message (Gustavo) adjustments
>     https://lore.kernel.org/netdev/20240730170142.32a6e9aa@kernel.org
>     https://lore.kernel.org/netdev/c815078e-67f9-4235-b66c-29f8bdd1a9e0@embeddedor.com
> 
> [...]

Here is the summary with links:
  - [v3] net: core: annotate socks of struct sock_reuseport with __counted_by
    https://git.kernel.org/netdev/net-next/c/f94074687d05

You are awesome, thank you!
diff mbox series

Patch

diff --git a/include/net/sock_reuseport.h b/include/net/sock_reuseport.h
index 6ec140b0a61b..6e4faf3ee76f 100644
--- a/include/net/sock_reuseport.h
+++ b/include/net/sock_reuseport.h
@@ -26,7 +26,7 @@  struct sock_reuseport {
 	unsigned int		bind_inany:1;
 	unsigned int		has_conns:1;
 	struct bpf_prog __rcu	*prog;		/* optional BPF sock selector */
-	struct sock		*socks[];	/* array of sock pointers */
+	struct sock		*socks[] __counted_by(max_socks);
 };
 
 extern int reuseport_alloc(struct sock *sk, bool bind_inany);
diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c
index 5a165286e4d8..4211710393a8 100644
--- a/net/core/sock_reuseport.c
+++ b/net/core/sock_reuseport.c
@@ -173,10 +173,9 @@  static bool __reuseport_detach_closed_sock(struct sock *sk,
 
 static struct sock_reuseport *__reuseport_alloc(unsigned int max_socks)
 {
-	unsigned int size = sizeof(struct sock_reuseport) +
-		      sizeof(struct sock *) * max_socks;
-	struct sock_reuseport *reuse = kzalloc(size, GFP_ATOMIC);
+	struct sock_reuseport *reuse;
 
+	reuse = kzalloc(struct_size(reuse, socks, max_socks), GFP_ATOMIC);
 	if (!reuse)
 		return NULL;