mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 02:51:55 +00:00
Merge pull request #127 from rneugeba/hvsockup
kernel: Update Hyper-V socket patch to v10
This commit is contained in:
Justin Cormack
commit
42e81e94f3
@ -1,7 +1,7 @@
|
||||
From d8f7730e3211cdb16cd9d26143121aeb05f22509 Mon Sep 17 00:00:00 2001
|
||||
From 4eb420ca189539397da818a6f0dab9f187693681 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Thu, 17 Dec 2015 16:53:43 +0800
|
||||
Subject: [PATCH 01/26] virtio: make find_vqs() checkpatch.pl-friendly
|
||||
Subject: [PATCH 01/27] virtio: make find_vqs() checkpatch.pl-friendly
|
||||
|
||||
checkpatch.pl wants arrays of strings declared as follows:
|
||||
|
||||
@ -189,10 +189,10 @@ index b976d96..2cc2522 100644
|
||||
|
||||
/* Setup the affinity for a virtqueue:
|
||||
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
|
||||
index 8e5cf19..c0c11fa 100644
|
||||
index 4469202..631021c 100644
|
||||
--- a/drivers/virtio/virtio_pci_modern.c
|
||||
+++ b/drivers/virtio/virtio_pci_modern.c
|
||||
@@ -418,7 +418,7 @@ err_new_queue:
|
||||
@@ -423,7 +423,7 @@ err_new_queue:
|
||||
static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs,
|
||||
struct virtqueue *vqs[],
|
||||
vq_callback_t *callbacks[],
|
||||
@ -215,5 +215,5 @@ index e5ce8ab..6e6cb0c 100644
|
||||
u64 (*get_features)(struct virtio_device *vdev);
|
||||
int (*finalize_features)(struct virtio_device *vdev);
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0260029492a1503e871236767ed86e2fc3862cc2 Mon Sep 17 00:00:00 2001
|
||||
From 55b1d9c5700491a520e9f62db00813153949038e Mon Sep 17 00:00:00 2001
|
||||
From: Julia Lawall <julia.lawall@lip6.fr>
|
||||
Date: Sat, 21 Nov 2015 18:39:17 +0100
|
||||
Subject: [PATCH 02/26] VSOCK: constify vmci_transport_notify_ops structures
|
||||
Subject: [PATCH 02/27] VSOCK: constify vmci_transport_notify_ops structures
|
||||
|
||||
The vmci_transport_notify_ops structures are never modified, so declare
|
||||
them as const.
|
||||
@ -73,5 +73,5 @@ index dc9c792..21e591d 100644
|
||||
vmci_transport_notify_pkt_socket_destruct,
|
||||
vmci_transport_notify_pkt_poll_in,
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 6a585c01a353551a69af45bf31606f13115480d1 Mon Sep 17 00:00:00 2001
|
||||
From 7344b208b2e3dc6283addd17ac444d0e6f086b3c Mon Sep 17 00:00:00 2001
|
||||
From: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
|
||||
Date: Tue, 22 Mar 2016 17:05:52 +0100
|
||||
Subject: [PATCH 03/26] AF_VSOCK: Shrink the area influenced by prepare_to_wait
|
||||
Subject: [PATCH 03/27] AF_VSOCK: Shrink the area influenced by prepare_to_wait
|
||||
|
||||
When a thread is prepared for waiting by calling prepare_to_wait, sleeping
|
||||
is not allowed until either the wait has taken place or finish_wait has
|
||||
@ -332,5 +332,5 @@ index 7fd1220..3dce53e 100644
|
||||
release_sock(sk);
|
||||
return err;
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a3f136168f164f66de1de277a08b76f54b289d5a Mon Sep 17 00:00:00 2001
|
||||
From 0397651ccfc37e24cc6c9ef3c6356e269e9e961f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Thu, 17 Dec 2015 11:10:21 +0800
|
||||
Subject: [PATCH 04/26] VSOCK: transport-specific vsock_transport functions
|
||||
Subject: [PATCH 04/27] VSOCK: transport-specific vsock_transport functions
|
||||
|
||||
struct vsock_transport contains function pointers called by AF_VSOCK
|
||||
core code. The transport may want its own transport-specific function
|
||||
@ -54,5 +54,5 @@ index 3dce53e..112fa8b 100644
|
||||
MODULE_DESCRIPTION("VMware Virtual Socket Family");
|
||||
MODULE_VERSION("1.0.1.0-k");
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,49 +1,13 @@
|
||||
From 4018aa8a812fd6f1a64e3d227550bf5752127314 Mon Sep 17 00:00:00 2001
|
||||
From 397a1c318aa57643a35b048ae9e9df10fb7c46cf Mon Sep 17 00:00:00 2001
|
||||
From: Asias He <asias@redhat.com>
|
||||
Date: Thu, 13 Jun 2013 18:27:00 +0800
|
||||
Subject: [PATCH 05/26] VSOCK: Introduce virtio_vsock_common.ko
|
||||
Subject: [PATCH 05/27] VSOCK: Introduce virtio_vsock_common.ko
|
||||
|
||||
This module contains the common code and header files for the following
|
||||
virtio_transporto and vhost_vsock kernel modules.
|
||||
|
||||
Signed-off-by: Asias He <asias@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
v5:
|
||||
* Add event virtqueue, struct virtio_vsock_event, and transport reset
|
||||
event
|
||||
* Reorder virtqueue indices: rx, tx, event
|
||||
* Drop unused virtqueue_pairs config field
|
||||
* Drop unused ctrl virtqueue
|
||||
* Switch to a free virtio device ID, the previous one was reserved
|
||||
v4:
|
||||
* Add MAINTAINERS file entry
|
||||
* checkpatch.pl cleanups
|
||||
* linux_vsock.h: drop wrong copy-pasted license header
|
||||
* Move tx sock refcounting to virtio_transport_alloc/free_pkt() to fix
|
||||
leaks in error paths
|
||||
* Add send_pkt_no_sock() to send RST packets with no listen socket
|
||||
* Rename per-socket state from virtio_transport to virtio_vsock_sock
|
||||
* Move send_pkt_ops to new virtio_transport struct
|
||||
* Drop dumppkt function, packet capture will be added in the future
|
||||
* Drop empty virtio_transport_dec_tx_pkt()
|
||||
* Allow guest->host connections again
|
||||
* Use trace events instead of pr_debug()
|
||||
v3:
|
||||
* Remove unnecessary 3-way handshake, just do REQUEST/RESPONSE instead
|
||||
of REQUEST/RESPONSE/ACK
|
||||
* Remove SOCK_DGRAM support and focus on SOCK_STREAM first
|
||||
* Only allow host->guest connections (same security model as latest
|
||||
VMware)
|
||||
v2:
|
||||
* Fix peer_buf_alloc inheritance on child socket
|
||||
* Notify other side of SOCK_STREAM disconnect (fixes shutdown
|
||||
semantics)
|
||||
* Avoid recursive mutex_lock(tx_lock) for write_space (fixes deadlock)
|
||||
* Define VIRTIO_VSOCK_TYPE_STREAM/DGRAM hardware interface constants
|
||||
* Define VIRTIO_VSOCK_SHUTDOWN_RCV/SEND hardware interface constants
|
||||
|
||||
(cherry picked from commit 83ac0f5ff6c9faf03050a4c77b3d7a96afe53402)
|
||||
---
|
||||
MAINTAINERS | 10 +
|
||||
include/linux/virtio_vsock.h | 167 ++++
|
||||
@ -58,10 +22,10 @@ v2:
|
||||
create mode 100644 net/vmw_vsock/virtio_transport_common.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 65bf152..fab150d 100644
|
||||
index 4c3e1d2..aa88662 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -11395,6 +11395,16 @@ S: Maintained
|
||||
@@ -11382,6 +11382,16 @@ S: Maintained
|
||||
F: drivers/media/v4l2-core/videobuf2-*
|
||||
F: include/media/videobuf2-*
|
||||
|
||||
@ -1357,5 +1321,5 @@ index 0000000..5b9e202
|
||||
+MODULE_AUTHOR("Asias He");
|
||||
+MODULE_DESCRIPTION("common code for virtio vsock");
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,29 +1,13 @@
|
||||
From ccaac837ceb4a9582bb57f71e0cac791f7336b19 Mon Sep 17 00:00:00 2001
|
||||
From bfa67b1c19a075f4fbb89fd393e9c368ad156416 Mon Sep 17 00:00:00 2001
|
||||
From: Asias He <asias@redhat.com>
|
||||
Date: Thu, 13 Jun 2013 18:28:48 +0800
|
||||
Subject: [PATCH 06/26] VSOCK: Introduce virtio_transport.ko
|
||||
Subject: [PATCH 06/27] VSOCK: Introduce virtio_transport.ko
|
||||
|
||||
VM sockets virtio transport implementation. This driver runs in the
|
||||
guest.
|
||||
|
||||
Signed-off-by: Asias He <asias@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
v5:
|
||||
* Add transport reset event handling
|
||||
* Drop ctrl virtqueue
|
||||
v4:
|
||||
* Add MAINTAINERS file entry
|
||||
* Drop short/long rx packets
|
||||
* checkpatch.pl cleanups
|
||||
* Clarify locking in struct virtio_vsock
|
||||
* Narrow local variable scopes as suggested by Alex Bennee
|
||||
* Call wake_up() after decrementing total_tx_buf to avoid deadlock
|
||||
v2:
|
||||
* Fix total_tx_buf accounting
|
||||
* Add virtio_transport global mutex to prevent races
|
||||
|
||||
(cherry picked from commit 1b5c3d05a4c0c1dc87d29d3bee701cf1c84cd5d3)
|
||||
---
|
||||
MAINTAINERS | 1 +
|
||||
net/vmw_vsock/virtio_transport.c | 584 +++++++++++++++++++++++++++++++++++++++
|
||||
@ -31,10 +15,10 @@ v2:
|
||||
create mode 100644 net/vmw_vsock/virtio_transport.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index fab150d..403c4cc 100644
|
||||
index aa88662..889d0d7 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -11404,6 +11404,7 @@ S: Maintained
|
||||
@@ -11391,6 +11391,7 @@ S: Maintained
|
||||
F: include/linux/virtio_vsock.h
|
||||
F: include/uapi/linux/virtio_vsock.h
|
||||
F: net/vmw_vsock/virtio_transport_common.c
|
||||
@ -633,5 +617,5 @@ index 0000000..45472e0
|
||||
+MODULE_DESCRIPTION("virtio transport for vsock");
|
||||
+MODULE_DEVICE_TABLE(virtio, id_table);
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,40 +1,13 @@
|
||||
From f52efbc874c742a671939ea6408c59545025007d Mon Sep 17 00:00:00 2001
|
||||
From a40b8961e92a5cfea634685e0e3aff9227a0fdd5 Mon Sep 17 00:00:00 2001
|
||||
From: Asias He <asias@redhat.com>
|
||||
Date: Thu, 13 Jun 2013 18:29:21 +0800
|
||||
Subject: [PATCH 07/26] VSOCK: Introduce vhost_vsock.ko
|
||||
Subject: [PATCH 07/27] VSOCK: Introduce vhost_vsock.ko
|
||||
|
||||
VM sockets vhost transport implementation. This driver runs on the
|
||||
host.
|
||||
|
||||
Signed-off-by: Asias He <asias@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
v5:
|
||||
* Only take rx/tx virtqueues, userspace handles the other virtqueues
|
||||
* Explicitly skip instances without a CID when transferring packets
|
||||
* Add VHOST_VSOCK_START ioctl to being vhost virtqueue processing
|
||||
* Reset established connections when device is closed
|
||||
v4:
|
||||
* Add MAINTAINERS file entry
|
||||
* virtqueue used len is now sizeof(pkt->hdr) + pkt->len instead of just
|
||||
pkt->len
|
||||
* checkpatch.pl cleanups
|
||||
* Clarify struct vhost_vsock locking
|
||||
* Add comments about optimization that disables virtqueue notify
|
||||
* Drop unused vhost_vsock_handle_ctl_kick()
|
||||
* Call wake_up() after decrementing total_tx_buf to prevent deadlock
|
||||
v3:
|
||||
* Remove unneeded variable used to store return value
|
||||
(Fengguang Wu <fengguang.wu@intel.com> and Julia Lawall
|
||||
<julia.lawall@lip6.fr>)
|
||||
v2:
|
||||
* Add missing total_tx_buf decrement
|
||||
* Support flexible rx/tx descriptor layout
|
||||
* Refuse to assign reserved CIDs
|
||||
* Refuse guest CID if already in use
|
||||
* Only accept correctly addressed packets
|
||||
|
||||
(cherry picked from commit 40d1901b66f0250e91094df07955edf57cf2f41e)
|
||||
---
|
||||
MAINTAINERS | 2 +
|
||||
drivers/vhost/vsock.c | 694 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
@ -44,10 +17,10 @@ v2:
|
||||
create mode 100644 drivers/vhost/vsock.h
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 403c4cc..530bce8 100644
|
||||
index 889d0d7..9a70d2d 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -11405,6 +11405,8 @@ F: include/linux/virtio_vsock.h
|
||||
@@ -11392,6 +11392,8 @@ F: include/linux/virtio_vsock.h
|
||||
F: include/uapi/linux/virtio_vsock.h
|
||||
F: net/vmw_vsock/virtio_transport_common.c
|
||||
F: net/vmw_vsock/virtio_transport.c
|
||||
@ -768,5 +741,5 @@ index 0000000..173f9fc
|
||||
+#define VHOST_VSOCK_START _IO(VHOST_VIRTIO, 0x61)
|
||||
+#endif
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,22 +1,12 @@
|
||||
From e8c8f5299fd202db5d56a10f1dc0a4e464e9a211 Mon Sep 17 00:00:00 2001
|
||||
From f0c236fefc57085cb6de93b4af6a97f794d86944 Mon Sep 17 00:00:00 2001
|
||||
From: Asias He <asias@redhat.com>
|
||||
Date: Thu, 13 Jun 2013 18:30:19 +0800
|
||||
Subject: [PATCH 08/26] VSOCK: Add Makefile and Kconfig
|
||||
Subject: [PATCH 08/27] VSOCK: Add Makefile and Kconfig
|
||||
|
||||
Enable virtio-vsock and vhost-vsock.
|
||||
|
||||
Signed-off-by: Asias He <asias@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
v4:
|
||||
* Make checkpatch.pl happy with longer option description
|
||||
* Clarify dependency on virtio rather than QEMU as suggested by Alex
|
||||
Bennee
|
||||
v3:
|
||||
* Don't put vhost vsock driver into staging
|
||||
* Add missing Kconfig dependencies (Arnd Bergmann <arnd@arndb.de>)
|
||||
|
||||
(cherry picked from commit 4c9d2a6be1c69ec22f8ee90bb4a5cc21d3848077)
|
||||
---
|
||||
drivers/vhost/Kconfig | 15 +++++++++++++++
|
||||
drivers/vhost/Makefile | 4 ++++
|
||||
@ -104,5 +94,5 @@ index 2ce52d7..cf4c294 100644
|
||||
vsock-y += af_vsock.o vsock_addr.o
|
||||
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 550ec4c8f90f2bf99c1bcb13b2f8476780f42418 Mon Sep 17 00:00:00 2001
|
||||
From bb208cf070af4f831073ded2ae58e624ee965105 Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ian.campbell@docker.com>
|
||||
Date: Mon, 4 Apr 2016 14:50:10 +0100
|
||||
Subject: [PATCH 09/26] VSOCK: Only allow host network namespace to use
|
||||
Subject: [PATCH 09/27] VSOCK: Only allow host network namespace to use
|
||||
AF_VSOCK.
|
||||
|
||||
The VSOCK addressing schema does not really lend itself to simply creating an
|
||||
@ -27,5 +27,5 @@ index 112fa8b..ead5127 100644
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1f7906c43fe139e15c19f35a4493a7ca61a6463f Mon Sep 17 00:00:00 2001
|
||||
From c30350ee4aaaf29604fc6f3f3f9bdcef2f4fdb2a Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:47 -0800
|
||||
Subject: [PATCH 10/26] Drivers: hv: vmbus: serialize process_chn_event() and
|
||||
Subject: [PATCH 10/27] Drivers: hv: vmbus: serialize process_chn_event() and
|
||||
vmbus_close_internal()
|
||||
|
||||
process_chn_event(), running in the tasklet, can race with
|
||||
@ -83,5 +83,5 @@ index 9098f13..6a90c69 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 00375a20748490730b2f004bfe44e83abecec5f1 Mon Sep 17 00:00:00 2001
|
||||
From 3aeadb59ed3d6216976648b3aee9b1db2c64c752 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:48 -0800
|
||||
Subject: [PATCH 11/26] Drivers: hv: vmbus: do sanity check of channel state in
|
||||
Subject: [PATCH 11/27] Drivers: hv: vmbus: do sanity check of channel state in
|
||||
vmbus_close_internal()
|
||||
|
||||
This fixes an incorrect assumption of channel state in the function.
|
||||
@ -38,5 +38,5 @@ index 6a90c69..b3c14ca 100644
|
||||
channel->sc_creation_callback = NULL;
|
||||
/* Stop callback and cancel the timer asap */
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 53cd041cabf572ec98d5b911abfff1a3baf1ccaa Mon Sep 17 00:00:00 2001
|
||||
From c1709827403ac4f3858b2ae0a9ee23733054b896 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:49 -0800
|
||||
Subject: [PATCH 12/26] Drivers: hv: vmbus: fix rescind-offer handling for
|
||||
Subject: [PATCH 12/27] Drivers: hv: vmbus: fix rescind-offer handling for
|
||||
device without a driver
|
||||
|
||||
In the path vmbus_onoffer_rescind() -> vmbus_device_unregister() ->
|
||||
@ -118,5 +118,5 @@ index f19b6f7..7e46a48 100644
|
||||
|
||||
}
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 613d19efd48c06602018c0e7c6b4bf8d191105cd Mon Sep 17 00:00:00 2001
|
||||
From 84a3cd7026e12d7bd88f9b896df40148236af875 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:50 -0800
|
||||
Subject: [PATCH 13/26] Drivers: hv: vmbus: release relid on error in
|
||||
Subject: [PATCH 13/27] Drivers: hv: vmbus: release relid on error in
|
||||
vmbus_process_offer()
|
||||
|
||||
We want to simplify vmbus_onoffer_rescind() by not invoking
|
||||
@ -70,5 +70,5 @@ index bd2e9f6..df76a71 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b9a136e91171bea99a140195ccb4bbea2a65551d Mon Sep 17 00:00:00 2001
|
||||
From 567b486c7ee1eddf6aee005103b801cd9508057f Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:51 -0800
|
||||
Subject: [PATCH 14/26] Drivers: hv: vmbus: channge
|
||||
Subject: [PATCH 14/27] Drivers: hv: vmbus: channge
|
||||
vmbus_connection.channel_lock to mutex
|
||||
|
||||
spinlock is unnecessary here.
|
||||
@ -112,5 +112,5 @@ index 3782636..d9937be 100644
|
||||
struct workqueue_struct *work_queue;
|
||||
};
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 37e0f1616a680b0b209c3555812c0691dacd74e0 Mon Sep 17 00:00:00 2001
|
||||
From fa129d6856d2fb887a124bb17ac88f18e3fb639f Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:37 -0800
|
||||
Subject: [PATCH 15/26] Drivers: hv: vmbus: add a helper function to set a
|
||||
Subject: [PATCH 15/27] Drivers: hv: vmbus: add a helper function to set a
|
||||
channel's pending send size
|
||||
|
||||
This will be used by the coming net/hvsock driver.
|
||||
@ -32,5 +32,5 @@ index ae6a711..fda6310 100644
|
||||
|
||||
int vmbus_request_offers(void);
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7d695c9e75755b005a7f45f99dfd7d3bb641e3a8 Mon Sep 17 00:00:00 2001
|
||||
From 14c27d35657e10990f6b428460ef9d5fc81ffca4 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:38 -0800
|
||||
Subject: [PATCH 16/26] Drivers: hv: vmbus: define the new offer type for
|
||||
Subject: [PATCH 16/27] Drivers: hv: vmbus: define the new offer type for
|
||||
Hyper-V socket (hvsock)
|
||||
|
||||
A helper function is also added.
|
||||
@ -40,5 +40,5 @@ index fda6310..9fb2130 100644
|
||||
enum hv_signal_policy policy)
|
||||
{
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 8507cfd5b7af092d5cc5e99ff9852b3bc46c48c0 Mon Sep 17 00:00:00 2001
|
||||
From ff94799688f8090c70cdca2158a8c0ca7a9f676c Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:39 -0800
|
||||
Subject: [PATCH 17/26] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid
|
||||
Subject: [PATCH 17/27] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid
|
||||
unnecessary signaling
|
||||
|
||||
When the hvsock channel's outbound ringbuffer is full (i.e.,
|
||||
@ -41,5 +41,5 @@ index 2889d97..a7f9e3e 100644
|
||||
|
||||
return ret;
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 746cdb5f4c824ef3af9d12909818a077a0cf303c Mon Sep 17 00:00:00 2001
|
||||
From 91c41d9e85f67881be5523d544508c08ca9926e3 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:40 -0800
|
||||
Subject: [PATCH 18/26] Drivers: hv: vmbus: define a new VMBus message type for
|
||||
Subject: [PATCH 18/27] Drivers: hv: vmbus: define a new VMBus message type for
|
||||
hvsock
|
||||
|
||||
A function to send the type of message is also added.
|
||||
@ -97,5 +97,5 @@ index 9fb2130..3f485a4 100644
|
||||
+ const uuid_le *shv_host_servie_id);
|
||||
#endif /* _HYPERV_H */
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From fb6b14a429dae008b7fee772a1e27cb09db459b7 Mon Sep 17 00:00:00 2001
|
||||
From 22631e9eff59670c7cef5f91979375a2144189dd Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:41 -0800
|
||||
Subject: [PATCH 19/26] Drivers: hv: vmbus: add a hvsock flag in struct
|
||||
Subject: [PATCH 19/27] Drivers: hv: vmbus: add a hvsock flag in struct
|
||||
hv_driver
|
||||
|
||||
Only the coming hv_sock driver has a "true" value for this flag.
|
||||
@ -60,5 +60,5 @@ index 3f485a4..9ee79af 100644
|
||||
uuid_le dev_type;
|
||||
const struct hv_vmbus_device_id *id_table;
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4a2d55757c137c2e574500227cb2efe77a26ee3a Mon Sep 17 00:00:00 2001
|
||||
From 220aa4002752a3ce9d8b7a8010c64d8a9c3e1654 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:42 -0800
|
||||
Subject: [PATCH 20/26] Drivers: hv: vmbus: add a per-channel rescind callback
|
||||
Subject: [PATCH 20/27] Drivers: hv: vmbus: add a per-channel rescind callback
|
||||
|
||||
This will be used by the coming hv_sock driver.
|
||||
|
||||
@ -68,5 +68,5 @@ index 9ee79af..09e9ec1 100644
|
||||
* Retrieve the (sub) channel on which to send an outgoing request.
|
||||
* When a primary channel has multiple sub-channels, we choose a
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b6c9f23164d3e7460d8983d27f2df194ab5e9a0b Mon Sep 17 00:00:00 2001
|
||||
From 8cdace7efd0cba254c7183e302d97e2018d61840 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:43 -0800
|
||||
Subject: [PATCH 21/26] Drivers: hv: vmbus: add an API
|
||||
Subject: [PATCH 21/27] Drivers: hv: vmbus: add an API
|
||||
vmbus_hvsock_device_unregister()
|
||||
|
||||
The hvsock driver needs this API to release all the resources related
|
||||
@ -149,5 +149,5 @@ index 09e9ec1..af7ee0a 100644
|
||||
resource_size_t min, resource_size_t max,
|
||||
resource_size_t size, resource_size_t align,
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f483aa8ef1890f82d6a362d296c21786c5ee9f30 Mon Sep 17 00:00:00 2001
|
||||
From d2dabcfdbf46a4c78f87d1a6b56822a3ed10499a Mon Sep 17 00:00:00 2001
|
||||
From: Tom Herbert <tom@herbertland.com>
|
||||
Date: Mon, 7 Mar 2016 14:11:06 -0800
|
||||
Subject: [PATCH 22/26] kcm: Kernel Connection Multiplexor module
|
||||
Subject: [PATCH 22/27] kcm: Kernel Connection Multiplexor module
|
||||
|
||||
This module implements the Kernel Connection Multiplexor.
|
||||
|
||||
@ -18,13 +18,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
include/linux/socket.h | 6 +-
|
||||
include/net/kcm.h | 125 +++
|
||||
include/uapi/linux/kcm.h | 40 +
|
||||
include/uapi/linux/kcm.h | 39 +
|
||||
net/Kconfig | 1 +
|
||||
net/Makefile | 1 +
|
||||
net/kcm/Kconfig | 10 +
|
||||
net/kcm/Kconfig | 9 +
|
||||
net/kcm/Makefile | 3 +
|
||||
net/kcm/kcmsock.c | 2016 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
8 files changed, 2201 insertions(+), 1 deletion(-)
|
||||
net/kcm/kcmsock.c | 2015 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
8 files changed, 2198 insertions(+), 1 deletion(-)
|
||||
create mode 100644 include/net/kcm.h
|
||||
create mode 100644 include/uapi/linux/kcm.h
|
||||
create mode 100644 net/kcm/Kconfig
|
||||
@ -195,10 +195,10 @@ index 0000000..1bcae39
|
||||
+#endif /* __NET_KCM_H_ */
|
||||
diff --git a/include/uapi/linux/kcm.h b/include/uapi/linux/kcm.h
|
||||
new file mode 100644
|
||||
index 0000000..a5a53094
|
||||
index 0000000..d72350f
|
||||
--- /dev/null
|
||||
+++ b/include/uapi/linux/kcm.h
|
||||
@@ -0,0 +1,40 @@
|
||||
@@ -0,0 +1,39 @@
|
||||
+/*
|
||||
+ * Kernel Connection Multiplexor
|
||||
+ *
|
||||
@ -238,7 +238,6 @@ index 0000000..a5a53094
|
||||
+#define KCM_RECV_DISABLE 1
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
diff --git a/net/Kconfig b/net/Kconfig
|
||||
index 127da94..b8439e6 100644
|
||||
--- a/net/Kconfig
|
||||
@ -265,10 +264,10 @@ index a5d0409..81d1411 100644
|
||||
obj-$(CONFIG_DECNET) += decnet/
|
||||
diff --git a/net/kcm/Kconfig b/net/kcm/Kconfig
|
||||
new file mode 100644
|
||||
index 0000000..5db94d9
|
||||
index 0000000..4f28332
|
||||
--- /dev/null
|
||||
+++ b/net/kcm/Kconfig
|
||||
@@ -0,0 +1,10 @@
|
||||
@@ -0,0 +1,9 @@
|
||||
+
|
||||
+config AF_KCM
|
||||
+ tristate "KCM sockets"
|
||||
@ -278,7 +277,6 @@ index 0000000..5db94d9
|
||||
+ KCM (Kernel Connection Multiplexor) sockets provide a method
|
||||
+ for multiplexing messages of a message based application
|
||||
+ protocol over kernel connectons (e.g. TCP connections).
|
||||
+
|
||||
diff --git a/net/kcm/Makefile b/net/kcm/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..cb525f7
|
||||
@ -290,10 +288,10 @@ index 0000000..cb525f7
|
||||
+kcm-y := kcmsock.o
|
||||
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
|
||||
new file mode 100644
|
||||
index 0000000..30ef69a
|
||||
index 0000000..649d246
|
||||
--- /dev/null
|
||||
+++ b/net/kcm/kcmsock.c
|
||||
@@ -0,0 +1,2016 @@
|
||||
@@ -0,0 +1,2015 @@
|
||||
+#include <linux/bpf.h>
|
||||
+#include <linux/errno.h>
|
||||
+#include <linux/errqueue.h>
|
||||
@ -2309,7 +2307,6 @@ index 0000000..30ef69a
|
||||
+
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS_NETPROTO(PF_KCM);
|
||||
+
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4e7679280dd0ad8e28f9ebeea70127ed4385222a Mon Sep 17 00:00:00 2001
|
||||
From 5df30f620de871e80745c25687dbcb5af4c532e5 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 21 Mar 2016 02:51:09 -0700
|
||||
Subject: [PATCH 23/26] net: add the AF_KCM entries to family name tables
|
||||
Subject: [PATCH 23/27] net: add the AF_KCM entries to family name tables
|
||||
|
||||
This is for the recent kcm driver, which introduces AF_KCM(41) in
|
||||
b7ac4eb(kcm: Kernel Connection Multiplexor module).
|
||||
@ -48,5 +48,5 @@ index 0d91f7d..925def4 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
|
||||
1307
alpine/kernel/patches/0024-net-Add-Qualcomm-IPC-router.patch
Normal file
1307
alpine/kernel/patches/0024-net-Add-Qualcomm-IPC-router.patch
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
From 0198717a05de80bc7769ed1d2c3a0cdf3c40fd7c Mon Sep 17 00:00:00 2001
|
||||
From 9e6fe61e17afc54313f2fd8216c1c8aa150f97e7 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 21 Mar 2016 02:53:08 -0700
|
||||
Subject: [PATCH 25/26] net: add the AF_HYPERV entries to family name tables
|
||||
Subject: [PATCH 26/27] net: add the AF_HYPERV entries to family name tables
|
||||
|
||||
This is for the hv_sock driver, which introduces AF_HYPERV(42).
|
||||
|
||||
@ -45,5 +45,5 @@ index 925def4..323f7a3 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a0ae608df96d0059ffa2e0561ff0a53aa298adca Mon Sep 17 00:00:00 2001
|
||||
From 637d86f5133f5c0a446dcce0d1dd6006bc9a3b4d Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ian.campbell@docker.com>
|
||||
Date: Wed, 4 May 2016 14:21:53 +0100
|
||||
Subject: [PATCH 26/26] VSOCK: do not disconnect socket when peer has shutdown
|
||||
Subject: [PATCH 27/27] VSOCK: do not disconnect socket when peer has shutdown
|
||||
SEND only
|
||||
|
||||
The peer may be expecting a reply having sent a request and then done a
|
||||
@ -64,5 +64,5 @@ index ead5127..8373709 100644
|
||||
out:
|
||||
release_sock(sk);
|
||||
--
|
||||
2.8.0.rc3
|
||||
2.8.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user