From patchwork Wed Jan 23 19:59:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lindsay X-Patchwork-Id: 10777789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C55586C2 for ; Wed, 23 Jan 2019 20:05:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BCF32C830 for ; Wed, 23 Jan 2019 20:05:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F9B52C851; Wed, 23 Jan 2019 20:05:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 07F182C830 for ; Wed, 23 Jan 2019 20:05:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:40953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmOlf-0000U5-7N for patchwork-qemu-devel@patchwork.kernel.org; Wed, 23 Jan 2019 15:04:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmOje-0007Dd-DI for qemu-devel@nongnu.org; Wed, 23 Jan 2019 15:02:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmOgd-0004Ui-Jl for qemu-devel@nongnu.org; Wed, 23 Jan 2019 14:59:48 -0500 Received: from mail-eopbgr800125.outbound.protection.outlook.com ([40.107.80.125]:61120 helo=NAM03-DM3-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 1gmOga-0004PS-HL; Wed, 23 Jan 2019 14:59:46 -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=md8yN09mreSAhprAyFKdmf4eTI2cw1Em7gYuSND9oDo=; b=FJeMbb/SitfwZ+rq38CllYuINimeFuin6JceQixK+zs2Zt0Ml5HuMspWc7Z42C9LJNEboLJ56u9r7yNoobBTlbgRKYcX2XouuMYTf1m3AwIgtx56UXab/5fA9bxr+5szbqVQzfGIRQWuTsvMV0KgtxdEfKDgSaDDXLysA/F4EDg= Received: from DM6PR01MB4825.prod.exchangelabs.com (20.177.218.222) by DM6PR01MB5034.prod.exchangelabs.com (20.176.120.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Wed, 23 Jan 2019 19:59:36 +0000 Received: from DM6PR01MB4825.prod.exchangelabs.com ([fe80::8054:2484:c74a:d082]) by DM6PR01MB4825.prod.exchangelabs.com ([fe80::8054:2484:c74a:d082%3]) with mapi id 15.20.1558.016; Wed, 23 Jan 2019 19:59:36 +0000 From: Aaron Lindsay OS To: "qemu-arm@nongnu.org" , Peter Maydell , Alistair Francis , Wei Huang , Peter Crosthwaite , Richard Henderson Thread-Topic: [PATCH] target/arm: Don't clear supported PMU events when initializing PMCEID1 Thread-Index: AQHUs1Yq7R34PkeQFUa1wl27sGQrPg== Date: Wed, 23 Jan 2019 19:59:36 +0000 Message-ID: <20190123195814.29253-1-aaron@os.amperecomputing.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CY1PR07CA0033.namprd07.prod.outlook.com (2a01:111:e400:c60a::43) 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-mailer: git-send-email 2.20.1 x-originating-ip: [216.85.170.152] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM6PR01MB5034; 6:LBhFGl8zz0SBzGYUU2X9IU19n65Ip1EwlGl4UtQHgk4DQJwuLcxVQDTMd6gcGrb4YaRTY2E22l+Jp2VGChR06wxrapkIw59eXVkUJvYJpd831SGHZDZJrf+3pBeGzRpht1dMjYxiaBWKP8ur57SnWFNPPMf51pczBdaoDKnA5FkqzLvWg1AkrmlEWNSTJPt9gFpTGFaieVAXBLzczvVIEN7ge5xjmwHd+rEvQ6Fc3o541zwmcbfYmkkX+v51S+MWPuzaxDqpQGkiiOOvdb3FsJrF3LO1P2B5kz1C69tMWEb/NYIvJB1UySOkEq0IsH/6Ajm7DMF/lCPO7eEdn1kEvynXFUfwobzox0FWjG0o7BvC+FvbU/uSzfbb9lKzk7klHVg2/O7r9UaGtwd6mdf1/mDESxORDyvih9O/fbJW4LP4IImxOxBZWQ7yBkEULEHSGEKa3/cRhq3VwVjzs/O7vA==; 5:p2IMiwQcah+xgJjUsDUyRcRPfWPpqBNUuvAOsrY1/e6UOwZd8aLr9XcjdsyJD+8RTHP3iZIBMTubIm+prwdoFGvDD/Zv7vLg4ZPy/MG0htqIQVTVJfDY2aXwEXonP7qSyleFJDb9c6Hw0+4+kI38PNg7jz2HVG3Ph1XBeQe8XmuYoe8ntY4aNJ6xuJPqOMWbNnPhfEH8Slgbz0pohtJSXw==; 7:wKJVNmLa6XhDk9WTH3jQsgLBAUEXZnmLXY/iRcBilNZKnUO7fCphsPTY3bKLoL5ek27njcQm6SlvJj4ivfw2ofq8zGPprkTQMvg0Ij6CId/8oDCVWyM9JRTPis3eDmGig0crcaeWbOM+eeSyMpumJA== x-ms-office365-filtering-correlation-id: df7f4fb7-deb9-4d43-b3c8-08d6816d4cac x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DM6PR01MB5034; x-ms-traffictypediagnostic: DM6PR01MB5034: x-microsoft-antispam-prvs: x-forefront-prvs: 0926B0E013 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(136003)(39840400004)(396003)(376002)(199004)(189003)(6486002)(186003)(478600001)(6436002)(110136005)(102836004)(316002)(2501003)(54906003)(7736002)(99286004)(2616005)(486006)(305945005)(476003)(86362001)(52116002)(6512007)(26005)(39060400002)(107886003)(25786009)(97736004)(3846002)(81166006)(14454004)(6116002)(106356001)(2906002)(71190400001)(71200400001)(4326008)(68736007)(8676002)(1076003)(81156014)(66066001)(6506007)(386003)(8936002)(256004)(50226002)(53936002)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR01MB5034; H:DM6PR01MB4825.prod.exchangelabs.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; MX:1; received-spf: None (protection.outlook.com: os.amperecomputing.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 2gfZr5MQ9AfXbndld5Y4Kspu9L173y7s3MfCPtspKRxjcQr90k9myxjb9Nry77tg20GrO0W/1m8PiATfnptSM4+jL2arjNB6fPsoQK4ZESPeOkK6asP4SrA18eBGqJGXdK33Dyjn+DslB18784UYehtkVYS731WHZ6wayXB/cmKdm2KMnABBzfm29+wbCpILFWPWMkzB8LZFeUCvYCWXPS7Ixa9W/2Mx6pj6sa5TxA5+vQQhK3gliA2TnxYnlnVeAalAPaIMKaELJIscYptPVEcvbnR4PPT6UTYjUABu7Rcunzwf5UlhPKdGaP1JbfdmqGvr+aP6atpC3AE8ktUfPPJbF0HXKdMaRtTCsyMMv5+zP1OOdu+dJemVsPKcM1uguYk/SMi46ioSmmnjjmZU6GoYZiCZw7vOApv5frTuxDo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: df7f4fb7-deb9-4d43-b3c8-08d6816d4cac X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2019 19:59:34.7892 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB5034 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.80.125 Subject: [Qemu-devel] [PATCH] target/arm: Don't clear supported PMU events when initializing PMCEID1 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 OS , Michael Spradling , "qemu-devel@nongnu.org" , Digant Desai Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP A bug was introduced during a respin of: commit 57a4a11b2b281bb548b419ca81bfafb214e4c77a target/arm: Add array for supported PMU events, generate PMCEID[01]_EL0 This patch introduced two calls to get_pmceid() during CPU initialization - one each for PMCEID0 and PMCEID1. In addition to building the register values, get_pmceid() clears an internal array mapping event numbers to their implementations (supported_event_map) before rebuilding it. This is an optimization since much of the logic is shared. However, since it was called twice, the contents of supported_event_map reflect only the events in PMCEID1 (the second call to get_pmceid()). Fix this bug by moving the initialization of PMCEID0 and PMCEID1 back into a single function call, and name it more appropriately since it is doing more than simply generating the contents of the PMCEID[01] registers. Signed-off-by: Aaron Lindsay Reviewed-by: Richard Henderson --- target/arm/cpu.c | 3 +-- target/arm/cpu.h | 11 +++++------ target/arm/helper.c | 27 ++++++++++++++++----------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 7e1f3dd637..d6da3f4fed 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1039,8 +1039,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) unset_feature(env, ARM_FEATURE_PMU); } if (arm_feature(env, ARM_FEATURE_PMU)) { - cpu->pmceid0 = get_pmceid(&cpu->env, 0); - cpu->pmceid1 = get_pmceid(&cpu->env, 1); + pmu_init(cpu); if (!kvm_enabled()) { arm_register_pre_el_change_hook(cpu, &pmu_pre_el_change, 0); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ff81db420d..b8161cb6d7 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1012,14 +1012,13 @@ void pmu_pre_el_change(ARMCPU *cpu, void *ignored); void pmu_post_el_change(ARMCPU *cpu, void *ignored); /* - * get_pmceid - * @env: CPUARMState - * @which: which PMCEID register to return (0 or 1) + * pmu_init + * @cpu: ARMCPU * - * Return the PMCEID[01]_EL0 register values corresponding to the counters - * which are supported given the current configuration + * Initialize the CPU's PMCEID[01]_EL0 registers and associated internal state + * for the current configuration */ -uint64_t get_pmceid(CPUARMState *env, unsigned which); +void pmu_init(ARMCPU *cpu); /* SCTLR bit meanings. Several bits have been reused in newer * versions of the architecture; in that case we define constants diff --git a/target/arm/helper.c b/target/arm/helper.c index 92666e5208..31273fb8de 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1090,22 +1090,24 @@ static const pm_event pm_events[] = { static uint16_t supported_event_map[MAX_EVENT_ID + 1]; /* - * Called upon initialization to build PMCEID0_EL0 or PMCEID1_EL0 (indicated by - * 'which'). We also use it to build a map of ARM event numbers to indices in - * our pm_events array. + * Called upon CPU initialization to initialize PMCEID[01]_EL0 and build a map + * of ARM event numbers to indices in our pm_events array. * * Note: Events in the 0x40XX range are not currently supported. */ -uint64_t get_pmceid(CPUARMState *env, unsigned which) +void pmu_init(ARMCPU *cpu) { - uint64_t pmceid = 0; unsigned int i; - assert(which <= 1); - + /* + * Empty supported_event_map and cpu->pmceid[01] before adding supported + * events to them + */ for (i = 0; i < ARRAY_SIZE(supported_event_map); i++) { supported_event_map[i] = UNSUPPORTED_EVENT; } + cpu->pmceid0 = 0; + cpu->pmceid1 = 0; for (i = 0; i < ARRAY_SIZE(pm_events); i++) { const pm_event *cnt = &pm_events[i]; @@ -1113,13 +1115,16 @@ uint64_t get_pmceid(CPUARMState *env, unsigned which) /* We do not currently support events in the 0x40xx range */ assert(cnt->number <= 0x3f); - if ((cnt->number & 0x20) == (which << 6) && - cnt->supported(env)) { - pmceid |= (1 << (cnt->number & 0x1f)); + if (cnt->supported(&cpu->env)) { supported_event_map[cnt->number] = i; + uint64_t event_mask = 1 << (cnt->number & 0x1f); + if (cnt->number & 0x20) { + cpu->pmceid1 |= event_mask; + } else { + cpu->pmceid0 |= event_mask; + } } } - return pmceid; } /*