Message ID | 20230106011306.85230-21-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 E3CDDC3DA7A for <kvm@archiver.kernel.org>; Fri, 6 Jan 2023 01:15:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231791AbjAFBPj (ORCPT <rfc822;kvm@archiver.kernel.org>); Thu, 5 Jan 2023 20:15:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbjAFBPO (ORCPT <rfc822;kvm@vger.kernel.org>); Thu, 5 Jan 2023 20:15:14 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DA577816A for <kvm@vger.kernel.org>; Thu, 5 Jan 2023 17:13:48 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id l15-20020a170903244f00b001927c3a0055so134369pls.6 for <kvm@vger.kernel.org>; Thu, 05 Jan 2023 17:13:48 -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=+A51GFnbIGYLOWeoxnDIO9I82OkrlDigpTJkMvBwJMw=; b=F8yzvupPXsGW06DH+1jZGD+zuxJ+ciFFDXXj42wqvm5h/vD4rhWkB30ytSbi5IxBuA Q5xYNnENse/uvcUlUomuo7rHIYID/0orsR2GikNSViLFaGeDyOT+YXUA6lCTMd22/TEh aI3kr97jkgXyYnUf4ENzElIjb1HTY47wtaolr+BE6/YVwz1ssR3YJf4tpjzZ3nVYqzMY ZnhnbxON18+UcKHIAdr2Cljg4XsGGn9t9JwVHz2zt8nMQ5p+aGq4LDXRs9h5/BhafCxC FGAk9Wc0ZmsylkByffi09PfVC11igMnAmYKf47AhvnSHzgj81CSlQ/MCY0a9Im14Ntm5 vS8w== 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=+A51GFnbIGYLOWeoxnDIO9I82OkrlDigpTJkMvBwJMw=; b=BOOiIuV+re8I2iNdEBAOeZg7SsPzqAkogVTQE2zg405HyToJLBUPuOiFwdRvWPdQ2E nlk61N7HHVq4U+2/+IxvMsSCUeEE6G2gZ47f3QlKbQF2csmWYumJ0Edqaya0miVD3MnT n5YO/fFEu+Fs7WXGHcbbCci1DoYo2OqvnzrfQIyb7B9RIOrtjR1/aln/UGZNJ7aNpF/N B/loS9U1cAKzw+Bpsj0edsnPEICOhy/YPPDjt6e3e+hG9D25qcfLiavXOICA9G/dm+aH vDwE6eP9aHvjz0N9FbVAUA+x3xeFsbNq57XZRSfJhDwBhxpel2iPK20qgY2myTF/mvRL 63/g== X-Gm-Message-State: AFqh2kru9ygVMn8GUkLLSYhOebnTNa43orLaRlZLkpAHfL4mGgWC+mjc JbOGJdRmH7tIf8QUOEtem7jHkzZg4/U= X-Google-Smtp-Source: AMrXdXsYY7BVFxPRMEfoT/emgTWWz1OhSiCaBGRQGPHU+fL6h44G8pju8fB+2riNfABFA2yT830hOts7P8A= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:46d8:b0:226:6523:7849 with SMTP id jx24-20020a17090b46d800b0022665237849mr1263637pjb.66.1672967627955; Thu, 05 Jan 2023 17:13:47 -0800 (PST) Reply-To: Sean Christopherson <seanjc@google.com> Date: Fri, 6 Jan 2023 01:12:53 +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-21-seanjc@google.com> Subject: [PATCH v5 20/33] 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>, 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 fd7726ff95c6..dca87bb6dd1a 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -343,8 +343,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,