s390x: add virtio-blk-ccw support #1965

jschintag · 2019-08-14T13:14:23Z

The changes of this PR are

create abstraction of bridge type
move bridge var in qemu
add ccw as bridge type
add devno
add virtio-blk-ccw support

Signed-off-by: Alice Frosi afrosi@de.ibm.com
Reviewed-by: Jan Schintag jan.schintag@de.ibm.com

jschintag · 2019-08-14T13:16:07Z

@grahamwhaley Can i get the RequestForComments Label? I can't set labels in this repo.

grahamwhaley · 2019-08-14T13:21:14Z

@jschintag - sure - you could also put [RFC] in the subject title of the PR - the CI should also pick that up.
I'll also go add you to this repo/team (if I can work out how ;-) )

jschintag · 2019-08-14T14:23:38Z

/test

codecov · 2019-08-14T15:05:48Z

Codecov Report

❗ No coverage uploaded for pull request base (master@a1e0a4c). Click here to learn what that means.
The diff coverage is 47.69%.

@@            Coverage Diff            @@
##             master    #1965   +/-   ##
=========================================
  Coverage          ?   51.61%           
=========================================
  Files             ?      107           
  Lines             ?    14540           
  Branches          ?        0           
=========================================
  Hits              ?     7505           
  Misses            ?     6135           
  Partials          ?      900

virtcontainers/kata_agent.go

virtcontainers/types/bridges.go

virtcontainers/qemu.go

virtcontainers/types/bridges.go

virtcontainers/qemu_arch_base.go

virtcontainers/types/bridges.go

virtcontainers/qemu_arch_base.go

virtcontainers/qemu_s390x.go

jschintag · 2019-08-15T07:49:05Z

@devimc Thank you for your review

jschintag · 2019-08-15T12:06:01Z

Here is what i changed:

Changed BridgeMaxCapacity to MaxCapacity
Added Addr as parameter to NewBridge and added fallthrough to the switch
Changed description of addBridge
Use virtlog in qemu_s390x.go

I also noticed that the qemu-tests for other archs weren`t included in the changes. Fixed it.

/test

devimc · 2019-08-15T14:13:43Z

CI is failing, @jschintag any thoughts?

command failed error 'exit status 125'
[docker run --cidfile /tmp/cid900304392/OlACPKKDhZGKDUpOEYW8wA6f2zYc74 --runtime kata-runtime --device /dev/loop0 --device /dev/loop1 --device /dev/loop2 --device /dev/loop3 --device /dev/loop4 --device /dev/loop5 --device /dev/loop6 --device /dev/loop7 --device /dev/loop8 --device /dev/loop9 --rm --name OlACPKKDhZGKDUpOEYW8wA6f2zYc74 busybox stat /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/loop8 /dev/loop9]
Timeout: 120 seconds
Exit Code: 125
Stdout: 
Stderr: docker: Error response from daemon: OCI runtime create failed: rpc error: code = InvalidArgument desc = invalid ID and VM path for device type:"blk" container_path:"/dev/loop0": unknown.

jschintag · 2019-08-15T14:27:10Z

@devimc I cannot replicate the issue on s390x, i need to further look into it.

jschintag · 2019-08-16T11:00:48Z

@devimc As far as i can see, the agent receives a grpc Request to add a device with an empty id. However i can't replicate the issue on my local x86. Let's check if it reoccurs.

/test

nitkon · 2019-08-16T16:47:42Z

/test-power

jschintag · 2019-08-19T08:38:15Z

@grahamwhaley I can't replicate the issue on my local x86 machine.

make FOCUS="run hot plug block devices" docker
ln -sf . vendor/src
GOPATH=/root/go/src/github.com/kata-containers/tests/vendor go build ./vendor/github.com/onsi/ginkgo/ginkgo
unlink vendor/src
./ginkgo -failFast -v -focus "run hot plug block devices" -skip "" \
        ./integration/docker/ -- -runtime=kata-runtime -timeout=120
Running command '/usr/local/bin/kata-runtime [kata-runtime --kata-show-default-config-paths]'
[kata-runtime --kata-show-default-config-paths]
Timeout: 120 seconds
Exit Code: 0
Stdout: /etc/kata-containers/configuration.toml
/usr/share/defaults/kata-containers/configuration.toml
Stderr:

Running Suite: Integration Suite
Random Seed: 1566203206

Will run 1 of 249 specs
Running command '/usr/bin/docker [docker pull busybox]'

[docker pull busybox]

Timeout: 600 seconds

Exit Code: 0

Stdout: Using default tag: latest

latest: Pulling from library/busybox

Digest: sha256:9f1003c480699be56815db0f8146ad2e22efea85129b5b5983d0e0fb52d9ab70

Status: Image is up to date for busybox:latest

docker.io/library/busybox:latest
Stderr:

Running command '/usr/bin/docker [docker pull alpine:3.7]'

[docker pull alpine:3.7]

Timeout: 600 seconds

Exit Code: 0

Stdout: 3.7: Pulling from library/alpine

5d20c808ce19: Pulling fs layer

5d20c808ce19: Verifying Checksum

5d20c808ce19: Download complete

5d20c808ce19: Pull complete

Digest: sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10

Status: Downloaded newer image for alpine:3.7

docker.io/library/alpine:3.7
Stderr:

Running command '/usr/bin/docker [docker pull debian]'

[docker pull debian]

Timeout: 600 seconds

Exit Code: 0

Stdout: Using default tag: latest

latest: Pulling from library/debian

4ae16bd47783: Pulling fs layer

4ae16bd47783: Verifying Checksum

4ae16bd47783: Download complete

4ae16bd47783: Pull complete

Digest: sha256:2f04d3d33b6027bb74ecc81397abe780649ec89f1a2af18d7022737d0482cefe

Status: Downloaded newer image for debian:latest

docker.io/library/debian:latest
Stderr:

Running command '/usr/bin/docker [docker pull fedora]'

[docker pull fedora]

Timeout: 600 seconds

Exit Code: 0

Stdout: Using default tag: latest

latest: Pulling from library/fedora

fd2e8b5b2254: Pulling fs layer

fd2e8b5b2254: Download complete

fd2e8b5b2254: Pull complete

Digest: sha256:d39a02a0f13c1df3bbcb0ccea4021c53b8e0bfd87f701a5115e18ec089814e70

Status: Downloaded newer image for fedora:latest

docker.io/library/fedora:latest
Stderr:

Running command '/usr/bin/docker [docker pull centos]'

[docker pull centos]

Timeout: 600 seconds

Exit Code: 0

Stdout: Using default tag: latest

latest: Pulling from library/centos

8ba884070f61: Pulling fs layer

8ba884070f61: Verifying Checksum

8ba884070f61: Download complete

8ba884070f61: Pull complete

Digest: sha256:a799dd8a2ded4a83484bbae769d97655392b3f86533ceb7dd96bbac929809f3c

Status: Downloaded newer image for centos:latest

docker.io/library/centos:latest
Stderr:

Running command '/usr/bin/docker [docker pull vish/stress]'

[docker pull vish/stress]

Timeout: 600 seconds

Exit Code: 0

Stdout: Using default tag: latest

latest: Pulling from vish/stress

2ce2382a5646: Pulling fs layer

2ce2382a5646: Verifying Checksum

2ce2382a5646: Download complete

2ce2382a5646: Pull complete

Digest: sha256:b6456a3df6db5e063e1783153627947484a3db387be99e49708c70a9a15e7177

Status: Downloaded newer image for vish/stress:latest

docker.io/vish/stress:latest
Stderr:

Running command '/usr/bin/docker [docker images --format {{.Repository}}]'

[docker images --format {{.Repository}}]

Timeout: 120 seconds

Exit Code: 0

Stdout: debian

fedora

busybox

alpine

helloworld

edgemicro

node

centos

alpine

vish/stress
Stderr:

SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
run hot plug block devices

should be attached

/root/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:147

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd899282237 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd899282237 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.101386 s, 517 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd899282237]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd899282237]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0xcf30aab8.
Command (m for help): Created a new GPT disklabel (GUID: 43C93B83-4C5A-E443-932C-6CE4BC8E7C64).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd899282237]'

[losetup -fP /tmp/dd899282237]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd899282237]'

[losetup -j /tmp/dd899282237]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop2: [64514]:131098 (/tmp/dd899282237)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd906912632 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd906912632 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.108625 s, 483 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd906912632]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd906912632]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x2b86c9d4.
Command (m for help): Created a new GPT disklabel (GUID: 08352D12-43FB-344E-8171-5547A0912355).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd906912632]'

[losetup -fP /tmp/dd906912632]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd906912632]'

[losetup -j /tmp/dd906912632]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop3: [64514]:131101 (/tmp/dd906912632)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd211389047 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd211389047 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.0871715 s, 601 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd211389047]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd211389047]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x346a642a.
Command (m for help): Created a new GPT disklabel (GUID: DD638E6C-9EDF-3349-B0F5-A627ECE9B46A).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd211389047]'

[losetup -fP /tmp/dd211389047]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd211389047]'

[losetup -j /tmp/dd211389047]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop4: [64514]:131102 (/tmp/dd211389047)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd006137706 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd006137706 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.115736 s, 453 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd006137706]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd006137706]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x962282a9.
Command (m for help): Created a new GPT disklabel (GUID: 82FB0021-6BFE-4F48-A0A1-EE7D562E9C63).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd006137706]'

[losetup -fP /tmp/dd006137706]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd006137706]'

[losetup -j /tmp/dd006137706]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop5: [64514]:131103 (/tmp/dd006137706)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd946753985 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd946753985 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.0763301 s, 687 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd946753985]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd946753985]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0xc2e293e8.
Command (m for help): Created a new GPT disklabel (GUID: 118FD8D8-36AC-844E-80BE-2C94F0F78A00).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd946753985]'

[losetup -fP /tmp/dd946753985]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd946753985]'

[losetup -j /tmp/dd946753985]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop6: [64514]:131104 (/tmp/dd946753985)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd383974444 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd383974444 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.10151 s, 516 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd383974444]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd383974444]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x0dcee642.
Command (m for help): Created a new GPT disklabel (GUID: AA7BF5B9-57AB-9B4A-86D0-2E74AF8967E9).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd383974444]'

[losetup -fP /tmp/dd383974444]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd383974444]'

[losetup -j /tmp/dd383974444]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop7: [64514]:131105 (/tmp/dd383974444)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd826486171 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd826486171 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.0748785 s, 700 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd826486171]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd826486171]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x151ff382.
Command (m for help): Created a new GPT disklabel (GUID: 91160215-78DD-7E41-A203-C9F384F3EBDC).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd826486171]'

[losetup -fP /tmp/dd826486171]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd826486171]'

[losetup -j /tmp/dd826486171]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop12: [64514]:131106 (/tmp/dd826486171)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd026542654 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd026542654 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.0720971 s, 727 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd026542654]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd026542654]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x0703b3df.
Command (m for help): Created a new GPT disklabel (GUID: C09F796B-38AB-C64A-9F99-3D67159D3D66).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd026542654]'

[losetup -fP /tmp/dd026542654]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd026542654]'

[losetup -j /tmp/dd026542654]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop13: [64514]:131107 (/tmp/dd026542654)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd430980229 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd430980229 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.104901 s, 500 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd430980229]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd430980229]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0xbdfaccfe.
Command (m for help): Created a new GPT disklabel (GUID: 2DC26E3E-40C7-844D-AF45-29494742F171).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd430980229]'

[losetup -fP /tmp/dd430980229]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd430980229]'

[losetup -j /tmp/dd430980229]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop14: [64514]:131108 (/tmp/dd430980229)
Stderr:

Running command '/bin/dd [dd if=/dev/zero of=/tmp/dd416564768 count=1 bs=50M]'

[dd if=/dev/zero of=/tmp/dd416564768 count=1 bs=50M]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr: 1+0 records in

1+0 records out

52428800 bytes (52 MB, 50 MiB) copied, 0.119541 s, 439 MB/s
Running command '/bin/bash [bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd416564768]'

[bash -c printf "g\nn\n\n\n\nw\n" | fdisk /tmp/dd416564768]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Welcome to fdisk (util-linux 2.31.1).

Changes will remain in memory only, until you decide to write them.

Be careful before using the write command.
Device does not contain a recognized partition table.

Created a new DOS disklabel with disk identifier 0x736b2f41.
Command (m for help): Created a new GPT disklabel (GUID: 9FFF66B6-5A16-1747-ACC3-8ABE06EE1646).
Command (m for help): Partition number (1-128, default 1): First sector (2048-102366, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102366, default 102366):

Created a new partition 1 of type 'Linux filesystem' and of size 49 MiB.
Command (m for help): The partition table has been altered.

Syncing disks.
Stderr:

Running command '/sbin/losetup [losetup -fP /tmp/dd416564768]'

[losetup -fP /tmp/dd416564768]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -j /tmp/dd416564768]'

[losetup -j /tmp/dd416564768]

Timeout: 120 seconds

Exit Code: 0

Stdout: /dev/loop15: [64514]:131109 (/tmp/dd416564768)
Stderr:

Running command '/usr/bin/docker [docker run --cidfile /tmp/cid082798550/0cbAcnASystCAH5314i6Jw3Bgk2ER1 --runtime kata-runtime --device /dev/loop2 --device /dev/loop3 --device /dev/loop4 --device /dev/loop5 --device /dev/loop6 --device /dev/loop7 --device /dev/loop12 --device /dev/loop13 --device /dev/loop14 --device /dev/loop15 --rm --name 0cbAcnASystCAH5314i6Jw3Bgk2ER1 busybox stat /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/loop12 /dev/loop13 /dev/loop14 /dev/loop15]'

[docker run --cidfile /tmp/cid082798550/0cbAcnASystCAH5314i6Jw3Bgk2ER1 --runtime kata-runtime --device /dev/loop2 --device /dev/loop3 --device /dev/loop4 --device /dev/loop5 --device /dev/loop6 --device /dev/loop7 --device /dev/loop12 --device /dev/loop13 --device /dev/loop14 --device /dev/loop15 --rm --name 0cbAcnASystCAH5314i6Jw3Bgk2ER1 busybox stat /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/loop12 /dev/loop13 /dev/loop14 /dev/loop15]

Timeout: 120 seconds

Exit Code: 0

Stdout:   File: /dev/loop2

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1144        Links: 1     Device type: fe,1

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop3

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1145        Links: 1     Device type: fe,11

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop4

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1146        Links: 1     Device type: fe,21

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop5

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1147        Links: 1     Device type: fe,30

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop6

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1148        Links: 1     Device type: fe,40

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop7

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1149        Links: 1     Device type: fe,51

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop12

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1150        Links: 1     Device type: fe,61

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop13

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1151        Links: 1     Device type: fe,70

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop14

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1152        Links: 1     Device type: fe,80

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
File: /dev/loop15

Size: 0               Blocks: 0          IO Block: 4096   block special file

Device: 23h/35d Inode: 1153        Links: 1     Device type: fe,90

Access: (0660/brw-rw----)  Uid: (    0/    root)   Gid: (    6/    disk)

Access: 2019-08-19 08:27:35.000000000

Modify: 2019-08-19 08:27:35.000000000

Change: 2019-08-19 08:27:35.000000000
Stderr:

Running command '/usr/bin/docker [docker ps -a -f name=0cbAcnASystCAH5314i6Jw3Bgk2ER1 --format {{.Status}}]'

[docker ps -a -f name=0cbAcnASystCAH5314i6Jw3Bgk2ER1 --format {{.Status}}]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop2]'

[losetup -d /dev/loop2]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop3]'

[losetup -d /dev/loop3]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop4]'

[losetup -d /dev/loop4]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop5]'

[losetup -d /dev/loop5]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop6]'

[losetup -d /dev/loop6]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop7]'

[losetup -d /dev/loop7]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop12]'

[losetup -d /dev/loop12]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop13]'

[losetup -d /dev/loop13]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop14]'

[losetup -d /dev/loop14]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:

Running command '/sbin/losetup [losetup -d /dev/loop15]'

[losetup -d /dev/loop15]

Timeout: 120 seconds

Exit Code: 0

Stdout:

Stderr:
• [SLOW TEST:9.975 seconds]

run

/root/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:101

hot plug block devices

/root/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:146

should be attached

/root/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:147
SSSSSSSSSSSSSSSSSSSSSSSSSSSS

Ran 1 of 249 Specs in 44.077 seconds

SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 248 Skipped

PASS
Ginkgo ran 1 suite in 50.775969517s

Test Suite Passed

grahamwhaley · 2019-08-19T08:51:01Z

/test
@jschintag - let me re-trigger the CIs and see what happens. There were quite a few failing though.
/cc @devimc

jschintag · 2019-08-19T09:17:52Z

/test

I rebased the PR to master to solve the Merge conflicts

virtcontainers/kata_agent.go

virtcontainers/types/bridges.go

devimc · 2019-08-19T14:45:03Z

CI still failing 😟

Stderr: docker: Error response from daemon: OCI runtime create failed: rpc error: code = InvalidArgument desc = invalid ID and VM path for device type:"blk" container_path:"/dev/loop0": unknown.

devimc · 2019-08-20T14:16:22Z

/test-ubuntu

jschintag · 2019-08-26T12:09:10Z

/test

jschintag · 2019-08-28T09:26:45Z

/test-ubuntu

Let's check if this fixes the netmon error

jschintag · 2019-08-28T11:00:45Z

/test

jschintag · 2019-08-28T12:21:20Z

/test

some of the failures seem to be from the CI

jschintag · 2019-08-29T06:27:40Z

/test-ubuntu

virtcontainers/qemu.go

jschintag · 2019-08-30T13:38:24Z

/test

devimc · 2019-08-30T14:54:37Z

@jschintag initrd CI is happy, why did you remove that line?

jschintag · 2019-08-30T15:05:15Z

@devimc I actually don't know why that line was removed. Alice wrote that part, i'll ask her on Monday. I'll also look into the opensuse-15 failure.

devimc · 2019-08-30T15:58:31Z

@jschintag suse has been failing, it's not stable right now

jschintag · 2019-09-02T06:27:07Z

@devimc so, do you think we can merge this PR?

alicefr · 2019-09-02T06:51:05Z

@devimc I actually don't know why that line was removed. Alice wrote that part, i'll ask her on Monday. I'll also look into the opensuse-15 failure.

My mistake. I did something wrong during the rebase probably sorry. Thx @jschintag

The abstraction of the bridge type to add additional types. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Co-authored-by: Jan Schintag <jan.schintag@de.ibm.com>

In this way it is possible to set bridge variable for each arch when instantiating the hypervisor. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Co-authored-by: Jan Schintag <jan.schintag@de.ibm.com>

On IBM Z, CCW bus type can be additionally used. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

Create generic function to be reused to the reimplemented methods by various architectures Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

The devno number is use to identify the device on IBM Z arch. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

Add virtio-blk-ccw support Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

jschintag · 2019-09-02T12:38:40Z

/test-ubuntu

jschintag · 2019-09-02T12:39:31Z

I just rebased the PR to the current master.

devimc · 2019-09-02T14:23:20Z

adding dnm label, I'd like to review this again

alicefr · 2019-09-02T14:28:23Z

@devimc please let us know if we need to split this PR is smallers PR. Without these changes the kata runtime is broken on s390x.

devimc · 2019-09-02T14:43:52Z

/test

jschintag · 2019-09-04T08:32:30Z

@jodh-intel What are your thoughts on this. Is this PR fine as it is, or do we need to split it into smaller PRs?

jodh-intel

Thanks @jschintag - thls...

lgtm

Any thoughts @amshinde, @mcastelino?

jodh-intel · 2019-09-05T07:46:02Z

Ok - silence is compliance... merging.

grahamwhaley added the rfc Requires input from the team label Aug 14, 2019

devimc reviewed Aug 14, 2019

View reviewed changes

jschintag force-pushed the virtio-blk-ccw branch from 5396568 to 2bca4ac Compare August 15, 2019 11:59

jschintag force-pushed the virtio-blk-ccw branch from 2bca4ac to d9fd1d0 Compare August 16, 2019 10:56

jschintag force-pushed the virtio-blk-ccw branch from d9fd1d0 to bbdcbfb Compare August 19, 2019 09:16

jodh-intel reviewed Aug 19, 2019

View reviewed changes

jschintag force-pushed the virtio-blk-ccw branch from bbdcbfb to cfe8475 Compare August 20, 2019 12:00

jschintag force-pushed the virtio-blk-ccw branch from cfe8475 to 590e9e8 Compare August 26, 2019 12:08

jschintag force-pushed the virtio-blk-ccw branch from 4d55774 to 7682a62 Compare August 28, 2019 10:59

devimc reviewed Aug 30, 2019

View reviewed changes

virtcontainers/qemu.go Outdated Show resolved Hide resolved

jschintag force-pushed the virtio-blk-ccw branch from 2d7de41 to 827e41f Compare August 30, 2019 13:37

Alice Frosi and others added 6 commits September 2, 2019 14:32

bridges: abstraction of bridge type

9188774

The abstraction of the bridge type to add additional types. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Co-authored-by: Jan Schintag <jan.schintag@de.ibm.com>

virtcontainers: Move bridge var in qemu type

23e6073

In this way it is possible to set bridge variable for each arch when instantiating the hypervisor. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Co-authored-by: Jan Schintag <jan.schintag@de.ibm.com>

ccw: add ccw type as bridge

e99739f

On IBM Z, CCW bus type can be additionally used. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

virtcontainers: create generic function

7eec670

Create generic function to be reused to the reimplemented methods by various architectures Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

virtcontainers: add devno

d627585

The devno number is use to identify the device on IBM Z arch. Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

s390x: add virtio-blk-ccw

b075b5c

Add virtio-blk-ccw support Fixes: kata-containers#1153 Signed-off-by: Alice Frosi <afrosi@de.ibm.com> Reviewed-by: Jan Schintag <jan.schintag@de.ibm.com>

jschintag force-pushed the virtio-blk-ccw branch from 827e41f to b075b5c Compare September 2, 2019 12:36

jschintag removed the rfc Requires input from the team label Sep 2, 2019

devimc added the do-not-merge PR has problems or depends on another label Sep 2, 2019

devimc removed the do-not-merge PR has problems or depends on another label Sep 2, 2019

devimc approved these changes Sep 2, 2019

View reviewed changes

jodh-intel approved these changes Sep 4, 2019

View reviewed changes

jodh-intel merged commit 94c47dc into kata-containers:master Sep 5, 2019

jschintag deleted the virtio-blk-ccw branch September 5, 2019 08:55

Jakob-Naucke mentioned this pull request Jun 14, 2021

s390x: Enable virtio-blk-ccw kata-containers/kata-containers#2027

Merged

s390x: add virtio-blk-ccw support #1965

s390x: add virtio-blk-ccw support #1965

Conversation

jschintag commented Aug 14, 2019

jschintag commented Aug 14, 2019

grahamwhaley commented Aug 14, 2019

jschintag commented Aug 14, 2019

codecov bot commented Aug 14, 2019 • edited

Codecov Report

jschintag commented Aug 15, 2019

jschintag commented Aug 15, 2019

devimc commented Aug 15, 2019

jschintag commented Aug 15, 2019

jschintag commented Aug 16, 2019

nitkon commented Aug 16, 2019

jschintag commented Aug 19, 2019

Stderr: Running Suite: Integration Suite

Stderr: SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS

grahamwhaley commented Aug 19, 2019

jschintag commented Aug 19, 2019

devimc commented Aug 19, 2019

devimc commented Aug 20, 2019

jschintag commented Aug 26, 2019

jschintag commented Aug 28, 2019

jschintag commented Aug 28, 2019

jschintag commented Aug 28, 2019

jschintag commented Aug 29, 2019

jschintag commented Aug 30, 2019

devimc commented Aug 30, 2019

jschintag commented Aug 30, 2019

devimc commented Aug 30, 2019

jschintag commented Sep 2, 2019

alicefr commented Sep 2, 2019

jschintag commented Sep 2, 2019

jschintag commented Sep 2, 2019

devimc commented Sep 2, 2019

alicefr commented Sep 2, 2019

devimc commented Sep 2, 2019

jschintag commented Sep 4, 2019

jodh-intel left a comment

Choose a reason for hiding this comment

jodh-intel commented Sep 5, 2019

codecov bot commented Aug 14, 2019 •

edited

Stderr:
Running Suite: Integration Suite

Stderr:
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS