Message ID | 20230106011306.85230-22-seanjc@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <kvm-owner@vger.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 A2D53C4708E for <kvm@archiver.kernel.org>; Fri, 6 Jan 2023 01:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232591AbjAFBQQ (ORCPT <rfc822;kvm@archiver.kernel.org>); Thu, 5 Jan 2023 20:16:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231676AbjAFBPh (ORCPT <rfc822;kvm@vger.kernel.org>); Thu, 5 Jan 2023 20:15:37 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0A9C755D0 for <kvm@vger.kernel.org>; Thu, 5 Jan 2023 17:14:03 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-460ab8a327eso2578897b3.23 for <kvm@vger.kernel.org>; Thu, 05 Jan 2023 17:14:03 -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=QiGveUbKaqMPt6iTfsOvtO6yQmlbHWlXsxHlqUGMl/I=; b=IgbrbTl5VVQEWYsKOJIdi6Yh1Rkg0pxnO5FKrfb/4/5Qxejylccur32ccSkChi1BWm uNrufnv52MO1GV4aPWUTlMIVQdCAw64PEWa6M/B6kgKNK6cZuFwD85AckL/9uoZHparz +298w25KwqbNpkDWWG3fvXwVJOprfJez5wLuAtZsf1CEg/vV/I0j2/tIj4s84NJ2x24a 6xUmJHZcg6MlqBKqNcneW//MiQUT5D9tk2KcNx2zZ2UBS+Ekss9Guu2K2rJnWRh8PqYk hsoOAg/4wWltiJSgyf24wg3gGckY2Hk5Dsmn8pePTXlBQhal0Ru6ni9RiKz1Syw4a6zl QdAA== 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=QiGveUbKaqMPt6iTfsOvtO6yQmlbHWlXsxHlqUGMl/I=; b=X8xrqQMQn83fQDKpVWZ66lMMmFMEP8qM1O2L+q2kqvvguv5xr2UK0Ufm2/nHiz1yHN P6Di8zQTlb4+sHY0E80I70zC4zocBEBbTqHKjYGvh1tWkOPVX1nKJq9TPxmHv6IgB8wP GEhgb0yKqZo0jZfj5zoKAwXwgSBI4kXvEjxj1P3DyhPaReQLPeqxrX3wxVXMdgm9T0Vk s1bIYMcNYMPP/leXFYm+UIykcr8njdK0Kz5cAz2edQCnwsDuvzn6Ssc5PkiQIa+Jih0/ hqT9txVXh0+trit256bm8nFSYXlgKHVYX5OCOwYi4KHVMo8jonlL73AFsMJ/00a033+c C6xA== X-Gm-Message-State: AFqh2kp0kPfo8DIB2zTEP6OCqvEj/QM9nfftqEq93+ajq6UmbAJVelws E4ru7NSCE/oOR1cX+FxteoVhyxhMeFU= X-Google-Smtp-Source: AMrXdXtfxGfz2gG4ErZYxvuoVjkwSn3FVdr74faXbyyI8MKRfjpjhpYAUJbYOlNFP1jqpsbpwf1rN5sAlGc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:6784:0:b0:460:c029:6c76 with SMTP id b126-20020a816784000000b00460c0296c76mr362480ywc.515.1672967629741; Thu, 05 Jan 2023 17:13:49 -0800 (PST) Reply-To: Sean Christopherson <seanjc@google.com> Date: Fri, 6 Jan 2023 01:12:54 +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-22-seanjc@google.com> Subject: [PATCH v5 21/33] KVM: x86: Disable APIC logical map if vCPUs are aliased in logical mode 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>, Maxim Levitsky <mlevitsk@redhat.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, Li RongQing <lirongqing@baidu.com>, Greg Edwards <gedwards@ddn.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 dca87bb6dd1a..9c0554bae3b1 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -346,11 +346,12 @@ void kvm_recalculate_apic_map(struct kvm *kvm) if (!mask) continue; - if (!is_power_of_2(mask)) { + ldr = ffs(mask) - 1; + if (!is_power_of_2(mask) || cluster[ldr]) { new->logical_mode = KVM_APIC_MODE_MAP_DISABLED; continue; } - cluster[ffs(mask) - 1] = apic; + cluster[ldr] = apic; } out: old = rcu_dereference_protected(kvm->arch.apic_map,