diff options
| author | Willem de Bruijn <willemb@google.com> | 2017-08-03 16:29:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-03 21:37:29 -0700 |
| commit | 52267790ef52d7513879238ca9fac22c1733e0e3 (patch) | |
| tree | 3df2cd31743717fbf4335b950cc52328f2f44f14 /net/core/sock.c | |
| parent | 3ece782693c4b64d588dd217868558ab9a19bfe7 (diff) | |
| download | linux-stable-52267790ef52d7513879238ca9fac22c1733e0e3.tar.gz linux-stable-52267790ef52d7513879238ca9fac22c1733e0e3.tar.bz2 linux-stable-52267790ef52d7513879238ca9fac22c1733e0e3.zip | |
sock: add MSG_ZEROCOPY
The kernel supports zerocopy sendmsg in virtio and tap. Expand the
infrastructure to support other socket types. Introduce a completion
notification channel over the socket error queue. Notifications are
returned with ee_origin SO_EE_ORIGIN_ZEROCOPY. ee_errno is 0 to avoid
blocking the send/recv path on receiving notifications.
Add reference counting, to support the skb split, merge, resize and
clone operations possible with SOCK_STREAM and other socket types.
The patch does not yet modify any datapaths.
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 1261880bdcc8..e8b696858cad 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1670,6 +1670,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) atomic_set(&newsk->sk_drops, 0); newsk->sk_send_head = NULL; newsk->sk_userlocks = sk->sk_userlocks & ~SOCK_BINDPORT_LOCK; + atomic_set(&newsk->sk_zckey, 0); sock_reset_flag(newsk, SOCK_DONE); @@ -2722,6 +2723,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; sk->sk_stamp = SK_DEFAULT_STAMP; + atomic_set(&sk->sk_zckey, 0); #ifdef CONFIG_NET_RX_BUSY_POLL sk->sk_napi_id = 0; |