From patchwork Fri Dec 3 12:06:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12655009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF7A6C433EF for ; Fri, 3 Dec 2021 12:06:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.237504.411920 (Exim 4.92) (envelope-from ) id 1mt7KP-0004rk-QN; Fri, 03 Dec 2021 12:06:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237504.411920; Fri, 03 Dec 2021 12:06:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt7KP-0004rd-NA; Fri, 03 Dec 2021 12:06:13 +0000 Received: by outflank-mailman (input) for mailman id 237504; Fri, 03 Dec 2021 12:06:12 +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 1mt7KO-0004Rn-Of for xen-devel@lists.xenproject.org; Fri, 03 Dec 2021 12:06:12 +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 66b24870-5431-11ec-976b-d102b41d0961; Fri, 03 Dec 2021 13:06:09 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2056.outbound.protection.outlook.com [104.47.14.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-4QVetuCsOQ22W_Mt-roe_w-1; Fri, 03 Dec 2021 13:06:08 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4191.eurprd04.prod.outlook.com (2603:10a6:803:45::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Fri, 3 Dec 2021 12:06:06 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%5]) with mapi id 15.20.4734.028; Fri, 3 Dec 2021 12:06:06 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM6P194CA0083.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Fri, 3 Dec 2021 12:06:05 +0000 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: 66b24870-5431-11ec-976b-d102b41d0961 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1638533169; 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=lrCpsxf//rC38Yu1bAGmHgfd83NmkO7BJIS+XBF2CsI=; b=iUGyGd39fQx7XAt1YrDWM7G8y8erEwX9u97Wu+wYDj6RKbkTd+55IXBMKkgJqSy7mUyiuE DFiORNFOxFqEMXZQmn3zSzJgyPEJrMTpAVmrOYFTTEwJahctlqRN0yhqXoMfCHayLFkggR r25O9jR1szwRIzDY9QxJVk16SNRNEu4= X-MC-Unique: 4QVetuCsOQ22W_Mt-roe_w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1fVguAM5V8rx83t9IR/psERW/1mMT7Ma0P50Va4QH+bxVshLAa9wWHPvCyGdkBByN8DWEyuWNfyfROhdptYIb44Ne+QojjsdP/vZBf/t325IB2btsiUfnZBY9KHUoGo08Zk8c7lU0rerd292jWihxi3lh6lVyoLXoseyS2KIKV9MyEGzmZlPOt7LP+XMIY8r7rT5TXiR01xZwY8bwMWLbegSq8fOIBqtzMwqZJfm39ufinaCeopU9zLTJbLXoYRx1I2jnIYE+tASUQWi6AdHhkyPBCXCNp0cm+DhEZLiTlo/P7bvGmcOudbWrE2cqouRiSwGeQ6w5W/F96cIfKdgw== 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=lrCpsxf//rC38Yu1bAGmHgfd83NmkO7BJIS+XBF2CsI=; b=EIFiabaRuSdJ74uTdAWIrYqUwXOZWC9oHIhJuF1lF/evV0wdthMDVXr8m8DTVn5cAcNbjocO00BPhQayQhTeDqiYqDPEG6Izx1qRwloQv3jgm7rwVx/F6nl3FxFuFMq+DsySsQ2kMBdpibXU8npDpzqs8fKnfbj7ME6H2RjhQ9EklyJK1TEdY7DgJQ6ZWEe7ldaHuFtJx5WxXYjkiIqBUCdcaa8xXJYWBuyn/V+NuNOnEBQsDlhsLNf4jO8ajM02v8ZB/8L6eo5h2hR28P5FzzR/pZ5CS7upQfBlrjqdgn5pc+NvzLyW+yKMlnAOoWF/fmjSm0wGZ45omgvW7nrQzQ== 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: Date: Fri, 3 Dec 2021 13:06:04 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH 4/5] 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 , George Dunlap , Wei Liu , =?utf-8?q?R?= =?utf-8?q?oger_Pau_Monn=C3=A9?= References: <57038a1c-671b-f0f9-1bf1-0ff9bae6e2dc@suse.com> In-Reply-To: <57038a1c-671b-f0f9-1bf1-0ff9bae6e2dc@suse.com> X-ClientProxiedBy: AM6P194CA0083.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::24) 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: 084287df-8497-4aca-636c-08d9b65548ee X-MS-TrafficTypeDiagnostic: VI1PR04MB4191: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CBdYD8brSmj+sXlIdI1900fIoJ4ZXlTSOX0qxa6umyea1KrNEqDF8cO7v+GC0exJ6I/rSfKld5ZmeFfBoVsfrzqTAlyZZ0K2sxIE2IeFrKokNnNgd19sX1TsWdQ0X7VF5pjI5YO6gICPq1sGaCFkZq1DJ+v+pJjMbAnQVo17jBnN8DdUHMk1DbKMhcKBZUnZaLVJGppkYqXToZf1r16lLK1MEqYV+zCE0pVfl7j0MT+e+LOtkJUue1CcU5R3IiocHhFOQI/qQc3NdTDa/LX9iEF4gW+CyiX7fD+dDYXQvC0opOsqHm+nqMl704iVu/nCbKI8k3k/pylEV6gifv0SuJ7JiD0BrNkYP7+K98+tXp+UmHHUBZzVIcg0xxQJSfQBuhyjCLkyQ9nc7dZRNYkeC9k803SXdmlFJIqYI0LR3+wf9fr8U06qZRWJwqw21u9yIQr7XNm90nbXsdjyTSd+Ul28ZLgwZDcXDT15wt1bJC0EhkYM8Qq5XiXxpaXnL2KLdxHVYkeIYU6vEb/Cj/g5xeULscNViV2Hkmxo2/fVU1CY56lmikd4xzOyf+URfQ7Mdqk7FqukWKjpYXg0+9t8K0Q6q+QU1KPLl3TvHC8kkCmqWWvfSf41cbsRNTpsU7pwOS9Y//FKtMRTEZkwPI4uj55rmc8kKrhot9pEfg9YiuicDk34rMoOH4AFzBjXvfN/wYHVtRZV0xkYz9xk/LnpYh10sB1JSHhyCFBvsbOsVmc= 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)(16576012)(316002)(86362001)(8936002)(5660300002)(2906002)(4326008)(8676002)(83380400001)(508600001)(54906003)(6486002)(956004)(36756003)(2616005)(186003)(38100700002)(26005)(31696002)(66946007)(31686004)(66476007)(66556008)(6916009)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?2wd9iiL0Gqd8z/oEsR1RuPFFSKI9?= =?utf-8?q?s7zIUeBcb2yxm8WAGjySkHK61QIGgqKKctDx6PlROcA2xcwyD6ErGe2RUkWKFk+WW?= =?utf-8?q?5CCWg+tLli1mr4n62SmlJ+ZDg+HhD08MqW+X+9ZaCsUEb9KXQ2ih0OSbAyKX2dELW?= =?utf-8?q?cE9uYGl9rYkX6hVMK+JEmmJzvRrEknY28iZCSXnFndf64Ms3n4HEks/ItnW4tAxx2?= =?utf-8?q?xqdXN9CewjoyTJB3i2j28d9GPYH/IRgUdtQygoJ1O+Thjz/w/dX+k0MZd0E40AYjr?= =?utf-8?q?8UnEg4vCBG0R6ou1MiBzKH1F/r/qILRG5WXtguSwBVIgN/1SJU35XgYmqV0VjYwtw?= =?utf-8?q?gAayXdPP/qt1iL4yeVWIACdaepwHgSmw6VJku/MVaVvzocR/zuASJaBoUyK+1DjW0?= =?utf-8?q?geiikhGwIvXoj+94pPYoXCwLD0VAJV5skIEOVWusqXti+5cIA/kHKUrPGzAhB7EYi?= =?utf-8?q?rmTIFVMMHMYTMXPeNBw1XyraOWEEHDXqL+8ocsc+Wq/Talwvq8i1bqFSrvpfk0C03?= =?utf-8?q?9BFtRXfov/st383LSizj0ijY0gFD9JdrHTO1zVQEKUdSOj3o5ozAQuExgAuzifNBj?= =?utf-8?q?CVxpevtaAafVrmD7iUg6P7OgThX5NwZOF1jjw8mMG+Ai+M251xMr5IP59xIyAJ8AE?= =?utf-8?q?vpZsxN0pe/iLTNCpJAuPmL1b+ufdrLvGBc/002hpfpEjvVo+The+xxLyPprVvCl8q?= =?utf-8?q?pn/SI0YAzV0MIszpvBmzB6i+ULhafurXZTmkhATKMJGo8axa75RCFv28C7unzx6VI?= =?utf-8?q?sBZFPXBxe93WJDNuNTkk0iAX1kuHanAXbFWhAGNPIrenX1OFEAxkbebUJdiEwY9Pg?= =?utf-8?q?x3hHbPncdpyCxUJwC/MjFRUlYy+OJIfw/6ha5I2EbKpKtyNlglymiGZHHT/1yAlCB?= =?utf-8?q?Mdv1qBg2hjEjd/jBxWKCH/cwSn0CDhuK+lPX6tW+ZnDfYIH4wmiFs1zaXP912aO+5?= =?utf-8?q?+6KqnlJgVrhrZ6Uli55kOZeCCJkllPI1Km0HSeQCBeFz+zVJ3eppofp6OEUmYOvNw?= =?utf-8?q?xRtGIP7SnGq0ji7udu4/RjMasXijfCMyUtggHf8106aAzJ6maNjwc5WMHvYqCEQ6D?= =?utf-8?q?5N07b7xcUwF47ROOqLE3BS7MibDB7aurTrhbz3bqQ8793P28J/orZXHIvcll5RxZa?= =?utf-8?q?eG1KfP5GWuA/KuzSXib82Jdh2gxmBHZnDCLW208qMaSIr1eVQSMsscc1bS2l5zPz9?= =?utf-8?q?srqDDBVf9j0p1g5sxYh366i+fGb6IkCsjK+8n2sXHbmEgvgSwAM6cfK2NCitgs1hl?= =?utf-8?q?iSj8+d5cQx//66sI7kG8eiwmIPFjD6w4l0/BsFQ1GImviJB7U8o11xQ/U6pTSILzW?= =?utf-8?q?dCf1Q6/VFV6Q5lS/xRDRJaagPG6QMEG/7pkDUgxHd84P/429KzuSEKuZXeL3QijZ2?= =?utf-8?q?Ex3hxTg2oR0PIVRWJeaMuwR0SdQAOBVOD0hEVLYRBXdrjZ4MCaSjcmcFasmfVELnn?= =?utf-8?q?IVO3w1ncCehyvC/yIYCoy+bs2Ngg+ovmkBo8XJLWayEhl+mok98utKE4Xf+pH9ZDH?= =?utf-8?q?m8aASLuiWATp38p1ezqDaqa46AACOP7L1WJF4g4dYWct2Cikf9mdi6A=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 084287df-8497-4aca-636c-08d9b65548ee X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 12:06:06.2793 (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: r9AYsZLSo+4t/iINfivrIxR5brrFFY01/R1rBmftFceYwH7kn4f3dPEEVwdS4HZaQigYTxB025JykEm0yqDpXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4191 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 --- Given their large (and growing) number, I wonder whether we shouldn't fold "SVMexits" and "vmexits". They can't both be active at the same time. I wasn't sure about the #ifdef: Using CONFIG_PERF_COUNTERS there would seem slightly odd next to a construct which specifically abstracts away this aspect. --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2644,6 +2644,10 @@ void svm_vmexit_handler(struct cpu_user_ goto out; } + /* Note: "+2" to account for VMEXIT_NPF_PERFC. */ +#ifdef SVM_PERF_EXIT_REASON_SIZE + BUILD_BUG_ON(SVM_PERF_EXIT_REASON_SIZE != VMEXIT_LAST + 2); +#endif perfc_incra(svmexits, exit_reason); hvm_maybe_deassert_evtchn_irq(); --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -302,6 +302,7 @@ enum VMEXIT_EXITCODE VMEXIT_MWAIT_CONDITIONAL= 140, /* 0x8c */ VMEXIT_XSETBV = 141, /* 0x8d */ VMEXIT_RDPRU = 142, /* 0x8e */ +#define VMEXIT_LAST VMEXIT_RDPRU VMEXIT_NPF = 1024, /* 0x400, nested paging fault */ VMEXIT_INVALID = -1 }; --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -11,8 +11,8 @@ PERFCOUNTER_ARRAY(exceptions, PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SIZE) PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SIZE) -#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_SIZE) #endif /* CONFIG_HVM */