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 DCF4FC53210 for ; Fri, 6 Jan 2023 01:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230017AbjAFBQc (ORCPT ); Thu, 5 Jan 2023 20:16:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjAFBP6 (ORCPT ); Thu, 5 Jan 2023 20:15:58 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D72D3E858 for ; Thu, 5 Jan 2023 17:14:10 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id h6-20020a17090aa88600b00223fccff2efso2094081pjq.6 for ; Thu, 05 Jan 2023 17:14:10 -0800 (PST) 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:message-id:reply-to; bh=o4UAETXkM62nM2yYuGHBJ1AdJGjwtbarF4DTw13SG8M=; b=j2HNEccBP7np7M1sGlh/lR9iiwoxeu2tDdMfTtFmom/1SMGw9AQClRjRPjxLcQnERb P92ChTGaFkoInGodIaAPnUdfY53bosFhp2WBXli5H0PS/7/07MxxqJE4tVPSrQgL9zZ4 iy1PiDEc0mmhxGDEB4e9NZbEj87Xzb/ZJTKCAfEMolx9oL+EUzsxesFZVBys6msUS/dV BlERFFcesl/Aa0+XdXyltbE2MS4q6xScax+5zeprGT9eHK5nBMbpS06o+TwXC7g9SbZh y2NdVD5PQ5H5gTO6T23k2qqLzFuLP2O4eK7GOViM+89twqSlz/6vLB7iSc/KWmjVNb6L ngZw== 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:message-id :reply-to; bh=o4UAETXkM62nM2yYuGHBJ1AdJGjwtbarF4DTw13SG8M=; b=HEWSr7b1Dp2T98lNZQMD3ulpO3q34IxXkOhQEDn7WmgUe/rVJreJIa70HUCGE7pxqy cCvWNP43kfN+MKddLQsE9U1ZmHi9ZPqr6tmmjwmd0/IMecWdBEK2CeoI8+GhYYTeG30p vgoHggQImOXfF4LA+lsfI2y57m22m4ZlinNlt7TUD8Sj3FwPQBpydiyqA/sE28p9clD8 C6XlpxbehlHZNOGuHSWg2sDM8KQZRHEHt938kPzhvIW2FmPSSM1NZt5ORuPOZzyhPzv4 Ulx3pA6wnu0jOKYB4VvVa0rhPh+rPibYfSU55wqrcc7ZAlReW4VWbMmUCODxiaEG5ElE 2U5g== X-Gm-Message-State: AFqh2krAoxhtH9fteBmgsg6k9c4qRM9lol5pNtZm/Z3raW7mz6UW7DIC MO32JwdKJS4jIFx1bnVs43W38w99JGk= X-Google-Smtp-Source: AMrXdXuxaeNgG3qV2/dc3S4AdIlGeqilvlmQHbJQGHhMswaBgY/s1jn0nF3f3Xk4hQBpGykQGzmLpuaPAjQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:2e05:b0:225:b536:1209 with SMTP id q5-20020a17090a2e0500b00225b5361209mr4108245pjd.101.1672967634940; Thu, 05 Jan 2023 17:13:54 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 6 Jan 2023 01:12:57 +0000 In-Reply-To: <20230106011306.85230-1-seanjc@google.com> Mime-Version: 1.0 References: <20230106011306.85230-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230106011306.85230-25-seanjc@google.com> Subject: [PATCH v5 24/33] KVM: SVM: Inhibit AVIC if vCPUs are aliased in logical mode From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Alejandro Jimenez , Maxim Levitsky , Suravee Suthikulpanit , Li RongQing , Greg Edwards Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Inhibit SVM's AVIC if multiple vCPUs are aliased to the same logical ID. Architecturally, all CPUs whose logical ID matches the MDA are supposed to receive the interrupt; overwriting existing entries in AVIC's logical=>physical map can result in missed IPIs. Fixes: 18f40c53e10f ("svm: Add VMEXIT handlers for AVIC") Reviewed-by: Maxim Levitsky Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 6 ++++++ arch/x86/kvm/lapic.c | 5 +++++ arch/x86/kvm/svm/avic.c | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 5865bad08a23..b41a01b3a4af 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1218,6 +1218,12 @@ enum kvm_apicv_inhibit { * AVIC is disabled because SEV doesn't support it. */ APICV_INHIBIT_REASON_SEV, + + /* + * AVIC is disabled because not all vCPUs with a valid LDR have a 1:1 + * mapping between logical ID and vCPU. + */ + APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED, }; struct kvm_arch { diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 297da684c25f..0faf80cdc1be 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -396,6 +396,11 @@ void kvm_recalculate_apic_map(struct kvm *kvm) else kvm_clear_apicv_inhibit(kvm, APICV_INHIBIT_REASON_PHYSICAL_ID_ALIASED); + if (!new || new->logical_mode == KVM_APIC_MODE_MAP_DISABLED) + kvm_set_apicv_inhibit(kvm, APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED); + else + kvm_clear_apicv_inhibit(kvm, APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED); + old = rcu_dereference_protected(kvm->arch.apic_map, lockdep_is_held(&kvm->arch.apic_map_lock)); rcu_assign_pointer(kvm->arch.apic_map, new); diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index d1ac19f053ce..1fd473a57159 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -967,7 +967,8 @@ bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason) BIT(APICV_INHIBIT_REASON_SEV) | BIT(APICV_INHIBIT_REASON_PHYSICAL_ID_ALIASED) | BIT(APICV_INHIBIT_REASON_APIC_ID_MODIFIED) | - BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED); + BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED) | + BIT(APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED); return supported & BIT(reason); } -- 2.39.0.314.g84b9a713c41-goog