From patchwork Wed Apr 24 23:17:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 10915913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DC34922 for ; Wed, 24 Apr 2019 23:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D5F928BDE for ; Wed, 24 Apr 2019 23:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81BAC28BE1; Wed, 24 Apr 2019 23:43:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 246F028BDE for ; Wed, 24 Apr 2019 23:43:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388027AbfDXXn4 (ORCPT ); Wed, 24 Apr 2019 19:43:56 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:49356 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388013AbfDXXn4 (ORCPT ); Wed, 24 Apr 2019 19:43:56 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3ONcsW3120948; Wed, 24 Apr 2019 23:43:37 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; s=corp-2018-07-02; bh=2sTsWAwA6GxkQUOvMLfQwAKL2UY5en/+0IDeKjdqmdo=; b=ZDaheVGOJTwit9hE8twPmXYyqkJl4THpMnAg3PaZcCjwPH3XfCNp6lkLLJwbc42SzeFC zGmCXoxd9q53zjQse52XquvOBaM4kB45Q6HBGSeC2d0LvHdd7v4s/M0SqeQ5ArgVvM1X HRuRC3A9O13Bjq+j59h/VauDhUdRy6GG5kRuqhF64FfrXrRueOBUPBTpwZwQR4m2EBfO uCNgCtnMTGNdNlmMUPGty4IFBAUBKwyqOly5Dc/l9gzDoMIr25c4pWWtfNK3/z3KKJn3 rD1a7cqnzczBptg+mYChFO0ODt/nZPVDGWS3k8/mjyk51zxmExeMt2keUPx8t8hjNtW1 ag== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 2ryrxd5f8x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Apr 2019 23:43:37 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3ONgePB131814; Wed, 24 Apr 2019 23:43:37 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3020.oracle.com with ESMTP id 2s0fv3u6xa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Apr 2019 23:43:37 +0000 Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x3ONhaKR014909; Wed, 24 Apr 2019 23:43:36 GMT Received: from ban25x6uut29.us.oracle.com (/10.153.73.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Apr 2019 16:43:36 -0700 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, jmattson@google.com Subject: [PATCH 3/8][KVM VMX]: Add a function to check reserved bits in MSR_CORE_PERF_GLOBAL_CTRL Date: Wed, 24 Apr 2019 19:17:19 -0400 Message-Id: <20190424231724.2014-4-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190424231724.2014-1-krish.sadhukhan@oracle.com> References: <20190424231724.2014-1-krish.sadhukhan@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9237 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904240162 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9237 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904240162 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Krish Sadhukhan Reviewed-by: Karl Heubaum --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msr-index.h | 7 +++++++ arch/x86/kvm/x86.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 4660ce90de7f..c5b3c63129a6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1311,6 +1311,7 @@ int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu, void kvm_enable_efer_bits(u64); bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer); +bool kvm_valid_perf_global_ctrl(u64 perf_global); int kvm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr); int kvm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr); diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 8e40c2446fd1..d10e8d4b2842 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -775,6 +775,13 @@ #define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f #define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 +/* MSR_CORE_PERF_GLOBAL_CTRL bits */ +#define PERF_GLOBAL_CTRL_PMC0_ENABLE (1ull << 0) +#define PERF_GLOBAL_CTRL_PMC1_ENABLE (1ull << 1) +#define PERF_GLOBAL_CTRL_FIXED0_ENABLE (1ull << 32) +#define PERF_GLOBAL_CTRL_FIXED1_ENABLE (1ull << 33) +#define PERF_GLOBAL_CTRL_FIXED2_ENABLE (1ull << 34) + /* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 02c8e095a239..ecddb8baaa7f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -89,8 +89,19 @@ EXPORT_SYMBOL_GPL(kvm_mce_cap_supported); #ifdef CONFIG_X86_64 static u64 __read_mostly efer_reserved_bits = ~((u64)(EFER_SCE | EFER_LME | EFER_LMA)); +static +u64 __read_mostly perf_global_ctrl_reserved_bits = + ~((u64)(PERF_GLOBAL_CTRL_PMC0_ENABLE | + PERF_GLOBAL_CTRL_PMC1_ENABLE | + PERF_GLOBAL_CTRL_FIXED0_ENABLE | + PERF_GLOBAL_CTRL_FIXED1_ENABLE | + PERF_GLOBAL_CTRL_FIXED2_ENABLE)); #else static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE); +static +u64 __read_mostly perf_global_ctrl_reserved_bits = + ~((u64)(PERF_GLOBAL_CTRL_PMC0_ENABLE | + PERF_GLOBAL_CTRL_PMC1_ENABLE)); #endif #define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM @@ -1255,6 +1266,15 @@ static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data) return 0; } +bool kvm_valid_perf_global_ctrl(u64 perf_global) +{ + if (perf_global & perf_global_ctrl_reserved_bits) + return false; + + return true; +} +EXPORT_SYMBOL_GPL(kvm_valid_perf_global_ctrl); + bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer) { if (efer & efer_reserved_bits)