Re: [PATCH mptcp-next 3/4] mptcp: listen diag dump support

[Florian Westphal <fw@strlen.de>]

Paolo Abeni <pabeni@redhat.com> wrote:
> On Thu, 2022-03-24 at 14:57 +0100, Florian Westphal wrote:
> > makes 'ss -Ml' show mptcp listen sockets.
> > 
> > Signed-off-by: Florian Westphal <fw@strlen.de>
> > ---
> >  net/mptcp/mptcp_diag.c | 67 ++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 67 insertions(+)
> > 
> > diff --git a/net/mptcp/mptcp_diag.c b/net/mptcp/mptcp_diag.c
> > index c4992eeb67d8..6a6dfc7eac33 100644
> > --- a/net/mptcp/mptcp_diag.c
> > +++ b/net/mptcp/mptcp_diag.c
> > @@ -69,6 +69,8 @@ static int mptcp_diag_dump_one(struct netlink_callback *cb,
> >  struct mptcp_diag_ctx {
> >  	long s_slot;
> >  	long s_num;
> > +	unsigned int l_slot;
> > +	unsigned int l_num;
> >  };
> >  
> >  static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
> > @@ -114,6 +116,71 @@ static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
> >  		}
> >  		cond_resched();
> >  	}
> > +
> > +	if (r->idiag_states & TCPF_LISTEN) {
> > +		int i;
> 
> perhaps here we need to add something alike:
> 
> 		if (r->id.idiag_dport)
> 			return;
[..]

> Also, what about moving the following chunk in separate helper -
> mptcp_diag_dump_listener()?
Changed to:

if ((r->idiag_states & TCPF_LISTEN) && r->id.idiag_dport == 0)
            mptcp_diag_dump_listeners(skb, cb, r, net_admin);