Commit 4aaa1685 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: never fetch fwd memory from the subflow 



The memory accounting is broken in such exceptional code
path, and after commit 4890b686 ("net: keep sk->sk_forward_alloc
as small as possible") we can't find much help there.

Drop the broken code.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 456bfd9d

net/mptcp/protocol.c

+3 −8
Original line number Diff line number Diff line
@@ -328,15 +328,10 @@ static bool mptcp_rmem_schedule(struct sock *sk, struct sock *ssk, int size) 


	amt = sk_mem_pages(size);

	amount = amt << PAGE_SHIFT;

	msk->rmem_fwd_alloc += amount;

	if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV)) {

		if (ssk->sk_forward_alloc < amount) {

			msk->rmem_fwd_alloc -= amount;

	if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV))

		return false;

		}



		ssk->sk_forward_alloc -= amount;

	}

	msk->rmem_fwd_alloc += amount;

	return true;

}