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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 55A61C43381 for ; Fri, 15 Feb 2019 02:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A58C20643 for ; Fri, 15 Feb 2019 02:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550197238; bh=KHDTZ9u370Mfakkg/FZyhwqDWTrSRwHxXxvT3DgxIIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cD//TeNSL1DEv9QYReylbjzsGmhBdDQk0Bk9167tgKq/w0QRFsB3nu9GIPKNQ8zn6 LWVdw8c1I1GefkVYS22ZRkFNfsxHqoqcHEahxSKiY0zO95pTchDecEERubzNaha0Uy 4pDp5+RgpBAfx8IreAYdEDJ+SIOBS8fXJAoowqVM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405601AbfBOCPQ (ORCPT ); Thu, 14 Feb 2019 21:15:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:54982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405499AbfBOCPK (ORCPT ); Thu, 14 Feb 2019 21:15:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27CCF20643; Fri, 15 Feb 2019 02:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196909; bh=KHDTZ9u370Mfakkg/FZyhwqDWTrSRwHxXxvT3DgxIIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kzSK1AYhUi07valXCIqkPPgl5vSyfIMrbydUTz+5CUn9QYvf/eTHU0rmmnnd2OGP6 L23QT70yV5UDNeQa6l51aHLj/j1ye+tF8Z87Ed0vzGhT39HoxDwMbqhUIi6xEU6Lm4 M3jXhekeBJJbq+CvW4QO2CfkSlLhicZcSDHDm2RU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Suravee Suthikulpanit , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 26/27] svm: Fix AVIC incomplete IPI emulation Date: Thu, 14 Feb 2019 21:14:23 -0500 Message-Id: <20190215021424.178979-26-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021424.178979-1-sashal@kernel.org> References: <20190215021424.178979-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit [ Upstream commit bb218fbcfaaa3b115d4cd7a43c0ca164f3a96e57 ] In case of incomplete IPI with invalid interrupt type, the current SVM driver does not properly emulate the IPI, and fails to boot FreeBSD guests with multiple vcpus when enabling AVIC. Fix this by update APIC ICR high/low registers, which also emulate sending the IPI. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/svm.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index fa1b0e3c8a06..31df05fcbc61 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3932,25 +3932,14 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm) kvm_lapic_reg_write(apic, APIC_ICR, icrl); break; case AVIC_IPI_FAILURE_TARGET_NOT_RUNNING: { - int i; - struct kvm_vcpu *vcpu; - struct kvm *kvm = svm->vcpu.kvm; struct kvm_lapic *apic = svm->vcpu.arch.apic; /* - * At this point, we expect that the AVIC HW has already - * set the appropriate IRR bits on the valid target - * vcpus. So, we just need to kick the appropriate vcpu. + * Update ICR high and low, then emulate sending IPI, + * which is handled when writing APIC_ICR. */ - kvm_for_each_vcpu(i, vcpu, kvm) { - bool m = kvm_apic_match_dest(vcpu, apic, - icrl & KVM_APIC_SHORT_MASK, - GET_APIC_DEST_FIELD(icrh), - icrl & KVM_APIC_DEST_MASK); - - if (m && !avic_vcpu_is_running(vcpu)) - kvm_vcpu_wake_up(vcpu); - } + kvm_lapic_reg_write(apic, APIC_ICR2, icrh); + kvm_lapic_reg_write(apic, APIC_ICR, icrl); break; } case AVIC_IPI_FAILURE_INVALID_TARGET: -- 2.19.1