This repository was archived by the owner on Feb 8, 2021. It is now read-only.
Vsock support #249
Merged
Vsock support #249
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laijs
reviewed
Jan 5, 2017
build/Dockerfile
Outdated
| RUN yum install -y patch gcc ncurses-devel make openssl-devel bc | ||
|
|
||
| ENV KERNEL_VERSION 4.4.28 | ||
| ENV KERNEL_VERSION 4.8.10 |
Contributor
There was a problem hiding this comment.
4.9.x will be longterm support. 4.9.1 will be released in one or two weeks.
Member
Author
There was a problem hiding this comment.
Great! We should use 4.9.y in the long run then.
bergwolf
force-pushed
the
vsock-rebased
branch
6 times, most recently
from
32e51a7 to
e62bcb8
Compare
Member
Author
|
ci failure seems to relate to aufs |
Signed-off-by: Peng Tao <bergwolf@gmail.com>
bergwolf
force-pushed
the
vsock-rebased
branch
from
e62bcb8 to
c9b3e39
Compare
Member
Author
|
travis failed with |
laijs
reviewed
Feb 23, 2017
|
|
||
| AC_CHECK_FILE([/usr/include/linux/vm_sockets.h], | ||
| [], [AC_MSG_ERROR(Cannot find linux/vm_sockets.h)]) | ||
|
|
Contributor
There was a problem hiding this comment.
It shouldn't stop the build when there is no /usr/include/linux/vm_sockets.h, please just disable the VSOCK in this case.
Member
Author
There was a problem hiding this comment.
done. Now vsock is built only when /usr/include/linux/vm_sockets.h is present.
laijs
reviewed
Feb 23, 2017
.travis.yml
Outdated
| before_install: | ||
| - sudo apt-get update -qq | ||
| - sudo apt-get install -y autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev qemu libvirt-bin -qq | ||
| - sudo apt-get install -y autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev qemu libvirt-bin -qq linux-headers-$(uname -r) |
Contributor
There was a problem hiding this comment.
please change the position of -qq.
sudo apt-get install -y -qq
gao-feng
reviewed
Feb 23, 2017
| CONFIG_CGROUP_DEVICE=y | ||
| CONFIG_CPUSETS=y | ||
| CONFIG_PROC_PID_CPUSET=y | ||
| CONFIG_CGROUP_CPUACCT=y |
bergwolf
force-pushed
the
vsock-rebased
branch
from
67ab098 to
f2a008a
Compare
laijs
reviewed
Feb 23, 2017
src/init.c
Outdated
| } else if (hyper_cmd("modprobe vmw_vsock_virtio_transport") < 0) { | ||
| fprintf(stderr, "fail to load vmw_vsock_virtio_transport.ko\n"); | ||
| } else { | ||
| hyper_epoll.vsock_ctl_listener.fd = 1; /* >0 indicates vsock support */ |
Contributor
There was a problem hiding this comment.
it is better to use a local var.
laijs
reviewed
Feb 23, 2017
src/init.c
Outdated
| cmdline = read_cmdline(); | ||
|
|
||
| setenv("PATH", "/bin:/sbin/:/usr/bin/:/usr/sbin/", 1); | ||
|
|
Contributor
There was a problem hiding this comment.
the env is set in hyper_setup_init_process()
Signed-off-by: Peng Tao <bergwolf@gmail.com>
listen control channel on port 2718, and message channel on 2719. Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Set up control channel and message channel if unset yet. Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
To have larger buffer size and also handle HUP events so that it is possible to reconnect to hyperstart. Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
So that we know when runv closes a connection. Signed-off-by: Peng Tao <bergwolf@gmail.com>
1. when read returns 0, it means remotes has closed socket, for normal TCP connections. 2. when read returns -ENOTCONN for vsock, it means remote has closed the socket. We should be able to just handle case 1) if we patch vsock kernel implementation to match normal TCP connection behavior. Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Now we need linux-headers to build as vsock requires <linux/vm_sockets.h>. But ubuntu saves it to /usr/src/linux-headers-$(uname -r)/include/uapi in its linux-headers package. Need to move it to /usr/include/linux manually because one cannot include the uapi directory directly. Signed-off-by: Peng Tao <bergwolf@gmail.com>
nonblock_read() relies errno being 0 upon entering, and also does not want to return -EINTR. Signed-off-by: Peng Tao <bergwolf@gmail.com>
If we cannot find /usr/include/linux/vm_sockets.h locally, do not build with vsock support. Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
bergwolf
force-pushed
the
vsock-rebased
branch
from
f2a008a to
0dbe3f7
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR rebases #194 on top of latest master. It does the following:
TODO: after rebase, control channel writer buffer needs to be preserved across dissociate/associate. I will add it later but it is not a blocker for this PR. vsock is optional and should not break serial port code. So I'd like to get the PR reviewed/merged first as it is already large enough.