s390x: add support for s390x #990

alicefr · Dec 7, 2018

The PR adds the support for s390x.

In the case of CCW devices, the vhost-user devices are not supported.
See #659. An error message is thrown if they tried to be used.

Memory hotplug is not supported on s390 yet and an error message is thrown.

The VirtioNetPCI has been changed to VirtioNet. The generalization
allows to set the VirtioNet to the correct CCW device for s390x.

A lot of the elements in this PR have been taken from #667

Fixes: #666

Co-authored-by: Yash D Jain ydjainopensource@gmail.com
Signed-off-by: Alice Frosi <afrosi@de.ibm.>

jodh-intel · Dec 7, 2018

jodh-intel approved these changes Dec 7, 2018

View changes

Very nice! Thanks @alicefr!

jodh-intel · Dec 7, 2018

cli/kata-check_data_s390x_test.go

+const testCPUInfoTemplate = `
+vendor_id       : IBM/S390
+# processors    : 4
+bogomips per cpu: 20325.00


cli/kata-check_s390x_test.go

cli/utils_s390x.go

jodh-intel · Dec 7, 2018

virtcontainers/qemu_s390x.go

+func MaxQemuVCPUs() uint32 {
+	// Max number of virtual Cpu defined in qemu. See
+	// https://github.com/qemu/qemu/blob/80422b00196a7af4c6efb628fae0ad8b644e98af/target/s390x/cpu.h#L55
+	// #define S390_MAX_CPUS 248


It's a shame this can't be queried by calling qemu (via govmm) directly. But clearly not a blocker as other architectures also hard-code a value.

Aside: For the future, I do wonder if we could push the hard-coded arch-specific values down into govmm rather than having them in the runtime though - wdyt @markdryan?

I didn't find a way. For Linux you can find it in /sys/devices/system/cpu/kernel_max

Sure - this was more a question for @markdryan ;)

jodh-intel · Dec 10, 2018

Ping @kata-containers/runtime! ;)

grahamwhaley · Dec 10, 2018

/test

jodh-intel · Dec 10, 2018

Travis is complaining due to a static analysis issue:

virtcontainers/qemu.go:907:9:warning: if block ends with a return statement, so drop this else and outdent its block (golint)

alicefr · Dec 10, 2018

alicefr reviewed Dec 10, 2018

View changes

virtcontainers/qemu.go

alicefr · Dec 10, 2018

@jodh-intel now the changes in virtcontainers/qemu.go are a little bit more, but it simplifies the code structure. I moved the switch out of the if statement. It was the same for both if and else statement and removed the else because the if statement has a return err

jodh-intel · Dec 10, 2018

Thanks @alicefr.

jodh-intel · Dec 10, 2018

/retest

devimc · Dec 10, 2018

devimc reviewed Dec 10, 2018

View changes

virtcontainers/qemu.go

devimc · Dec 10, 2018

devimc reviewed Dec 10, 2018

View changes

virtcontainers/qemu_s390x.go

devimc · Dec 10, 2018

thanks @alicefr

devimc · Dec 10, 2018

/test

jcvenegas · Dec 10, 2018

jcvenegas approved these changes Dec 10, 2018

View changes

LGTM

virtcontainers/qemu.go

sboeuf · Dec 11, 2018

Looks good!

jodh-intel · Dec 11, 2018

@bergwolf, @caoruidong, @grahamwhaley, @devimc - ptal

caoruidong · Dec 11, 2018

/test

caoruidong · Dec 11, 2018

caoruidong approved these changes Dec 11, 2018

View changes

lgtm

cli/kata-check_s390x.go

caoruidong · Dec 11, 2018

virtcontainers/qemu.go

+		return err
+	}
+	if err := q.qmpMonitorCh.qmp.ExecuteNetdevDel(q.qmpMonitorCh.ctx, tap.Name); err != nil {
+		return err


Thanks for refactoring!

alicefr · Dec 11, 2018

I introduced the error check for the getQemuMachine() and moved the devID := "virtio-" + tap.ID with the switch outside the if statement. I removed the model optional comment

devimc · Dec 11, 2018

devimc approved these changes Dec 11, 2018

View changes

lgtm

devimc · Dec 11, 2018

/test

jodh-intel · Dec 11, 2018

\o/ Thanks again @alicefr! 😄

This was referenced Dec 7, 2018

Closed

vhost-user devices not available on Z #659

Open

Add support for IBM Z kata-containers/kata-containers#33

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from 4592e59 to 0458cb5 Dec 7, 2018

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from d5f8484 to 5800002 Dec 10, 2018

alicefr force-pushed the alicefr:s390x branch from 5800002 to fdae96e Dec 10, 2018

alicefr force-pushed the alicefr:s390x branch from fdae96e to 7ee4c1a Dec 10, 2018

alicefr force-pushed the alicefr:s390x branch from 7ee4c1a to 411c2eb Dec 11, 2018

alicefr force-pushed the alicefr:s390x branch from 411c2eb to 6f83061 Dec 11, 2018

kata-containers/runtime

Join GitHub today

s390x: add support for s390x #990

Conversation

alicefr commented Dec 7, 2018

This was referenced Dec 7, 2018

vhost-user devices not available on Z #659

Add support for IBM Z kata-containers/kata-containers#33

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from 4592e59 to 0458cb5 Dec 7, 2018

jodh-intel approved these changes Dec 7, 2018 View changes

jodh-intel left a comment

This comment has been minimized.

jodh-intel Dec 7, 2018

This comment has been minimized.

jodh-intel Dec 7, 2018

This comment has been minimized.

alicefr Dec 10, 2018 • edited

This comment has been minimized.

jodh-intel Dec 10, 2018

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from d5f8484 to 5800002 Dec 10, 2018

This comment has been minimized.

jodh-intel commented Dec 10, 2018

This comment has been minimized.

grahamwhaley commented Dec 10, 2018

This comment has been minimized.

jodh-intel commented Dec 10, 2018

alicefr reviewed Dec 10, 2018 View changes

alicefr force-pushed the alicefr:s390x branch from 5800002 to fdae96e Dec 10, 2018

This comment has been minimized.

alicefr commented Dec 10, 2018 • edited

This comment has been minimized.

jodh-intel commented Dec 10, 2018

This comment has been minimized.

jodh-intel commented Dec 10, 2018

devimc reviewed Dec 10, 2018 View changes

devimc reviewed Dec 10, 2018 View changes

alicefr force-pushed the alicefr:s390x branch from fdae96e to 7ee4c1a Dec 10, 2018

This comment has been minimized.

devimc commented Dec 10, 2018

This comment has been minimized.

devimc commented Dec 10, 2018

jcvenegas approved these changes Dec 10, 2018 View changes

jcvenegas left a comment

This comment has been minimized.

sboeuf commented Dec 11, 2018

This comment has been minimized.

jodh-intel commented Dec 11, 2018

alicefr force-pushed the alicefr:s390x branch from 7ee4c1a to 411c2eb Dec 11, 2018

This comment has been minimized.

caoruidong commented Dec 11, 2018

caoruidong approved these changes Dec 11, 2018 View changes

caoruidong left a comment

This comment has been minimized.

caoruidong Dec 11, 2018

alicefr force-pushed the alicefr:s390x branch from 411c2eb to 6f83061 Dec 11, 2018

This comment has been minimized.

alicefr commented Dec 11, 2018

devimc approved these changes Dec 11, 2018 View changes

devimc left a comment

This comment has been minimized.

devimc commented Dec 11, 2018

Hide details View details devimc merged commit 976f5b2 into kata-containers:master Dec 11, 2018 8 checks passed

8 checks passed

This comment has been minimized.

jodh-intel commented Dec 11, 2018

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from `4592e59` to `0458cb5` Dec 7, 2018

jodh-intel approved these changes Dec 7, 2018

View changes

alicefr Dec 10, 2018 •

edited

alicefr force-pushed the alicefr:s390x branch 2 times, most recently from `d5f8484` to `5800002` Dec 10, 2018

alicefr reviewed Dec 10, 2018

View changes

alicefr force-pushed the alicefr:s390x branch from `5800002` to `fdae96e` Dec 10, 2018

alicefr commented Dec 10, 2018 •

edited

devimc reviewed Dec 10, 2018

View changes

devimc reviewed Dec 10, 2018

View changes

alicefr force-pushed the alicefr:s390x branch from `fdae96e` to `7ee4c1a` Dec 10, 2018

jcvenegas approved these changes Dec 10, 2018

View changes

alicefr force-pushed the alicefr:s390x branch from `7ee4c1a` to `411c2eb` Dec 11, 2018

caoruidong approved these changes Dec 11, 2018

View changes

alicefr force-pushed the alicefr:s390x branch from `411c2eb` to `6f83061` Dec 11, 2018

devimc approved these changes Dec 11, 2018

View changes

devimc merged commit `976f5b2` into kata-containers:master Dec 11, 2018
8 checks passed