Re: [PATCH AUTOSEL 6.6 030/139] l2tp: don't use tunnel socket sk_user_data in ppp procfs output

Sasha Levin
2024-10-11T13:52:50Z

On Wed, Sep 25, 2024 at 03:27:23PM +0100, James Chapman wrote:
>On 25/09/2024 13:07, Sasha Levin wrote:
>>From: James Chapman <jchapman@katalix.com>
>>
>>[ Upstream commit eeb11209e000797d555aefd642e24ed6f4e70140 ]
>>
>>l2tp's ppp procfs output can be used to show internal state of
>>pppol2tp. It includes a 'user-data-ok' field, which is derived from
>>the tunnel socket's sk_user_data being non-NULL. Use tunnel->sock
>>being non-NULL to indicate this instead.
>>
>>Signed-off-by: James Chapman <jchapman@katalix.com>
>>Signed-off-by: Tom Parkin <tparkin@katalix.com>
>>Signed-off-by: David S. Miller <davem@davemloft.net>
>>Signed-off-by: Sasha Levin <sashal@kernel.org>
>>---
>> net/l2tp/l2tp_ppp.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
>>index 6146e4e67bbb5..6ab8c47487161 100644
>>--- a/net/l2tp/l2tp_ppp.c
>>+++ b/net/l2tp/l2tp_ppp.c
>>@@ -1511,7 +1511,7 @@ static void pppol2tp_seq_tunnel_show(struct seq_file *m, void *v)
>> seq_printf(m, "\nTUNNEL '%s', %c %d\n",
>> tunnel->name,
>>- (tunnel == tunnel->sock->sk_user_data) ? 'Y' : 'N',
>>+ tunnel->sock ? 'Y' : 'N',
>> refcount_read(&tunnel->ref_count) - 1);
>> seq_printf(m, " %08x %ld/%ld/%ld %ld/%ld/%ld\n",
>> 0,
>
>This change isn't needed in 6.6. The commit was part of a series for
>6.12 that removed use of sk_user_data in l2tp tunnel sockets.

I'll drop it, thanks!

--
Thanks,
Sasha