From patchwork Tue Aug 4 06:10:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 11699759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C8C214DD for ; Tue, 4 Aug 2020 06:11:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A82220781 for ; Tue, 4 Aug 2020 06:11:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CXXo3e4F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728322AbgHDGK6 (ORCPT ); Tue, 4 Aug 2020 02:10:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727076AbgHDGK6 (ORCPT ); Tue, 4 Aug 2020 02:10:58 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A483C06174A; Mon, 3 Aug 2020 23:10:58 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id s26so19602724pfm.4; Mon, 03 Aug 2020 23:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BSDgawubjKZTjBa80whU7RPxG9HALrOtjtBrOe2a6/c=; b=CXXo3e4Fn//oKcVoftIyvz229kjYfndjtjhcOG7iFqjPULlGpd0vPxwhM7bfoUVD47 A9riFUhG4SQ7YM3tA0OqqEHWX3W3LnkwJOySfvGqFgsouLtuGVov1XB6jS0tr+4r7olz uLdczamHmIDm1KufCksyNt58T7AZNLQ8Atf1W13AaRoMnVU753aG/sIqT34eVIuur25h llusk7yrHg8q61Q+c0pOoMbmynRVZdLxHq3BMWi9F3zK+oMCWTH90Q86GFUYssxXNu+M Lb9OCFrcC8GX6bElNdXWdIteL62oOltQsd2UGyz697AdEnF5R0l2lbog4omF9GmLFOfn 6bjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BSDgawubjKZTjBa80whU7RPxG9HALrOtjtBrOe2a6/c=; b=bafmtS1tT1Pee5yfj50+j/i8OZXxVPyCWoj22poBJn0KeGvwfLZKV538nTfQxy0Lqk mZ1SZOfX5xKBX9zxsH8FaLaIb/T9aw9u16GXYa3BaNEIwBt78gGPFGt3/GSdoC9VQbuv iLIvXtLR8xa/G6lK4Zt3TPzv5i0+zWf+curXOgUhya5RF3M24AnzmgioHZRUXwZlAp4f yF8asYohmeQvf9I2gf6b6tWDoc9dkS+5E2abch9/g9UuL3vTYpvCm7B+qXRtW3Wy64K3 E3rufvU9NV95b+5MaU3t53JPsSu7TXmJjFvNTU34Qpy7twKKBqxcsPiUc2lz9CIrUo8p hVTw== X-Gm-Message-State: AOAM531T7DNqRzIk9NdS5d58TCl9eTL1zWwtsCzB3IK2EOEhUnRRWiKo Rt4MyPqTTT1qvHwIEHPIydaH0KVC X-Google-Smtp-Source: ABdhPJwjhVkCBOwIfQJd1BbYy7VJqkKlx4vZhImER3qR1wPDWN2a6Jq0LA2IPbi6RHnOzxrmLKuPlQ== X-Received: by 2002:a63:e114:: with SMTP id z20mr15925406pgh.300.1596521457625; Mon, 03 Aug 2020 23:10:57 -0700 (PDT) Received: from localhost.localdomain ([103.7.29.6]) by smtp.googlemail.com with ESMTPSA id s8sm22093069pfc.122.2020.08.03.23.10.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2020 23:10:57 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Date: Tue, 4 Aug 2020 14:10:47 +0800 Message-Id: <1596521448-4010-1-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Wanpeng Li Return 0 when getting the tscdeadline timer if the lapic is hw disabled Suggested-by: Paolo Bonzini Signed-off-by: Wanpeng Li --- arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index cfb8504..d89ab48 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2182,7 +2182,7 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu) { struct kvm_lapic *apic = vcpu->arch.apic; - if (!lapic_in_kernel(vcpu) || + if (!kvm_apic_present(vcpu) || !apic_lvtt_tscdeadline(apic)) return 0; From patchwork Tue Aug 4 06:10:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 11699761 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1471F6C1 for ; Tue, 4 Aug 2020 06:11:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3304920792 for ; Tue, 4 Aug 2020 06:11:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FjkP8xIZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728671AbgHDGLC (ORCPT ); Tue, 4 Aug 2020 02:11:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727076AbgHDGLA (ORCPT ); Tue, 4 Aug 2020 02:11:00 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D566DC06174A; Mon, 3 Aug 2020 23:11:00 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id s26so19602780pfm.4; Mon, 03 Aug 2020 23:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wLvICjqjYrd+Zh2vXjvJTYfRwMLWZImSkaARuz+JdB8=; b=FjkP8xIZDswm8+jRTrI5ZhoFdaZ6QvN44Ax01M1JKS9Hj7/uYxXG+Asd/FDBQIadYx AhYYpcW3ObeMCHOe+joGcwXzxpN7HUm5/KhVOMqd+IhNiYy2TDxlTb6h5wV64hPhOgZr qHCHzNth+o8khSBXs9la4GEMIz8cIqeWBqCu/ChJ6TSUfLUTTVzk1rB7xa29844EafWb pLJ0rl4LXp3DHE+HY4Qe0/otW4Ow7dmRjqWo3vkbTzrhV7CwIdOf5AfJa6X32s0oob3N gTwI153xeeN43agfAZ119zrZ81EQ5zavIwXrWB1cQ90ejpuWaq1PnZcfMMmh/zae0Yfu JnHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wLvICjqjYrd+Zh2vXjvJTYfRwMLWZImSkaARuz+JdB8=; b=D6cBMDMEr9/xLZaPgFc0xsLfU2uTZyjkVqSlpGTK85J7+By8IE4d6RJlr+Oy3vNE8P AGD8a7rX7LkvGQxNnLJ5FWfyulOb7Tdt0OLLdP8qXk1aNagkgFEUvekI7SvwA88wD0VB WCYHorHAVWw24PEWy0C4d0x7B1CMKPmeS0oUPd8HKMSSccVXuew8Ft8vnsWzWd5IETGl 1PZoYupCQ2Lbijpsd4Q+AGGLkhSVW5MfOPUKK8jIft7yruZX2QrG/KGmzgRtkUtxZHoN /bESWxgEP4qatLKaH2mr9UvEQ0tTRCVMDGJG3xT3BDCun3Kcx8t+LJP/q87IsU0M6t10 mrDg== X-Gm-Message-State: AOAM531lKfnNIfd97L+TU61Hx1sc7e1bVZnShCEDSbxCkncmEXnrLCBk VIQav61gjXJrwLefT41pC34cjFCO X-Google-Smtp-Source: ABdhPJwrYtKdS8xuzfckXsojr3zeK6ZtLenz+rXKx9XMlQUa2Bdpi0VPPIt/W8r9nTDbLQ3t8zaFAg== X-Received: by 2002:a05:6a00:90:: with SMTP id c16mr11083964pfj.200.1596521460237; Mon, 03 Aug 2020 23:11:00 -0700 (PDT) Received: from localhost.localdomain ([103.7.29.6]) by smtp.googlemail.com with ESMTPSA id s8sm22093069pfc.122.2020.08.03.23.10.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2020 23:10:59 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting Date: Tue, 4 Aug 2020 14:10:48 +0800 Message-Id: <1596521448-4010-2-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1596521448-4010-1-git-send-email-wanpengli@tencent.com> References: <1596521448-4010-1-git-send-email-wanpengli@tencent.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Wanpeng Li Check apic_lvtt_tscdeadline() mode directly instead of apic_lvtt_oneshot() and apic_lvtt_period() to guarantee the timer is in tsc-deadline mode when wrmsr MSR_IA32_TSCDEADLINE. Signed-off-by: Wanpeng Li --- arch/x86/kvm/lapic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index d89ab48..7b11fa8 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2193,8 +2193,8 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data) { struct kvm_lapic *apic = vcpu->arch.apic; - if (!kvm_apic_present(vcpu) || apic_lvtt_oneshot(apic) || - apic_lvtt_period(apic)) + if (!kvm_apic_present(vcpu) || + !apic_lvtt_tscdeadline(apic)) return; hrtimer_cancel(&apic->lapic_timer.timer);