mbox series

[v2,net-next,0/2] tcp: final (?) round of mem pressure fixes

Message ID 20220614171734.1103875-1-eric.dumazet@gmail.com (mailing list archive)
Headers show
Series tcp: final (?) round of mem pressure fixes | expand

Message

Eric Dumazet June 14, 2022, 5:17 p.m. UTC
From: Eric Dumazet <edumazet@google.com>

While working on prior patch series (e10b02ee5b6c "Merge branch
'net-reduce-tcp_memory_allocated-inflation'"), I found that we
could still have frozen TCP flows under memory pressure.

I thought we had solved this in 2015, but the fix was not complete.

v2: deal with zerocopy tx paths.

Eric Dumazet (2):
  tcp: fix over estimation in sk_forced_mem_schedule()
  tcp: fix possible freeze in tx path under memory pressure

 net/ipv4/tcp.c        | 33 +++++++++++++++++++++++++++++----
 net/ipv4/tcp_output.c |  7 ++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

Comments

David Miller June 15, 2022, 11:56 a.m. UTC | #1
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 14 Jun 2022 10:17:32 -0700

> From: Eric Dumazet <edumazet@google.com>
> 
> While working on prior patch series (e10b02ee5b6c "Merge branch
> 'net-reduce-tcp_memory_allocated-inflation'"), I found that we
> could still have frozen TCP flows under memory pressure.
> 
> I thought we had solved this in 2015, but the fix was not complete.
> 
> v2: deal with zerocopy tx paths.

Does not apply cleanly to net, please respin.

Thank you.
Eric Dumazet June 16, 2022, 6 a.m. UTC | #2
On Wed, Jun 15, 2022 at 4:56 AM David Miller <davem@davemloft.net> wrote:
>
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Tue, 14 Jun 2022 10:17:32 -0700
>
> > From: Eric Dumazet <edumazet@google.com>
> >
> > While working on prior patch series (e10b02ee5b6c "Merge branch
> > 'net-reduce-tcp_memory_allocated-inflation'"), I found that we
> > could still have frozen TCP flows under memory pressure.
> >
> > I thought we had solved this in 2015, but the fix was not complete.
> >
> > v2: deal with zerocopy tx paths.
>
> Does not apply cleanly to net, please respin.
>
> Thank you.

I was targeting net-next tree for this old bug, and planning to
prepare stable backports.

Tell me if you prefer to respin to net tree, probably later today
because I am traveling.

Thanks.
Eric Dumazet June 16, 2022, 6:07 a.m. UTC | #3
On Wed, Jun 15, 2022 at 11:00 PM Eric Dumazet <edumazet@google.com> wrote:
>
> On Wed, Jun 15, 2022 at 4:56 AM David Miller <davem@davemloft.net> wrote:
> >
> > From: Eric Dumazet <eric.dumazet@gmail.com>
> > Date: Tue, 14 Jun 2022 10:17:32 -0700
> >
> > > From: Eric Dumazet <edumazet@google.com>
> > >
> > > While working on prior patch series (e10b02ee5b6c "Merge branch
> > > 'net-reduce-tcp_memory_allocated-inflation'"), I found that we
> > > could still have frozen TCP flows under memory pressure.
> > >
> > > I thought we had solved this in 2015, but the fix was not complete.
> > >
> > > v2: deal with zerocopy tx paths.
> >
> > Does not apply cleanly to net, please respin.
> >
> > Thank you.
>
> I was targeting net-next tree for this old bug, and planning to
> prepare stable backports.

This was because in net-next we got rid of SK_MEM_QUANTUM, and to
limit merge conflicts.

>
> Tell me if you prefer to respin to net tree, probably later today
> because I am traveling.
>
> Thanks.