From: David S. Miller <davem@davemloft.net>
Date: Mon, 30 Apr 2018 01:29:55 +0000 (-0400)
Subject: Merge branch 'tcp-mmap-rework-zerocopy-receive'
X-Git-Tag: android-x86-8.1-r1~939^2~351
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d659b1d7d7ff0598111da55af6f0337887d9b2f;p=android-x86%2Fkernel.git

Merge branch 'tcp-mmap-rework-zerocopy-receive'

Eric Dumazet says:

====================
tcp: mmap: rework zerocopy receive

syzbot reported a lockdep issue caused by tcp mmap() support.

I implemented Andy Lutomirski nice suggestions to resolve the
issue and increase scalability as well.

First patch is adding a new getsockopt() operation and changes mmap()
behavior.

Second patch changes tcp_mmap reference program.

v4: tcp mmap() support depends on CONFIG_MMU, as kbuild bot told us.

v3: change TCP_ZEROCOPY_RECEIVE to be a getsockopt() option
    instead of setsockopt(), feedback from Ka-Cheon Poon

v2: Added a missing page align of zc->length in tcp_zerocopy_receive()
    Properly clear zc->recv_skip_hint in case user request was completed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

5d659b1d7d7ff0598111da55af6f0337887d9b2f