Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

virtcontainers: support SMP die#1914

Merged
devimc merged 2 commits intokata-containers:masterfrom
devimc:topic/virtcontainers/supportSMPDie
Jul 26, 2019
Merged

virtcontainers: support SMP die#1914
devimc merged 2 commits intokata-containers:masterfrom
devimc:topic/virtcontainers/supportSMPDie

Conversation

@devimc
Copy link
Copy Markdown

@devimc devimc commented Jul 26, 2019

CPU topology has changed in QEMU 4.1: socket > die > core > thread.
die option must be specified in order to hotplug CPUs on x86_64

Depends-on: github.com/kata-containers/packaging#657

fixes #1913

Signed-off-by: Julio Montes julio.montes@intel.com

@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" {
socketID = ""
threadID = ""
dieID = ""
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the comment needs updating for dieID :) I'd be tempted to change it to:

// If CPU type is IBM pSeries or Z, we do not set the following.

/cc @alicefr since this affects s390x.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think she agrees with this change kata-containers/govmm#103 (comment)

@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 0d0057a to 777e151 Compare July 26, 2019 15:32
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 26, 2019

Codecov Report

Merging #1914 into master will not change coverage.
The diff coverage is 0%.

@@           Coverage Diff           @@
##           master    #1914   +/-   ##
=======================================
  Coverage   52.19%   52.19%           
=======================================
  Files         108      108           
  Lines       14196    14196           
=======================================
  Hits         7410     7410           
  Misses       5907     5907           
  Partials      879      879

Shortlog:
68cdf64 test: add cpu topology tests
e0cf9d5 qmp: add checks for the CPU toplogy
a5c1190 qemu: support x86 SMP die

Signed-off-by: Julio Montes <julio.montes@intel.com>
@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 777e151 to 3a446ce Compare July 26, 2019 16:54
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 3a446ce to 65df6d7 Compare July 26, 2019 18:28
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 65df6d7 to 7ac8e79 Compare July 26, 2019 19:15
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 7ac8e79 to 091a28b Compare July 26, 2019 21:15
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

CPU topology has changed in QEMU 4.1: socket > die > core > thread.
die option must be specified in order to hotplug CPUs on x86_64

Depends-on: github.com/kata-containers/packaging#657

fixes kata-containers#1913

Signed-off-by: Julio Montes <julio.montes@intel.com>
@devimc devimc force-pushed the topic/virtcontainers/supportSMPDie branch from 091a28b to 7668aeb Compare July 26, 2019 21:18
@devimc
Copy link
Copy Markdown
Author

devimc commented Jul 26, 2019

/test

@devimc devimc merged commit 3255640 into kata-containers:master Jul 26, 2019
@devimc devimc deleted the topic/virtcontainers/supportSMPDie branch October 9, 2019 19:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

QEMU 4.1: support SMP die

3 participants