88 Commits

Author SHA1 Message Date
Ying Fang
12087330c1 target/arm: Add the kvm_adjvtime vcpu property for Cortex-A72
Add the kvm_adjvtime vcpu property for ARM Cortex-A72 cpu model,
so that virtual time adjust will be enabled for it.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-29 11:15:45 +08:00
Ying Fang
cdc4c75a8b Revert "target/arm: add ths missing GENERIC_TIMER"
This reverts commit 665d6b61fd86629272885e281410f512f8e7f32e.
2020-05-29 11:09:01 +08:00
XuYandong
ae7185c91d !51 [bugfix] add missing GENERIC_TIMER for cpu64
Merge pull request !51 from zhanghailiang/openEuler-20.03-LTS
2020-05-28 21:10:40 +08:00
zhanghailiang
665d6b61fd target/arm: add ths missing GENERIC_TIMER
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-05-28 20:19:41 +08:00
openeuler-ci-bot
0f9eaf7ed5 !48 Drop vtimer virutal time adjust
Merge pull request !48 from FangYing/openEuler-20.03-LTS
2020-05-27 21:51:18 +08:00
Ying Fang
863c2d9a26 spec: Update release version
increase release verison by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 17:55:44 +08:00
Ying Fang
79484a725d vtimer: Drop vtimer virtual timer adjust
This patch drops the vtimer virtual timer adjust, cross version migration
from openEuler qemu-4.0.1 to qemu-4.1.0 is not supported as a consequence.

By default openEuler qemu-4.1.0 use kvm_adjvtime as the virtual timer.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 17:54:00 +08:00
openeuler-ci-bot
3e65b9f2c0 !47 Compat vtimer for openEuler qemu v4.0.1 and v4.1.0
Merge pull request !47 from FangYing/openEuler-20.03-LTS
2020-05-27 12:56:19 +08:00
Ying Fang
56680863f3 spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fanging1@huawei.com>
2020-05-27 12:14:35 +08:00
Ying Fang
1461981236 migration: Compat virtual timer adjust for v4.0.1 and v4.1.0
Vtimer adjust is used in openEuler qemu-4.0.1, however kvm_adjvtime
is introduced in openEuler qemu-4.1.0. To maintain the compatibility
and enable cross version migration, let's enable vtimer adjust only
if kvm_adjvtime is not enabled, otherwise there may be conflicts
between vtimer adjust and kvm_adjvtime.

After this modification:
1: openEuler qemu-4.0.1 use vtimer as the default virtual timer
2: openEuler qemu-4.1.0 use kvm_adjvtime as the defaut virtual timer

Migration from openEuler qemu-4.0.1 to openEuler qemu-4.1.0 will
be ok, but migration path from upstream qemu-4.0.1 to openEuler
qemu-4..0.1 will be broken.

Since openEuler qemu-4.1.0, kvm_adjvtime is used as the default
virtual timer. So please upgrade to openEuler qemu-4.1.0 and
use the virt-4.1 machine.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:58 +08:00
Ying Fang
892f646185 hw/arm/virt: add missing compat for kvm-no-adjvtime
Machine compatibility for kvm-no-adjvtime is missed,
let's add it for virt machine 4.0, thus kvm-no-adjvtime
is supported in v4.1.0.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:48 +08:00
Ying Fang
1001a58940 vtimer: introduce the vtimer first used in v4.0.1
To support cross version migration, we had to add the vtimer back
which was introduced in openEuler qemu-4.0.1.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:37 +08:00
Ying Fang
52e260612c Revert: "vtimer: compat cross version migration from v4.0.1"
This reverts commit patch:
vtimer-compat-cross-version-migration-from-v4.0.1.patch

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:17 +08:00
openeuler-ci-bot
40b5784387 !45 [feature] Add some debug log in VM runtime path
Merge pull request !45 from FangYing/openEuler-20.03-LTS
2020-05-25 21:07:29 +08:00
Ying Fang
9fc44209ab spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 19:27:25 +08:00
Ying Fang
30364c2a3e log: Add some logs on VM runtime path
Add logs on VM runtime path, to make it easier to do trouble shooting.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 19:27:13 +08:00
openeuler-ci-bot
682a457d22 !43 fix CVE-2018-19665 and CVE-2019-15890
Merge pull request !43 from FangYing/openEuler-20.03-LTS
2020-05-22 14:03:17 +08:00
Leo Fang
26cae7937d CVE: Fix CVE-2018-19665
upstream url:
https://patchwork.kernel.org/patch/10688527/

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 12:29:21 +08:00
Ying Fang
ae206fbfdc CVE: Fix CVE-2019-15890
this patch fix CVE-2019-15890, upstream patch url:
https://gitlab.freedesktop.org/slirp/libslirp/commit/c5927943

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 12:27:56 +08:00
Ying Fang
6ca708e5c3 arm: drop redunt patch
Drop the redunt patch:
ARM-KVM-Check-KVM_CAP_ARM_IRQ_LINE_LAYOUT_2-for-smp_.patch

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 11:16:46 +08:00
openeuler-ci-bot
f19ebb0670 !42 Fix CVE-2020-7211
Merge pull request !42 from FangYing/openEuler-20.03-LTS
2020-05-15 17:49:19 +08:00
Ying Fang
4f814f3518 CVE: Fix CVE-2020-7211
backport from upstream:
14ec36e107

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 16:51:37 +08:00
openeuler-ci-bot
2a3c6ba49d !41 Fix CVE-2020-11869 and CVE-2019-20175
Merge pull request !41 from FangYing/openEuler-20.03-LTS
2020-05-15 16:30:51 +08:00
Ying Fang
e74fdc8bef spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:49:58 +08:00
Ying Fang
6fc286684c CVE: fix CVE-2020-11869
backport from qemu upstream:
https://git.qemu.org/?p=qemu.git;a=commit;h=ac2071c3791b67fc7af78b8ceb320c01ca1b5df7

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:47:11 +08:00
Ying Fang
ec1a227b48 CVE: fix CVE-2019-20175
backport patch from upstream:
https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ed78352a59ea7acf7520d4d47a96b9911bae7fc3

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:33:14 +08:00
XuYandong
29e83277d4 !40 arm64 add cpu cold plug support
Merge pull request !40 from yorifang/openEuler-20.03-LTS
2020-05-12 19:05:38 +08:00
Ying Fang
dd9af1f5f4 spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 17:24:19 +08:00
Keqian Zhu
c9fb301ff1 arm/virt: Support CPU cold plug
This adds CPU cold plug support to arm virt machine board.
CPU cold plug means adding CPU by using "-device xx-arm-cpu"
when we bring up Qemu.

Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
2020-05-12 17:19:50 +08:00
openeuler-ci-bot
8d736f8f78 !39 Rebase qemu to v4.1.0
Merge pull request !39 from FangYing/openEuler-20.03-LTS
2020-05-12 12:59:47 +08:00
Ying Fang
b46aa5167c spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:01 +08:00
Leo Fang
e352239c1d migration: fix some memleaks
Fix some memleaks for migration.

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
2020-05-12 11:33:01 +08:00
Ying Fang
39af0bd53c spec: Update release version
increase release version number by one

Singed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:01 +08:00
Ying Fang
7c553b71a4 vtimer: compat cross version migration from v4.0.1
vtimer feature was added to qemu v4.0.1 to record timer tick when vcpu
is stopped. However this feature is discared and the new virtual time
adjustment is introduced.

This patch add the missing vtimer parameter to ARMCPUState in order
to compat cross version migration fromm v4.0.1 openEuler 2003 lts release.

Singed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
Ying Fang
999a8108cb spec: Update release version
Increase release version number by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
zhengchuan
298c1ecc77 migration: backport migration patches from upstream
This series patches backport migration patches from upstream.
2020-05-12 11:33:00 +08:00
Keqian Zhu
785d06afe8 arm/virt: Add ACPI CPU hotplug support
This series is an attempt to provide CPU hotplug support on ARM
virt platform. This is based on ACPI GED device.

We should enable ACPI support, and use vGICv3 and 64bit CPU to
support CPU hotplug.

Under KVM accel, the KVM vCPUs is pre-created. Besides, vGIC IRIs
is pre-created too. However, QEMU vCPU objects are defer-created.

Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
2020-05-12 11:33:00 +08:00
Keqian Zhu
7265c59053 ARM virt: ACPI memory hotplug support
This series is an attempt to provide device memory hotplug support
on ARM virt platform. This is based on Eric's recent works here[1]
and carries some of the pc-dimm related patches dropped from his
series.

The kernel support for arm64 memory hot add was added recently by
Robin and hence the guest kernel should be => 5.0-rc1.

NVDIM support is not included currently as we still have an unresolved
issue while hot adding NVDIMM[2]. However NVDIMM cold plug patches
can be included, but not done for now, for keeping it simple.

This makes use of GED device to sent hotplug ACPI events to the
Guest. GED code is based on Nemu. Thanks to the efforts of Samuel and
Sebastien to add the hardware-reduced support to Nemu using GED
device[3]. (Please shout if I got the author/signed-off wrong for
those patches or missed any names).

This is sanity tested on a HiSilicon ARM64 platform and appreciate
any further testing.

Note:
Attempted adding dimm_pxm test case to bios-tables-test for arm/virt.
But noticed the issue decribed here[5]. This is under investigation
now.

upstream url: https://patchwork.kernel.org/cover/11150345/

Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
2020-05-12 11:33:00 +08:00
Ying Fang
8e45adc2e9 spec: Update release version
Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
Ying Fang
96149d7be3 target/arm/kvm: Adjust virtual time
v3:
 - Added a target/arm/kvm_arm.h comment cleanup patch (1/6)
 - Minor refactoring of assert_has_feature_enabled/disabled in 4/6,
   kept Richard's r-b.
 - Rewrote kvm-no-adjvtime documentation in 6/6.
 - Reworked approach in 5/6 to properly deal with migration and to
   track running vs. !running, rather than running vs. paused states.

v2:
 - Reworked it enough that I brought back the RFC tag and retitled the
   series. Also had to drop r-b's from a couple of patches, and even
   drop patches.
 - Changed approach from writing the QEMU virtual time to the guest
   vtime counter to saving and restoring the guest vtime counter.
 - Changed the kvm-adjvtime property, which was off by default, to a
   kvm-no-adjvtime property, which is also off by default, meaning the
   effective "adjust vtime" property is now on by default (but only
   for 5.0 virt machine types and later)

v1:
 - move from RFC status to v1
 - put kvm_arm_vm_state_change() in kvm.c to share among kvm32.c and kvm64.c
 - add r-b's from Richard

This series is inspired by a series[1] posted by Bijan Mottahedeh over
a year ago and by the patch[2] posted by Heyi Guo almost a year ago.
The problem described in the cover letter of [1] is easily reproducible
and some users would like to have the option to avoid it. However the
solution, which is to adjust the virtual counter each time the VM
transitions to the running state, introduces a different problem, which
is that the virtual and physical counters diverge. As described in the
cover letter of [1] this divergence is easily observed when comparing
the output of `date` and `hwclock` after suspending the guest, waiting
a while, and then resuming it. Because this different problem may actually
be worse for some users, unlike [1], the series posted here makes the
virtual counter adjustment optional. Besides the adjustment being
optional, this series approaches the needed changes differently to apply
them in more appropriate locations.

Additional notes
----------------

Note 1
------

As described above, when running a guest with kvm-no-adjtime disabled
it will be less likely the guest OS and guest applications get surprise
time jumps when they use the virtual counter.  However the counter will
no longer reflect real time.  It will lag behind.  If this is a problem
then the guest can resynchronize its time from an external source or
even from its physical counter.  If the suspend/resume is done with
libvirt's virsh, and the guest is running the guest agent, then it's
also possible to use a sequence like this

 $ virsh suspend $GUEST
 $ virsh resume $GUEST
 $ virsh domtime --sync $GUEST

in order to resynchronize a guest right after the resume.  Of course
there will still be time when the clock is not right, possibly creating
confusing timestamps in logs, for example, and the guest must still be
tolerant to the time synchronizations.

Note 2
------

Userspace that wants to set KVM_REG_ARM_TIMER_CNT should beware that
the KVM register ID is not correct.  This cannot be fixed because it's
UAPI and if the UAPI headers are used then it can't be a problem.
However, if a userspace attempts to create the ID themselves from the
register's specification, then they will get KVM_REG_ARM_TIMER_CVAL
instead, as the _CNT and _CVAL definitions have their register
parameters swapped.

Note 3
------

I didn't test this with a 32-bit KVM host, but the changes to kvm32.c
are the same as kvm64.c. So what could go wrong? Test results would be
appreciated.

[1] https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg05713.html
[2] https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg03695.html

upstream url:
https://patchwork.kernel.org/cover/11341629/
2020-05-12 11:33:00 +08:00
Ying Fang
38fe554b56 spec: Add release number by one
Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
Ying Fang
4ed2e8773c Backport: backport form upstream stable v4.1.1
This patch backports bugfix patch series from qemu upstream v4.1.1

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
Ying Fang
0b90f5bb05 Rebase qemu to 4.1.0 version
Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 11:33:00 +08:00
openeuler-ci-bot
4c55cf2f58 !36 [bugfix] nbd: backport nbd fix from qemu upstream
Merge pull request !36 from panny060/openEuler-20.03-LTS
2020-04-26 09:46:19 +08:00
Pan Nengyuan
527d495377 nbd: backport nbd fix from qemu upstream
-nbd: Fix regression with multiple meta contexts

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
2020-04-24 16:34:27 +08:00
openeuler-ci-bot
5d35483efb !34 Fix CVE-2020-1983
Merge pull request !34 from FangYing/openEuler-20.03-LTS
2020-04-24 15:45:48 +08:00
Ying Fang
a83a262a67 slirp: Fix CVE-2020-1983
upstream url:
9bd6c59132

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-04-24 15:10:23 +08:00
openeuler-ci-bot
55d6e334dc !30 asyn-fix-qemu-hang-PR-for-LTS-branch
Merge pull request !30 from FangYing/openEuler-20.03-LTS
2020-04-14 08:41:44 +08:00
Ying Fang
235154df9e async: Fix qemu main thread hang on weak ordered platfrom
aio-wait: delegate polling of main AioContext if BQL not held
upstream_url: https://patchwork.kernel.org/patch/11482099/

async: use explicit memory barriers
upstream_url: https://patchwork.kernel.org/patch/11482103/

Signed-off-by: Ying Fang <fanging1@huawei.com>
2020-04-11 08:52:38 +08:00
openeuler-ci-bot
890f828d19 !25 Add pcie-root-port fast hotplg/unplug feature
Merge pull request !25 from FangYing/pcie-hotplug-unplug
2020-03-18 17:56:19 +08:00