From nobody Wed Apr 24 18:21:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1641391082; cv=pass; d=zohomail.com; s=zohoarc; b=HVz52r0cx6oZr8vZQoI9fPphbVZa8Kwj79wzlhrVj2a9C90LBJuPrzrhqPPfvMLCdFMk7mbyZWiAVqk+4ZDebn/hjin79a8nbUVw7RYTC/cKUFriGGNTied9UXvv0g19sZnmNYaIiuOxDrrJtlAPG6+8SDz3+/xb/iclP6d64eY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641391082; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jfO6hMu+j+6AmU2LVFQtGR/ZVgz/9AB7/U+rI7fXn+I=; b=k/eB3s7rl1yXUaYp2aJL4HKoYZp/LG45xIVFIhqvplnCZofxQEc3ZrdLJ5/Vr+qqc8fmlFEGDdEV+laba2miBWpGkMITrvW+yzVwXoAAG3aNrGZHLSf0y0XRWYVRzoJSxzLaArKOgPSDqqy3g9GeurN56p6ZO6f73K3RuVSsO+o= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1641391081966793.7566349565806; Wed, 5 Jan 2022 05:58:01 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.253604.434792 (Exim 4.92) (envelope-from ) id 1n56nO-0003J0-Nb; Wed, 05 Jan 2022 13:57:42 +0000 Received: by outflank-mailman (output) from mailman id 253604.434792; Wed, 05 Jan 2022 13:57:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56nO-0003It-KG; Wed, 05 Jan 2022 13:57:42 +0000 Received: by outflank-mailman (input) for mailman id 253604; Wed, 05 Jan 2022 13:57:41 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56nN-0003Im-8H for xen-devel@lists.xenproject.org; Wed, 05 Jan 2022 13:57:41 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7218c0fe-6e2f-11ec-9ce5-af14b9085ebd; Wed, 05 Jan 2022 14:57:40 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2171.outbound.protection.outlook.com [104.47.17.171]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-oLMNv7RKMf2yc9KG15D2YA-1; Wed, 05 Jan 2022 14:57:38 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4445.eurprd04.prod.outlook.com (2603:10a6:803:6e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Wed, 5 Jan 2022 13:57:38 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4844.016; Wed, 5 Jan 2022 13:57:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7218c0fe-6e2f-11ec-9ce5-af14b9085ebd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641391059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jfO6hMu+j+6AmU2LVFQtGR/ZVgz/9AB7/U+rI7fXn+I=; b=bwIjFz44/fCijYUI4xAonv3exYe9s0wnlJ3z+V0YRYxGfl5a/6Fk3gLmkkuru5DhZtHfLY w5n2q8Rl5zuKVa1dLt5gprLkT98DaVbuL+3Rhwb/Po2REkJqDe1bJ3ODmGONugqn4GmZno g9TjrpggdgZjHp7reHGWwCS/jdLW+i8= X-MC-Unique: oLMNv7RKMf2yc9KG15D2YA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W3SpFfead0SkPqEqOEk3nfjGwuiCdjyZ0IrXVAy/hMVXbns4OSDWCdbvOaKJq17Lj8xhITJEYaXRm/El+395sDrNKRUQFlUgRUjDG5SGntX9GKycgTg25u82tp3FgCy1QfzEc2Q0e8q45niYAdZx+W/2RQm1xR303mxU6jG+GsW7o77MhFWvNWw02n5jP3K2FsR4PkIpZ3Q6+6QI+IwiVhPkIAQLqIGn2MiMOOKcIoDyAAtSaO7gztOp4oXcphlIvfisODGTgPqZ0vJ1E2wYCQND5tf+OmMHbCXqBbSKFprOXimlqftK8hB/PH9zp45apQntNJHm3hKb0X8SD/YFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jfO6hMu+j+6AmU2LVFQtGR/ZVgz/9AB7/U+rI7fXn+I=; b=Pge43x3gUHvdCLY6ED7YWAthFDbY8SeAHSNpeqcYOSwuqVP3+Xe/CKaLso0h+jgoxS7EGKmXs3qM6dPN8RlUe02L66LytxZ8MGJGixfi5B4yeMJMAklXhnrnpMtAL81P41raDMV+HmipF+6jbI52/aiF4aSUjYrgJzip+eRpe9HcA5DRNyHl7EM2Y168/7DPZqjtiSznzyPYSmnLCE0dSFHXhH75pYhibp0LzfjeFS0YvOOygiJcz1qyOF44X0LDJkTnrhMU8d/A4MpdX8nEl5/LZnUPufII/9IqC2Ptj0UZBlS8ecaIJhWLXikVNIyOXHCAGQ9MbjK9qH+tU5jaXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <7955e956-c619-38ef-618f-344f16fe6517@suse.com> Date: Wed, 5 Jan 2022 14:57:36 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: [PATCH v2 1/3] VMX: sync VM-exit perf counters with known VM-exit reasons Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Kevin Tian , Jun Nakajima References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR07CA0028.eurprd07.prod.outlook.com (2603:10a6:20b:46c::30) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf4d4d8c-94dc-4d0c-c1ff-08d9d053550e X-MS-TrafficTypeDiagnostic: VI1PR04MB4445:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vr9ZHUd5M/uTn7Vuzzsw3lHQBn2iHltWdEYXi3PQoc2VVkj0P0JBrUWOkD6W5tIknIjDyCRTU6RZFpukH/HTkEB57ZHsL+92Q7yTO8kFPf8ZINzn882zI0elJpuCsmGxoJFmQq6cTdfoHOHDyGs3dfUj2pfaacBqnJT5PcrDRA9tCvgtxgX00ksP0vC8M/jWFnI9ZqCarQGz8cQlrwdI1emr9rUOeNT8hXnj0itVV2qewoHl6mg0ryX51A8bEBbzzDUesekzkUtTz6rdyi4TI+SKxq3E0p/tXnzivhrHAIlIOOV2Np4jdgn+Yj1gs5Lp6nFraXSKw4Eg8op1M92DY4iKMZ0K9d6g2tikkeIZalERfwUw+fPnNISs/yWvjKvweKxf565OoHp4cFNFE74/6D22YjALZf5PbLqpyG36FsvqfNMd7WnaZTf15QvzJiE3fKjG1WfCN5jdJWAgKOz1IiuC8+asA3iwqNIQavxlJWJ18NQQz2soltapOl4bRgUCAEubBZOmkO6Qqnfq9cIRKKgRb+OfqXAgvmzZAft+YQlE4bMjedmpOnKx8S5oFJe7Dnu3fMWVh6mPVfCH2a7ZTUJCh1wE/NzzS9+RvoSWiBh7ypYQTBw2npQmThij1nAJ6/uoVMl8fd8cxLndrcG3o9mMubLNCRu328DOkWnV4iXuqbnS2oUDct1u3DtQyaZed45+lq5Jmj5heboIlu1m2/nqlO+NAQ0UMqiNbSSTxCI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(38100700002)(86362001)(54906003)(6916009)(66476007)(31686004)(8676002)(26005)(2906002)(8936002)(186003)(6512007)(66946007)(4326008)(6506007)(5660300002)(31696002)(36756003)(316002)(6486002)(83380400001)(508600001)(66556008)(2616005)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b3UwSVB3c1R6YUplTlZoSVRPM1ZjbkJ3a0hkN3E1QTJOMTkxT3JwMCtUL2lO?= =?utf-8?B?c0V0QlVVODJ6Z3FKaU1XTm54ZHMwUU1ud0FEUnQzK0l4bnBxTlF4ZzU5Wmlq?= =?utf-8?B?RUxESXBKSlhZb2FyK2ZVaWMzR2lIS3BsMFNvbnFaV1ZPOUljelZaRmtqUm9p?= =?utf-8?B?bVlsUkgwZ01GcDJ3S1JZTmtmRzdFcktuZTN3MEVncFliam1SVnMrWmhmRTBN?= =?utf-8?B?UnlZUTZXejgvcXVWa0ltazlSdktWQ05FWUsvS2l6QnZFR0tQeEw1RGpZSklv?= =?utf-8?B?R2ZydFZxUjI2TUJDTEJFL1pvV3V5dFlwOXJrenRPSFBkQnhuOUduN3hwU0hP?= =?utf-8?B?M29WS2ppaC85bCtoVnlWdmNGdWhkRnd1cXhxZ2JDeWhjQlliTkxTVzR1dExJ?= =?utf-8?B?VHk0WElBOHR6R01RR0ZaVWZDWlZ2aHBad2ZhL3NIVmZITEhUQWlhOEZXMWNW?= =?utf-8?B?eGRpQ2JoS2JDTkxZR3lBaENVTGo5WDlSUysvY0dpOVlvNUxOM0NoQVAxZ3Jk?= =?utf-8?B?TEp0Y0FMVVNwMGExbnVyT1k0NVJ6bUs1bGthM2o3bzR1ZisxYWVkcDZ1bFBt?= =?utf-8?B?Unlad0Z0eFZQN2FaaUVEN0t0SVdrSmxEUzkxdC9lNmFjY3ZLOWNhOGVJMUhk?= =?utf-8?B?emF0WnFSNnYybC9tb1RGUGFpaVZTNnFYc21GV251ZTg5Y3BlbHN1RmwyR055?= =?utf-8?B?ekt4a3FmMHdQR25PS3F4TG5QRW8zWDg0c0FQWEM3V0ZUZ3I1bFhoZEVwRDBB?= =?utf-8?B?R081QnZZZW90eUNLeFovYU1zT041K2lTUXBRYXFQYlpLbzMxNGViK2Nrdm1V?= =?utf-8?B?T1kzMlB0TnVPaitGM3ZyTVIxTld5REt0VnFZWWd3R25MK1d3VEh2L2cwMkp2?= =?utf-8?B?NkgwQWoyVFozVE5aSlBRQmJxcitOV29qaEZHb1R6R2pKZnd3Z0ova2MrRWIv?= =?utf-8?B?ZXdyN2tTeGdKU1VxTWdmQ3cwVGtPaHNybDFQWG5Nd0wzanNUYjlENnpScG5W?= =?utf-8?B?eVZzNEF6Vnc5WHY2ZExGOEZMUUN4QkZSQy9CcFcwTlhVWXdwcmFFNnI5ZmhQ?= =?utf-8?B?U1gxOEE1VTh0dlg1cXdHZjRWTldud1ZldFZOUzMrYmFSK1dyVjZhWUNpcy9I?= =?utf-8?B?MmtXQnVjOEtacm9zVmFxSFJNWGhsSHhTOXVQMGtQaWpFRzZnem9kVndNLzdO?= =?utf-8?B?b1ZSQnJSZUU4VnFSbk95VGpWQmhIU0pVN0dBbWwrQjJ5eDJzZU0xenhhN0xV?= =?utf-8?B?dHZZd0podVBsZERqalk5dEsxaDdOWFJkeHdHbjNQenEzOEZQYmNYNWF0YzJQ?= =?utf-8?B?NVdvNWY3dWZETWdTS1hpQUE1bW9NRDZUWURYOG9heHhQdm0zTEgyOHg1amJ0?= =?utf-8?B?aGo1ZkI4VHVVNFZoeTFiQ0xyRnhsUEg4c0E1MkVvYjhZVTVWNXU0WVJXcXNv?= =?utf-8?B?aWNsODN6N3FDL3M2RGsrVUM0SThtSUVHdUZybW1iSFdKbjduTGNXVktwL2JC?= =?utf-8?B?cHlUSzZGeHd0eVV2SE9iR2hjMEkrNlkzV0RFYnZsOElrYnhkbjYxRXFFSWZa?= =?utf-8?B?YTFtSS85TG9Vdk1QVGVJR2p1Wm9zbG9QTGZYQlkzOFU0SFJBa0F4RllNOS9G?= =?utf-8?B?Rkh6dWtvbTNNVytwMDhKU3g3YjRqRTFqZnByL2RaVzVhNnFCSDBEdStlQ0l3?= =?utf-8?B?WFdQUFRzenRqYmxpRGIzTmZvVXNSRzk2dHVib2NHbzVnYzNSTnVNQVN0VHBx?= =?utf-8?B?aENYWXZPc0Rxa3NyME5JU1o0cm9yMW0vbGtqVGlkb3N1d2JmWHRPb3E0RkJu?= =?utf-8?B?WFk4R3BIZ2VGSDhZdVVDalFOZXpPbVNFWk5JNC9PblhlWU9QbU5VSDkrdnB2?= =?utf-8?B?K0hNMHF3Q3NJMXFQTE80bkFKdzBXc2lpclBGalpheW5EcW53VGIvVE03eGRq?= =?utf-8?B?WWNaL0l0Vlhza2JFNHZ1RG1iSTFYYmtBc09KalhGTGR0VkYxRFQwckp2K2Uz?= =?utf-8?B?WGVVdzJ4a3VSTnVxVUVCTW4rMWFxZHpNTHk2ckxJb0pNWXJ6bXhUVDNNVUhQ?= =?utf-8?B?SHRFWGZWT09nR0xSRUt3Z0QzTTAzMTUwU3pXb0lScllJUlBsVTQvNzhmQWVi?= =?utf-8?B?ZWxsSXpXUmsvQUtjUE43cTltTW1YbXAxUWhBd2diYUM2bmZ0Zks0NHI1aC9h?= =?utf-8?Q?3Be5OGdqCAWOjG6MXxxbIIA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf4d4d8c-94dc-4d0c-c1ff-08d9d053550e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 13:57:37.9178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +24NBXRupR94C3M2NQ5OIQyU++g0E6xSvCBVsYXI3YhQ6iWcx/vKXKtc6l742zUwVsfhTdFIgBZBdoDoyMProA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4445 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1641391082860100001 Content-Type: text/plain; charset="utf-8" This has gone out of sync over time. Introduce a simplistic mechanism to hopefully keep things in sync going forward. Also limit the array index to just the "basic exit reason" part, which is what the pseudo-enumeration covers. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- v2: Use sentinel comment only. --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3869,7 +3869,7 @@ void vmx_vmexit_handler(struct cpu_user_ else HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, exit_reason, regs->eip); =20 - perfc_incra(vmexits, exit_reason); + perfc_incra(vmexits, (uint16_t)exit_reason); =20 /* Handle the interrupt we missed before allowing any more in. */ switch ( (uint16_t)exit_reason ) --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -219,6 +219,7 @@ static inline void pi_clear_sn(struct pi #define EXIT_REASON_PML_FULL 62 #define EXIT_REASON_XSAVES 63 #define EXIT_REASON_XRSTORS 64 +/* Remember to also update VMX_PERF_EXIT_REASON_SIZE! */ =20 /* * Interruption-information format --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -6,7 +6,7 @@ PERFCOUNTER_ARRAY(exceptions, =20 #ifdef CONFIG_HVM =20 -#define VMX_PERF_EXIT_REASON_SIZE 56 +#define VMX_PERF_EXIT_REASON_SIZE 65 #define VMX_PERF_VECTOR_SIZE 0x20 PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SI= ZE) PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SI= ZE) From nobody Wed Apr 24 18:21:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1641391112; cv=pass; d=zohomail.com; s=zohoarc; b=JHci3Q+NR9PPjupYg4Hv1amIBYAwTivWsHhwo5rnfuFsto1r/ygUfJtmyZWCRdjZDoJlOWXHyd4WwE+N2dC9ACGq10mzPZkwDnYWEund/4LlmZmy+mRQ6y/nYh2gBTN0UHNxE/RwsvLcEBwBi9rpMs0tFb/hM2xyUgQOnASP/Ew= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641391112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SqkPX7FWlaMH1FnPGqWT6XCdFCtT6FzcXUuscARTGtE=; b=G36RyFx/m91eIe5Ka/uc91KkuOy8ALdF0HW72u2kAEuXkkz7xs0OKgwgPSgsSgEgOrChPHJqaHcp4Jdhcp5tMRsLwOmjMj0LTKAxkCKHA+zzTIykFE68SLlUDeV7cOdxLy0VpaRBlW1NB8deMPHlC15q4Vqm2dZEk8AYQqci8T0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1641391112291846.03625074128; Wed, 5 Jan 2022 05:58:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.253608.434803 (Exim 4.92) (envelope-from ) id 1n56ny-0003qJ-0v; Wed, 05 Jan 2022 13:58:18 +0000 Received: by outflank-mailman (output) from mailman id 253608.434803; Wed, 05 Jan 2022 13:58:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56nx-0003qC-UD; Wed, 05 Jan 2022 13:58:17 +0000 Received: by outflank-mailman (input) for mailman id 253608; Wed, 05 Jan 2022 13:58:16 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56nw-0003oZ-Ih for xen-devel@lists.xenproject.org; Wed, 05 Jan 2022 13:58:16 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8782c489-6e2f-11ec-81c0-a30af7de8005; Wed, 05 Jan 2022 14:58:15 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2055.outbound.protection.outlook.com [104.47.10.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28--hAy7QPeNRWkXJ_HvB9LDA-1; Wed, 05 Jan 2022 14:58:14 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6301.eurprd04.prod.outlook.com (2603:10a6:803:f1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 13:58:13 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4844.016; Wed, 5 Jan 2022 13:58:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8782c489-6e2f-11ec-81c0-a30af7de8005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641391095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SqkPX7FWlaMH1FnPGqWT6XCdFCtT6FzcXUuscARTGtE=; b=A3N8XfXceGB6oQcAgqNVhVvtr5N0bxiabfwaTe+exVMa7NmEoj8Ia4j5p2sb3ekR9ufNgO 6ggcQFE0iPAhRYmj3DqrwdXbIPME/4kX/InCg1RlgLYCz7F/wTS2UuqtlqG0X/Yf5TT0nq JKxp+Aw/wBu5AJc+HURE7nh51jKN4vg= X-MC-Unique: -hAy7QPeNRWkXJ_HvB9LDA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iEIB9rQEhl9p4nCS0lm6BaTvDaMfs+ZnD2IDakzAQRczWQh4kif0eerd/RipUXWQzMGGrD95cKsu3aQADPMPCLXhRohuiUg5EOy1DVPtAkES2gtegQ093W0kaVduGrQ+M/eMFOx9m7TR6un3Ryv+mpRMbayuAkjCRBZaTSkXWtqtMgJPO5PFAxL+f8JAy683U+aYPexVOptF8Ks2wm4kt1/e49sjeUshVAnHQjhVbDI7kfjfq9OB/xYD+hsw0IY8eSbHWr34ZWT65rccs8mzbnWRlxIo/0J57cOg3AD7w34SrfPawzHH408jaBPVrhYSHwx2eaq0CSMRU88nW7pNRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SqkPX7FWlaMH1FnPGqWT6XCdFCtT6FzcXUuscARTGtE=; b=Nf2W0JjnrWDZPSop/fovTwHH0Kpsi/St3yVYju4H1CW1+DDllu2gJ4dtdgFsN+/v6sx7ZX4s015v89OMRQP46VOudvL/wytjR4nbNUB0Zig2OBt0ro9Mi18XrKYxAqj6iduEzk8zobAWN5u6nqv1cy0VUzip3fl/byN7UOFgB6p3NABU6tjMr7jT51VI21k05L2+6ye3X0FBW4LvYmwneZ6SvkSOgWZt1t2Mcydfw/KdfyclmE1jQ7Wq+uDbtu5GF0gNKEZD120+twiUnvFi5iZdiR9TOttY4G9EoTzh/9iDLv7lh8TMfnR8JxGlGCftBV7Cc9+yjCcSppmlNnu4KQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <00a9007c-62ef-8bad-5a92-67d0b880fda6@suse.com> Date: Wed, 5 Jan 2022 14:58:11 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: [PATCH v2 2/3] SVM: sync VM-exit perf counters with known VM-exit reasons Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR07CA0008.eurprd07.prod.outlook.com (2603:10a6:20b:46c::6) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 151456b1-bc22-417a-d8cf-08d9d0536a14 X-MS-TrafficTypeDiagnostic: VI1PR04MB6301:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xGFmIx09MhnwdSFoxiJC6ecOyU+dr+PkzltC8TR00D2SOHCj6Ajh++ynngNdr3berCeo5CDTIPW75G5vZ3gTCPw+gnXD6eTRpVvzMS8JAaBa+pwfsmzGTb1K1OxCeUOaVyt4S/LXNKzwXfB7rQUTBu2Z2gVrTNEBTfph205CaKYfegd0CqwyUJkocRlcXTE6sFdf6NIfx/AsEhN7ruf2EwvyYG+cyQi3U+V3GYV1Q8V9R/ZjYuVAI7MWNL4oRe/A3q4Rr7S/BB3uplo6P6maM/FAryaJVTblBPu7iaYMIIgngJ+kWlW8VtIiuW2xCZuOWoZAmuvtNXWQU6e88jHN73YrHSqE6UbSZtBCRhW2YanvMSy0W+RAsPk07pfeMJSdo/F/k4yyPnomuKdBtaG6h0a6Cs2hCMWf55/sTPvxzGCA2cjka6ybZrXbaWhmc1GS8enne+sc+wdD1509/bW81z+QjF5Rmx6tk2uKLadP7WO9NowWEibo9fi8D/8qsTrX6HNwOv6s1cukYIapnepPsDrHLjZP8LeucEWn3pPYcHqxhKfVXPNLDsDpYLW6yOLFsXghHQkVLYTLWImA5GdLkAK/56IN0VwSYztSr/J0K0O3YaSH0sBjzio39KMbND7KOz+fflZcsMMMy9D5NYjw+xQ4caDv6zk+LBeTsCDZaYgcuKx/MFPuekDzP9HBKY7k3gzUCWJPXEN1iPQLKzGtYdTksFJAJU5BY3T/TLlR1MCKOnsp9kWKxwDUow2lKZc/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(31696002)(54906003)(66556008)(6916009)(8676002)(508600001)(6486002)(38100700002)(83380400001)(66476007)(316002)(66946007)(86362001)(2616005)(36756003)(6506007)(4326008)(5660300002)(31686004)(6512007)(2906002)(8936002)(26005)(186003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MXV0WlJSVTY4d1N6b1dyZkROeFplVGJ1anJubFAzK1Y5U21ocWlvbHh6UFJF?= =?utf-8?B?QnZjeGI4ZXA4TkdNOGt4SHJveXBIZzU0dnlGV0h0SGZONkQ1YjBxNmxGZ1Z4?= =?utf-8?B?bkZ6RGVER3lzR2lIeTJpMkJkVUM4VS9nL01iYTRCeFNHUzZBTThKdzEyNUtr?= =?utf-8?B?Q3NOa05GbkFLK3hsVTVxZWd5TXZ0Ymcra1pUMlNIMTZwQkFoM3F0T0djWlUw?= =?utf-8?B?SDEzUFEwekZvZisraWk2ODgrTkVnSkpyZStYRnFuSUJ5QUd4OTkzN0R5d3pJ?= =?utf-8?B?WGRiWFV5aldYNFdOVkp4eFRsWjNFalVkdUpwVE02M3VPWmhSWklQS2RTdEs5?= =?utf-8?B?QTJSMS94MDJrU0pnTTU2eE5TQm1nY0ZyNnp2bVY3QnMrZ2VZRzdBNm04S0Fi?= =?utf-8?B?Q0tiTnNaL3NmOEVWQzhEemFEbmRKVk5iLzFkbDBGbUpkTDZPc0NUb3NOcVhQ?= =?utf-8?B?L0hwTFNrZzNhQVFDcGxmeEpCWGIrL2VzQTNuRnBDN3I5aDVIam9NRlBYeTk5?= =?utf-8?B?NW1Jc0tINUZ3TzdnNnN3TE9ZTEhGbWVKZTc3WTZFNlB1YXNRUmIxb1FkcUJn?= =?utf-8?B?TGhpNzVTSm5kbGltbm5aamxxR0NYOEFGVTRFR3NaZ0t0Mlh4eHZNa1dmdzEw?= =?utf-8?B?aktQR3pwYmgyS1hjRmJzR2QxbXZpUndyQzc0UVdGRFJLM0M4Y014Skd2azBj?= =?utf-8?B?ekFXWXlEbDIxYkZaeUoxVFpabW9tWk55RFdqdmZrZXl1aU1GcDdxZ1NQdU8w?= =?utf-8?B?ZVhlaXRVck1IUEw1OWxrZWdsa2ZOMVJvcTdSWm42M0ZYaFNNMkJLcHhDVEk1?= =?utf-8?B?RG9PS2JCTzhpNFBxWWNiUXBuQmFTb1Bpb3gzR1BCZENPWUhNSW9ZU2NvdkVN?= =?utf-8?B?MTEwd2IwRFBKQUJNb0d1MmczSE8zMWV3UnNOMzFOQzBIZ1Z4cUJsQVdneVFr?= =?utf-8?B?bnhNTUh3NUJ1MWpINDAxOFhwSVo4dkE3M2ZKN1VpcitsSXNhenEzTEdaN3B1?= =?utf-8?B?bnVUOTV0QUYzc2lBWFBUL3lGckpYbXZWK1B2ekJCYzlKa1MvN0kvVWhRQkhi?= =?utf-8?B?TlRNa0RIeWpCTDE3cjNGK2o3VUxaTVRoL2EwU3dNbmN3RGZubUpHVHJkZXYw?= =?utf-8?B?Q3lkN2xxQ2lWSlVsclVjV3lQQkVwaFl3YUlDM1BGakhteEhUbG1ES2xYM2hS?= =?utf-8?B?VVRaVkh5MmpSU3U4RU1iSGJvOVpNMWRabElPOE9WOXFCdXh4dTZTV3RETGdN?= =?utf-8?B?VVZ4b1RMemN6bWpnUS8reEt0Q2hZcXZjQk5GeFptbGtGN09tOTBGUCs1Z2RQ?= =?utf-8?B?L1VNdlcxOTNyVjZMdG1qWnlPdU00WFZhTi9Ba1Uwc3BPSFN5Tmdyc2RqTUhQ?= =?utf-8?B?aWJIbXdsNEVnNGVyTWdtdUpOS0FUbHpyU2RXNlVhaWsweTFNR3dTVllkSnlQ?= =?utf-8?B?alNPUTBTZyswek1sUmhtSkdTOVNlRE9QVWxmYlFSVk5SZkpFdWNkN0FIYVRH?= =?utf-8?B?QWptMkR3akpFRlBVdE5jakpQRklwS0pQN1hNaUZFOFd3OHA3VHpjbWtRNisw?= =?utf-8?B?OTRaK3JhQmRnWHQ0T3VLOTJINlMyU2tncG5HdlZ2RHFVRkhhZHdnN3BxUVRq?= =?utf-8?B?ME9CUXR1OEQrWVRjNUhGZlJGOUlLZHBERUtOOFF2elA5Z3FyVlk1VWM1bHpG?= =?utf-8?B?VGN6b2JYWVRXTExkODAyNTYycG9hZm1LdGE2NjQ0OXhNb0VvZUFKQ2g4WlVG?= =?utf-8?B?d2Z5R2FSYnNWWG1iM1IzQlprQWQxVE1zNUNEMmJZQnprblptQ0thaE56cTBr?= =?utf-8?B?UnBvZFM3UE1wTHFHdGFsS0o1aGNjdFF3WjJZSksyQlhmTm1tUnZtOThMNHVw?= =?utf-8?B?WVFSZ2lrcWhzOEI3VlBES3R2NFRWQXFvcDBqNDlRYjJoZk9tMW9RYkp2dXRS?= =?utf-8?B?cFg2c3ZTK2NJbHJzN1VBTitXNjEyK1BwUE0xZWVsQ2djRXhYTGEyd0pUMTA3?= =?utf-8?B?QldGcnNDMzc1UEtaR3hQRzB5SEZ4MGk3enJOOURHelZIZWlpdlN1UHhDTEx5?= =?utf-8?B?b0ZMQ3h1N2ZMYlhaRDN2aldkWU1RTHM5MVp6Nk44aUtDRHk4UVVZZmllYWEz?= =?utf-8?B?UTFYdWl6d3NFRVRoYkJlcjArQmhCUURPV29tcjJlQkZpZ05FTmN4bkIyWDVL?= =?utf-8?Q?h3OkxETxffePnEixp2W4+G0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 151456b1-bc22-417a-d8cf-08d9d0536a14 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 13:58:13.2158 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7MvkFt24JBFNTZakkjajOlLc4ujNxbC5phkD1Z/89rdEX6r0xx+pvtuvHHQPbyRkWwNbQo2LWTaYNDd3MgO8hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6301 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1641391113389100003 Content-Type: text/plain; charset="utf-8" This has gone out of sync over time, resulting in NPF and XSETBV exits incrementing the same counter. Introduce a simplistic mechanism to hopefully keep things in better sync going forward. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v2: Use sentinel comments only. --- a/xen/arch/x86/include/asm/hvm/svm/vmcb.h +++ b/xen/arch/x86/include/asm/hvm/svm/vmcb.h @@ -302,7 +302,9 @@ enum VMEXIT_EXITCODE VMEXIT_MWAIT_CONDITIONAL=3D 140, /* 0x8c */ VMEXIT_XSETBV =3D 141, /* 0x8d */ VMEXIT_RDPRU =3D 142, /* 0x8e */ + /* Remember to also update VMEXIT_NPF_PERFC! */ VMEXIT_NPF =3D 1024, /* 0x400, nested paging fault */ + /* Remember to also update SVM_PERF_EXIT_REASON_SIZE! */ VMEXIT_INVALID =3D -1 }; =20 --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -11,8 +11,8 @@ PERFCOUNTER_ARRAY(exceptions, PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SI= ZE) PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SI= ZE) =20 -#define VMEXIT_NPF_PERFC 141 -#define SVM_PERF_EXIT_REASON_SIZE (1+141) +#define VMEXIT_NPF_PERFC 143 +#define SVM_PERF_EXIT_REASON_SIZE (VMEXIT_NPF_PERFC + 1) PERFCOUNTER_ARRAY(svmexits, "SVMexits", SVM_PERF_EXIT_REASON_S= IZE) =20 #endif /* CONFIG_HVM */ From nobody Wed Apr 24 18:21:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1641391165; cv=pass; d=zohomail.com; s=zohoarc; b=MYXsQm1lh70atkFlN8JE51dgtOduXy1Jl63BsaYBEFeznCV6G/VdF+HMp8Puvbo52aRjfoVk2IR0JyEET4w1tR0sh6RQ7iWOWvF1KXYLpO6xPJF8X/9VaIpttN5ebYxvu129ozgsvxODmnlmCMZmXUyrtDsgwERvqx2gGnyQPvk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641391165; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oOtoJrYnwb+6pTq3iX76gcDNkqLaRj7Wk1Spp/mwh8I=; b=m/Cb/JkGdGNTPSlLE8YBOPoT0TkFHzrXx0WCog+nQaLGAX3PKrj0enqJCOwpo2AmT+StttbJAkuFvxCGwpCLvxMmiaYExKQ90cDbdFR3eKlbwds8lGBKrUGAQRA5aSL0NUg5AYhSV8szxZrTkWxEkJkIKYvcOQ7LwMwOet4l6BU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1641391165368637.9318074565838; Wed, 5 Jan 2022 05:59:25 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.253612.434815 (Exim 4.92) (envelope-from ) id 1n56on-0004Wo-Gx; Wed, 05 Jan 2022 13:59:09 +0000 Received: by outflank-mailman (output) from mailman id 253612.434815; Wed, 05 Jan 2022 13:59:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56on-0004Wh-De; Wed, 05 Jan 2022 13:59:09 +0000 Received: by outflank-mailman (input) for mailman id 253612; Wed, 05 Jan 2022 13:59:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1n56ol-0004VU-Vd for xen-devel@lists.xenproject.org; Wed, 05 Jan 2022 13:59:07 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a5f423d2-6e2f-11ec-9ce5-af14b9085ebd; Wed, 05 Jan 2022 14:59:07 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2056.outbound.protection.outlook.com [104.47.1.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-9-LgKUMkULNFieCDNIM9IpXg-1; Wed, 05 Jan 2022 14:59:05 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6301.eurprd04.prod.outlook.com (2603:10a6:803:f1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 13:59:05 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4844.016; Wed, 5 Jan 2022 13:59:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a5f423d2-6e2f-11ec-9ce5-af14b9085ebd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641391146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oOtoJrYnwb+6pTq3iX76gcDNkqLaRj7Wk1Spp/mwh8I=; b=LgZ+CB2IfzMOEUEKVDZSS+tZoUF1VGIQZbt1dwhCv+s77/O1Rf4HKyHu8NQrlWYrfaNvyQ /VLuIWLYYVAAV8MWAqiKL8niMXShY6oQhRucKbozm6D78yfopBh9zoLsOfFYNN1w64AVBW C04JqWqLd/U9BH4LPYd01g0NxMzYe3Y= X-MC-Unique: LgKUMkULNFieCDNIM9IpXg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WvmCoBWNuuSiestSOAgqxqBIzCySQ4gysDqAsNpNacQGFNQu/QFTDkXnx9EaWYJBS+9/Al0WiQQNMnaBDkS1S1ZP97+22PrJC/C7Vi+3eQEeBTMPcJK392NdFjuYCsg8BDZ1P38usqkBUB3wAlv1lOHHwlbV98z+iRm/Yf/5hZTm0VFmUhmHg8Fb1uhb3uFe502AOAZMz709X4vP6Izh5pwQwcuADmVPXnd5G/of5ykDczlaCjGtnQHxvR7unFhDFXKdkKQad5XiTGCPlnN5OO5bnDNvj+uC4gMsmFYXVXZjJyzgwr/lEMU10F/Bpb1JlDO+74T/qQn//0CdWJW7jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oOtoJrYnwb+6pTq3iX76gcDNkqLaRj7Wk1Spp/mwh8I=; b=iekbL4HYjIXrxiVuYnR1xHRT8q09Ft+Pu8jGmG4T3ou52zOOMLldN7IXBzc/Doe0UaKIcF/t25i4qGDCTIsToLqWf4YP7v4ccqbDOTvgqpJlNvjjte9LOofZMlWi0ZpnNM9gXo5cAljyshAN8U1JmDIKwgb87/xONkVtCiCRdZb2J89jlXoPxdJkXLwNgpVCjgRKMuuvgxMWVn7VJZDCF8Wvw7Zo+p3WtW04mbXBOZpLBTTduSQtypWXa+2REFCD2DpVChenEVAd7HFLL/8CC0i2/26WQ1mvMRhH5M4jX08d+lDSk5EmEKakt7HIfHTBXP7o4E8+Q1ncbm7tqX4UFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <6a2a47af-4ae1-2fe9-1190-e15b6ce742e6@suse.com> Date: Wed, 5 Jan 2022 14:59:03 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: [PATCH v2 3/3] x86/perfc: fold HVM's VM-exit counter arrays Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR07CA0056.eurprd07.prod.outlook.com (2603:10a6:20b:459::25) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44fe8601-47e1-4883-9189-08d9d05388f2 X-MS-TrafficTypeDiagnostic: VI1PR04MB6301:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PC2+5gDSiJZ8TJzmZs5NzS30mS6LQKLgi6+Lb1j/1t4zd0dA1hn4AElRwWLkJvzmHE4RoPgqIF+iqnN2+OS1uimk5ZsQ00OLF7ar5OC9zDSsWARm9zTEjVtui4jGU92R06LohxLm17DLt2O7mQoV/rDXfjoesWigeKy5fpcYlWX9l0WsPHKxVpY5f/kgbjoJvfslY7bBVDVxCpVDwvh+nPePuh8rE7y6cO58m2z5cSaSALGIOGwyDs28kA8evv1SkUs8DoNwCIFYCQlb4gpBDs/G7Yr540DLrmh0ZpgnPkOKRzDXQcuZpFgWbeUmhDhoUpV1tbFHETW/neauERVkwiWyc8Ga3PA+GMCluA2ZzM0u1H+BlshX/wGz+nEN8RkPqfMXOaGcCtziJnRoc1Emh/1eSHGYjBOqRtNTHMVIGPmKnr5Nrq13QNvVGlGibwaUt697w0a0PJv7vHQkjLzqzmJaIZnz3/h9YM5x4JQbXATAUZ2B6WmMbrZrXtOOmzVURG1+gmm+rMxZ25eDmsQUM3J7SeSucSlyRh7GgU9iv73jTwNEzSQj7YpkZgixrmOjDgiqzbBEaENgiY2tsz3YeMRMA/HCYghk3/ECQILHTGqMUHDfZ9qpFqk/iTQ/h+GTuJdxb4Oethytqhr5ywSglw/5nxe62CJLY3bbzjbXRccWTW97KhxUnd0fHoLRFz/A0UCCiyOwdkzR+bEiPZ2BMDh7yahur5ZnmA/CETLIPbbXF6JE+lxdnHfueMT2zDCh X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(31696002)(54906003)(66556008)(6916009)(8676002)(508600001)(6486002)(38100700002)(66476007)(316002)(66946007)(86362001)(2616005)(36756003)(6506007)(4326008)(5660300002)(31686004)(6512007)(2906002)(8936002)(26005)(186003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MnBXZXNiK2Zwd0VwdDJtTFRmVW44VSt0WUppd3ZyNGlZNmdFN3pXSjdqeE9C?= =?utf-8?B?NGZCVmtGK3VocHo4MVdEdWc2ak9FZDgrTFlzRDlvU2ZLSldqTEJhVTZuL3FH?= =?utf-8?B?ZnRJM1F2cHZXNUVsMGFvTGFqMCtYZUpiUnkxVWdrTy94VzZYdlBrMklQbVFx?= =?utf-8?B?TjVpaENMeVEyMi8vc2tmSG5ib1VzTDlscUsxd2VFRGFHV3R6Wmw0b05uQUxW?= =?utf-8?B?cnczRlpiSlFNQ29TVU9RS2NVQ1pkdmVWdWl4SkNudkNMTVAxbDhWMlpMSnF0?= =?utf-8?B?WHdseHNJd0tGdStYcTZycGFJZXQxdFQ1anEyemJFMk1Ld1Y0KzdPa3daNlFq?= =?utf-8?B?bnh1R291TDdCeUxEem5EbFJxdEtUTDdDd2xPZkVEQVUvNVU1NFBhVytGT0pL?= =?utf-8?B?VHc3MldseUpKcjZlRjRmSUpLQXVBQmpEMWpxZ24wY1g3aUFiT21LM2dkZXk0?= =?utf-8?B?akZoN0tmNm1BZHVPOHZOKzZHRzNnSmxlUkl6Tnd3aG5hdmZ1aEJKcytWOHRl?= =?utf-8?B?blRaM0FBeHBTdzhaeGtzRXhMTmwrMVNzUnFwc0J4YTBNby9vMU9idHZWOTMr?= =?utf-8?B?QUo3VnJuOGZZbVl0YmcyZW5qZERjY0JWdzVVUWs5NXNiUG1BQmR5TG9Rakor?= =?utf-8?B?OUlqRWFySU9XcFBDZ1c4QzJWdi9OQ29JVlZBRFMwbzlEaDRhVHZHQ1liMmlt?= =?utf-8?B?MjBVWUdwVk5DdFBHSU00ZEZyODBuWTArRXpQM0xTTC94OEVoSFRnTTliUmhv?= =?utf-8?B?WC9ZRzZWeVpLLzIwcC9ueUpBYTk1ZWZBU0JuY2ZnUlR3S2VOcFVUYXRCd0pE?= =?utf-8?B?MkdEY05MVTdGdDBhcnZSVllxRkFXOVFCamRQc3BDZnA2enZBekJwNTVjbVFy?= =?utf-8?B?OHlHamdUWklOWHo4MG9rcGM1OWhnV29uM0lsdnFUYS9vN0MydWI4eXJuNnVv?= =?utf-8?B?QWxvT2xsTlFFem8rc2JpZzg5MjZWM1FuUk53MEFRazNqM2NFSzFRRTNEZjA2?= =?utf-8?B?S1JKOGVOMDlqazFBY0pQWVVoQUtya1pnSitjOUJ4b3Z0UHVCem4yMFBySDZ5?= =?utf-8?B?eVhnRzdhZEF5b2xUU3JJcWdNSnNNcktER1VxT28xaXJhalBHS0hDVFpLUVhv?= =?utf-8?B?YmtUN3dacnRvTVczRTdPeGErV3VSTFl5UnN0VnBZTk5OOTFScWZWUFR0dzN5?= =?utf-8?B?T1VyeWVwOTNJcXc2YzZtSmNsYzVLRFF2OHVIZW1reitTRU5QVjlvUHRGTnN6?= =?utf-8?B?VUZQSGhrUHZXZ1F5RHI3dFNjeVdKZEJOKzRwSXZ6QmZKTWMxUzE3SytEbTRL?= =?utf-8?B?TnEyN3ZJOU9pb1h1Nzl0TDhTclNxRUNSaDFFWkxhUEVYVnVxdENLTFc2Q09H?= =?utf-8?B?SzdLOWVxRXo4K0tnYXF2TituelZQZy93U1hBdGg3bEQrU1Z1TDR6UHBZN1hi?= =?utf-8?B?UGpHT0IxZUVyUVRiTGdydldLelI1Wmo1aHhZMUxvemNTTFNCeHQ1VlFaMi92?= =?utf-8?B?QldMWE5MUUljdHNQVW9panVjNlVSMWxlQjFMY29mOS9TWXJSelo5VnB5MHJC?= =?utf-8?B?NmFVMWxQLzBJY0Z6a2ZUSkI3U2s1MkRGeWtFZGdqWGMzT3Bya3ZkcXpMdHVC?= =?utf-8?B?Tmx2RmhhWFBITENFczJsUWg1NFEwbmxteWRMQVZQV2xiUG5wQXNnNjJsblVo?= =?utf-8?B?a09QdUM1QU15T1NtTTBIenJPYUhNTXdpSS9ZQVJZNDZBU1M2UmgyTmQ2Z1Mx?= =?utf-8?B?dFcxMEdTcFl0cWxSdjN0NEQ0d29CS2VnZmxmbDdqaDJtVVA1VXdZWitsT2Vk?= =?utf-8?B?akZFSmxkUlpyWHI0THlsZWdrZnpIdTAyQUpLblZJaE5hTTJRRTVMMnBnVElG?= =?utf-8?B?d205UDZhMEhxYllZejJ4bjNEa2ZHTVZ1N1kySTU5Q21sbmplOWllODRsTzZF?= =?utf-8?B?ZmthaXk1M1YxZFdKTDBITHQ4LytPcVNaUGZtOTJSV053TDVRUjcrMkJacFpa?= =?utf-8?B?b1hkS1BwOHFmVWNFQ1ZhbzNDZDJ1Ykk2WHd2VGE3a05QaGpTZ3Q3ZkJzcU9l?= =?utf-8?B?N0k2LzVUbmdUR3RYRktCeUc4VldyTi9PeUcrbUFGYkRNakc5eUdncEh1NXZm?= =?utf-8?B?ckxIWU5FNGtLMzhQc2R2djRjK3NyVXl1Ynk3bHl6Mk10VUM5cjM4VjNzeUh5?= =?utf-8?Q?ryxrsMA2hmZJtZWYU8tRH64=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44fe8601-47e1-4883-9189-08d9d05388f2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 13:59:04.9246 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sEe2xvOAqtGmFNZS1ZwRYMBvNM9DW+wJtaBniyQKT80hNL3+QthkLBYenTZWBNOBnmHMjhW+zKfogjHp1YqiHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6301 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1641391167529100003 Content-Type: text/plain; charset="utf-8" Only one of them can be in use at a time, so make the whole set union- like. While doing the rename in SVM code, combine the two perf_incra(), generalizing the range upwards of VMEXIT_NPF. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v2: New. --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2644,7 +2644,10 @@ void svm_vmexit_handler(struct cpu_user_ goto out; } =20 - perfc_incra(svmexits, exit_reason); + perfc_incra(vmexits, + exit_reason < VMEXIT_NPF + ? exit_reason + : exit_reason - VMEXIT_NPF + VMEXIT_NPF_PERFC); =20 hvm_maybe_deassert_evtchn_irq(); =20 @@ -2973,7 +2976,6 @@ void svm_vmexit_handler(struct cpu_user_ break; =20 case VMEXIT_NPF: - perfc_incra(svmexits, VMEXIT_NPF_PERFC); if ( cpu_has_svm_decode ) v->arch.hvm.svm.cached_insn_len =3D vmcb->guest_ins_len & 0xf; rc =3D vmcb->exitinfo1 & PFEC_page_present --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -7,13 +7,13 @@ PERFCOUNTER_ARRAY(exceptions, #ifdef CONFIG_HVM =20 #define VMX_PERF_EXIT_REASON_SIZE 65 -#define VMX_PERF_VECTOR_SIZE 0x20 -PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SI= ZE) -PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SI= ZE) - #define VMEXIT_NPF_PERFC 143 #define SVM_PERF_EXIT_REASON_SIZE (VMEXIT_NPF_PERFC + 1) -PERFCOUNTER_ARRAY(svmexits, "SVMexits", SVM_PERF_EXIT_REASON_S= IZE) +PERFCOUNTER_ARRAY(vmexits, "vmexits", + MAX(VMX_PERF_EXIT_REASON_SIZE, SVM_PERF_EXIT_REASON_SIZE= )) + +#define VMX_PERF_VECTOR_SIZE 0x20 +PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SI= ZE) =20 #endif /* CONFIG_HVM */ =20