[v4] mptcp: add statistics for mptcp socket in use

[PATCH mptcp-next v4 0/3] mptcp: add statistics for mptcp socket in use

Posted by menglong8.dong@gmail.com 1 year, 6 months ago

From: Menglong Dong <imagedong@tencent.com>

In the 1th patch, we do some code cleanup with replease 'sock->sk'
with 'sk'. In the 2th patch, we add statistics for mptcp socket in
use. And in the 3th patch, we add the testing for this commit.

Changes since v3:
- rename MPTCP_DESTROIED to MPTCP_DESTROYED in the 2th patch

Changes since v2:
- add testing

Changes since v1:
- split the code cleanup into the 1th patch.
- decrease the statistics for listening mptcp socket inuse with
  mptcp_listen_inuse_dec()
- add MPTCP_DESTROIED flags to store if mptcp_destroy_common() was
  called on the msk. For fallback case, we need to decrease the
  statistics only once, and mptcp_destroy_common() can be called
  more than once.

Menglong Dong (3):
  mptcp: introduce 'sk' to replace 'sock->sk' in mptcp_listen()
  mptcp: add statistics for mptcp socket in use
  selftest: mptcp: add test for mptcp socket in use

 net/mptcp/protocol.c                      | 35 ++++++++++++++++++-----
 net/mptcp/protocol.h                      |  1 +
 net/mptcp/subflow.c                       |  3 ++
 tools/testing/selftests/net/mptcp/diag.sh | 28 ++++++++++++++++++
 4 files changed, 60 insertions(+), 7 deletions(-)

-- 
2.37.2

Re: [PATCH mptcp-next v4 0/3] mptcp: add statistics for mptcp socket in use

Posted by Mat Martineau 1 year, 6 months ago

On Thu, 6 Oct 2022, menglong8.dong@gmail.com wrote:

> From: Menglong Dong <imagedong@tencent.com>
>
> In the 1th patch, we do some code cleanup with replease 'sock->sk'
> with 'sk'. In the 2th patch, we add statistics for mptcp socket in
> use. And in the 3th patch, we add the testing for this commit.
>

Hi Menglong -

Thanks for the post. While your patches did apply cleanly to the export 
branch when you sent them, there's now a significant merge conflict 
because of this patch (applied today) that refactors 
mptcp_stream_connect():

https://lore.kernel.org/mptcp/c74935435f59a6120f62c56bd5e1519c30d269bf.1664915909.git.pabeni@redhat.com/

Sorry about that timing! Can you rebase and re-post?


- Mat


> Changes since v3:
> - rename MPTCP_DESTROIED to MPTCP_DESTROYED in the 2th patch
>
> Changes since v2:
> - add testing
>
> Changes since v1:
> - split the code cleanup into the 1th patch.
> - decrease the statistics for listening mptcp socket inuse with
>  mptcp_listen_inuse_dec()
> - add MPTCP_DESTROIED flags to store if mptcp_destroy_common() was
>  called on the msk. For fallback case, we need to decrease the
>  statistics only once, and mptcp_destroy_common() can be called
>  more than once.
>
> Menglong Dong (3):
>  mptcp: introduce 'sk' to replace 'sock->sk' in mptcp_listen()
>  mptcp: add statistics for mptcp socket in use
>  selftest: mptcp: add test for mptcp socket in use
>
> net/mptcp/protocol.c                      | 35 ++++++++++++++++++-----
> net/mptcp/protocol.h                      |  1 +
> net/mptcp/subflow.c                       |  3 ++
> tools/testing/selftests/net/mptcp/diag.sh | 28 ++++++++++++++++++
> 4 files changed, 60 insertions(+), 7 deletions(-)
>
> -- 
> 2.37.2
>
>

--
Mat Martineau
Intel

Re: [PATCH mptcp-next v4 0/3] mptcp: add statistics for mptcp socket in use

Posted by Menglong Dong 1 year, 6 months ago

On Fri, Oct 7, 2022 at 5:54 AM Mat Martineau
<mathew.j.martineau@linux.intel.com> wrote:
>
> On Thu, 6 Oct 2022, menglong8.dong@gmail.com wrote:
>
> > From: Menglong Dong <imagedong@tencent.com>
> >
> > In the 1th patch, we do some code cleanup with replease 'sock->sk'
> > with 'sk'. In the 2th patch, we add statistics for mptcp socket in
> > use. And in the 3th patch, we add the testing for this commit.
> >
>
> Hi Menglong -
>
> Thanks for the post. While your patches did apply cleanly to the export
> branch when you sent them, there's now a significant merge conflict
> because of this patch (applied today) that refactors
> mptcp_stream_connect():
>
> https://lore.kernel.org/mptcp/c74935435f59a6120f62c56bd5e1519c30d269bf.1664915909.git.pabeni@redhat.com/
>
> Sorry about that timing! Can you rebase and re-post?
>

Okay, I'll rebase and send the v5.

>
> - Mat
>
>
> > Changes since v3:
> > - rename MPTCP_DESTROIED to MPTCP_DESTROYED in the 2th patch
> >
> > Changes since v2:
> > - add testing
> >
> > Changes since v1:
> > - split the code cleanup into the 1th patch.
> > - decrease the statistics for listening mptcp socket inuse with
> >  mptcp_listen_inuse_dec()
> > - add MPTCP_DESTROIED flags to store if mptcp_destroy_common() was
> >  called on the msk. For fallback case, we need to decrease the
> >  statistics only once, and mptcp_destroy_common() can be called
> >  more than once.
> >
> > Menglong Dong (3):
> >  mptcp: introduce 'sk' to replace 'sock->sk' in mptcp_listen()
> >  mptcp: add statistics for mptcp socket in use
> >  selftest: mptcp: add test for mptcp socket in use
> >
> > net/mptcp/protocol.c                      | 35 ++++++++++++++++++-----
> > net/mptcp/protocol.h                      |  1 +
> > net/mptcp/subflow.c                       |  3 ++
> > tools/testing/selftests/net/mptcp/diag.sh | 28 ++++++++++++++++++
> > 4 files changed, 60 insertions(+), 7 deletions(-)
> >
> > --
> > 2.37.2
> >
> >
>
> --
> Mat Martineau
> Intel