diff options
author | Peng Tao <bergwolf@gmail.com> | 2017-03-14 21:32:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-21 17:41:46 -0400 |
commit | 36d277bac8080202684e67162ebb157f16631581 (patch) | |
tree | 0fe31321089fa4634de3ad403b98078ca84a8986 /net | |
parent | 8a0f5ccfb33b0b8b51de65b7b3bf342ba10b4fb6 (diff) |
vsock: track pkt owner vsock
So that we can cancel a queued pkt later if necessary.
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 8d592a45b597..af087b44ceea 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c | |||
@@ -58,6 +58,7 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, | |||
58 | pkt->len = len; | 58 | pkt->len = len; |
59 | pkt->hdr.len = cpu_to_le32(len); | 59 | pkt->hdr.len = cpu_to_le32(len); |
60 | pkt->reply = info->reply; | 60 | pkt->reply = info->reply; |
61 | pkt->vsk = info->vsk; | ||
61 | 62 | ||
62 | if (info->msg && len > 0) { | 63 | if (info->msg && len > 0) { |
63 | pkt->buf = kmalloc(len, GFP_KERNEL); | 64 | pkt->buf = kmalloc(len, GFP_KERNEL); |
@@ -180,6 +181,7 @@ static int virtio_transport_send_credit_update(struct vsock_sock *vsk, | |||
180 | struct virtio_vsock_pkt_info info = { | 181 | struct virtio_vsock_pkt_info info = { |
181 | .op = VIRTIO_VSOCK_OP_CREDIT_UPDATE, | 182 | .op = VIRTIO_VSOCK_OP_CREDIT_UPDATE, |
182 | .type = type, | 183 | .type = type, |
184 | .vsk = vsk, | ||
183 | }; | 185 | }; |
184 | 186 | ||
185 | return virtio_transport_send_pkt_info(vsk, &info); | 187 | return virtio_transport_send_pkt_info(vsk, &info); |
@@ -519,6 +521,7 @@ int virtio_transport_connect(struct vsock_sock *vsk) | |||
519 | struct virtio_vsock_pkt_info info = { | 521 | struct virtio_vsock_pkt_info info = { |
520 | .op = VIRTIO_VSOCK_OP_REQUEST, | 522 | .op = VIRTIO_VSOCK_OP_REQUEST, |
521 | .type = VIRTIO_VSOCK_TYPE_STREAM, | 523 | .type = VIRTIO_VSOCK_TYPE_STREAM, |
524 | .vsk = vsk, | ||
522 | }; | 525 | }; |
523 | 526 | ||
524 | return virtio_transport_send_pkt_info(vsk, &info); | 527 | return virtio_transport_send_pkt_info(vsk, &info); |
@@ -534,6 +537,7 @@ int virtio_transport_shutdown(struct vsock_sock *vsk, int mode) | |||
534 | VIRTIO_VSOCK_SHUTDOWN_RCV : 0) | | 537 | VIRTIO_VSOCK_SHUTDOWN_RCV : 0) | |
535 | (mode & SEND_SHUTDOWN ? | 538 | (mode & SEND_SHUTDOWN ? |
536 | VIRTIO_VSOCK_SHUTDOWN_SEND : 0), | 539 | VIRTIO_VSOCK_SHUTDOWN_SEND : 0), |
540 | .vsk = vsk, | ||
537 | }; | 541 | }; |
538 | 542 | ||
539 | return virtio_transport_send_pkt_info(vsk, &info); | 543 | return virtio_transport_send_pkt_info(vsk, &info); |
@@ -560,6 +564,7 @@ virtio_transport_stream_enqueue(struct vsock_sock *vsk, | |||
560 | .type = VIRTIO_VSOCK_TYPE_STREAM, | 564 | .type = VIRTIO_VSOCK_TYPE_STREAM, |
561 | .msg = msg, | 565 | .msg = msg, |
562 | .pkt_len = len, | 566 | .pkt_len = len, |
567 | .vsk = vsk, | ||
563 | }; | 568 | }; |
564 | 569 | ||
565 | return virtio_transport_send_pkt_info(vsk, &info); | 570 | return virtio_transport_send_pkt_info(vsk, &info); |
@@ -581,6 +586,7 @@ static int virtio_transport_reset(struct vsock_sock *vsk, | |||
581 | .op = VIRTIO_VSOCK_OP_RST, | 586 | .op = VIRTIO_VSOCK_OP_RST, |
582 | .type = VIRTIO_VSOCK_TYPE_STREAM, | 587 | .type = VIRTIO_VSOCK_TYPE_STREAM, |
583 | .reply = !!pkt, | 588 | .reply = !!pkt, |
589 | .vsk = vsk, | ||
584 | }; | 590 | }; |
585 | 591 | ||
586 | /* Send RST only if the original pkt is not a RST pkt */ | 592 | /* Send RST only if the original pkt is not a RST pkt */ |
@@ -826,6 +832,7 @@ virtio_transport_send_response(struct vsock_sock *vsk, | |||
826 | .remote_cid = le64_to_cpu(pkt->hdr.src_cid), | 832 | .remote_cid = le64_to_cpu(pkt->hdr.src_cid), |
827 | .remote_port = le32_to_cpu(pkt->hdr.src_port), | 833 | .remote_port = le32_to_cpu(pkt->hdr.src_port), |
828 | .reply = true, | 834 | .reply = true, |
835 | .vsk = vsk, | ||
829 | }; | 836 | }; |
830 | 837 | ||
831 | return virtio_transport_send_pkt_info(vsk, &info); | 838 | return virtio_transport_send_pkt_info(vsk, &info); |