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 5A4CAECAAD5 for ; Wed, 31 Aug 2022 00:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232273AbiHaAiY (ORCPT ); Tue, 30 Aug 2022 20:38:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231933AbiHaAhb (ORCPT ); Tue, 30 Aug 2022 20:37:31 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BCB4ADCCB for ; Tue, 30 Aug 2022 17:36:20 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id r6-20020a17090a2e8600b001fbb51e5cc1so9844302pjd.5 for ; Tue, 30 Aug 2022 17:36:19 -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; bh=FEhIkuDQLTbhRgVY6gxGRT46rdlXqm8xEd2WlujPlPw=; b=C3Jvhnth10yD5RbGbE4OnTHfMpzbKLPlep3eopnVwcvyjqfctzeThj//Ph1qD1y8OL qw9TQyRwuTRnJXYvCX5ukpbnFxwQXyGSq0w9Fq1YTGnr1ByLfMK1WGZCElQXQ5tTbfY9 Y9NJhVw2GAp2N6Rr9q6qG3KglgOR0ryWSCkgDM60t4x31chuG5aamaHUMO5M1GV5GoZe QPnlXa08Wa7rWD60+Uu5j9e6SbcRdHSx2LC+RYWgXmLMtJ0FoSsYVhlOUf5xSIX5BbRR DOznjFBqs8f6sEjF+RO2Rew5mO43wTBsRkbqcRrfuYSf+WryThV+E4muiRE628KnhcRV fjZw== 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; bh=FEhIkuDQLTbhRgVY6gxGRT46rdlXqm8xEd2WlujPlPw=; b=tZ90cxVIYW7BFGDLDQUkQDW5Gmi+te7745FHCv9E2onzrdNYMNqpJowhsxzSWIwC2G dIxmF1YxXW1rDGp2+1b3nXXRp9CIi+GzQr0Ivp7c+Zc6+CGew9iyEkKighyzkIMLQORv tI3awTNTWE3UCPz7fCqd6wzjapAvAgs2eaPGa8/O6WQOAngyOiRQ5gjDPKfDEP3mzS/r bGh68SwhHFpEZHil45QV0rnZXaziGlPI2xDgWsEOLuTIS5g7+5tNJMVVr6OvER65rQrx 0ZRsO02wEjydigLY4kxjqtLw2ixo/c2px8hko9sEtHftolpbeBZmE0HKe/tZ4gV2ZpPU sIsg== X-Gm-Message-State: ACgBeo127Xy8H3RMOawUCG330j+tqz7iH4yK/BaAh3Uh+jFdVLAN8TJV dsJW20MuPqdurkbTPMok1PAGwKWEfUI= X-Google-Smtp-Source: AA6agR6TzP+FIywrqeQqCZzSFVPsDmgyLFfh2V3lEmwUZq63KVkLk4QrRpb+1AKCQPIZKXEtbItpe/uflhI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:168a:0:b0:535:ff3d:b68d with SMTP id 132-20020a62168a000000b00535ff3db68dmr23683340pfw.86.1661906136120; Tue, 30 Aug 2022 17:35:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 31 Aug 2022 00:35:03 +0000 In-Reply-To: <20220831003506.4117148-1-seanjc@google.com> Mime-Version: 1.0 References: <20220831003506.4117148-1-seanjc@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220831003506.4117148-17-seanjc@google.com> Subject: [PATCH 16/19] KVM: x86: Explicitly track all possibilities for APIC map's logical modes 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: linux-kernel@vger.kernel.org Track all possibilities for the optimized APIC map's logical modes instead of overloading the pseudo-bitmap and treating any "unknown" value as "invalid". As documented by the now-stale comment above the mode values, the values did have meaning when the optimized map was originally added. That dependent logical was removed by commit e45115b62f9a ("KVM: x86: use physical LAPIC array for logical x2APIC"), but the obfuscated behavior and its comment were left behind. Opportunistically rename "mode" to "logical_mode", partly to make it clear that the "disabled" case applies only to the logical map, but also to prove that there is no lurking code that expects "mode" to be a bitmap. Functionally, this is a glorified nop. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 21 ++++++++++-------- arch/x86/kvm/lapic.c | 38 ++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 1f51411f3112..0184e64ab555 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -955,19 +955,22 @@ struct kvm_arch_memory_slot { }; /* - * We use as the mode the number of bits allocated in the LDR for the - * logical processor ID. It happens that these are all powers of two. - * This makes it is very easy to detect cases where the APICs are - * configured for multiple modes; in that case, we cannot use the map and - * hence cannot use kvm_irq_delivery_to_apic_fast either. + * Track the mode of the optimized logical map, as the rules for decoding the + * destination vary per mode. Enabling the optimized logical map requires all + * software-enabled local APIs to be in the same mode, each addressable APIC to + * be mapped to only one MDA, and each MDA to map to at most one APIC. */ -#define KVM_APIC_MODE_XAPIC_CLUSTER 4 -#define KVM_APIC_MODE_XAPIC_FLAT 8 -#define KVM_APIC_MODE_X2APIC 16 +enum kvm_apic_logical_mode { + KVM_APIC_MODE_SW_DISABLED, + KVM_APIC_MODE_XAPIC_CLUSTER, + KVM_APIC_MODE_XAPIC_FLAT, + KVM_APIC_MODE_X2APIC, + KVM_APIC_MODE_MAP_DISABLED, +}; struct kvm_apic_map { struct rcu_head rcu; - u8 mode; + enum kvm_apic_logical_mode logical_mode; u32 max_apic_id; union { struct kvm_lapic *xapic_flat_map[8]; diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 8209caffe3ab..3b6ef36b3963 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -168,7 +168,12 @@ static bool kvm_use_posted_timer_interrupt(struct kvm_vcpu *vcpu) static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map, u32 dest_id, struct kvm_lapic ***cluster, u16 *mask) { - switch (map->mode) { + switch (map->logical_mode) { + case KVM_APIC_MODE_SW_DISABLED: + /* Arbitrarily use the flat map so that @cluster isn't NULL. */ + *cluster = map->xapic_flat_map; + *mask = 0; + return true; case KVM_APIC_MODE_X2APIC: { u32 offset = (dest_id >> 16) * 16; u32 max_apic_id = map->max_apic_id; @@ -193,8 +198,10 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map, *cluster = map->xapic_cluster_map[(dest_id >> 4) & 0xf]; *mask = dest_id & 0xf; return true; + case KVM_APIC_MODE_MAP_DISABLED: + return false; default: - /* Not optimized. */ + WARN_ON_ONCE(1); return false; } } @@ -256,10 +263,12 @@ void kvm_recalculate_apic_map(struct kvm *kvm) goto out; new->max_apic_id = max_id; + new->logical_mode = KVM_APIC_MODE_SW_DISABLED; kvm_for_each_vcpu(i, vcpu, kvm) { struct kvm_lapic *apic = vcpu->arch.apic; struct kvm_lapic **cluster; + enum kvm_apic_logical_mode logical_mode; u32 x2apic_id, physical_id; u16 mask; u32 ldr; @@ -314,7 +323,8 @@ void kvm_recalculate_apic_map(struct kvm *kvm) new->phys_map[physical_id] = apic; } - if (!kvm_apic_sw_enabled(apic)) + if (new->logical_mode == KVM_APIC_MODE_MAP_DISABLED || + !kvm_apic_sw_enabled(apic)) continue; ldr = kvm_lapic_get_reg(apic, APIC_LDR); @@ -322,25 +332,33 @@ void kvm_recalculate_apic_map(struct kvm *kvm) continue; if (apic_x2apic_mode(apic)) { - new->mode |= KVM_APIC_MODE_X2APIC; + logical_mode = KVM_APIC_MODE_X2APIC; } else { ldr = GET_APIC_LOGICAL_ID(ldr); if (kvm_lapic_get_reg(apic, APIC_DFR) == APIC_DFR_FLAT) - new->mode |= KVM_APIC_MODE_XAPIC_FLAT; + logical_mode = KVM_APIC_MODE_XAPIC_FLAT; else - new->mode |= KVM_APIC_MODE_XAPIC_CLUSTER; + logical_mode = KVM_APIC_MODE_XAPIC_CLUSTER; } + if (new->logical_mode != KVM_APIC_MODE_SW_DISABLED && + new->logical_mode != logical_mode) { + new->logical_mode = KVM_APIC_MODE_MAP_DISABLED; + continue; + } + new->logical_mode = logical_mode; - if (!kvm_apic_map_get_logical_dest(new, ldr, &cluster, &mask)) + if (WARN_ON_ONCE(!kvm_apic_map_get_logical_dest(new, ldr, + &cluster, &mask))) { + new->logical_mode = KVM_APIC_MODE_MAP_DISABLED; continue; + } if (!mask) continue; ldr = ffs(mask) - 1; if (!is_power_of_2(mask) || cluster[ldr]) { - new->mode = KVM_APIC_MODE_XAPIC_FLAT | - KVM_APIC_MODE_XAPIC_CLUSTER; + new->logical_mode = KVM_APIC_MODE_MAP_DISABLED; continue; } cluster[ldr] = apic; @@ -993,7 +1011,7 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kvm, struct kvm_lapic **src, { if (kvm->arch.x2apic_broadcast_quirk_disabled) { if ((irq->dest_id == APIC_BROADCAST && - map->mode != KVM_APIC_MODE_X2APIC)) + map->logical_mode != KVM_APIC_MODE_X2APIC)) return true; if (irq->dest_id == X2APIC_BROADCAST) return true; -- 2.37.2.672.g94769d06f0-goog