Commit Graph

844 Commits

Author SHA1 Message Date
Julio Montes
4307982fdf virtcontainers: revert apply devices constraints
Due to issue https://github.com/kata-containers/runtime/issues/677
commit 137769a694 must be reverted

This reverts commit 137769a694.

fixes #685

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-08-31 13:07:12 -05:00
Wei Zhang
c518b1ef00 device: use devicemanager to manage rootfs block
Fixes #635

When container rootfs is block based in devicemapper use case, we can re-use
sandbox device manager to manage rootfs block plug/unplug, we don't detailed
description of block in container state file, instead we only need a Block index
referencing sandbox device.

Remove `HotpluggedDrive` and `RootfsPCIAddr` from state file because it's not
necessary any more.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-31 19:30:08 +08:00
James O. D. Hunt
7d5a5a7416
Merge pull request #649 from woshijpf/update-govmm-vendor
vendor: update govmm to be compatible with qemu 2.8
2018-08-31 11:41:38 +01:00
Ruidong
26f912ef86 virtcontainers: Make qdisc of hotplug nics mq
In order to avoid performance drop caused by qdisc. And align with
cold plug codes.

Fixes #650

Signed-off-by: Ruidong Cao <caoruidong@huawei.com>
2018-08-31 22:07:12 +08:00
James O. D. Hunt
fcbe6e1f90
Merge pull request #679 from amshinde/remove-cni-docs
network: Remove CNI docs
2018-08-31 11:34:39 +01:00
Peng Tao
5e849f143b network: always assign sandbox networkNS
For vm factory, we also need netns to be set otherwise we fail to
create new VMs in `s.network.run`.

Fixes: #681

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-08-31 16:57:53 +08:00
Peng Tao
b982373813
Merge pull request #623 from sboeuf/move_hooks
network: Move OCI hooks and network namespace creation out of virtcontainers
2018-08-31 15:46:12 +08:00
Frank Cao
7dc1a3246c
Merge pull request #675 from caoruidong/delete-comment
virtcontainers: delete out-of-date TODO
2018-08-31 15:13:37 +08:00
Peng Tao
4c5fa2d641
Merge pull request #662 from WeiZhang555/fix-golang1.8.3
build: fix breaking 1.8.3 build
2018-08-31 15:09:04 +08:00
Wei Zhang
e599ef430a device: don't persist ContainerPath of DeviceInfo
Fixes #635

`ContainerPath` isn't meaningful in sandbox's `devices.json`, because
device is sandbox level which can be referenced by many containers, and
`ContainerPath` is per container which means nothing to a sandbox level
resource.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-31 09:53:01 +08:00
Wei Zhang
affd6e3216 devices: add reference count for devices.
Fixes #635

Remove `Hotplugged bool` field from device and add two new fields
instead:
* `RefCount`: how many references to this device. One device can be
referenced(`NewDevice()`) many times by same/different container(s),
two devices are regarded identical if they have same hostPath
* `AttachCount`: how many times this device has been attached. A device
can only be hotplugged once to the qemu, every new Attach command will
add the AttachCount, and real `Detach` will be done only when
`AttachCount == 0`

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-31 09:53:01 +08:00
Wei Zhang
7f4b221bc3 devices: share genericDevice logic among devices
Fixes #635

Shares generic device logic among all device drivers to reduce
duplicated codes.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-31 09:53:01 +08:00
Wei Zhang
af0c137ec3 build: fix breaking 1.8.3 build
Fixes #638.

Latest kata-runtime can't build with golang 1.8.3, fix it for backward compatibility.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
2018-08-31 09:52:04 +08:00
Archana Shinde
9a8b45fc53 network: Remove CNI docs
We need to update the network docs to reflect CNM
and CNI are handled much the same way. Start off
by removing the incorrect CNI docs first.

Fixes #678

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
2018-08-30 15:31:39 -07:00
Ruidong Cao
e906095a7b virtcontainers: delete out-of-date TODO
drivers package is already removed from this file.

fixes #674

Signed-off-by: Ruidong Cao <caoruidong@huawei.com>
2018-08-30 23:20:18 +08:00
James O. D. Hunt
7d14aea067
Merge pull request #657 from devimc/topic/applyConstraints
virtcontainers: apply devices constraints
2018-08-30 14:57:58 +01:00
James O. D. Hunt
ede60044fd
Merge pull request #661 from jodh-intel/fix-amd64-kata-env
kata-env: Fix amd64 VM container capable check
2018-08-30 14:07:52 +01:00
James O. D. Hunt
35d7672d73 kata-env: Fix amd64 VM container capable check
Fix nasty bug which resulted in `kata-env` showing
`VMContainerCapable = true` even on amd64 systems without virtualisation
support (thankfully `kata-check` still showed the correct results).

Added arch-specific tests to avoid any possibility of regression.

Fixes #660.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-30 09:41:24 +01:00
James O. D. Hunt
d814bc50fb versions: Bump golang from 1.8.3 to 1.9.7
golang version 1.8.3 is old and the runtime cannot even be built with
it now it seems.

Since it is no longer considered a stable version [1], move to the
oldest official stable version (version 1.9.7).

Fixes #642.

[1] - https://golang.org/dl/

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-30 09:40:20 +01:00
Frank Cao
f14660f82c
Merge pull request #664 from chavafg/topic/travis-static-checks
travis: Add variable needed to run static checks
2018-08-30 10:21:03 +08:00
Salvador Fuentes
414ddd17e8 travis: Add variable needed to run static checks
Now that we support multiple branches, we changed how
static-checks.sh compares branches. We now need a
variable called $target_branch to make the correct
comparison when testing a PR.

Fixes: #663.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
2018-08-29 11:13:37 -05:00
Julio Montes
137769a694 virtcontainers: apply devices constraints
Apply devices constraints to the container in the virtual machine

fixes #656

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-08-29 10:15:07 -05:00
James O. D. Hunt
b5ea753ff4 config: Detect if VM memory smaller than image
Add a heuristic to ensure the amount of memory allocated to the
hypervisor is bigger than the size of the image.

This catches simple configuration issues where `default_memory=` is set
to a smaller value than the size of either the `image=` or `initrd=`
files.

If the configured image type is `initrd`, fail but only warn in the
logs for `image` as although it seems a highly unlikely scenario, it is
permitted.

Update tests to ensure that created resources have `>0` bytes.

Fixes #636.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-28 16:21:36 +01:00
James O. D. Hunt
1ba4841865 config: Fix test that was using system files
The `TestMinimalRuntimeConfig` should not be using the real
resource files that might be installed on a system so make temporary
files instead to better control the test.

Split out `TestMinimalRuntimeConfigWithVsock` to reduce cyclomatic
complexity (along with dropping the config file delete at the end - not
required as the entire test-specific directory gets auto-deleted).

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-28 16:21:34 +01:00
Julio Montes
a3038924fb
Merge pull request #654 from devimc/topic/applyMemConstraints
virtcontainers: Apply memory constraints
2018-08-28 09:09:39 -05:00
James O. D. Hunt
dcf3229b37
Merge pull request #648 from bergwolf/vmconsole
builtin-proxy: print guest console output to logger
2018-08-28 14:46:10 +01:00
Julio Montes
12f52cdfb8
Merge pull request #641 from jodh-intel/trace-grpc-calls
vendor: Update kata agent for gRPC tracing
2018-08-28 08:09:45 -05:00
Julio Montes
2677a5fa91 virtcontainers: Apply memory constraints
Apply all supported memory constraints to the contrainer
inside the virtual machine.

fixes #653

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-08-28 07:36:40 -05:00
Peng Tao
3940189be0 builtin-proxy: print guest console output to logger
So daemons such as containerd shimv2 can still see it.

Fixes: #647

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-08-28 14:45:40 +08:00
flyflypeng
f841e89dc7 vendor: update govmm to be compatible with qemu 2.8
govmm has ExecuteBlockdevAdd() function and ExecuteBlockdevDel() function
doesn't compatible with qemu 2.8,because blockdev-add and x-blockdev-del usages
are different between qemu 2.7 and qemu 2.8

shortlog:

ce070d1 govmm: modify govmm to be compatible with qemu 2.8
0286ff9 qemu/qmp: support hotplug a nic whose qdisc is mq
8515ae4 qmp: Remind users that you must first call ExecuteQMPCapabilities()
21504d3 qemu/qmp: Add netdev_add with chardev support
ed34f61 Add some negative test cases for qmp.go
17cacc7 Add negative test cases for qemu.go

fixes: #637

Signed-off-by: flyflypeng <jiangpengfei9@huawei.com>
2018-08-25 22:05:41 +08:00
Sebastien Boeuf
97d280ee0c virtcontainers: Don't handle the network in case of a factory
If the sandbox has been initialized with a factory, this means the
caller should be in charge of adding any network to the VM, and
virtcontainers library cannot make any assumptions about adding
the default underlying network.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-24 15:07:29 -07:00
Sebastien Boeuf
9c6ed93f80 hook: Move OCI hooks handling to the CLI
The CLI being the implementation of the OCI specification, and the
hooks being OCI specific, it makes sense to move the handling of any
OCI hooks to the CLI level. This changes allows the Kata API to
become OCI agnostic.

Fixes #599

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-24 15:07:27 -07:00
Sebastien Boeuf
ec0fd1b67a virtcontainers: sandbox: Add new getter to retrieve netns
As we want to call the OCI hook from the CLI, we need a way for the
CLI to figure out what is the network namespace used by the sandbox.
This is needed particularly because virtcontainers creates the netns
if none was provided.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-24 14:19:25 -07:00
Sebastien Boeuf
cb351dca10 network: Create network namespace from the CLI
This commit moves the network namespace creation out of virtcontainers
in order to anticipate the move of the OCI hooks to the CLI through a
follow up commit.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-24 14:19:23 -07:00
Sebastien Boeuf
44d2ec757c virtcontainers: network: Rename CNM to DefaultNetwork
Since we removed the CNI implementation and that we agreed the network
should only be handled in a single way from virtcontainers, this patch
logically replace the "CNM" naming with "Default".

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-24 14:12:12 -07:00
Julio Montes
cc29b8d4b6
Merge pull request #607 from amshinde/pass-disk-as-shared
Pass qemu --share-rw option for hotplugging disks
2018-08-24 13:09:16 -05:00
Julio Montes
8b5fa32d9b
Merge pull request #634 from sboeuf/add_noop_filesystem
virtcontainers: storage: Rework resource storage
2018-08-24 07:21:58 -05:00
Julio Montes
500d017c31
Merge pull request #616 from Weichen81/master
qemu/arm64: Detect host GIC version to configure guest GIC
2018-08-24 07:04:21 -05:00
James O. D. Hunt
7785352021 vendor: Update kata agent for gRPC tracing
Update the agent vendoring for the new `NewAgentClient()` API - the
agent client code will enable gRPC tracing when passed a context
containing an opentracing span.

Agent client code changes:

    6d26d61 client: Add context parameter and enable tracing support

Fixes #640.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-24 12:19:52 +01:00
James O. D. Hunt
ed6f715ae6
Merge pull request #630 from sboeuf/move_generic_function
virtcontainers: kata_agent: Move out a generic function
2018-08-24 09:40:24 +01:00
James O. D. Hunt
695244afad
Merge pull request #628 from sboeuf/fix_qmp_shutdown
virtcontainers: qemu: Don't shutdown QMP from hotplug
2018-08-24 09:39:20 +01:00
Sebastien Boeuf
8b20c3f26d virtcontainers: storage: Separate storage interface from implementations
The storage implementation of filesystem was in the same file where
the resource storage interface was declared. It's more proper to
separate implementations and interface into different files.

Fixes #633

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-23 16:38:14 -07:00
Sebastien Boeuf
26f0430a7c virtcontainers: storage: Add a noop version of filesystem
This noop implementation of resourceStorage will allow for easier
unit testing of some sandbox functions.

Fixes #632

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-23 16:38:02 -07:00
Sebastien Boeuf
f0e09c887a virtcontainers: kata_agent: Move out a generic function
The specific agent implementation kata_agent was defining a very
useful generic function that is now moved to the global file
network.go.

Fixes #629

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-23 16:03:06 -07:00
Sebastien Boeuf
a1787da97c virtcontainers: qemu: Don't shutdown QMP from hotplug
The QMP shutdown is taken care of by the sandbox release, through a
call to hypervisor.disconnect(). By shutting down the QMP at the qemu
level directly, we are creating some unrecoverable errors by trying to
close an already closed channel.

This patch simply removes the faulty code, following the same design
other hotplug functions are designed.

Fixes #627

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-08-23 15:54:02 -07:00
Eric Ernst
3f458187a4
Merge pull request #617 from jodh-intel/add-vc-trace-support
Add virtcontainers trace support
2018-08-23 10:08:22 -07:00
Wei Chen
b4385901da qemu/arm64: Detect host GIC version to configure guest GIC
QEMU supports GICv2, GICv3 and host parameters for guest
gic-version. The "host" parameter will let QEMU detect
GIC version by itself. This parameter will work properly
when host GIC version is GICv2 or GICv3. But the detection
will failed when host GIC is GICv4 or higher:
"Unable to determine GIC version supported by host"

In this case, we have to detect the host GIC version manually
and force QEMU to use GICv3 when host GIC is GICv4 or higher.

Fixes: #614

Signed-off-by: Wei Chen <wei.chen@arm.com>
Signed-off-by: Penny Zheng <penny.zheng@arm.com>
2018-08-23 08:33:14 +00:00
James O. D. Hunt
d0679a6fd1 tracing: Add tracing support to virtcontainers
Add additional `context.Context` parameters and `struct` fields to allow
trace spans to be created by the `virtcontainers` internal functions,
objects and sub-packages.

Note that not every function is traced; we can add more traces as
desired.

Fixes #566.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-22 08:24:58 +01:00
James O. D. Hunt
6ddc9b4e8e network: Use correct logger
Use the `networkLogger()`, not the network-specific `cnmLogger()`.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-22 08:24:58 +01:00
James O. D. Hunt
90970d94c0 tracing: Add trace spans to virtcontainers APIs
Create spans for all `virtcontainers` API functions.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-08-22 08:24:58 +01:00