Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

channel: Check for channel type in kernel cmdline options #510

Merged
merged 1 commit into from
Apr 3, 2019

Conversation

amshinde
Copy link
Member

@amshinde amshinde commented Apr 3, 2019

With a recent kernel change, the agent can no longer rely on
/dev/vsock and AF_VSOCK in socket(), to detect if vhost-vsock
channel has been passed by the runtime.
These are not created when the vhost-vsock driver is initialised.

The runtime should now pass this information explicilty.
Based on the channel type passed, the agent now checks for that
partcular channel type.
In case it is not passed, check for both serial and vsock channel.
This also introduces a change in the way vsock channel is detected
by checking for devices under the vhost-vsock driver path.

Changes did not apply directly due to additions related to tracing
in master, manually resolved conflicts, by getting rid of
any tracing related changes.

Fixes #506

Signed-off-by: Archana Shinde [email protected]
(cherry picked from commit 2af3599)

With a recent kernel change, the agent can no longer rely on
/dev/vsock and AF_VSOCK in socket(), to detect if vhost-vsock
channel has been passed by the runtime.
These are not created when the vhost-vsock driver is initialised.

The runtime should now pass this information explicilty.
Based on the channel type passed, the agent now checks for that
partcular channel type.
In case it is not passed, check for both serial and vsock channel.
This also introduces a change in the way vsock channel is detected
by checking for devices under the vhost-vsock driver path.

Fixes kata-containers#506

Changes did not apply directly due to additions related to tracing
in master, manually resolved conflicts, by getting rid of
any tracing related changes.

Signed-off-by: Archana Shinde <[email protected]>
(cherry picked from commit 2af3599)
@egernst egernst merged commit 5f3fa74 into kata-containers:stable-1.5 Apr 3, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants