channel: Check for channel type in kernel cmdline options #508
Conversation
| serialCh commType = iota | ||
|
|
||
| // vsock channel | ||
| vsockCh |
There was a problem hiding this comment.
Because there's a new line and comments between serialCh and vsockCh, and unknownCh, I think both vsockCh and unknownCh are going to be typed as int instead of commType.
There was a problem hiding this comment.
@sboeuf I was able to assign between those values, I think compile would have complained in that case.
There was a problem hiding this comment.
You can still compile since it's a cast later in the code, but unless the Go compiler got smarter, this was a problem I had encountered before.
There was a problem hiding this comment.
No golang will never cast automatically.
Looks like newline are allowed according to this wiki: https://github.com/golang/go/wiki/Iota
amshinde
force-pushed
the
vsock-channel-check
branch
from
8c777c9
to
2e3db7f
Compare
|
/test |
channel.go
Outdated
| defer span.Finish() | ||
|
|
||
| // check vsock path | ||
| var err error |
There was a problem hiding this comment.
useless variable, please use
if _, err := os.Stat(vSockDevPath); err != nil {
amshinde
force-pushed
the
vsock-channel-check
branch
from
2e3db7f
to
6a32b7b
Compare
|
/test |
channel.go
Outdated
| @@ -228,23 +268,51 @@ func (c *serialChannel) teardown() error { | |||
| return c.serialConn.Close() | |||
| } | |||
|
|
|||
| // isAFVSockSupported checks if vsock channel is used by the runtime | |||
| // by checking for devices under the vhost-vsock driver path. | |||
| // It returns true if more a device is found for the driver. | |||
There was a problem hiding this comment.
nit: can you clarify this last sentence?
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 Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
amshinde
force-pushed
the
vsock-channel-check
branch
from
6a32b7b
to
2af3599
Compare
|
/test |
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 #506
Signed-off-by: Archana Shinde archana.m.shinde@intel.com