Message ID | 20221001005915.2041642-22-seanjc@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
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 998DBC433F5 for <kvm@archiver.kernel.org>; Sat, 1 Oct 2022 01:02:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbiJABCi (ORCPT <rfc822;kvm@archiver.kernel.org>); Fri, 30 Sep 2022 21:02:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233019AbiJABBw (ORCPT <rfc822;kvm@vger.kernel.org>); Fri, 30 Sep 2022 21:01:52 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02BBACAF8F for <kvm@vger.kernel.org>; Fri, 30 Sep 2022 18:00:11 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id s16-20020a170902ea1000b00176cf52a348so4224667plg.3 for <kvm@vger.kernel.org>; Fri, 30 Sep 2022 18:00: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=hhcjKYj23YWXw5bc06GwUk4XMJj5K2PGd9rVASFSpWo=; b=qtM8qb/++PwpgXE2ygkDVfIK//jRrXsh1Omp8NBBjy0Bi2V4L+SL0932+qwGCRQ1eO gQVyVdaJpR0xll4/hJ4iUhPV18G5g6CmWEml+Nu41FjKWXxNHqsyU5cI/LIMxOKbeZJu AO4YL/N+HJGs83bExHbqGrJAiGNKstEA8+jouR1/Q7Q2iCKe2mktRsSWjRZsF69BAFUT WdHLiHD7zI5GhMfOJqkkc9MIOEEXzu0Mb80wASiV7p6Znx7/JoBXUsYcG7iEtYCiANUI jOUXmvJ5NbNOLJHuBH9MbmrDWyRwGYcOp79VFDiQ/l/9E//lmqUG7eHAEC0zlE2yLY2g 0Lag== 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=hhcjKYj23YWXw5bc06GwUk4XMJj5K2PGd9rVASFSpWo=; b=41ghuW4rC8uPKVY8fhFBGL/ZvNbpS0IsByK00+TtijZcxYMyW6S9SSyNbpFB9FGDnS QiXPTI9gyZhkz6YyCRrmJvF9Rsc4Nxu/i6HG/yNdz5Qzan7pRUJZXa+s/2W1hqmIQZFX jHcQMFIv+y8GydGKadduTd0bTMChW71dmQGbL1Aurc/1FqZ9kkfrYXISXU9zFGa2bBNt YeCJkKfRUWZLZfALiGUHeWMjLFwq3aP2BDX5rOrLpf8/dNsTQ8Xgv/qTEMV30xlSCVUQ a09Y5kzMzEvsSAhvJk6ttBtlFcpM4z4pW2Txb644XS/sdeD9SA4NdCqCuqO8DuhN82FA vnUw== X-Gm-Message-State: ACrzQf2O4t5um8T5rAJIG6uVk0rOvEIYFWYimopNH/JMaUW0XbanmfzE LczJwrfY3MVNQwztTnwk8nQNbTd1PGQ= X-Google-Smtp-Source: AMsMyM6KQ7OLb2NI9kzXe2RozSCiOLmBy6eUO9tIPcSGSxDHZtFK3SySAG6SKJ17NWpDOjDwB4/9hRfn+YI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:2442:b0:176:c8ee:a5d6 with SMTP id l2-20020a170903244200b00176c8eea5d6mr11245653pls.20.1664585994392; Fri, 30 Sep 2022 17:59:54 -0700 (PDT) Reply-To: Sean Christopherson <seanjc@google.com> Date: Sat, 1 Oct 2022 00:59:04 +0000 In-Reply-To: <20221001005915.2041642-1-seanjc@google.com> Mime-Version: 1.0 References: <20221001005915.2041642-1-seanjc@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221001005915.2041642-22-seanjc@google.com> Subject: [PATCH v4 21/32] KVM: x86: Disable APIC logical map if logical ID covers multiple MDAs From: Sean Christopherson <seanjc@google.com> To: Sean Christopherson <seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com> Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Alejandro Jimenez <alejandro.j.jimenez@oracle.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, Maxim Levitsky <mlevitsk@redhat.com>, Li RongQing <lirongqing@baidu.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: <kvm.vger.kernel.org> X-Mailing-List: kvm@vger.kernel.org |
Series |
KVM: x86: AVIC and local APIC fixes+cleanups
|
expand
|
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index fca8bbb44375..7fd55e24247c 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -338,8 +338,14 @@ void kvm_recalculate_apic_map(struct kvm *kvm) continue; } - if (mask) - cluster[ffs(mask) - 1] = apic; + if (!mask) + continue; + + if (!is_power_of_2(mask)) { + new->logical_mode = KVM_APIC_MODE_MAP_DISABLED; + continue; + } + cluster[ffs(mask) - 1] = apic; } out: old = rcu_dereference_protected(kvm->arch.apic_map,