mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
ppc patch queue 2016-07-29
Here are the current pending ppc and spapr related patches for qemu-2.7. Given the freeze status, these are all bugfixes, with two exceptions: * There's some final rework of the vcpu hotplug model. Specifically we add spapr specific code on the generic basis Igor established to make cpu_index stable for pseries-2.7 and later machine types. - This allows us to remove the limitation that cpu cores had to be inserted in linear order, and removed in LIFO order. - This is worth merging this late in 2.7 because it will avoid considerable future grief with management layers needing to discover whether out-of-order hotplug is possible, amongst other things. - For now we do add a constraint that the initial cpu cannot be unplugged. * We add two extra testcases to make check, for postcopy and drive_del on ppc64. - Not strictly bugfixes, but safe, because they don't affect the actual code, and increase test coverage. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXmuB6AAoJEGw4ysog2bOSboIQANFAPB5c33cgRv1Fe2csqHor Z3VfjP72/sittYxEHVwhxnbmzCHpYb0KN2AZTrHBjXkryWZR/yjXDebiV9HM7NCy BOA8euberkfyde3HYptcviaqypmnHOZqcJicx1+jtTG2iKSGb8HVeM5KO3a6aKvQ 6yGngUy8NCMrVmGPNlG/Q2Y8wkGVDbr8A2h6xJGJKC8Ol+IV3WNCaZIXLst/2q/O UbYr1thoWG32nAu4asUOg6rExfirjcr16hYEbDzREnhUK4AYykosmeOw1kRg/Oki JVVFhRlgEsZ4htLBtenBv+MLPoFWXY2PHp90Lx5ITLkLwmfgxmoRgaQvBYlcJNSA Jt7j4THhHw0ppPGrQf4L0M3wt+peyvNo4IGbaeAojamctnu9b6TLEjbhiDd66onB bgPy3Diwti+vRt2k1q0CSwB+mlUbS1TisK0y1BG1ob9TbtWfZRVDRCVuTJI0fzX7 cneaOzKu660pct06ciOTb0TSrvdhNYehBpHHm4pdzc8kU0mRJpPhhX38iCPMyTA3 eTGLOYyz6sHQjwvys6/TtDm8A+5Aot65WW0Y1OpM9iLx+20lRE/KLzmYtC+GB4T3 KjdRLNzKaC+CAbc/c1zBQvPIPW95Le9Pmq87ZZUovg8UXt8RdSldzpg98krHfLoG itDVvgUwydTbzXABOTFY =t6gz -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160729' into staging ppc patch queue 2016-07-29 Here are the current pending ppc and spapr related patches for qemu-2.7. Given the freeze status, these are all bugfixes, with two exceptions: * There's some final rework of the vcpu hotplug model. Specifically we add spapr specific code on the generic basis Igor established to make cpu_index stable for pseries-2.7 and later machine types. - This allows us to remove the limitation that cpu cores had to be inserted in linear order, and removed in LIFO order. - This is worth merging this late in 2.7 because it will avoid considerable future grief with management layers needing to discover whether out-of-order hotplug is possible, amongst other things. - For now we do add a constraint that the initial cpu cannot be unplugged. * We add two extra testcases to make check, for postcopy and drive_del on ppc64. - Not strictly bugfixes, but safe, because they don't affect the actual code, and increase test coverage. # gpg: Signature made Fri 29 Jul 2016 05:50:02 BST # gpg: using RSA key 0x6C38CACA20D9B392 # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" # gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" # gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.7-20160729: tests: add drive_del-test to ppc/ppc64 spapr: Prevent boot CPU core removal ppc: Fix fault PC reporting for lve*/stve* VMX instructions test: port postcopy test to ppc64 Revert "spapr: Ensure CPU cores are added contiguously and removed in LIFO order" spapr: init CPUState->cpu_index with index relative to core-id Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
df2c35902e
|
@ -125,7 +125,6 @@ static void spapr_core_release(DeviceState *dev, void *opaque)
|
|||
void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||
Error **errp)
|
||||
{
|
||||
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
||||
CPUCore *cc = CPU_CORE(dev);
|
||||
int smt = kvmppc_smt_threads();
|
||||
int index = cc->core_id / smp_threads;
|
||||
|
@ -133,16 +132,12 @@ void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||
spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index * smt);
|
||||
sPAPRDRConnectorClass *drck;
|
||||
Error *local_err = NULL;
|
||||
int spapr_max_cores = max_cpus / smp_threads;
|
||||
int i;
|
||||
|
||||
for (i = spapr_max_cores - 1; i > index; i--) {
|
||||
if (spapr->cores[i]) {
|
||||
error_setg(errp, "core-id %d should be removed first",
|
||||
i * smp_threads);
|
||||
return;
|
||||
}
|
||||
if (index == 0) {
|
||||
error_setg(errp, "Boot CPU core may not be unplugged");
|
||||
return;
|
||||
}
|
||||
|
||||
g_assert(drc);
|
||||
|
||||
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
|
||||
|
@ -224,7 +219,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(OBJECT(hotplug_dev));
|
||||
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
||||
int spapr_max_cores = max_cpus / smp_threads;
|
||||
int index, i;
|
||||
int index;
|
||||
Error *local_err = NULL;
|
||||
CPUCore *cc = CPU_CORE(dev);
|
||||
char *base_core_type = spapr_get_cpu_core_type(machine->cpu_model);
|
||||
|
@ -261,14 +256,6 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < index; i++) {
|
||||
if (!spapr->cores[i]) {
|
||||
error_setg(&local_err, "core-id %d should be added first",
|
||||
i * smp_threads);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
g_free(base_core_type);
|
||||
error_propagate(errp, local_err);
|
||||
|
@ -307,9 +294,13 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
|||
sc->threads = g_malloc0(size * cc->nr_threads);
|
||||
for (i = 0; i < cc->nr_threads; i++) {
|
||||
char id[32];
|
||||
CPUState *cs;
|
||||
|
||||
obj = sc->threads + i * size;
|
||||
|
||||
object_initialize(obj, size, typename);
|
||||
cs = CPU(obj);
|
||||
cs->cpu_index = cc->core_id + i;
|
||||
snprintf(id, sizeof(id), "thread[%d]", i);
|
||||
object_property_add_child(OBJECT(sc), id, obj, &local_err);
|
||||
if (local_err) {
|
||||
|
|
|
@ -232,16 +232,16 @@ target_ulong helper_lscbx(CPUPPCState *env, target_ulong addr, uint32_t reg,
|
|||
\
|
||||
if (needs_byteswap(env)) { \
|
||||
r->element[LO_IDX ? index : (adjust - index)] = \
|
||||
swap(access(env, addr)); \
|
||||
swap(access(env, addr, GETPC())); \
|
||||
} else { \
|
||||
r->element[LO_IDX ? index : (adjust - index)] = \
|
||||
access(env, addr); \
|
||||
access(env, addr, GETPC()); \
|
||||
} \
|
||||
}
|
||||
#define I(x) (x)
|
||||
LVE(lvebx, cpu_ldub_data, I, u8)
|
||||
LVE(lvehx, cpu_lduw_data, bswap16, u16)
|
||||
LVE(lvewx, cpu_ldl_data, bswap32, u32)
|
||||
LVE(lvebx, cpu_ldub_data_ra, I, u8)
|
||||
LVE(lvehx, cpu_lduw_data_ra, bswap16, u16)
|
||||
LVE(lvewx, cpu_ldl_data_ra, bswap32, u32)
|
||||
#undef I
|
||||
#undef LVE
|
||||
|
||||
|
@ -259,16 +259,17 @@ LVE(lvewx, cpu_ldl_data, bswap32, u32)
|
|||
\
|
||||
if (needs_byteswap(env)) { \
|
||||
access(env, addr, swap(r->element[LO_IDX ? index : \
|
||||
(adjust - index)])); \
|
||||
(adjust - index)]), \
|
||||
GETPC()); \
|
||||
} else { \
|
||||
access(env, addr, r->element[LO_IDX ? index : \
|
||||
(adjust - index)]); \
|
||||
(adjust - index)], GETPC()); \
|
||||
} \
|
||||
}
|
||||
#define I(x) (x)
|
||||
STVE(stvebx, cpu_stb_data, I, u8)
|
||||
STVE(stvehx, cpu_stw_data, bswap16, u16)
|
||||
STVE(stvewx, cpu_stl_data, bswap32, u32)
|
||||
STVE(stvebx, cpu_stb_data_ra, I, u8)
|
||||
STVE(stvehx, cpu_stw_data_ra, bswap16, u16)
|
||||
STVE(stvewx, cpu_stl_data_ra, bswap32, u32)
|
||||
#undef I
|
||||
#undef LVE
|
||||
|
||||
|
|
|
@ -259,6 +259,8 @@ check-qtest-arm-y += tests/virtio-blk-test$(EXESUF)
|
|||
gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
|
||||
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
||||
check-qtest-ppc64-y += tests/boot-order-test$(EXESUF)
|
||||
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
|
||||
check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)
|
||||
check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
|
||||
gcov-files-ppc64-y += ppc64-softmmu/hw/ppc/spapr_pci.c
|
||||
check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
||||
|
@ -268,6 +270,7 @@ check-qtest-sparc-y += tests/prom-env-test$(EXESUF)
|
|||
#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
|
||||
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
||||
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
|
||||
check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)
|
||||
|
||||
check-qtest-generic-y += tests/qom-test$(EXESUF)
|
||||
|
||||
|
|
|
@ -115,7 +115,8 @@ int main(int argc, char **argv)
|
|||
qtest_add_func("/drive_del/without-dev", test_drive_without_dev);
|
||||
|
||||
/* TODO I guess any arch with PCI would do */
|
||||
if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
|
||||
if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64") ||
|
||||
!strcmp(arch, "ppc") || !strcmp(arch, "ppc64")) {
|
||||
qtest_add_func("/drive_del/after_failed_device_add",
|
||||
test_after_failed_device_add);
|
||||
qtest_add_func("/blockdev/drive_del_device_del",
|
||||
|
|
|
@ -18,6 +18,9 @@
|
|||
#include "qemu/sockets.h"
|
||||
#include "sysemu/char.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "hw/nvram/openbios_firmware_abi.h"
|
||||
|
||||
#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
|
||||
|
||||
const unsigned start_address = 1024 * 1024;
|
||||
const unsigned end_address = 100 * 1024 * 1024;
|
||||
|
@ -122,6 +125,44 @@ unsigned char bootsect[] = {
|
|||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa
|
||||
};
|
||||
|
||||
static void init_bootfile_x86(const char *bootpath)
|
||||
{
|
||||
FILE *bootfile = fopen(bootpath, "wb");
|
||||
|
||||
g_assert_cmpint(fwrite(bootsect, 512, 1, bootfile), ==, 1);
|
||||
fclose(bootfile);
|
||||
}
|
||||
|
||||
static void init_bootfile_ppc(const char *bootpath)
|
||||
{
|
||||
FILE *bootfile;
|
||||
char buf[MIN_NVRAM_SIZE];
|
||||
struct OpenBIOS_nvpart_v1 *header = (struct OpenBIOS_nvpart_v1 *)buf;
|
||||
|
||||
memset(buf, 0, MIN_NVRAM_SIZE);
|
||||
|
||||
/* Create a "common" partition in nvram to store boot-command property */
|
||||
|
||||
header->signature = OPENBIOS_PART_SYSTEM;
|
||||
memcpy(header->name, "common", 6);
|
||||
OpenBIOS_finish_partition(header, MIN_NVRAM_SIZE);
|
||||
|
||||
/* FW_MAX_SIZE is 4MB, but slof.bin is only 900KB,
|
||||
* so let's modify memory between 1MB and 100MB
|
||||
* to do like PC bootsector
|
||||
*/
|
||||
|
||||
sprintf(buf + 16,
|
||||
"boot-command=hex .\" _\" begin %x %x do i c@ 1 + i c! 1000 +loop "
|
||||
".\" B\" 0 until", end_address, start_address);
|
||||
|
||||
/* Write partition to the NVRAM file */
|
||||
|
||||
bootfile = fopen(bootpath, "wb");
|
||||
g_assert_cmpint(fwrite(buf, MIN_NVRAM_SIZE, 1, bootfile), ==, 1);
|
||||
fclose(bootfile);
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for some output in the serial output file,
|
||||
* we get an 'A' followed by an endless string of 'B's
|
||||
|
@ -131,10 +172,29 @@ static void wait_for_serial(const char *side)
|
|||
{
|
||||
char *serialpath = g_strdup_printf("%s/%s", tmpfs, side);
|
||||
FILE *serialfile = fopen(serialpath, "r");
|
||||
const char *arch = qtest_get_arch();
|
||||
int started = (strcmp(side, "src_serial") == 0 &&
|
||||
strcmp(arch, "ppc64") == 0) ? 0 : 1;
|
||||
|
||||
do {
|
||||
int readvalue = fgetc(serialfile);
|
||||
|
||||
if (!started) {
|
||||
/* SLOF prints its banner before starting test,
|
||||
* to ignore it, mark the start of the test with '_',
|
||||
* ignore all characters until this marker
|
||||
*/
|
||||
switch (readvalue) {
|
||||
case '_':
|
||||
started = 1;
|
||||
break;
|
||||
case EOF:
|
||||
fseek(serialfile, 0, SEEK_SET);
|
||||
usleep(1000);
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
switch (readvalue) {
|
||||
case 'A':
|
||||
/* Fine */
|
||||
|
@ -147,6 +207,8 @@ static void wait_for_serial(const char *side)
|
|||
return;
|
||||
|
||||
case EOF:
|
||||
started = (strcmp(side, "src_serial") == 0 &&
|
||||
strcmp(arch, "ppc64") == 0) ? 0 : 1;
|
||||
fseek(serialfile, 0, SEEK_SET);
|
||||
usleep(1000);
|
||||
break;
|
||||
|
@ -295,32 +357,48 @@ static void test_migrate(void)
|
|||
char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
|
||||
QTestState *global = global_qtest, *from, *to;
|
||||
unsigned char dest_byte_a, dest_byte_b, dest_byte_c, dest_byte_d;
|
||||
gchar *cmd;
|
||||
gchar *cmd, *cmd_src, *cmd_dst;
|
||||
QDict *rsp;
|
||||
|
||||
char *bootpath = g_strdup_printf("%s/bootsect", tmpfs);
|
||||
FILE *bootfile = fopen(bootpath, "wb");
|
||||
const char *arch = qtest_get_arch();
|
||||
|
||||
got_stop = false;
|
||||
g_assert_cmpint(fwrite(bootsect, 512, 1, bootfile), ==, 1);
|
||||
fclose(bootfile);
|
||||
|
||||
cmd = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
|
||||
" -name pcsource,debug-threads=on"
|
||||
" -serial file:%s/src_serial"
|
||||
" -drive file=%s,format=raw",
|
||||
tmpfs, bootpath);
|
||||
from = qtest_start(cmd);
|
||||
g_free(cmd);
|
||||
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
||||
init_bootfile_x86(bootpath);
|
||||
cmd_src = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
|
||||
" -name pcsource,debug-threads=on"
|
||||
" -serial file:%s/src_serial"
|
||||
" -drive file=%s,format=raw",
|
||||
tmpfs, bootpath);
|
||||
cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
|
||||
" -name pcdest,debug-threads=on"
|
||||
" -serial file:%s/dest_serial"
|
||||
" -drive file=%s,format=raw"
|
||||
" -incoming %s",
|
||||
tmpfs, bootpath, uri);
|
||||
} else if (strcmp(arch, "ppc64") == 0) {
|
||||
init_bootfile_ppc(bootpath);
|
||||
cmd_src = g_strdup_printf("-machine accel=kvm:tcg -m 256M"
|
||||
" -name pcsource,debug-threads=on"
|
||||
" -serial file:%s/src_serial"
|
||||
" -drive file=%s,if=pflash,format=raw",
|
||||
tmpfs, bootpath);
|
||||
cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 256M"
|
||||
" -name pcdest,debug-threads=on"
|
||||
" -serial file:%s/dest_serial"
|
||||
" -incoming %s",
|
||||
tmpfs, uri);
|
||||
} else {
|
||||
g_assert_not_reached();
|
||||
}
|
||||
|
||||
cmd = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
|
||||
" -name pcdest,debug-threads=on"
|
||||
" -serial file:%s/dest_serial"
|
||||
" -drive file=%s,format=raw"
|
||||
" -incoming %s",
|
||||
tmpfs, bootpath, uri);
|
||||
to = qtest_init(cmd);
|
||||
g_free(cmd);
|
||||
from = qtest_start(cmd_src);
|
||||
g_free(cmd_src);
|
||||
|
||||
to = qtest_init(cmd_dst);
|
||||
g_free(cmd_dst);
|
||||
|
||||
global_qtest = from;
|
||||
rsp = qmp("{ 'execute': 'migrate-set-capabilities',"
|
||||
|
|
Loading…
Reference in a new issue