From patchwork Wed Jan 19 22:25:27 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12717823
Return-Path: <kvm-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 70886C433EF
	for <kvm@archiver.kernel.org>; Wed, 19 Jan 2022 22:25:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232704AbiASWZc (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 19 Jan 2022 17:25:32 -0500
Received: from gandalf.ozlabs.org ([150.107.74.76]:52633 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1357489AbiASWZb (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 19 Jan 2022 17:25:31 -0500
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4JfKw91KTXz4y3q;
        Thu, 20 Jan 2022 09:25:28 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1642631129;
        bh=HUdoUmXAE4umbq1ha82W4mzfeV6PIiWF9Q2FlUbPvhg=;
        h=Date:From:To:Cc:Subject:From;
        b=kot4OaUkUGOhlUT+7MXUvBZXx3gI0a6zPGKst2UDvK83yrHlpkmGkmyYmCyHF5aom
         vXG3fycxnCL+7+Nn6ZHpWroq9gGR8RM0omi1bdi3cIeRrT5bL5ANgtgCOQwpAhKMrd
         ptfmBB9jZhRRgMcvECVqlE6+0TuhOlQvc7hdwocpPKxDxomP1OPOSb3Vj4f+wcY/D4
         PUzy6XVD277dp/t7HdyzmcTbKyf2P2Djis/77KqmpGzUysHXFvRmm4j7oDufqLt4GM
         6NioQUwYNH/nCYPActkdAUdQDWuOMLlXRR9ZPw4Vza6COHJ0wqINzJtU4zdvPPPnzG
         B9mQz/dQ4fPPQ==
Date: Thu, 20 Jan 2022 09:25:27 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Marcelo Tosatti <mtosatti@redhat.com>,
        Sean Christopherson <seanjc@google.com>
Subject: linux-next: manual merge of the kvm-fixes tree with Linus' tree
Message-ID: <20220120092527.71e3a85f@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org

Hi all,

Today's linux-next merge of the kvm-fixes tree got a conflict in:

  arch/x86/kvm/vmx/posted_intr.c

between commits:

  c95717218add ("KVM: VMX: Drop unnecessary PI logic to handle impossible conditions")
  29802380b679 ("KVM: VMX: Drop pointless PI.NDST update when blocking")
  89ef0f21cf96 ("KVM: VMX: Save/restore IRQs (instead of CLI/STI) during PI pre/post block")
  cfb0e1306a37 ("KVM: VMX: Read Posted Interrupt "control" exactly once per loop iteration")
  baed82c8e489 ("KVM: VMX: Remove vCPU from PI wakeup list before updating PID.NV")
  45af1bb99b72 ("KVM: VMX: Clean up PI pre/post-block WARNs")

from Linus' tree and commit:

  5f02ef741a78 ("KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock")

from the kvm-fixes tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

It may be worth while rebasing this fix on top of Linus' current tree.

diff --cc arch/x86/kvm/vmx/posted_intr.c
index 88c53c521094,21ea58d25771..000000000000
--- a/arch/x86/kvm/vmx/posted_intr.c