[PATCH v1 net] l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops.

[PATCH v1 net] l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops.

[Kuniyuki Iwashima]

Commit fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and
ppp parts") converted net->gen->ptr[pppol2tp_net_id] in l2tp_ppp.c to
net->gen->ptr[l2tp_net_id] in l2tp_core.c.

Now the leftover wastes one entry of net->gen->ptr[] in each netns.

Let's avoid the unwanted allocation.

Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
 net/l2tp/l2tp_ppp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 3596290047b2..246089b17910 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1406,8 +1406,6 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
  * L2TPv2, we dump only L2TPv2 tunnels and sessions here.
  *****************************************************************************/
 
-static unsigned int pppol2tp_net_id;
-
 #ifdef CONFIG_PROC_FS
 
 struct pppol2tp_seq_data {
@@ -1641,7 +1639,6 @@ static __net_exit void pppol2tp_exit_net(struct net *net)
 static struct pernet_operations pppol2tp_net_ops = {
 	.init = pppol2tp_init_net,
 	.exit = pppol2tp_exit_net,
-	.id   = &pppol2tp_net_id,
 };
 
 /*****************************************************************************
-- 
2.30.2

Re: [PATCH v1 net] l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops.

[Simon Horman]

On Mon, Jul 22, 2024 at 12:15:56PM -0700, Kuniyuki Iwashima wrote:
> Commit fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and
> ppp parts") converted net->gen->ptr[pppol2tp_net_id] in l2tp_ppp.c to
> net->gen->ptr[l2tp_net_id] in l2tp_core.c.
> 
> Now the leftover wastes one entry of net->gen->ptr[] in each netns.
> 
> Let's avoid the unwanted allocation.
> 
> Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
> Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>

Hi Iwashima-san,

It looks like this problem is a resource overuse that has been present
since 2010. So I lean towards it being a clean-up for net-next rather than
a fix.

That notwithstanding, this looks good to me.

Reviewed-by: Simon Horman <horms@kernel.org>

...

Re: [PATCH v1 net] l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops.

[Kuniyuki Iwashima]

From: Simon Horman <horms@kernel.org>
Date: Tue, 23 Jul 2024 09:50:23 +0100
> On Mon, Jul 22, 2024 at 12:15:56PM -0700, Kuniyuki Iwashima wrote:
> > Commit fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and
> > ppp parts") converted net->gen->ptr[pppol2tp_net_id] in l2tp_ppp.c to
> > net->gen->ptr[l2tp_net_id] in l2tp_core.c.
> > 
> > Now the leftover wastes one entry of net->gen->ptr[] in each netns.
> > 
> > Let's avoid the unwanted allocation.
> > 
> > Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
> > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> 
> Hi Iwashima-san,
> 
> It looks like this problem is a resource overuse that has been present
> since 2010. So I lean towards it being a clean-up for net-next rather than
> a fix.
> 
> That notwithstanding, this looks good to me.
> 
> Reviewed-by: Simon Horman <horms@kernel.org>

Thanks, Simon.

Will post this next week in a seris.