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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43396C38145 for ; Sat, 3 Sep 2022 00:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231424AbiICAXZ (ORCPT ); Fri, 2 Sep 2022 20:23:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbiICAXO (ORCPT ); Fri, 2 Sep 2022 20:23:14 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE2E0F72D0 for ; Fri, 2 Sep 2022 17:23:11 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id 74-20020a62144d000000b0053b2a8e18ffso1716588pfu.7 for ; Fri, 02 Sep 2022 17:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date; bh=QGfA0SPabQE2R3mTMEiHM9w7+nZN1T1OVaqiQ+IC3mI=; b=d+a+sPvbty8fX65SGwCSUPdb2VNS1zH1EpY8wQ8K2oklg4QQo3zBa8SiaCHxWnoujz Eex6Q9ikO5sMn4145/38ZNgrliW2qtezfapw3Aj1+HfVvQ8oBx+n/TxwDpa/GZypzuTU xfbvDrp5hJ+sshHLkf25qEE0/GjNE0aRAwtw7SoDyCsLphVJCRUenA2FNocoAFiAazbA Lleh/c6CC0pmX6rYyNu4NNIvTJOmuXwjLCS7lsWTn6OP1ro8/08GIREnjT6BOEQycOzZ cM32tiBDh9KI5+mpvbHZsSSuIG887H+Pg3bAHpiBSQj+RtIyH5nWKgQ1ZfNQgIV6tjQD c4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date; bh=QGfA0SPabQE2R3mTMEiHM9w7+nZN1T1OVaqiQ+IC3mI=; b=ZZCYNNXWm7HsJn5OU3Z+OQE8gyAme4PAMiFahVKJbhVh1feIIv7h8vR2mrZXwFQYfc F7QaI67B1Imas0n9yRxOEECvrziGKByISdNPkdrwookr84jUgAdvnDKOgxGnPKiWsimV YtYrolGYP4ZhD74aQa04WEPSg/V/jkcvkJW4M4Q5SuytYgFPHYKD4G0ghTiyYhO/eF/7 GWSbx+lcVWmh6o0s50K2HRTLDA+BlfCxcegFLi4QsivmMCNjtYgfjW6JyNtY5/Y2E3Fx zODSU33uDB/sM+gUFbmzNA+zyM0cEqwqKJXw5e+R58csBDP7itbRp5i69XnwK+Ns9txa rAmw== X-Gm-Message-State: ACgBeo2nq8/9ZRrzqDsvjGK/LhVJixAUh/Uk43hesFb8Pb24DRRG9/Y0 t3ujl7hX7r5oJJ1jtCaUMhhJr7wfyiU= X-Google-Smtp-Source: AA6agR7nuG06KNHuOhPwbwIB64qfgB9FAo5CZsNmGvbVnFFWEiJXhkb8QbcPke+ZCjTPA+36UOxjc6ylbt4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:e558:b0:1fb:c4b7:1a24 with SMTP id ei24-20020a17090ae55800b001fbc4b71a24mr30859pjb.1.1662164591154; Fri, 02 Sep 2022 17:23:11 -0700 (PDT) Reply-To: Sean Christopherson Date: Sat, 3 Sep 2022 00:22:38 +0000 In-Reply-To: <20220903002254.2411750-1-seanjc@google.com> Mime-Version: 1.0 References: <20220903002254.2411750-1-seanjc@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220903002254.2411750-8-seanjc@google.com> Subject: [PATCH v2 07/23] KVM: SVM: Compute dest based on sender's x2APIC status for AVIC kick From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Maxim Levitsky , Li RongQing Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Compute the destination from ICRH using the sender's x2APIC status, not each (potential) target's x2APIC status. Fixes: c514d3a348ac ("KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID") Cc: Li RongQing Signed-off-by: Sean Christopherson Reviewed-by: Li RongQing Reviewed-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 3022a135c060..50721c9167c4 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -456,6 +456,7 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, u32 icrl, u32 icrh, u32 index) { + u32 dest = apic_x2apic_mode(source) ? icrh : GET_XAPIC_DEST_FIELD(icrh); unsigned long i; struct kvm_vcpu *vcpu; @@ -471,13 +472,6 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, * since entered the guest will have processed pending IRQs at VMRUN. */ kvm_for_each_vcpu(i, vcpu, kvm) { - u32 dest; - - if (apic_x2apic_mode(vcpu->arch.apic)) - dest = icrh; - else - dest = GET_XAPIC_DEST_FIELD(icrh); - if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, dest, icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true; -- 2.37.2.789.g6183377224-goog