Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4636399ybz; Tue, 28 Apr 2020 15:22:16 -0700 (PDT) X-Google-Smtp-Source: APiQypJY2EZKRG2k8+sLIAgcRjXeZt4VPt3sB3drS6u47oI0m2qUmFU+ijq3GFGoJbPHoKoCstdR X-Received: by 2002:aa7:c643:: with SMTP id z3mr17579310edr.154.1588112536307; Tue, 28 Apr 2020 15:22:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588112536; cv=none; d=google.com; s=arc-20160816; b=QpLZtmskBlr2Lp6A/fSSnUvsuV3aj/TmkbKQNthF7v5gL5HJg4hlX9/8cG+25ilK9i JRzpk+wkvM6uvbsgJoU6aLStKFaea+nHvLl/4V60m2OP+dxwXYszcU9elmYps0BH/d17 xP8Lnptn0TQuHPjjOFyKrWY2OWGaIEQnHgZy46Vw/YHKuihMiFb3Xp2GihfM/Kotw7qQ CjsBPzl9eq7B4SM20UyI91Ajhgot37HORjXGhIKMYk+6cvj8aCGmCZjLnEze18KQyoEg O9RBggBINNeFN0zoeHBvGs1pTf18tdbnj/1be370OSx9QrM1yK4YjfkoI7cbQLB1qvAX OfiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:ironport-sdr:ironport-sdr; bh=92OHZvzZYu42apT9WMN7NJNW5VFrHS/h0ncCHblGxxE=; b=ERZrneT5AAFXEPm0++7a7S0b8OdZ9b3bbVaeZ2f2RHdBRZKgXw1rtNZdwWUIGoeVI6 3k3ZmGqrzs0JK1ymE7Mq4kAYI0vbDBysEwAs5Rho8MmSsbbKKWnt5fA81sWcIejCHDhv KSNHj0xN0/R7tjDEVlITy0838i9Yx/iKA9rLQgezrNJhRs4F4S/7eg7OMRmKG1eviTXF e/g6kDpxpLXQe+J/DBNAo3DvufkejHCKIcCa3SOs1Yc+l884XODJs28MLOK5VZPx0xDq R6G9nCD+mmjne35iNDp0VugwbbxvZ35kF9CzPnne1HL7iSeIkFZn36LmC1uehyIkx3NP sspQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m4si2795041ejd.315.2020.04.28.15.21.53; Tue, 28 Apr 2020 15:22:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbgD1WUM (ORCPT + 99 others); Tue, 28 Apr 2020 18:20:12 -0400 Received: from mga18.intel.com ([134.134.136.126]:26741 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726312AbgD1WUL (ORCPT ); Tue, 28 Apr 2020 18:20:11 -0400 IronPort-SDR: 9eTYK0Ki80pHPzGB9aS+XFf+aN7x33TQ61gd+MtoBe6TQhSl6x6ulvCgjqBP9syLBYc3pPkRzI riZukShdDsWQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2020 15:20:11 -0700 IronPort-SDR: pTtCLvWjqtF4QvauuVuS6xbdBEQ8G5baHf6iF3cul0p0dYsj9BFlAPk+IeX1OIcF0eoQ3bi+nh s+Evr0h4QT0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,328,1583222400"; d="scan'208";a="367632604" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.202]) by fmsmga001.fm.intel.com with ESMTP; 28 Apr 2020 15:20:10 -0700 Date: Tue, 28 Apr 2020 15:20:10 -0700 From: Sean Christopherson To: Jim Mattson Cc: Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Joerg Roedel , kvm list , LKML , Oliver Upton , Peter Shier Subject: Re: [PATCH 12/13] KVM: x86: Replace late check_nested_events() hack with more precise fix Message-ID: <20200428222010.GN12735@linux.intel.com> References: <20200423022550.15113-1-sean.j.christopherson@intel.com> <20200423022550.15113-13-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 28, 2020 at 03:12:51PM -0700, Jim Mattson wrote: > On Wed, Apr 22, 2020 at 7:26 PM Sean Christopherson > wrote: > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 7c49a7dc601f..d9d6028a77e0 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -7755,24 +7755,10 @@ static int inject_pending_event(struct kvm_vcpu *vcpu) > > --vcpu->arch.nmi_pending; > > vcpu->arch.nmi_injected = true; > > kvm_x86_ops.set_nmi(vcpu); > > - } else if (kvm_cpu_has_injectable_intr(vcpu)) { > > - /* > > - * Because interrupts can be injected asynchronously, we are > > - * calling check_nested_events again here to avoid a race condition. > > - * See https://lkml.org/lkml/2014/7/2/60 for discussion about this > > - * proposal and current concerns. Perhaps we should be setting > > - * KVM_REQ_EVENT only on certain events and not unconditionally? > > - */ > > - if (is_guest_mode(vcpu) && kvm_x86_ops.check_nested_events) { > > - r = kvm_x86_ops.check_nested_events(vcpu); > > - if (r != 0) > > - return r; > > - } > > - if (kvm_x86_ops.interrupt_allowed(vcpu)) { > > - kvm_queue_interrupt(vcpu, kvm_cpu_get_interrupt(vcpu), > > - false); > > - kvm_x86_ops.set_irq(vcpu); > > - } > > + } else if (kvm_cpu_has_injectable_intr(vcpu) && > > + kvm_x86_ops.interrupt_injection_allowed(vcpu)) { > > + kvm_queue_interrupt(vcpu, kvm_cpu_get_interrupt(vcpu), false); > > + kvm_x86_ops.set_irq(vcpu); > > } > So, that's what this mess was all about! Well, this certainly looks better. Right? I can't count the number of times I've looked at this code and wondered what the hell it was doing. Side topic, I just realized you're reviewing my original series. Paolo commandeered it to extend it to SVM. https://patchwork.kernel.org/cover/11508679/