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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 CA01BC433B4 for ; Tue, 11 May 2021 00:18:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F4AD61613 for ; Tue, 11 May 2021 00:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230005AbhEKATR (ORCPT ); Mon, 10 May 2021 20:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbhEKATQ (ORCPT ); Mon, 10 May 2021 20:19:16 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14480C061574 for ; Mon, 10 May 2021 17:18:11 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id gc22-20020a17090b3116b02901558435aec1so328996pjb.4 for ; Mon, 10 May 2021 17:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ikfVvr5cpOXAclsRrng8wpNS2FGQXkIocuD0PuY3Rzg=; b=QQm08qjhO9hEu4hEn7czTFqAA8u6AFQcfQWATVLm5/JxkfZSD3dz6zwhb4eGOQqT/+ qvsVePq/3y4E0e4mwGzIk71xFqOZMgETPbfJf7WDYwBl5ah+Rh0snT+c3JOeILg6E4u2 ZrQE+v6i0HwKMKMokPfflQglaJAMeIkxbv8EFh8bfSvAflX2LOJpOm9Jgs6XhLbpBuur 5GAu0J/8AdmYIsiOeaj5qqzaQVrB+ZNCRAgrzHeGAThJq52OFsM4Hs/o5N2ZkFRZXJ1/ 0lil+6Z2KZO+4bCSwx8tbHTw7hTijjggRZuwUjrMT++cazHzFBnSHHsdMooAuQB/jkr+ uAJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ikfVvr5cpOXAclsRrng8wpNS2FGQXkIocuD0PuY3Rzg=; b=egir0gJyzUU4mpE8nVby+taU9hSWX2/qji2Oshd9QlD4/LKutc8KjAm/vvA8piflQW 50hFx4Zg6FF4ttdJyY87zRH7pGdZYQJWD7cHSgnQz6fBk1qN8+dRaKuZmPRBSgjTpesD shtq46wOoqdMzp9pFIA1FxbCED+KnMZXiIKP34yadWjViu9Ii6YEz8pd6S0PdXfbvYdU uUi9p0PKd4UHRZQ/1c7CYw67TtZCwhqFd0cA74HGrbKq9ANTQsEyuiSdIO4s6qUdIurC bma0BLwVodiIqPU4rsMd4kfUYDIuRvgLatQ6nEhqk4aoWpuyGMQY8SoiQi5Qg1bAtHwn swog== X-Gm-Message-State: AOAM53055E5ra+apigXTQbwao4/Ik4wOZPc4Dbj4YvSrN0ApjodcXdj0 YAXxhLe/BPzpq9mPrH8NtWuWQg== X-Google-Smtp-Source: ABdhPJxplAR7tJENAHjFyyue0ZJQV0NzZ9jIhZ0stkVaVOs+UT1MefDKqZCQHmTfe7qLhH+HTUQSUQ== X-Received: by 2002:a17:90a:71c6:: with SMTP id m6mr2004510pjs.174.1620692290358; Mon, 10 May 2021 17:18:10 -0700 (PDT) Received: from google.com (240.111.247.35.bc.googleusercontent.com. [35.247.111.240]) by smtp.gmail.com with ESMTPSA id i8sm4912597pgt.58.2021.05.10.17.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 17:18:09 -0700 (PDT) Date: Tue, 11 May 2021 00:18:06 +0000 From: Sean Christopherson To: Wanpeng Li Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , stable@vger.kernel.org Subject: Re: [PATCH 3/3] KVM: X86: Fix vCPU preempted state from guest point of view Message-ID: References: <1620466310-8428-1-git-send-email-wanpengli@tencent.com> <1620466310-8428-3-git-send-email-wanpengli@tencent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1620466310-8428-3-git-send-email-wanpengli@tencent.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sat, May 08, 2021, Wanpeng Li wrote: > From: Wanpeng Li > > Commit 66570e966dd9 (kvm: x86: only provide PV features if enabled in guest's > CPUID) avoids to access pv tlb shootdown host side logic when this pv feature > is not exposed to guest, however, kvm_steal_time.preempted not only leveraged > by pv tlb shootdown logic but also mitigate the lock holder preemption issue. > From guest point of view, vCPU is always preempted since we lose the reset of > kvm_steal_time.preempted before vmentry if pv tlb shootdown feature is not > exposed. This patch fixes it by clearing kvm_steal_time.preempted before > vmentry. > > Fixes: 66570e966dd9 (kvm: x86: only provide PV features if enabled in guest's CPUID) > Cc: stable@vger.kernel.org > Signed-off-by: Wanpeng Li > --- > arch/x86/kvm/x86.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index c0244a6..c38e990 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3105,7 +3105,8 @@ static void record_steal_time(struct kvm_vcpu *vcpu) > st->preempted & KVM_VCPU_FLUSH_TLB); > if (xchg(&st->preempted, 0) & KVM_VCPU_FLUSH_TLB) > kvm_vcpu_flush_tlb_guest(vcpu); > - } > + } else > + st->preempted = 0; Curly braces needed since the if-statment needs 'em. Other than that, Reviewed-by: Sean Christopherson > > vcpu->arch.st.preempted = 0; > > -- > 2.7.4 >