summaryrefslogtreecommitdiffstats
path: root/net/mptcp
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2022-06-30 15:17:56 -0700
committerDavid S. Miller <davem@davemloft.net>2022-07-01 13:24:59 +0100
commit69d93daec026cdda98e29e8edb12534bfa5b1a9b (patch)
treedad36e35e0e9d2e24fff0311621b0ffbed617539 /net/mptcp
parentd24141fe7b48d3572afb673ae350cf0e88caba6c (diff)
downloadlinux-69d93daec026cdda98e29e8edb12534bfa5b1a9b.tar.gz
linux-69d93daec026cdda98e29e8edb12534bfa5b1a9b.tar.bz2
linux-69d93daec026cdda98e29e8edb12534bfa5b1a9b.zip
mptcp: refine memory scheduling
Similar to commit 7c80b038d23e ("net: fix sk_wmem_schedule() and sk_rmem_schedule() errors"), let the MPTCP receive path schedule exactly the required amount of memory. Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp')
-rw-r--r--net/mptcp/protocol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index b4b4ca897e14..d77ca57f5e6e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -323,9 +323,10 @@ static bool mptcp_rmem_schedule(struct sock *sk, struct sock *ssk, int size)
struct mptcp_sock *msk = mptcp_sk(sk);
int amt, amount;
- if (size < msk->rmem_fwd_alloc)
+ if (size <= msk->rmem_fwd_alloc)
return true;
+ size -= msk->rmem_fwd_alloc;
amt = sk_mem_pages(size);
amount = amt << PAGE_SHIFT;
if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV))