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=-13.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 736C8C4320A for ; Tue, 27 Jul 2021 21:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5636160F6C for ; Tue, 27 Jul 2021 21:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232583AbhG0VKC (ORCPT ); Tue, 27 Jul 2021 17:10:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43595 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233629AbhG0VIn (ORCPT ); Tue, 27 Jul 2021 17:08:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627420122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TUpUKaHU71NYL6/47as07mmBCcnbbXJebfKydCKE4tk=; b=f10rzjpeX/QnzOkvue8r3z1fBx3nLM6NliSZv6A/yX6zt9Q9e0fGQ2bfUYH13RYZWdxaSo d/Ya3HInZhACm5zNpw0Hutb7uhviW/BJZrU3f0hIQBbnEvDX2FkapQKXtsMTYlX4p/vyE8 WDMudzqXl2eu3qN+X7uTq631PeWrkJU= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-cJz1N2J5NBqfU0aUmeeA2g-1; Tue, 27 Jul 2021 17:08:41 -0400 X-MC-Unique: cJz1N2J5NBqfU0aUmeeA2g-1 Received: by mail-ed1-f70.google.com with SMTP id de5-20020a0564023085b02903bb92fd182eso99005edb.8 for ; Tue, 27 Jul 2021 14:08:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:subject:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=TUpUKaHU71NYL6/47as07mmBCcnbbXJebfKydCKE4tk=; b=lXw04Pi4OZccogw4QwwLPumTCz1iueVfm2GD4Muy3H9T5emY/4o5jcd6EgN/SxB+BT EOKJFmUYkZaVrahwDBto8kA1XnqyVCvUeKZ8PI9GcDObZC45epWzVOFIECsAzyfMJOQ0 XyOJegYD3NhvwED+mXHIq4DxhiORKOT04WKOJDPhDigmG57RoWw6qIGfvublM3zjuxOS vg26WaGPlYnVewmU4qNuL7XTeQVeMDhINHzNmbex7+DTMnjCBSvg3u8bhPYwytfjrC++ UbMUd191heduffbSQ8QsMzKLsHzh19zOm6oWdKgaXzHb3+W4Zeqth7ilOPOZBNjS5NNI /G2A== X-Gm-Message-State: AOAM530PU6Vkw4X121pyoTnGhvSt7xzenhbsTZAVC+7bjKxMFS+MuuNL iSAVDn0WTdtOb84Ht85GqRGNGYaFwbcSVK90AiwPdXlb2nqI531olazNgjxQA2HTEtjCSzf2G2s DWM8tGt4zhnh0sIDSyjOM6VmT X-Received: by 2002:a50:fd17:: with SMTP id i23mr30313193eds.270.1627420120370; Tue, 27 Jul 2021 14:08:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxk1VtOYP3rrDEaPWF4C6xsoU2R3/eMAg1NRsJWDrGHre7V3ZZhApRMbe+bviVTVGcOJBusTg== X-Received: by 2002:a50:fd17:: with SMTP id i23mr30313172eds.270.1627420120204; Tue, 27 Jul 2021 14:08:40 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id u5sm1701982edv.64.2021.07.27.14.08.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Jul 2021 14:08:39 -0700 (PDT) To: Sean Christopherson Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, stable@vger.kernel.org, Stas Sergeev References: <20210727170620.1643969-1-pbonzini@redhat.com> From: Paolo Bonzini Subject: Re: [PATCH v2] KVM: x86: accept userspace interrupt only if no event is injected Message-ID: <9ae42cf8-e3e5-b8aa-ba86-d680feb09830@redhat.com> Date: Tue, 27 Jul 2021 23:08:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27/07/21 22:58, Sean Christopherson wrote: >> --- >> arch/x86/kvm/x86.c | 12 +++++++++++- >> 1 file changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c >> index 4116567f3d44..5e921f1e00db 100644 >> --- a/arch/x86/kvm/x86.c >> +++ b/arch/x86/kvm/x86.c >> @@ -4358,8 +4358,18 @@ static int kvm_cpu_accept_dm_intr(struct kvm_vcpu *vcpu) >> >> static int kvm_vcpu_ready_for_interrupt_injection(struct kvm_vcpu *vcpu) >> { >> + /* >> + * Do not cause an interrupt window exit if an exception >> + * is pending or an event needs reinjection; userspace >> + * might want to inject the interrupt manually using KVM_SET_REGS >> + * or KVM_SET_SREGS. For that to work, we must be at an >> + * instruction boundary and with no events half-injected. >> + */ >> return kvm_arch_interrupt_allowed(vcpu) && >> - kvm_cpu_accept_dm_intr(vcpu); >> + kvm_cpu_accept_dm_intr(vcpu) && > > Opportunistically align this indentation? Yep, good idea. >> + !kvm_event_needs_reinjection(vcpu) > > Missing &&, apparently the mysterious cherry-pick didn't go so well :-) Well, yeah. The only way I can excuse myself, is by not being the kind of person that yells for such stupid things... Paolo