From patchwork Tue Dec 11 15:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lindsay X-Patchwork-Id: 1011141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=os.amperecomputing.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amperemail.onmicrosoft.com header.i=@amperemail.onmicrosoft.com header.b="L1pyT9XV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43DkFk5769z9s6w for ; Wed, 12 Dec 2018 02:22:18 +1100 (AEDT) Received: from localhost ([::1]:38627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWjrT-0004jK-Kq for incoming@patchwork.ozlabs.org; Tue, 11 Dec 2018 10:22:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWjpn-0003sa-Sy for qemu-devel@nongnu.org; Tue, 11 Dec 2018 10:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWjpm-0001Rx-OH for qemu-devel@nongnu.org; Tue, 11 Dec 2018 10:20:31 -0500 Received: from mail-eopbgr710107.outbound.protection.outlook.com ([40.107.71.107]:42240 helo=NAM05-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWjpk-00018w-47; Tue, 11 Dec 2018 10:20:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amperemail.onmicrosoft.com; s=selector1-os-amperecomputing-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bCGijUgPPQCwMo4ui9qVskI+ONO5XPCxVc/TwlxAEtI=; b=L1pyT9XVTl7mYYpx/skLViKGz64w/sMKcgcO5dJcQR8rrn3+ytqju7EwtjUGsv88aLX8eIYcJOdiD47YwG/Li2FwtTlzqkqjaqPlEb8xQz2Ud5iTyC36L7+lWQ/6PdM5f9Ykex0CmjLlKEu6k9CokrpSvOZJvbOoSf+jAl05O/g= Received: from DM6PR01MB4825.prod.exchangelabs.com (20.177.218.222) by DM6PR01MB4379.prod.exchangelabs.com (20.177.221.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.18; Tue, 11 Dec 2018 15:20:18 +0000 Received: from DM6PR01MB4825.prod.exchangelabs.com ([fe80::9c7c:27c7:4cb7:f820]) by DM6PR01MB4825.prod.exchangelabs.com ([fe80::9c7c:27c7:4cb7:f820%2]) with mapi id 15.20.1404.026; Tue, 11 Dec 2018 15:20:18 +0000 From: Aaron Lindsay To: "qemu-arm@nongnu.org" , Peter Maydell , Alistair Francis , Wei Huang , Peter Crosthwaite , Richard Henderson Thread-Topic: [PATCH v10 03/14] target/arm: Swap PMU values before/after migrations Thread-Index: AQHUkWUGUY0t6Xr9CEu/h5Xc9eW7kg== Date: Tue, 11 Dec 2018 15:20:18 +0000 Message-ID: <20181211151945.29137-4-aaron@os.amperecomputing.com> References: <20181211151945.29137-1-aaron@os.amperecomputing.com> In-Reply-To: <20181211151945.29137-1-aaron@os.amperecomputing.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0041.namprd11.prod.outlook.com (2603:10b6:a03:80::18) To DM6PR01MB4825.prod.exchangelabs.com (2603:10b6:5:6b::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aaron@os.amperecomputing.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [65.190.6.212] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM6PR01MB4379; 6:6vi1S4kXczT2FJ8PRVbWr4m0IIpA9NIszXFNf6MJ2HPbuLHlS21dCVSRwUOhLeWK+nVP+kloZRQUxFQMeoKiXPdzwSH13V4uB7kNLr7QkLV/6ofib2e9fhBcD2Z7j5fFNl3mtMjhHTLjC9QbEwrKU3ir1KCtcDb1KDGAdUL7N1yTjROU+H9ikvjlUcUuri5oP9AOxQZfspJdbjPQ2zvdc5e7kridQDD5INIZZlK8HlD+77w2JpaP7EaMCA6g4pwSL3LzjIDuqBVzgCxqAVJR00P6EC5+ftrU+yKEK06Mr8orE7rQZAq+w1Zqs4fEiN1091XSRu7GYk+qSkeQO9EMKxsQv6QCNroMKRqfWXSmKFguIieuv06hevTryO6w0YOsIe45FHni5oKoPVhb+IW97qBhUM/GAMVO0ZgPzzqw5lW+XfSuu/9Iutw+yEGdTD4h7VgxGgIDvXV5xT3iphYZAQ==; 5:vLtdXG0XB6gHAQ/UvQtMB0u+mmx/7+Vw2hmvDjn2YlL7Jmgr0ph7Uj2bn7wqbtS6HRyMwFIhK2KqMuDzfqxG6z5pvLiWPaOa1B2//K9Hcskmdv92k5P0swZS5S0oOqHRLEdYZk2s3yklcf8EgSEcoMs3s3baqPNXjes/j9HEPgw=; 7:VfiXMJ3CQo/0DkSWNjoXdiYgS+YPTMDdMEUbz2SGxPGHPwSERj+1J+gR2ACPAzVyLHNjO1UYXQC/9A/myIPXwdkZO3YoIhgvTqzc6/Xan9Bp2xpmYoGZXA+PrYB1Dj6NSPWODK/TcI6Xe3cJ22lIIg== x-ms-office365-filtering-correlation-id: 72742aa1-3e46-449f-735b-08d65f7c287c x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DM6PR01MB4379; x-ms-traffictypediagnostic: DM6PR01MB4379: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231455)(999002)(944501520)(52105112)(93006095)(93001095)(10201501046)(3002001)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:DM6PR01MB4379; BCL:0; PCL:0; RULEID:; SRVR:DM6PR01MB4379; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(136003)(39850400004)(396003)(346002)(376002)(189003)(199004)(4326008)(26005)(81166006)(81156014)(71200400001)(71190400001)(106356001)(6436002)(66066001)(14454004)(68736007)(3846002)(2501003)(102836004)(8936002)(6486002)(8676002)(97736004)(6116002)(186003)(446003)(99286004)(476003)(11346002)(2616005)(25786009)(7416002)(486006)(7736002)(54906003)(305945005)(39060400002)(478600001)(14444005)(256004)(52116002)(2906002)(386003)(1076002)(6506007)(105586002)(76176011)(6512007)(575784001)(86362001)(53936002)(5660300001)(316002)(110136005); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR01MB4379; H:DM6PR01MB4825.prod.exchangelabs.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:0; received-spf: None (protection.outlook.com: os.amperecomputing.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: zsTVn19FBUfJArGGzV9ZHIcl5pAaapG6Yu55cqcG7x4QXJ8wro00W6ATg72aoK2kPHy9K/CKkAikA/jGNeuGPM/FDnJllFbosDhOrZ18i+jpGz3T6T7/pmckDxoGWR+TcNqA8nnOol4pqAADT6JBrz8Ol16o+8rN8ML5WSPBr+pYTV/9pOm7WqtW7IDqMQf3LX1lGtf1y/+xrSvSfXrQOIesIRrVog9C5+nIzZhPY1vPdYRLISCGPWIzGt3zDMYhdigxsbESeDuXbPhz5rBBzOai9HR35ypsxmK+76dVNm+Po0pM5n2xd+HUzaVbLjA7 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72742aa1-3e46-449f-735b-08d65f7c287c X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 15:20:18.1988 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB4379 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.71.107 Subject: [Qemu-devel] [PATCH v10 03/14] target/arm: Swap PMU values before/after migrations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aaron Lindsay , Aaron Lindsay , Michael Spradling , "qemu-devel@nongnu.org" , Digant Desai Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Because of the PMU's design, many register accesses have side effects which are inter-related, meaning that the normal method of saving CP registers can result in inconsistent state. These side-effects are largely handled in pmu_op_start/finish functions which can be called before and after the state is saved/restored. By doing this and adding raw read/write functions for the affected registers, we avoid migration-related inconsistencies. Signed-off-by: Aaron Lindsay Signed-off-by: Aaron Lindsay Reviewed-by: Peter Maydell --- target/arm/helper.c | 6 ++++-- target/arm/machine.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 497907fc79..71a5c71e0a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1450,11 +1450,13 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 0, .access = PL0_RW, .accessfn = pmreg_access_ccntr, .type = ARM_CP_IO, - .readfn = pmccntr_read, .writefn = pmccntr_write, }, + .fieldoffset = offsetof(CPUARMState, cp15.c15_ccnt), + .readfn = pmccntr_read, .writefn = pmccntr_write, + .raw_readfn = raw_read, .raw_writefn = raw_write, }, #endif { .name = "PMCCFILTR_EL0", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 15, .opc2 = 7, - .writefn = pmccfiltr_write, + .writefn = pmccfiltr_write, .raw_writefn = raw_write, .access = PL0_RW, .accessfn = pmreg_access, .type = ARM_CP_IO, .fieldoffset = offsetof(CPUARMState, cp15.pmccfiltr_el0), diff --git a/target/arm/machine.c b/target/arm/machine.c index 7a22ebc209..b292549614 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -620,6 +620,10 @@ static int cpu_pre_save(void *opaque) { ARMCPU *cpu = opaque; + if (!kvm_enabled()) { + pmu_op_start(&cpu->env); + } + if (kvm_enabled()) { if (!write_kvmstate_to_list(cpu)) { /* This should never fail */ @@ -641,6 +645,17 @@ static int cpu_pre_save(void *opaque) return 0; } +static int cpu_post_save(void *opaque) +{ + ARMCPU *cpu = opaque; + + if (!kvm_enabled()) { + pmu_op_finish(&cpu->env); + } + + return 0; +} + static int cpu_pre_load(void *opaque) { ARMCPU *cpu = opaque; @@ -653,6 +668,10 @@ static int cpu_pre_load(void *opaque) */ env->irq_line_state = UINT32_MAX; + if (!kvm_enabled()) { + pmu_op_start(&cpu->env); + } + return 0; } @@ -721,6 +740,10 @@ static int cpu_post_load(void *opaque, int version_id) hw_breakpoint_update_all(cpu); hw_watchpoint_update_all(cpu); + if (!kvm_enabled()) { + pmu_op_finish(&cpu->env); + } + return 0; } @@ -729,6 +752,7 @@ const VMStateDescription vmstate_arm_cpu = { .version_id = 22, .minimum_version_id = 22, .pre_save = cpu_pre_save, + .post_save = cpu_post_save, .pre_load = cpu_pre_load, .post_load = cpu_post_load, .fields = (VMStateField[]) {