Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp93425ybb; Tue, 24 Mar 2020 17:19:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu02easktqq9094aYezZo7+RXnLD6HxggujiKqLiLKqJWrXA/71wcNz+46pK961SafdT9Vv X-Received: by 2002:a05:6830:118d:: with SMTP id u13mr522551otq.41.1585095579774; Tue, 24 Mar 2020 17:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585095579; cv=none; d=google.com; s=arc-20160816; b=fKHZHtw6Vass2HP20ZptO1FGuH9edmv8A6mG9XlDcGh/w+5Glowu8bosTW4L/MDOup 1L5PiS0M91e0hpAcKYjP/B3QRDNDdHgCdrfVL8UsVZxyM1Q/DCy7JucKcqbQmVSP9zE4 wIVBADD8+5fGVb1zTsY8DwvAwV3XpwvJZ7XoQ7caWO3qCSgYXUlN80DE2sjfQDS5Q0Fp gO9LfKljeLVS2H7CEJUyh1ECZm/hMF6sTW+Hsa50BL2XpcwiH9+KgWyqx0Q8xr3cjT6e ziVClTIKH4/VkyKQxnE0uUaVqjYQFwoIXlI0iMxMMOTC0yk7MvHpVJ/f5Pbtc8Cht18C tv0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=xliuxZL0N48dRPjxOaKyrNwz6ljCGZsPU9rKwkE7dMU=; b=Jnlz0hDaOlmhM1y0ORod4qDrR9RiGn5AxFGTw2kmz/XhZlPEVFGMhqbvZvYO3xn4/a GfQ7cCcugyPNi7QFty4AXDCX8ymfn9mIYGmMy6/pkm2LpRqClYCI4G74eGbfK5CyIA7w +PqNGRt+IIN821vgN0HGhyEseK374B5FAIXuuLOGMLLOosaFASHThGkdFs1SA5VQrRfz hHRNQgKGEtlivBlHo8IipnHCHJNVQp6NJT0i0UYhV/vli5n7OeO3jCq019GoOcoFwF8e pb3ssSkeR2HHBjERtudZWsbfewonljBQbQkhb5FPubGY2f19wNBMrHa2lgKvLK3PtFAj wf8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EHRCFejj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z5si4591027oiz.209.2020.03.24.17.19.15; Tue, 24 Mar 2020 17:19:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EHRCFejj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727249AbgCYAQZ (ORCPT + 99 others); Tue, 24 Mar 2020 20:16:25 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:40058 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727103AbgCYAQZ (ORCPT ); Tue, 24 Mar 2020 20:16:25 -0400 Received: by mail-oi1-f193.google.com with SMTP id y71so477280oia.7; Tue, 24 Mar 2020 17:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xliuxZL0N48dRPjxOaKyrNwz6ljCGZsPU9rKwkE7dMU=; b=EHRCFejjY7irVPRNrXToOdyPzFbIIVxupoMSIZ3sZHI5sW6dPc/MOGfEcs2D1oijRf iJCqcJ0SaYXZIkdO2TK50428ar8Hfu6RfIkiBBm5KPw47FjlbWAaEKPP0PzqHcIuyDBs 3mFoJzvZIDlYwJt2IBN+gOI0bAp9ndohAOFQKwcPyvCrih02ttSjsDowYGj55sq7EPnY 6FvOSijPVES5PGFBGYhKzUxbQhACthtCR9VSgv2ptsjDXOpYzMRApxpIG+31ogp2LwS7 NTNp0UL78h5ek7JFQPY1EktTqXpx5rdULzFIUYP4p0o7HOA0klTHaNpsI/qoJ58qBGDk 6sxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xliuxZL0N48dRPjxOaKyrNwz6ljCGZsPU9rKwkE7dMU=; b=la4Eomiinb9j7yY6NXr2GSeOtd2K5dWuMKLbjFet5V28pHFqYBUrrIVAZpPf4lSkYv y1OyKpT5xtYQfTM3IjixlYHwNqYR42kdtntszs+rQph3hEErAc9jUuIjalKRL1FbSxmP LXRqAiaqPLqixyVBDt6bxe0a/NdikxO3ZVnHbVhOS+Q1mC5HjXDDsBMWxdAYc2GVaMVo wOsdXdLRXb51VSZZOxzwXSxWOLejuTNW9FcXepki1O4Csnaz9ox/MImMyiDDNyAn4DLc vgZEP0DivSQjmc6Dw91hw4wsy/Bc0RC1OZsOpsykBqXppqg8e7zS7Umu1OBp231aDkFq faxg== X-Gm-Message-State: ANhLgQ32mXI3EQtlewJ23jQDfBNP1He9x1UqpGqbQ3qZ+gtV0AR2VrqT ZbiVF1rohtCnZZ1AwgyLTQ11BQ1o3ktosoE+2oM= X-Received: by 2002:aca:f288:: with SMTP id q130mr236015oih.33.1585095384559; Tue, 24 Mar 2020 17:16:24 -0700 (PDT) MIME-Version: 1.0 References: <1585031530-19823-1-git-send-email-wanpengli@tencent.com> <87imit7p36.fsf@vitty.brq.redhat.com> In-Reply-To: <87imit7p36.fsf@vitty.brq.redhat.com> From: Wanpeng Li Date: Wed, 25 Mar 2020 08:16:13 +0800 Message-ID: Subject: Re: [PATCH] KVM: LAPIC: Also cancel preemption timer when disarm LAPIC timer To: Vitaly Kuznetsov Cc: LKML , kvm , Paolo Bonzini , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 24 Mar 2020 at 23:24, Vitaly Kuznetsov wrote: > > Wanpeng Li writes: > > > From: Wanpeng Li > > > > The timer is disarmed when switching between TSC deadline and other modes, > > we should set everything to disarmed state, however, LAPIC timer can be > > emulated by preemption timer, it still works if vmx->hv_deadline_timer is > > not -1. This patch also cancels preemption timer when disarm LAPIC timer. > > > > Signed-off-by: Wanpeng Li > > --- > > arch/x86/kvm/lapic.c | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > > index 338de38..a38f1a8 100644 > > --- a/arch/x86/kvm/lapic.c > > +++ b/arch/x86/kvm/lapic.c > > @@ -1445,6 +1445,8 @@ static void limit_periodic_timer_frequency(struct kvm_lapic *apic) > > } > > } > > > > +static void cancel_hv_timer(struct kvm_lapic *apic); > > + > > Nitpick: cancel_hv_timer() is only 4 lines long so I'd suggest we move > it instead of adding a forward declaration. There are other preemption timer operations like start_hv_timer etc around cancel_hv_timer, so it is not that suitable to move directly. Wanpeng