From patchwork Fri Dec 2 00:22:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongli Zhang X-Patchwork-Id: 1711162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2022-7-12 header.b=BJgaAF7L; dkim=pass (1024-bit key; unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=yDsz1iL3; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NNYgG6qKDz23nC for ; Fri, 2 Dec 2022 11:27:38 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0tsm-0000uM-48; Thu, 01 Dec 2022 19:26:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0tsk-0000tz-L7 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 19:26:22 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0tsh-0004h1-S0 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 19:26:22 -0500 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B20PFiu024873; Fri, 2 Dec 2022 00:26:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=7hTQ0KulW8fHzyfyXunHYyE7lIpwH/xtHaTskd5eFAE=; b=BJgaAF7LrYkSJtrOXj+NFSa5JD/bynCqOL2abgw5IJ1G4NspxXJHl8nQtVdvNIhMAceh eAZVpfnNaNzAbxpLJm2XHY1Lp0y14SR2brS857YAAUKCoy+r9ptIytzLD2lOspQfAxqt YIoWIUyQEeU3BZn7q9fdhfvj6Yp0mKLgOe1uiWJF3g6Y9VpGGED/ng74KC1aVE2MRNei xicYyJdgo07lwViOu/aB0DEbFMM8PsXHOSbOYlkgTZvfK0hB+7sD1HqAcQt8dEfD5zTc lkPC+IYXgEuZbxZs+OVgw6NjzvwAZLlNBivaeBRHkw4pMC7Iel9PxcUYYICXA0gpTE+1 Ng== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3m765w01uj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 02 Dec 2022 00:26:05 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B1NOMM0036602; Fri, 2 Dec 2022 00:26:04 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3m3c215xms-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 02 Dec 2022 00:26:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fQvB7AY54EianZZeSSuMSmazDuL7Y3MZeU1r3tFg5r2H91Qb88NsnychazmnPOX7ILfQAwtpBANp0e0Ep4Qeu2WPmrmblmh8iFBhMpAyygWtIDQtyVo16mG0cjduMuXwUHnZxwUmMVk+PEw42EF3eP74qIzzIxqW/iNZfJN3Un1r+3Og3hehri7wUFvV0/JbA080SkvIgLD853gOY7iyfe6fL8W+H7upWfPj+GdQE90laRUjlZQ1XjMJylnSBOrH+ayMKTbJEqsJUKGeHOwvEFM7WiR/c3XI6ueaWptpRklEvSLdjtAN/B1E6gZAcyFNwhUf8uvox3jUN5f8AkFzDg== 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=7hTQ0KulW8fHzyfyXunHYyE7lIpwH/xtHaTskd5eFAE=; b=S95gm7D5O1QwpQiqZRoS5dFPDyCHLhU7zFwlK7t6V/U0hiPgmuwl1Oq064mNwJxr9+SIk7KF7Nvu6o2VqHR88vG1f2k5KAa6gQbov741mp9JQu9K6YtVBQDEbDMgDZC/+UlqBrpezfjSsfNuU9qXZNPOfWK7XFbL3OCzDcgBIb74hcZGGzGSsJq9ranYD59xJGVq1otwnAYMZUbNqfaQ/+29HQaiePIDyW3tji1in6SUs+2IDTCWSL5Mic/V4QqdzrzQkoHZf5pQn5btKK4puS9O5xJoeTfnxWkMc2HOPCATq9C20z2CJPUUSNQ7rOvFKu12LpV7xzDCEosGO3y6Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7hTQ0KulW8fHzyfyXunHYyE7lIpwH/xtHaTskd5eFAE=; b=yDsz1iL3Q2687Ly78Max6jzNfGcwcKQD3WAhjVzGDQYqldl3aPcqaEKlgmjWQ67toa6wrM6rIDOKHE/dvLYZN5iOoLXMVUAKd5uyOrzBuG74Jw3sLK5y+vaqimW/9yzttFJeptkysi9pppCouPt4F7IaL5rAKKH47iaN3I2oEvI= Received: from BYAPR10MB2663.namprd10.prod.outlook.com (2603:10b6:a02:a9::20) by DM6PR10MB4396.namprd10.prod.outlook.com (2603:10b6:5:21e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8; Fri, 2 Dec 2022 00:26:02 +0000 Received: from BYAPR10MB2663.namprd10.prod.outlook.com ([fe80::d868:78cd:33d4:ec7]) by BYAPR10MB2663.namprd10.prod.outlook.com ([fe80::d868:78cd:33d4:ec7%7]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 00:26:02 +0000 From: Dongli Zhang To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, joe.jin@oracle.com, likexu@tencent.com, groug@kaod.org, lyan@digitalocean.com Subject: [PATCH v2 1/2] target/i386/kvm: introduce 'pmu-cap-disabled' to set KVM_PMU_CAP_DISABLE Date: Thu, 1 Dec 2022 16:22:55 -0800 Message-Id: <20221202002256.39243-2-dongli.zhang@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221202002256.39243-1-dongli.zhang@oracle.com> References: <20221202002256.39243-1-dongli.zhang@oracle.com> X-ClientProxiedBy: SN7PR04CA0181.namprd04.prod.outlook.com (2603:10b6:806:126::6) To BYAPR10MB2663.namprd10.prod.outlook.com (2603:10b6:a02:a9::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2663:EE_|DM6PR10MB4396:EE_ X-MS-Office365-Filtering-Correlation-Id: 09d50109-8c88-4b6a-57c0-08dad3fbcb15 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9LiUhAcVa8BdXa04OAdqMQN9GBI2MJrgNLC5zQvF7pahcKAiVRpU5QV2ESVzCU+yRUuDgT/xsF1q1Ukh7WJlDCE1npIxcU/vaErkLcps/fxEEC4HPvUqTN0BIQm1cQBWFspfvBNVwp4bqhINTPDGiKKR4KFH4bru65Z7i5J3zWYdV8pfb42CvKdPRSsIWy2Ql8PDOb/srwjcfyPKZ9bicsmmFaYGC+pU+N1TSKwOv3Ez/oGArgzjJitlt2ATqH3pvgOel2RMC3D6vBJ6vEUFGQO9QqeCpR1B3wPp+j6Nc4qm5saJQPRdlV9btsCVsYADuf69aYXO022zH6+QaIZhZjPaBnYfKRBpjC/jt68YCxW3aONg1JSSb1xYJwCKKQ1RwgP/2oJRu5fxdXCHSrYqf9NEJedhFS8OsANOt4PU3fLxUElWt/3vfVQ5N0/APt3BCIqIRqXpIfHpO3DH63OfjykpKW3nowIB9yZVd8WamB7palR1T33zEF42LR5tCDhjVfGZfzcl5ld8AT+nC/qGEoiSNRccYtGOvU5k+ZrPh3yTEXmU8LKNskybLbCTaTl89ybUa+9zm5UT7ua4c8RShzIKjkHMNASztlE4BhiYOmSemaP7t/ubal7fqVYV3BSL0vgFID3bvH0+XzXu+1ShvA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2663.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(136003)(346002)(39860400002)(366004)(451199015)(36756003)(86362001)(316002)(6486002)(44832011)(8676002)(66946007)(4326008)(2906002)(5660300002)(41300700001)(66476007)(8936002)(66556008)(83380400001)(38100700002)(478600001)(26005)(6666004)(6512007)(186003)(6506007)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UvpR9dQFvsMUDcStRLZM6eRyHwhgtE2vxoGKHv0R3Cp9dZioCJ9t8vAdbBpaT4jV+jTlSFJlzi0Ynlvx9cHLkpjgXG8mfc5+F/mb3RLTkQMFq2QlOGHC0UiH1AFuSrfZl1mGTMSruEybjH/FIQbp6qMfUpaRbQ0qFN5mH8xPnyj4gcRr9lOKo7lXGcSW3jJgmAAj2JEGxqbtOwO6Ff6hfCHRj0KeRG/9UftCSLx+c5a0Ox1aLqpd/o7di0OB5MSuokxpoPF9seIpmcfksyj0sXKKYA6p54vwm7lpfQZPmH8Bl1jWwPYIzUecnYaTt9/u5XKrhKxGoWfJ8HBLB4TL7HwofCwkdHRk9nMjMiyN897ayyidvL29FxJG6sqJ8z9TkB0uIG4jNLOHnslLBXU20SsfKpNxZyFp00JykkUlWx/CsJoukbYzj1zLz8u/UBYnuUHNns0BzAOudw2SEv7mKcCM3IOyr3EP4yioWy+eJNbPxhaEWxG5JglcOwGg3poBEEJjpu7iKCbilXroFfIMfAtyhqTdxK4ylfL6fUd9Qq/tF6DkEYHkUmJL71LZPr2RFYHxLsIa3z/7gdSRZ43eE30gMlZ2xLeKrkTB7QuRGuGSBhvzd2yfuvilY6nryHxSzxx/ye0RetJrjKjlDpvFtq8tez6ldEQybe7OqCOGnQx73Nvh1OyEqjw4f8IRvJFpPJQ/1KnORBfwIHcvvN2+enM6PAhgjFDM48j507GnYTiZ47y93QyqT1mibBBnBWCOfQEtJLq4Vy+va5T5E4v375BBgvTK7ollBmE4JlTEFEK/KZo2W/lBz7ZklsMTDGgZdjPIiuR3PCGkM0Iy/g6Q6gyEbgrJ6GL54iiDq9jIfAephQTojWu1HxljBJJgeQ/s0aLyIHQueGDK7aBBCy39ZmcTk1tIj67rRDO+EsS0XXA5rhraabuSyMfBneKXU4/rOYt5wnh/IguxyaV24eEgAdhxs8zyTJ/vOQG88tj28A2FR6nbJ7QPvc0YqDLCWCqf0TMS5KCKwbaIoj4fQAqCBT5EkCx3zLPJ5qruidPp8HiDtwlDJ7s0/ZgRsTZq6u5WQ1dhQfUphy9RDYBD07zsogjEXGHTNIdE0FZwAxXUP39trid/JyU5EPbZUFV21j6uaEWGMd1jh9ITZ48AtMKZ6zx4/eOWL72pZNw5CNuwVSp9n4H0DuxVZLv+ky1wKtPNzZod/aU6lYM4lyVzNefRkZG4znDWv1o2+ASGWN1IxKUv1Loh1v34h2hPItKQt5NSOCsWOGojOBZdldBGOAkYym2nAOowrW+E3/A+0N3dQcxMvlhUo3EH2RZ+JQ+S8lDXsKScmVMpLbG37a1Uqr22AwI0FM79DqhXgujnhzMHlx3biwVpxw4CKukMtRgxQgtD9C6O5kAJiJ547zJKDn6qH9aQChDEQXfNdM/avTH92XDY80U+TWyUEO/TZq47v6CECAa9e4vEFma/DXXE61ZajYeYAQo558Ih2QTR1fcL0Hv5Dj8/e3SjRlNQmUs7ez4PCFVj4aaZUfXhJxNr7nHFjxOBeaXkkVqZn0fvAvo+1ZhL0lksdS8rD0mKro8GLw5t X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cCA7pxiHoopARJi+NejitNz+pIL6lplUEzvJ5z2ktPuYBdsMcFnXErE4GRia9I+fr7unsDE15Qur4zPx2NnAwYbsQMwi4AaCnrSPuM/K2M3RY4qG8TL1szBjyLfjzfi/gLx0K9kRoH668clphiMCxl+rsws+Qwiy+WtgBTa2TG4VGvQI9BEccUo1Dwml7yuWvq639VlhDJ9LAC/QQNjlcg50hXh/1w8+BRwGJl+oGIwzxq2aSvMuf1ehydMTUC2LiR3DvhEJRMiO/JKTr4rZrZRdPj0Tep7INhcMgCeJTusIqR3+tl/kSV5bzI4d3uNNuW607bndEoDIehwUZv5NzOhViB1bb19sOlHpQbAXs2hYibHnDY0gui2LU1edzudMHo48af6s+XP56ZSt1jAMQRxP0+aGc6y5tTweftWT7UgnsdLeKKmkZfipebxsrB+Fl3c4pYwgof4zhcc5G1RHhs489B7U6vbDvqZpjqwyYUX/TsCyotXoKQqn7147FIjNtq5sFGBZQwRjmU1RrpXCZ07JWSGPfoS3mAoLuFvbWPo5mjjWPuqO8SlJ3LScmnQ3iso3XBMhnVHEPYhlilNKZ98RRExvJ/SmMl+9Ti9l4pioqKY/elaSv2mLWP5QXeOe1qnM0DnasB1pGsmHpbR/iw6KQy/v5snHJlev8bg2uI2jQYVR1MZdzbRR4GbaZ2epo6XQ6mm4IT5o5pbm7wJ1yNUNcSsqB/5acmQXJ3us+emZ5UrLCVWdx5ifpKuIeXyMkbx5WHmjH5KPmm6bKW62tiOEHhIBGqAbewLIsWNkBtk8/yLwBlxjgcod6lg4GNSdHR3csKKvCU600SJYpyAmhJPtT2XtmgzbSF61uN9LOV/0pg/gSDiCxGK2nP9cRm5BlNVpegfudqvgg95Rpgpolqd94sWr+NCzZlxYMaEXkCRT0na3VRCH0hOkBTAUqp23l+R4Gsdez9DZGWhghVWOzQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09d50109-8c88-4b6a-57c0-08dad3fbcb15 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 00:26:02.5646 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vZbJcD6Z5Sqni6zdNoK+AjQgkL0JjXCyMbDewDK0RweUTYSW+vcXm+SE76SRfew85NaFBsOjvACppj05ZAaDRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4396 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-01_14,2022-12-01_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212020002 X-Proofpoint-ORIG-GUID: gNxDslJ99jxP3cN3kATvoVzoInWQR3fM X-Proofpoint-GUID: gNxDslJ99jxP3cN3kATvoVzoInWQR3fM Received-SPF: pass client-ip=205.220.165.32; envelope-from=dongli.zhang@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The "perf stat" at the VM side still works even we set "-cpu host,-pmu" in the QEMU command line. That is, neither "-cpu host,-pmu" nor "-cpu EPYC" could disable the pmu virtualization in an AMD environment. We still see below at VM kernel side ... [ 0.510611] Performance Events: Fam17h+ core perfctr, AMD PMU driver. ... although we expect something like below. [ 0.596381] Performance Events: PMU not available due to virtualization, using software events only. [ 0.600972] NMI watchdog: Perf NMI watchdog permanently disabled This is because the AMD pmu (v1) does not rely on cpuid to decide if the pmu virtualization is supported. We introduce a new property 'pmu_disabled' for KVM accel to set KVM_PMU_CAP_DISABLE if KVM_CAP_PMU_CAPABILITY is supported. Only x86 host is supported because currently KVM uses KVM_CAP_PMU_CAPABILITY only for x86. Cc: Joe Jin Signed-off-by: Dongli Zhang --- Changed since v1: - In version 1 we did not introduce the new property. We ioctl KVM_PMU_CAP_DISABLE only before the creation of the 1st vcpu. We had introduced a helpfer function to do this job before creating the 1st KVM vcpu in v1. accel/kvm/kvm-all.c | 1 + include/sysemu/kvm_int.h | 1 + qemu-options.hx | 7 ++++++ target/i386/kvm/kvm.c | 46 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f99b0becd8..5d4439ba74 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3620,6 +3620,7 @@ static void kvm_accel_instance_init(Object *obj) s->kvm_dirty_ring_size = 0; s->notify_vmexit = NOTIFY_VMEXIT_OPTION_RUN; s->notify_window = 0; + s->pmu_cap_disabled = false; } /** diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index 3b4adcdc10..e29ac5d767 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -110,6 +110,7 @@ struct KVMState struct KVMDirtyRingReaper reaper; NotifyVmexitOption notify_vmexit; uint32_t notify_window; + bool pmu_cap_disabled; }; void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, diff --git a/qemu-options.hx b/qemu-options.hx index 7f99d15b23..15a2f717ff 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -186,6 +186,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel, " tb-size=n (TCG translation block cache size)\n" " dirty-ring-size=n (KVM dirty ring GFN count, default 0)\n" " notify-vmexit=run|internal-error|disable,notify-window=n (enable notify VM exit and set notify window, x86 only)\n" + " pmu-cap-disabled=true|false (disable KVM_CAP_PMU_CAPABILITY, x86 only, default false)\n" " thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL) SRST ``-accel name[,prop=value[,...]]`` @@ -247,6 +248,12 @@ SRST open up for a specified of time (i.e. notify-window). Default: notify-vmexit=run,notify-window=0. + ``pmu-cap-disabled=true|false`` + When the KVM accelerator is used, it controls whether to disable the + KVM_CAP_PMU_CAPABILITY via KVM_PMU_CAP_DISABLE. When disabled, the + PMU virtualization is disabled at the KVM module side. This is for + x86 host only. + ERST DEF("smp", HAS_ARG, QEMU_OPTION_smp, diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a213209379..090e4fb44d 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -122,6 +122,7 @@ static bool has_msr_ucode_rev; static bool has_msr_vmx_procbased_ctls2; static bool has_msr_perf_capabs; static bool has_msr_pkrs; +static bool has_pmu_cap; static uint32_t has_architectural_pmu_version; static uint32_t num_architectural_pmu_gp_counters; @@ -2652,6 +2653,23 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } } + has_pmu_cap = kvm_check_extension(s, KVM_CAP_PMU_CAPABILITY); + + if (s->pmu_cap_disabled) { + if (has_pmu_cap) { + ret = kvm_vm_enable_cap(s, KVM_CAP_PMU_CAPABILITY, 0, + KVM_PMU_CAP_DISABLE); + if (ret < 0) { + s->pmu_cap_disabled = false; + error_report("kvm: Failed to disable pmu cap: %s", + strerror(-ret)); + } + } else { + s->pmu_cap_disabled = false; + error_report("kvm: KVM_CAP_PMU_CAPABILITY is not supported"); + } + } + return 0; } @@ -5706,6 +5724,28 @@ static void kvm_arch_set_notify_window(Object *obj, Visitor *v, s->notify_window = value; } +static void kvm_set_pmu_cap_disabled(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + KVMState *s = KVM_STATE(obj); + bool pmu_cap_disabled; + Error *error = NULL; + + if (s->fd != -1) { + error_setg(errp, "Cannot set properties after the accelerator has been initialized"); + return; + } + + visit_type_bool(v, name, &pmu_cap_disabled, &error); + if (error) { + error_propagate(errp, error); + return; + } + + s->pmu_cap_disabled = pmu_cap_disabled; +} + void kvm_arch_accel_class_init(ObjectClass *oc) { object_class_property_add_enum(oc, "notify-vmexit", "NotifyVMexitOption", @@ -5722,6 +5762,12 @@ void kvm_arch_accel_class_init(ObjectClass *oc) object_class_property_set_description(oc, "notify-window", "Clock cycles without an event window " "after which a notification VM exit occurs"); + + object_class_property_add(oc, "pmu-cap-disabled", "bool", + NULL, kvm_set_pmu_cap_disabled, + NULL, NULL); + object_class_property_set_description(oc, "pmu-cap-disabled", + "Disable KVM_CAP_PMU_CAPABILITY"); } void kvm_set_max_apic_id(uint32_t max_apic_id) From patchwork Fri Dec 2 00:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongli Zhang X-Patchwork-Id: 1711166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2022-7-12 header.b=bvoAxKZP; dkim=pass (1024-bit key; unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=yFa7JP/y; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NNYtw3gbTz23nB for ; Fri, 2 Dec 2022 11:37:43 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0u2l-0004ox-IX; Thu, 01 Dec 2022 19:36:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0u2j-0004on-H0 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 19:36:41 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0u2g-0007FP-9w for qemu-devel@nongnu.org; Thu, 01 Dec 2022 19:36:41 -0500 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B20PEVf024840; Fri, 2 Dec 2022 00:36:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=14VI+7tC9JZ/5H23OXDWNC+e/UWDTR/PfYwG22dUupQ=; b=bvoAxKZPnBNEs3CetSrJdu6w7sKOTQJ6Vx5Ng9LQ2ICRDpBVB9ce/QsksrcfDEnxt8tY /5uA+62p/F8nZLRfI8cF4y1+O19yjeFlfl1IU86R3kulHXEkY+dO5znmLgciiykauY9v r2XMXTe5829/iKnDFF/sQWoNy1zP86Kb8uOpiFKjJOl1PvgJZfXw+S4raF0lRlnszUVY l+3CtVVCmRlPBC2Aqaf607OrC54JyylTEarNzZdasPM5IAMSyTk7JQU+7ze/yqIPRdyB U/fSwM/gthVYr50cYlvnHWm+DFop7wYTy9vsISPdMrTdhX4BcoCmfhUInRPQXsVz5pzi sw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3m765w02xv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 02 Dec 2022 00:36:18 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2B202RXs007636; Fri, 2 Dec 2022 00:36:12 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2046.outbound.protection.outlook.com [104.47.51.46]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3m398brgwg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 02 Dec 2022 00:36:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fTfD5Hkb8znM4kKdvEL4ZCTEbJXFTC2merK+sUW9E/x5IqU2TDnwWtYTnlpORt7BJl+aZHIWGVV+uPUmWUEXJFvKeotYAXo0LMITsr9mKnTl7iHVHg0+zaQj9QE7TpB7/FCHB2tN/XiGGdgK0YTT0ggNE/6eELlc2PAh9rpYzo5TnFnXxR65QbbehZpaNTH9SuCkG84kLeGaKL75Qo6e/a6VXr4f58uWxmAXqPgyy4dvUo7eek5T4noExT9++ug5TrImbJEZcQFf3DZ6f7pkrPBrBeN0fdSAVrPeU8/ht/p5tU5bNS2yHnpuZJWkvRC2qWJVAgC6+iuQjAO6YhI0/g== 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=14VI+7tC9JZ/5H23OXDWNC+e/UWDTR/PfYwG22dUupQ=; b=Ih0Shcvjz3IEqhl+mQahc6K3A6yylvWw82yV4bt06m8v6HdpMKkB1PAH72EZQQV43gW6Y0INITon3f9NnQZ0TUoQPI0fF6JWzxBebxdfWNWzertJfdQ/R7D5SH2z0PAucLc9n3EcbEkH3VSI86a93QgOkBzpt7o1pQafvp5B5igw8couXZnKAHIFWl7XkZGsDzEIODXgowVYtaflrIRM1XPY5umPYrDnrNHLVopEtSL0Pcich9Xlab12oJyEa6/4c0ZjTXSEZ9ehnQWPGkJv+wm15lLb5THwbakFVuX4+CjRpDjcMjK7OuT3DKFU+q4qCMpgPkpti9fqEvuz051qIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=14VI+7tC9JZ/5H23OXDWNC+e/UWDTR/PfYwG22dUupQ=; b=yFa7JP/yNZCNT+LVeOGCcOv2jETsDewrSEizjif5ytjMEWLMORCwMVgNwt9ym1pyywX/bOQ3ctJcJYpljTjAo7fbUnM1Vq1v2b4EC1fbKZ2oanrxNSldxm20IZK7kUC/IAl3+wSt9RjnEURIZUP1pcdzOCye+SYrVTT/gSeskZk= Received: from BYAPR10MB2663.namprd10.prod.outlook.com (2603:10b6:a02:a9::20) by DM6PR10MB4396.namprd10.prod.outlook.com (2603:10b6:5:21e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8; Fri, 2 Dec 2022 00:26:09 +0000 Received: from BYAPR10MB2663.namprd10.prod.outlook.com ([fe80::d868:78cd:33d4:ec7]) by BYAPR10MB2663.namprd10.prod.outlook.com ([fe80::d868:78cd:33d4:ec7%7]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 00:26:09 +0000 From: Dongli Zhang To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, joe.jin@oracle.com, likexu@tencent.com, groug@kaod.org, lyan@digitalocean.com Subject: [PATCH v2 2/2] target/i386/kvm: get and put AMD pmu registers Date: Thu, 1 Dec 2022 16:22:56 -0800 Message-Id: <20221202002256.39243-3-dongli.zhang@oracle.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221202002256.39243-1-dongli.zhang@oracle.com> References: <20221202002256.39243-1-dongli.zhang@oracle.com> X-ClientProxiedBy: BYAPR05CA0020.namprd05.prod.outlook.com (2603:10b6:a03:c0::33) To BYAPR10MB2663.namprd10.prod.outlook.com (2603:10b6:a02:a9::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2663:EE_|DM6PR10MB4396:EE_ X-MS-Office365-Filtering-Correlation-Id: 3151831f-e9b6-48b3-2ad4-08dad3fbcf08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uC+DagLP5Af7MKiLs8LNYxmZZHodBQS71d+NJf1xz0oxxGoDbl9nzetQrZ6PAYH0I065QM1jPUGi+Ts2cz16xm6wO45scNdXhP7ZRINqhlnjaJL34URDPCB+Wue8cX+CW4pNyd8H89+atNVr7kOPnqHc/9X7lmtR7ktGMmiOWbx4kY5g3JdAkyvjNqD4acbiBcyhWfcwTzJ1/DKO6ocdR6NllYBauw/hCLVbRJwqhU2vWyiXh2aStexz1k3sea3yq1EC4qNmu9ybH7lLHYxF48a86etk5jTHUa9NulmQCnYXOR4FPWeTPawWMzNVx2f/VfPwWYEq/dDFDa2b+I8ehfVvPV+IsN8uinTNU0lr129RITMDZ9hmHDDMXhKa6N/UINzyQTN4Tui73t3VcXaPy9hV7MDYSQtJStP3TCn95QSrMMpyvpo3qVli6fwXaDDqx8d7JUF2tLSw35JQPGblBEalFlAX2QY0NgQ9PckIHPO+GhVe20gPWYyR4JpjDwQNfoaURV4FGhy6U15u7X5RaXoNJj0K31NkjANDSzrFf5lzmCW0kjP7o+AjvXinz8Rd02hyB1f/aHHu3RP0DjqRws6OoXm/B2b4Mw8kGwBoa1ZUVJTHo/hj52JDLZdPIFGpOHcpianCZfAfWXGa9IZWZg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2663.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(136003)(346002)(39860400002)(366004)(451199015)(36756003)(86362001)(316002)(6486002)(44832011)(8676002)(66946007)(4326008)(2906002)(5660300002)(41300700001)(66476007)(8936002)(66556008)(83380400001)(38100700002)(478600001)(26005)(6666004)(6512007)(186003)(6506007)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: krqkIf6IihO25wu8XRBzOLY6u+AU/qVKZ2o2zSGAi+W5N4pbNr81v8smxYZc+N7W8zPtw2cHvB3DN5mSuyskbfTBsWunG0a+1Q796p2MK4ZudU0JM0ITt7mrYPHGkcS1vMf5NldoTpwLWMQgbgb/ApllzMuvLKsjBchfqHoUx3bSZAwVEIdWUPHWkL8i7vnCnPnpEH6NN/D06NYmfUxmm5vmIQCbbao2FGEUidUv3eBxHi853sYc3u/+bDZNqsFoNe4+378RkKwi9jOmf/n1kJytS86FbUeWy2xX1AR1b4219YmDcegCNPpeJr6/R2ydfUWkWn+tqBAWqIyFzP+guhq6NthGShU1stWpLNGsE3TgivS3POdAsKwQbndyQncpOx+kqTr4DsdkY/Wo8vDtKgXc6Wk+YMwFx+3fOEAw1nxWo6hiMgcKXg24KKg1PzHWAFcV6knjDOufYG2Eg8T+soaScKFkmzbgSw7gFaBRE9gDGlF8kVQmZIRzMVGt6jkypW44c3QmmI3Z8ygnwU5e4kUrQljNJvQard7j40TKOd8Uu204HQAPymYFgTNx3VkCROe1M/tl7OK2km6jP1/gmrnztjosYchUcfMv+bA05calVpRjTpRkULLCjrbh5i70qtGG74cLp4X8mlZin8DPWhX/FTeyPhcbtfwHShm/IpYvtfaHTRW9Ymf26sxmCuJxISiiD9T7daDsdjLnjP88LBs0Up7ZvGBYO115UFSUqv3qgaD0AJIqtSvPDVFu26cFAAZLfSv7AUWcnkjp5Btij48ERMmo0645SMITGqJT9+slMVr9bEzseYDQsEtnrmMfltzr3lbzyqOkVruTx6i3Jn87u12M6QJo/tvcjvHUzcNlUqgMnEAb/GUkNPTC8Y/jrpjy5YVR1FYd+sJDXOooe4rztuv6RpuGksanFOett79ynMeK+SkVl1a753cS6PJkgpGpRZr7lhTrxMJN/fTfwet8Ns/fFZsahsdsRCbe/bTp9ERgHvK8e61NNp9uTXBnzsQ3mO2Cg335bfxrSlJcKElmUDX9ksDCGgSuC/Z38FMGCRiNwhBWemrCEXSJl9HLSWUXkt2lP7jpcFSDcwoGB27QEL6kvL9QhPcTYUzj971NRwaUEPXbPgRFHbu6tYkC42NEPRnNyFGGFD2Q8vY/OSQhdc9ZCdZaO+rkz/QyoOK/bOcqXj8bM/8yVEI0hDhcyA4WYrfswEXV8aWNgfs1HQiKQDBLWlrWUiJCqgaYyb3q+nglWkz1Ca7wmGEY6BIge4GrxRXUzjDFEilKDShtBh1rK1bmd2w5J+ek0CR5xGaGY9lqrvyYSVXrv5C89aUpd7Za1spE3s4V/SRE0wEFr9yRlox5kTaQZ+NPCdHzUgFy6X251oXTGIpCdXouT/A9Pk7Z1kuxq5F5pUZDqfrnMVSfVzlksZgMzcQaKvUciyFotbWsV+PQZ32wSG7nsUqPZPeNX26ZwPHlNjXHmznVXGVFPMyqjCgRqxuKy9DMbxr2N0/eEMdk0R7x5Zy4QToHZStfmQ8eump9eeklTm4MZVyZC6DEfj3GmrdvbFu5qk8wPeVMlLbU7hhiwCZeSbKT X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: LtoyKfY1fhfG7vMrFpHfKARgJbPEFlD41n/GzHGDycZ5jwi9wLzxvPwbBakKElRLIPnF1FL8u1IKbWzZfFGCPceB0PgRtKvYJYiI7vh6Die1il7LPUTC2iLzwOsMv+aOexqKYU+hRB1oZNF5eEeghdSzStG6CiTP3rvivfJPKVYYtSaLnyEH43LxqHL5hxJWSIYymohAivV5lrsiNW6+L7XOIesb0ye5XavzW1q2LMDqHWThsXo9k95wbRAoJSttab7V1WGhpsdzXm2V/IRI+Qng1VT+NrpegBntsSq7CBsOLXUiFVOtuspgM2eT9LFLqZJVaMZ70ER9dQCQfImtHb9GX9ZzjHJNrMbosAGsSuT2gRI5ijuBmQKY7P+G7tMmurDtCRNXC8X/gDuNBq51B2hykVDGsn7e3ytn7nFW9riUXNe+xz9fqbyyNetgI762n8hNt/D1n89+DtWv8VhUluoX89j0xwGRtX/r2SmQwLEXkYlSMgxDEvFL38BsuGXX4JiDqLeoNmm3vLYDH0KuhLmrq+7u1M3OIGCHajnvi3D+z7oZI4Z056vBpGBle4yucYWrQftMGlfjER4eH0gwpR1HSSJvPIp8az6eSFehvna/pG7n9l03pGs17WRCsU/7ohYhu09Rkq0l94aFiqx8GmkmcNnyqNw38uighYzFvBcrHs0ETjIXGaXmskI5MnTSqmTRCs6+a8GZrBnKciaf1Zgf/Nw4bLTd3L/IFmXwdY1pr5S5dtGLeIrM/NhPAAOzjGH9K0V8v3NrehZBPJDXgpOEC589znL2oc2gHvqjc64V+gkO6jyiJHL5WLsEcgFRzcPNmw2Ry7314hO779+8OVesBDu0hKmmhylaYelL+Aye2YZTmumlM5mtcwxyN03ClgJ76CA33t62uNH+0xp2nl7sD4OwyzFVvZphyaJhBO9IxIQzVSyeRMdnvu9Kz2oWIRT7LTlEL18kRUZlr5/D1g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3151831f-e9b6-48b3-2ad4-08dad3fbcf08 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 00:26:09.1267 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tDHmS+VUU/pFKlAi7VC7hLZjuUFFUjMTo153GDGw0wCDbwMePRYkBsWv1olPc2VyRPTEucu8+OowQ7BXBHYcaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4396 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-01_14,2022-12-01_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212020003 X-Proofpoint-ORIG-GUID: R0MJPss_L8gUbEFWDT5f2rA3vSrS0faP X-Proofpoint-GUID: R0MJPss_L8gUbEFWDT5f2rA3vSrS0faP Received-SPF: pass client-ip=205.220.165.32; envelope-from=dongli.zhang@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The QEMU side calls kvm_get_msrs() to save the pmu registers from the KVM side to QEMU, and calls kvm_put_msrs() to store the pmu registers back to the KVM side. However, only the Intel gp/fixed/global pmu registers are involved. There is not any implementation for AMD pmu registers. The 'has_architectural_pmu_version' and 'num_architectural_pmu_gp_counters' are calculated at kvm_arch_init_vcpu() via cpuid(0xa). This does not work for AMD. Before AMD PerfMonV2, the number of gp registers is decided based on the CPU version. This patch is to add the support for AMD version=1 pmu, to get and put AMD pmu registers. Otherwise, there will be a bug: 1. The VM resets (e.g., via QEMU system_reset or VM kdump/kexec) while it is running "perf top". The pmu registers are not disabled gracefully. 2. Although the x86_cpu_reset() resets many registers to zero, the kvm_put_msrs() does not puts AMD pmu registers to KVM side. As a result, some pmu events are still enabled at the KVM side. 3. The KVM pmc_speculative_in_use() always returns true so that the events will not be reclaimed. The kvm_pmc->perf_event is still active. 4. After the reboot, the VM kernel reports below error: [ 0.092011] Performance Events: Fam17h+ core perfctr, Broken BIOS detected, complain to your hardware vendor. [ 0.092023] [Firmware Bug]: the BIOS has corrupted hw-PMU resources (MSR c0010200 is 530076) 5. In a worse case, the active kvm_pmc->perf_event is still able to inject unknown NMIs randomly to the VM kernel. [...] Uhhuh. NMI received for unknown reason 30 on CPU 0. The patch is to fix the issue by resetting AMD pmu registers during the reset. Cc: Joe Jin Signed-off-by: Dongli Zhang --- target/i386/cpu.h | 5 +++ target/i386/kvm/kvm.c | 83 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d4bc19577a..4cf0b98817 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -468,6 +468,11 @@ typedef enum X86Seg { #define MSR_CORE_PERF_GLOBAL_CTRL 0x38f #define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x390 +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_F15H_PERF_CTL0 0xc0010200 +#define MSR_F15H_PERF_CTR0 0xc0010201 + #define MSR_MC0_CTL 0x400 #define MSR_MC0_STATUS 0x401 #define MSR_MC0_ADDR 0x402 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 090e4fb44d..296cd4cab7 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1987,6 +1987,32 @@ int kvm_arch_init_vcpu(CPUState *cs) } } + /* + * If KVM_CAP_PMU_CAPABILITY is not supported, there is no way to + * disable the AMD pmu virtualization. + * + * If KVM_CAP_PMU_CAPABILITY is supported, kvm_state->pmu_cap_disabled + * indicates the KVM side has already disabled the pmu virtualization. + */ + if (IS_AMD_CPU(env) && !cs->kvm_state->pmu_cap_disabled) { + int64_t family; + + family = (env->cpuid_version >> 8) & 0xf; + if (family == 0xf) { + family += (env->cpuid_version >> 20) & 0xff; + } + + if (family >= 6) { + has_architectural_pmu_version = 1; + + if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_PERFCORE) { + num_architectural_pmu_gp_counters = 6; + } else { + num_architectural_pmu_gp_counters = 4; + } + } + } + cpu_x86_cpuid(env, 0x80000000, 0, &limit, &unused, &unused, &unused); for (i = 0x80000000; i <= limit; i++) { @@ -3323,7 +3349,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level) kvm_msr_entry_add(cpu, MSR_KVM_POLL_CONTROL, env->poll_control_msr); } - if (has_architectural_pmu_version > 0) { + if (has_architectural_pmu_version > 0 && IS_INTEL_CPU(env)) { if (has_architectural_pmu_version > 1) { /* Stop the counter. */ kvm_msr_entry_add(cpu, MSR_CORE_PERF_FIXED_CTR_CTRL, 0); @@ -3354,6 +3380,26 @@ static int kvm_put_msrs(X86CPU *cpu, int level) env->msr_global_ctrl); } } + + if (has_architectural_pmu_version > 0 && IS_AMD_CPU(env)) { + uint32_t sel_base = MSR_K7_EVNTSEL0; + uint32_t ctr_base = MSR_K7_PERFCTR0; + uint32_t step = 1; + + if (num_architectural_pmu_gp_counters == 6) { + sel_base = MSR_F15H_PERF_CTL0; + ctr_base = MSR_F15H_PERF_CTR0; + step = 2; + } + + for (i = 0; i < num_architectural_pmu_gp_counters; i++) { + kvm_msr_entry_add(cpu, ctr_base + i * step, + env->msr_gp_counters[i]); + kvm_msr_entry_add(cpu, sel_base + i * step, + env->msr_gp_evtsel[i]); + } + } + /* * Hyper-V partition-wide MSRs: to avoid clearing them on cpu hot-add, * only sync them to KVM on the first cpu @@ -3814,7 +3860,7 @@ static int kvm_get_msrs(X86CPU *cpu) if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_POLL_CONTROL)) { kvm_msr_entry_add(cpu, MSR_KVM_POLL_CONTROL, 1); } - if (has_architectural_pmu_version > 0) { + if (has_architectural_pmu_version > 0 && IS_INTEL_CPU(env)) { if (has_architectural_pmu_version > 1) { kvm_msr_entry_add(cpu, MSR_CORE_PERF_FIXED_CTR_CTRL, 0); kvm_msr_entry_add(cpu, MSR_CORE_PERF_GLOBAL_CTRL, 0); @@ -3830,6 +3876,25 @@ static int kvm_get_msrs(X86CPU *cpu) } } + if (has_architectural_pmu_version > 0 && IS_AMD_CPU(env)) { + uint32_t sel_base = MSR_K7_EVNTSEL0; + uint32_t ctr_base = MSR_K7_PERFCTR0; + uint32_t step = 1; + + if (num_architectural_pmu_gp_counters == 6) { + sel_base = MSR_F15H_PERF_CTL0; + ctr_base = MSR_F15H_PERF_CTR0; + step = 2; + } + + for (i = 0; i < num_architectural_pmu_gp_counters; i++) { + kvm_msr_entry_add(cpu, ctr_base + i * step, + env->msr_gp_counters[i]); + kvm_msr_entry_add(cpu, sel_base + i * step, + env->msr_gp_evtsel[i]); + } + } + if (env->mcg_cap) { kvm_msr_entry_add(cpu, MSR_MCG_STATUS, 0); kvm_msr_entry_add(cpu, MSR_MCG_CTL, 0); @@ -4115,6 +4180,20 @@ static int kvm_get_msrs(X86CPU *cpu) case MSR_P6_EVNTSEL0 ... MSR_P6_EVNTSEL0 + MAX_GP_COUNTERS - 1: env->msr_gp_evtsel[index - MSR_P6_EVNTSEL0] = msrs[i].data; break; + case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL0 + 3: + env->msr_gp_evtsel[index - MSR_K7_EVNTSEL0] = msrs[i].data; + break; + case MSR_K7_PERFCTR0 ... MSR_K7_PERFCTR0 + 3: + env->msr_gp_counters[index - MSR_K7_PERFCTR0] = msrs[i].data; + break; + case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTL0 + 0xb: + index = index - MSR_F15H_PERF_CTL0; + if (index & 0x1) { + env->msr_gp_counters[index] = msrs[i].data; + } else { + env->msr_gp_evtsel[index] = msrs[i].data; + } + break; case HV_X64_MSR_HYPERCALL: env->msr_hv_hypercall = msrs[i].data; break;