From patchwork Fri Jul 8 12:02:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9220673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8ACDB60572 for ; Fri, 8 Jul 2016 12:02:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A5BF28735 for ; Fri, 8 Jul 2016 12:02:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F1B028734; Fri, 8 Jul 2016 12:02:56 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 EDAEE28739 for ; Fri, 8 Jul 2016 12:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932439AbcGHMCp (ORCPT ); Fri, 8 Jul 2016 08:02:45 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35374 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932367AbcGHMCc (ORCPT ); Fri, 8 Jul 2016 08:02:32 -0400 Received: by mail-wm0-f66.google.com with SMTP id k123so6079411wme.2; Fri, 08 Jul 2016 05:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding; bh=41/M+FB7YZifYbHeAs2XhJoLfMxFWd9iNynomXLeXxw=; b=nkQj9YLpC5gG2nu/tlP+rQ2ZluwgH2GA+Ihxrt56AtUn+1DjKzyCrFO1OcYuWm3zYk PKG3DmFQVDMrHW8rw5iJV6Squtdp8ihCYuI9gryTRt4tR06huaSHveXkKJzgR0fXsDGT KSGJD4G09MzBb07uTTWAZB7C1BpvOujfxRyIPqVllXTiIKXIQMuEk1PPvBNl+l7JMQ2c w0ts2UugAL54Cbd+KAFaHINPiq06Qa0Jd2dZlQaaa9n9srYv/qlrU7HjXvAXZngV29p6 Ezv3dsM3b1rcef+S7vwfjpsVUmv+kSOoj0zIUYSvJujw4DZQ2uh3O3mM5EcaQQR1RYiV tDrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:content-transfer-encoding; bh=41/M+FB7YZifYbHeAs2XhJoLfMxFWd9iNynomXLeXxw=; b=CArZg7CMurIX3FIPdCEYt6AovdyMY2B2EOSrvibs2Lipy59T+67i1jjF2ZfUo6UoB6 OMtzsRhyZhWsrVGO9kdI4r0n4V1OdCePWYsHTUoMpqv0NohYDuguKriq+lSgSpBTB8jH zNn0+xIOxpii0otNeMuUkcXSxfYljRqok/Al+hrvfotbsRPPYTH5OMa4VJ/weOzP8p5V vD5uui2FaudOSKzCeLPcNsT0ldtTeVI2m4nA2xLITnStEZuz0418Noyc0YpbUQ0Xrtul Lb9LXTgIlhGFDgmrC4QlmdDPvsEdXPR2fksJyH1AZo7ep9oS6lZ58Ra54LfM6E87E1Li QTTQ== X-Gm-Message-State: ALyK8tJuIMy+MJzMxX2mJM3iu7CjgQUzKXL+/scKt8e7E0vtoYauqL4lpmVSPzjhaIUpnA== X-Received: by 10.28.142.144 with SMTP id q138mr3199253wmd.30.1467979345788; Fri, 08 Jul 2016 05:02:25 -0700 (PDT) Received: from 640k.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id xu4sm6818567wjc.24.2016.07.08.05.02.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2016 05:02:25 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Wanpeng Li , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Yunhong Jiang , Jan Kiszka , Haozhong Zhang Subject: [RFT PATCH v5 2/3] KVM: VMX: reflect broken preemption timer in vmcs_config Date: Fri, 8 Jul 2016 14:02:12 +0200 Message-Id: <1467979333-19535-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1467979333-19535-1-git-send-email-pbonzini@redhat.com> References: <1467979333-19535-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify cpu_has_vmx_preemption_timer. This is consistent with the rest of setup_vmcs_config and preparatory for the next patch. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index f6e5cc679898..0048be79c7b9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1121,9 +1121,6 @@ static inline bool cpu_has_broken_vmx_preemption_timer(void) static inline bool cpu_has_vmx_preemption_timer(void) { - if (cpu_has_broken_vmx_preemption_timer()) - return false; - return vmcs_config.pin_based_exec_ctrl & PIN_BASED_VMX_PREEMPTION_TIMER; } @@ -3407,6 +3404,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) &_pin_based_exec_control) < 0) return -EIO; + if (cpu_has_broken_vmx_preemption_timer()) + _pin_based_exec_control &= ~PIN_BASED_VMX_PREEMPTION_TIMER; if (!(_cpu_based_2nd_exec_control & SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY)) _pin_based_exec_control &= ~PIN_BASED_POSTED_INTR;