From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C99AEC282DE for ; Wed, 5 Jun 2019 10:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D65C2075C for ; Wed, 5 Jun 2019 10:09:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mTFuorut" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727334AbfFEKJf (ORCPT ); Wed, 5 Jun 2019 06:09:35 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45167 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727112AbfFEKJe (ORCPT ); Wed, 5 Jun 2019 06:09:34 -0400 Received: by mail-pl1-f196.google.com with SMTP id x7so8527407plr.12; Wed, 05 Jun 2019 03:09:34 -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 :mime-version:content-transfer-encoding; bh=dIuUcIyMK8nuPrLvAHMlgxxAYTbCV88vnbbR/Oftlkw=; b=mTFuorutizHMDSHbn3tP7SVn4HDvwoZqGcuzMbB/n4GQXN0kZmLz4uBbA3hI1+kTVc 1Ln3yQC/A7lPuAme07EdEV1ZIrrOS+W/f6SNmQv4ttktnP9gc6vXwIjrXRpWBIiKrC2R cCRT9BtGKwbdmxcZM+r9+156WM10WG8fxOwKx8XehsgBSQrOjBYw2G6MnuIMzKBBqBBB cI83VBG5vYz0IM+MkNtYJTvvoP5+GH/nx7K+YwQGZjJXNefIPzEgPHbG4Cr7Dbl243wb F0UfgNcN3D/jo7e6/3sbWzkAsVaVWq0nFbs4UWnwnrKHUUkpOKe04GAzMYTxDX/Hbkbm pVEQ== 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:mime-version:content-transfer-encoding; bh=dIuUcIyMK8nuPrLvAHMlgxxAYTbCV88vnbbR/Oftlkw=; b=XMw4+KsVWBorQ57a7tFkIndO8bAuft61uxKFmsxNgWZpH/5GLGy+HVQLxY4GVLckoW Ab4+hy9dNKFVsc9TMd9L5Bx4Tf3nYqkuFlk+YRQ3X9JBlq12JqP+N5wYSgqv3rjIki8v rsazJboftWWkLIdS0vG7vOKyeSI+v9ALv62GHvar6vW5/p6Eig5Ue6DH1DKMg+HrEAEr LdswZ2CrAb+1zcYiLh6ewe0GXl2Cmt2St0Y93Qc8dsGbV4Ck07rIBJgLJUFBh8lYVYKl O4BlDNGQO4GfPRjnRS2LprfP9Iqeef5em9TFGMAjzByUL9w5Yg1UYfutLFWsbl1LX+H3 xYtw== X-Gm-Message-State: APjAAAVJ8chjn3w41AKjdvGbUIUzTVUPbfCK0vKBg3rr2x57aCEzvrU6 Fcc0az9AUKVNOejg221+e3HsA5LS X-Google-Smtp-Source: APXvYqyBoWBc80zPeCCeF2ViNlmd8cdOjGvoi9xGqyokMwkW51ZaQFIT+cjnME8u/54BIHukQysgWQ== X-Received: by 2002:a17:902:28c9:: with SMTP id f67mr42846474plb.19.1559729373861; Wed, 05 Jun 2019 03:09:33 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id v9sm19030010pfm.34.2019.06.05.03.09.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Jun 2019 03:09:33 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH 3/3] KVM: LAPIC: Ignore timer migration when lapic timer is injected by posted-interrupt Date: Wed, 5 Jun 2019 18:09:11 +0800 Message-Id: <1559729351-20244-4-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559729351-20244-1-git-send-email-wanpengli@tencent.com> References: <1559729351-20244-1-git-send-email-wanpengli@tencent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wanpeng Li When lapic timer is injected by posted-interrupt, the emulated timer is offload to the housekeeping cpu. The timer interrupt will be delivered properly, no need to migrate timer. Cc: Paolo Bonzini Cc: Radim Krčmář Signed-off-by: Wanpeng Li --- arch/x86/kvm/lapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index e9db086..3bb4376 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2534,7 +2534,8 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) { struct hrtimer *timer; - if (!lapic_in_kernel(vcpu)) + if (!lapic_in_kernel(vcpu) || + posted_interrupt_inject_timer(vcpu)) return; timer = &vcpu->arch.apic->lapic_timer.timer; -- 2.7.4