github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 00:37:24 +00:00
Code Issues Projects Releases Wiki Activity

vsock: set VHOST_VSOCK_SET_GUEST_CID based based on arch

Browse Source 
set VHOST_VSOCK_SET_GUEST_CID depending on
the host architecture.

Fixes: #1988

Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
This commit is contained in:
Nitesh Konkar 2019-08-30 14:32:26 +05:30
parent a1e0a4c3f5
commit 8cf0f0602f
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtcontainers/utils/utils_linux.go
View File

@ -16,10 +16,6 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
// from <linux/vhost.h>
// VHOST_VSOCK_SET_GUEST_CID = _IOW(VHOST_VIRTIO, 0x60, __u64)
const ioctlVhostVsockSetGuestCid = 0x4008AF60
var ioctlFunc = Ioctl var ioctlFunc = Ioctl
// maxUInt represents the maximum valid value for the context ID. // maxUInt represents the maximum valid value for the context ID.
@ -78,6 +74,7 @@ func FindContextID() (*os.File, uint64, error) {
} }
} }
ioctlVhostVsockSetGuestCid := getIoctlVhostVsockGuestCid()
// Last chance to get a free context ID. // Last chance to get a free context ID.
for cid := contextID - 1; cid >= firstContextID; cid-- { for cid := contextID - 1; cid >= firstContextID; cid-- {
if err = ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil { if err = ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil {

16
virtcontainers/utils/utils_linux_generic.go Normal file
View File

@ -0,0 +1,16 @@
// +build amd64 arm64 s390x !ppc64le
// Copyright (c) 2019 IBM
//
// SPDX-License-Identifier: Apache-2.0
//
package utils
// from <linux/vhost.h>
// VHOST_VSOCK_SET_GUEST_CID = _IOW(VHOST_VIRTIO, 0x60, __u64)
const ioctlVhostVsockSetGuestCid = 0x4008AF60
func getIoctlVhostVsockGuestCid() uintptr {
return ioctlVhostVsockSetGuestCid
}

18
virtcontainers/utils/utils_linux_ppc64le.go Normal file
View File

@ -0,0 +1,18 @@
// Copyright (c) 2019 IBM
//
// SPDX-License-Identifier: Apache-2.0
//
package utils
// from <linux/vhost.h>
// VHOST_VSOCK_SET_GUEST_CID = _IOW(VHOST_VIRTIO, 0x60, __u64)
// _IOC_WRITE is 1 for arch generic and 4 for powerpc
// Code reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/uapi/asm/ioctl.h
// Explanation: https://github.com/kata-containers/runtime/pull/1989#issuecomment-525993135
const ioctlVhostVsockSetGuestCid = 0x8008AF60
func getIoctlVhostVsockGuestCid() uintptr {
return ioctlVhostVsockSetGuestCid
}