From patchwork Thu May 26 11:11:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12862257 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 11C35C433EF for ; Thu, 26 May 2022 11:12:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.337556.562186 (Exim 4.92) (envelope-from ) id 1nuBPq-0003Rt-Ky; Thu, 26 May 2022 11:12:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 337556.562186; Thu, 26 May 2022 11:12:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nuBPq-0003Rm-I7; Thu, 26 May 2022 11:12:30 +0000 Received: by outflank-mailman (input) for mailman id 337556; Thu, 26 May 2022 11:12:29 +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 1nuBPp-0003PI-Hg for xen-devel@lists.xenproject.org; Thu, 26 May 2022 11:12:29 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b946a42a-dce4-11ec-bd2c-47488cf2e6aa; Thu, 26 May 2022 13:12:27 +0200 (CEST) Received: from mail-mw2nam10lp2107.outbound.protection.outlook.com (HELO NAM10-MW2-obe.outbound.protection.outlook.com) ([104.47.55.107]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 26 May 2022 07:12:25 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by PH0PR03MB6527.namprd03.prod.outlook.com (2603:10b6:510:ba::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Thu, 26 May 2022 11:12:23 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::5df3:95ce:4dfd:134e]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::5df3:95ce:4dfd:134e%4]) with mapi id 15.20.5293.013; Thu, 26 May 2022 11:12:23 +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: b946a42a-dce4-11ec-bd2c-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1653563547; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=IjSmW8a1Um+GGMYx28eSmPuDoMRq2A1WoAd0TjwqTSk=; b=J1wkBp5nfK8DjKcJOJPvUvAqrW1aKf/f5v37pVy3zWUJ/3o1etHL3dC8 POSPTV4cpYfFhFxAZdALYwgkLb5w7dmeVR3TwPGVAixl/kGqDQohbA52i +Lf1IL9qCfLMAx/nOEwaEPpJXChb6Ttewm0w7ySPLBviAlo5NSJobobF+ w=; X-IronPort-RemoteIP: 104.47.55.107 X-IronPort-MID: 72630640 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:2yE1f6+oXuqEo7YpKA+aDrUDmn+TJUtcMsCJ2f8bNWPcYEJGY0x3y 2pOXD3SPKyIZTP0Ldp2OYS2/RtTupLXnIRlQVNsrn88E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5DnZ44f5fs7Rh2NQw3ILnW1rlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCnbuiCisTYqzupMc6dEVYITw9OIsb/LCSdBBTseTLp6HHW13F5qw2SWQJZ8gf8OsxBnxS/ /sFLjxLdgqEm++93LO8TK9rm9gnK87oeogYvxmMzxmAVapgHc+FHviMvIcHtNszrpkm8fL2f c0WZCApdB3dSxZOJk0WGNQ1m+LAanzXLGcG8wrL+fJfD277wit207TIDOLpPePRd8JvowWHh G3C8DGsav0dHJnFodafyVq8i+mKkS7lVYY6ELyj6uUskFCV3nYUChAdSR28u/bRokyjXZRZI k8d+CsrpIAz8lCmSp/2WBjQiH2JoB8aHcZRGusS6QeRx66S6AGcbkAGRDNcbN0ttOctWCcnk FSOmrvBGjhHoLCTD3WH+d+pQSiaPCEUKSoHenUCRA5cu937+thr0VTIU8ppF7OzgpvtAzbsz juWrS84wbIOkcoM0Kb99lfC696xmqX0oscOzl2/dgqYAslRPeZJu6TABYDn0Mt9 IronPort-HdrOrdr: A9a23:lW59pavwSjrciKMZFBR1BMFk7skDjNV00zEX/kB9WHVpm6yj+v xGUs566faUskd0ZJhEo7q90ca7Lk80maQa3WBzB8bGYOCFghrKEGgK1+KLrwEIcxeUygc379 YDT0ERMrzN5VgRt7eG3OG7eexQvOVuJsqT9JjjJ3QGd3AVV0l5hT0JbTpyiidNNXJ77ZxSLu v72uN34wCOVF4wdcqBCnwMT4H41qf2fMKPW29+O/Y/gjP+9Q+V1A== X-IronPort-AV: E=Sophos;i="5.91,252,1647316800"; d="scan'208";a="72630640" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oZTsr2ihrAEUmvE3vLt102ZtesSSmuVPWN1lszmUZkQQnblr2976XIxdyNGV98ntKEJt+pSpeJrxDqwcZo+P7VJ3FZTCb5iir0LAlfezy64JoLAZ7juqjb3xX6zwOc07/KkjtQ6KdggE2V+hdVmDuNsO5Be1DvTHljagjuge703NdBVt10q0PBWX73fLp2LBY2EhGZHZ8zWP7gsDerrnmOgvK7zGbmgJGGoE5sESMnlAeriJADkKYeSmCbBS2AIVY8lzJnMZDJtvSnKfKJet0euqj3W5ifAPa+7YCe/HtUAgZYwm3xpKfVVG8+bRpyPRmhCIpiekt/ua7jaPThsuCA== 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=Lk51GUgUWIAXFPTQpLQYHdKMy/7fDVifoFw+Du1GkSU=; b=IoVD4iHAwT0dRCdY4PbKfTcCeBBsaNpsArhyIVWCbfbxlqFPWR0gIY4CxkUEoYRaEmducvzRqtV6vSnTBk+RN1wy9gCR8HUZv//jmcwfWXmJWNKzJEVKjWiOBZ0AdDiUwXJonT4HlxaFSXz+aWYYo/igakArWUwmN5dxjGlF5xPqRr9IEp8fUX3OiW5KnD8FBjJC0IEGB1ehBtRSCc3t0GZATnIa/blcDVw+i0bVW9Bo09LTCJXuxfPfmW5uJSmTfDBLO8ZrzryQg0RANy7eKIDH49cOIIpHt6+GmMVQF9bd+nLWpJIL9QoHA3zEcBqQGWfsfe2G5CQmeKpsYfoftA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Lk51GUgUWIAXFPTQpLQYHdKMy/7fDVifoFw+Du1GkSU=; b=k0vSU3nu51WbGrE5TP2MwqI3mQq/ihEJgSwXg0/Ox9jbe/gXMTkPFzbSVZOG1JGKUYxM/lZGQK5kQu4ZWCUYCuy3f4vGjTabEp8HQNs4CzDZ07oIJMQdIxQCpkRgffDKPaMGtBgdsjGYcNXMHVaiXwFWmLBPlQDInW0f4y2XGz4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jun Nakajima , Kevin Tian , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH v2 1/3] x86/vmx: implement Bus Lock detection Date: Thu, 26 May 2022 13:11:55 +0200 Message-Id: <20220526111157.24479-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220526111157.24479-1-roger.pau@citrix.com> References: <20220526111157.24479-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0472.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a2::28) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84c91296-d62f-4b61-6c93-08da3f089bc2 X-MS-TrafficTypeDiagnostic: PH0PR03MB6527:EE_ X-LD-Processed: 335836de-42ef-43a2-b145-348c2ee9ca5b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8FdQy/bgXTeZ8ARRoWXDk2Nh/pUAdUL6TVVI+hst4EedvK8OXnnPQwM6poc3ZDzrcwCZdGY77R4aLOTjtOXwhJETvEaZ5/zdLuWywz9kf6pcDAAIKDgszyrJV4+2QnJ0ran5hmBH62aTo2xibF8wJSGHvNshMKtAxydPpLpQcksfqV8etb3k3I3tL4EUUtCJF4EiRtUiUZm37B3GswPTW1UZop84V9q/Y8yYCJAV8rYFc863NkB4xA/JzRgprU1TKv4fKaKwt7RvyfIqljfJdMV3sSYyQ6ICYXmyb2CO9FjhS344v6tE+1lcBbCtTXPZbSuQxMimPdRBGrg8jmN/ZUeye/OGeqKnsxI76c4RRFXdOpoma1hf0JAsJntBXrBc0oy6kvthpJzeyOqn+Zgg9flny8TMjFCxhnYnQmDWkOHANYJ7yfhN7VA0/5287Jj9cdeag5MJSnfbPabL7EzH15NF4MvCW9d+USDhG0n/VvBN2L47tewXJCU3f91nuDJL/JEX++Z1WZMy9LqftUAycMx8+pj5PpS5ecLazu9c7TfoYvpvuQzyw5DugXW9pff+wPxnYdudoi1hrHIExgpnPKusVKtwWGmjykqyGirUJMVcbRgPTqtXj0W+Br9xKYBC7nyGFO+pxF8TSZ04uydSfw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(86362001)(4326008)(66476007)(66556008)(66946007)(8676002)(8936002)(54906003)(316002)(6916009)(38100700002)(1076003)(6506007)(82960400001)(6512007)(26005)(6486002)(83380400001)(6666004)(186003)(508600001)(36756003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?mVp99MKTjTMZCrV8LoOTMCnyYCVe?= =?utf-8?q?TpLC8xUNz1gHvGk4EIiyLXIyR7EbOXbwnbdAUmaaLJRAaxUjVZjbh9kSlgVyqWNi/?= =?utf-8?q?E91AY1LoINizoSpC/7yeW1INVB0hxgNfPilVJoMydCvMX7eUdLHCpdoPyuuurKRnb?= =?utf-8?q?E8UCx41cM4t2m47k+1JSp5MXwSxdLcasKTvTtEcz8PtYGOqJdh0XT3UzWzEyjrXO6?= =?utf-8?q?URMmRRiQMvoe+4s1Lm738GHYSxzB9xl8kyNGblyw+L9NImiyqYkEKNkU/gP7Th9Xy?= =?utf-8?q?Ng//9sCd7s1JNC7azl+6H0RI29zKnNpmYRw1a4Rh2scQQD6LNCxXOv1AsD+bavkkN?= =?utf-8?q?j2jwuN038wqn1SBC7jTRFxvjMFGu95scoPgIfjWby9wMdPX8/nqpFTTSuZThB4gPL?= =?utf-8?q?ZlsZSM0aYoLcv3pSo5P70275/J/DHFaSgtpQn2YiVelcJFGjVAfD8XEFQHMN9UylX?= =?utf-8?q?xWZw47aZuepu8BCfhCjMyPhtnKnmjPcaDEmo5p/QhbP+bxPLEffxbfHWAZKkLKdDo?= =?utf-8?q?7tFOim+XW30OlLIb+Gs3QtiWGu+Glqn2fcyRQjjj3WBXAzk24WDM5IsRh2mAQ/9iE?= =?utf-8?q?NGyWKGRnKuefqGnFS19vVsgcR6EB5roTRM++FVOnptXLPa0ZGCTk5p/ng8p2R8BxC?= =?utf-8?q?x5HHfwhT7tzxiQYrLBpqSLDNoQOySBjbZsTOLPIrga5lT+i55rEMt5FGvbl4CnAHL?= =?utf-8?q?AC9qbNXcY9KZToLnj0sloC8gjyGkzANDGAJJSYgpCtygDpe3hd32UPywK+0snw1MN?= =?utf-8?q?ul8PJm8SG11MY8jwcv28qyaj3YQiQIYFniIGPLq7uXgk0eeLxHYNFjMNNC6qgmSVH?= =?utf-8?q?myT7HbscTnBmf8TKAxQ3QPD73/vq2oCa4YQXLhevNrH1eW8nL4iSCa/IYv0QC84Lk?= =?utf-8?q?AOzB8gqiaht+uvLu9pZMS0Uqgg/CKw/qi7h7gpu3DRbUboXMIGFSGJiFxoZfnb9o7?= =?utf-8?q?ti2r3oIdp7Ipob+9tdMmnMXymxlTP1rn96IKOYU/AhiEZhHH0uccKIuWzvkwsWp1T?= =?utf-8?q?z3XzV+EpKvxpjwm5IArgdJUnTcaBxCw/+ULfpMFbcvA60LT2ZSputh9cjeI+8jO7o?= =?utf-8?q?s13YmiBb4UaaYl88hh63ofC7XYT4D04Iv4lZsvkQwFZaZQD++o9qc4K3boRvoHWER?= =?utf-8?q?Gyqiz32w8VPzZq0X1Dvh9vseJaqtJRrnTkBGZxLBl5yFacfSw9nWDFlbo3WkEasPR?= =?utf-8?q?IgwDKLSLq1KgU8uDf0xfIoenrwVau6y9Y8zrMbIoo0Dg774t9j6WsGszNr/OzGhnG?= =?utf-8?q?RI5hvdm+JEVAEUdbb9OwU4RHIo1qFimCywwRSuwlhicoIt0uAborcT1csWXeE3zZg?= =?utf-8?q?VTytbZZmMZHvOFV6/SQdkRFP5IPfCMdeaUe7yTOxTKWIs37+WVl97hJuHji2Meg73?= =?utf-8?q?YttvyDW94FV5DMVkHEd3yQKiGXOrEAo5EYlKkESzoincQj9lYeYj1/6KadV4LfoWv?= =?utf-8?q?drWtwkIF+vrONGJYYT7oHWxUtTEp3xo4V5fMdEDUAdBJ4qY4cw4rfXOdj7EE2k5U+?= =?utf-8?q?1iFLI0REPpwG5vXBDxCrhSSXRgo0NVs6Cj7Gv1RFQJADFcuMmIuzoxqbupPMlgjoH?= =?utf-8?q?dp0ZVX+xppMuQufH1zZUElLg3yt8OAnpSAlIQMuS1YXTq6vGGfCrdvNpvSGyQ+8qz?= =?utf-8?q?/OLpTA+bz1iWEk3Pw70BAiE1/XEwg420a7SNMFheAvB8KWyCVqvvA=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84c91296-d62f-4b61-6c93-08da3f089bc2 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2022 11:12:23.3094 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Tfwr3fYZuh+tbeBpJzMNMUOmGmTleqFLZSW2Ni3hDecWMqVc5Oj3xu8wpGTG+lXLc8gkuXvoPhHeMNGI3K8rFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6527 Add support for enabling Bus Lock Detection on Intel systems. Such detection works by triggering a vmexit, which ought to be enough of a pause to prevent a guest from abusing of the Bus Lock. Add an extra Xen perf counter to track the number of Bus Locks detected. This is done because Bus Locks can also be reported by setting the bit 26 in the exit reason field, so also account for those. Suggested-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Changes since v1: - Adjust commit message. --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- xen/arch/x86/hvm/vmx/vmx.c | 18 ++++++++++++++++++ xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 3 +++ xen/arch/x86/include/asm/hvm/vmx/vmx.h | 2 ++ xen/arch/x86/include/asm/perfc_defn.h | 4 +++- 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 56fed2db03..d388e6729c 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -209,6 +209,7 @@ static void __init vmx_display_features(void) P(cpu_has_vmx_virt_exceptions, "Virtualisation Exceptions"); P(cpu_has_vmx_pml, "Page Modification Logging"); P(cpu_has_vmx_tsc_scaling, "TSC Scaling"); + P(cpu_has_vmx_bus_lock_detection, "Bus Lock Detection"); #undef P if ( !printed ) @@ -318,7 +319,8 @@ static int vmx_init_vmcs_config(bool bsp) SECONDARY_EXEC_ENABLE_VM_FUNCTIONS | SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS | SECONDARY_EXEC_XSAVES | - SECONDARY_EXEC_TSC_SCALING); + SECONDARY_EXEC_TSC_SCALING | + SECONDARY_EXEC_BUS_LOCK_DETECTION); if ( _vmx_misc_cap & VMX_MISC_VMWRITE_ALL ) opt |= SECONDARY_EXEC_ENABLE_VMCS_SHADOWING; if ( opt_vpid_enabled ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f08a00dcbb..476ab72463 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4065,6 +4065,16 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( unlikely(exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) ) return vmx_failed_vmentry(exit_reason, regs); + if ( unlikely(exit_reason & VMX_EXIT_REASONS_BUS_LOCK) ) + { + /* + * Delivery of Bus Lock VM exit was pre-empted by a higher priority VM + * exit. + */ + exit_reason &= ~VMX_EXIT_REASONS_BUS_LOCK; + if ( exit_reason != EXIT_REASON_BUS_LOCK ) + perfc_incr(buslock); + } if ( v->arch.hvm.vmx.vmx_realmode ) { @@ -4561,6 +4571,14 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vmx_handle_descriptor_access(exit_reason); break; + case EXIT_REASON_BUS_LOCK: + perfc_incr(buslock); + /* + * Nothing to do: just taking a vmexit should be enough of a pause to + * prevent a VM from crippling the host with bus locks. + */ + break; + case EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED: case EXIT_REASON_INVPCID: /* fall through */ diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index 9119aa8536..5d3edc1642 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -266,6 +266,7 @@ extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS 0x00040000 #define SECONDARY_EXEC_XSAVES 0x00100000 #define SECONDARY_EXEC_TSC_SCALING 0x02000000 +#define SECONDARY_EXEC_BUS_LOCK_DETECTION 0x40000000 extern u32 vmx_secondary_exec_control; #define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001 @@ -345,6 +346,8 @@ extern u64 vmx_ept_vpid_cap; (vmx_secondary_exec_control & SECONDARY_EXEC_XSAVES) #define cpu_has_vmx_tsc_scaling \ (vmx_secondary_exec_control & SECONDARY_EXEC_TSC_SCALING) +#define cpu_has_vmx_bus_lock_detection \ + (vmx_secondary_exec_control & SECONDARY_EXEC_BUS_LOCK_DETECTION) #define VMCS_RID_TYPE_MASK 0x80000000 diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 8eedf59155..03995701a1 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -159,6 +159,7 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc) * Exit Reasons */ #define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000 +#define VMX_EXIT_REASONS_BUS_LOCK (1u << 26) #define EXIT_REASON_EXCEPTION_NMI 0 #define EXIT_REASON_EXTERNAL_INTERRUPT 1 @@ -219,6 +220,7 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc) #define EXIT_REASON_PML_FULL 62 #define EXIT_REASON_XSAVES 63 #define EXIT_REASON_XRSTORS 64 +#define EXIT_REASON_BUS_LOCK 74 /* Remember to also update VMX_PERF_EXIT_REASON_SIZE! */ /* diff --git a/xen/arch/x86/include/asm/perfc_defn.h b/xen/arch/x86/include/asm/perfc_defn.h index b07063b7d8..d6eb661940 100644 --- 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, "exceptions", 32) #ifdef CONFIG_HVM -#define VMX_PERF_EXIT_REASON_SIZE 65 +#define VMX_PERF_EXIT_REASON_SIZE 75 #define VMEXIT_NPF_PERFC 143 #define SVM_PERF_EXIT_REASON_SIZE (VMEXIT_NPF_PERFC + 1) PERFCOUNTER_ARRAY(vmexits, "vmexits", @@ -125,4 +125,6 @@ PERFCOUNTER(realmode_exits, "vmexits from realmode") PERFCOUNTER(pauseloop_exits, "vmexits from Pause-Loop Detection") +PERFCOUNTER(buslock, "Bus Locks Detected") + /*#endif*/ /* __XEN_PERFC_DEFN_H__ */