From patchwork Fri Jan 6 01:12:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 39874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp577445wrt; Thu, 5 Jan 2023 17:17:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXtyuidMdsTw9gUfj3+6DNRlkpc5XOb3O6b4W+6acnpjdx/BCgetdCeHHKVeZtXRqKgoyZd+ X-Received: by 2002:a17:907:9849:b0:7c0:d88e:4b37 with SMTP id jj9-20020a170907984900b007c0d88e4b37mr49514720ejc.52.1672967836758; Thu, 05 Jan 2023 17:17:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672967836; cv=none; d=google.com; s=arc-20160816; b=eEb+BrJHv4ZqyVIFXhSt2NKYKd3dbCJrtI8KJrIhQEK/h980tfcXclpbgh3GNHX2Wm 2FSjNBMJr1uYGBr39HRkGceLO6o7fflBZPvOQUOUaxjp1pL98lKirTfXR0bU/7n1sHsZ VNI4DsrEChA2vTSYjomWK8F4uAj1GbYwvC2zukAiYF1yLZivNb4UAA+anOgtIRlTLS+V 7x8BoNuFrOrVALbL+ctRcP2RYpVfBxPanERIwCwAXKYUfL1KXnKxvs8BsK/EF5GMG6sY RVYmmv+a3t0yTk2XH0F6MKkBxPoyDeBq/K92OJiVHj+5t0xUUwIs2ZBx/h/amLCY0yFe voVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=TSmJoHpGEg4kYZow7Hfuz8WMYi0D8WbHpbMSfsD+jaY=; b=lKyXMvz61JOOXmrCfcTXKx1R3d9kj51GmEn604vmqzE9RSV2UCjYkMcH9S6cvRX3GD v34oBCPz4vTfPWE/W3LInbS5vyUWo+O9uh2yo9TEBuJUjnTnhDai5/NuuVRERxzL3CGk PHvSPE2jcJEvMr4m8HXEgoTgQrfb2s4/Ezu9h/bcVG6DFQ/6W7cMLtIaLiX+w27dTjJ3 Xp/CvAGdi2SefeKnthf3p9Wxj+FVFjnAiDeWlxgqVkM4LK8iprD9KZ2+zoiNYGSYsE5Y NSWVQnCY1L4wARwVdBLjkGN2rJ5A1cWal1THELU9EYtGXKbZ175Oksk24celll9Lqf2X jDCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=svIrwG0B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xi1-20020a170906dac100b007a953d421bbsi33216185ejb.322.2023.01.05.17.16.51; Thu, 05 Jan 2023 17:17:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=svIrwG0B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236811AbjAFBN6 (ORCPT + 99 others); Thu, 5 Jan 2023 20:13:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236660AbjAFBN0 (ORCPT ); Thu, 5 Jan 2023 20:13:26 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99B1971FF5 for ; Thu, 5 Jan 2023 17:13:25 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-46658ec0cfcso2656287b3.19 for ; Thu, 05 Jan 2023 17:13:25 -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=TSmJoHpGEg4kYZow7Hfuz8WMYi0D8WbHpbMSfsD+jaY=; b=svIrwG0BQCeHJr9kAw3C+ZqzVl4Z8noxUTH4Nm3fxagfr95d0yzpFEtYY0HeWbhhKa Mj7UpQwZ7gK6e4mFFGwm0yRoGFdQDHTTjKT6l5xTDNF8OFTJh2qF4SspR394jOniGrm7 VB61W1PzyR7BbjmWZILBvd/PVnnDPQhcIb6iUkb+AW8JAjkUmWmRfBYZ1Q8StJ44SPZ5 LDv7eYcCPaniI5y9ttvrcjEwaToRELdufqVSRdy9bWT89upLDk1TBMAJzDoeGg2Mx5WW EFeJq5rozALDwYstow/5AByuY7f51vDJ08FP07o3mQkp1a2xtOeuAxfqH1LPWOQly+pZ b+eQ== 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=TSmJoHpGEg4kYZow7Hfuz8WMYi0D8WbHpbMSfsD+jaY=; b=jwmPhw9iDypZn1fOziSXDNFxg62mv3eBp0uTRkzu3SOQLyfbKhk4Bzf6yp4JLkyY2B S7kKZ2ltW0iUXtGcrPr/SrxxISO93gmu1Mjd2sKympT4aflMcRg0/1JeOObOSvSeIa7M HTccHwyQdYt6Z/euQH3iSSeWdUvHlJBizvp0sZhGig4BSqCPhtRBcpEGFijetfHwhLOx ThB7/EPPMXEf73JO+biyw89X6L5coR6u3iKHFeMjk846TrrsiBQwUjPLnf/j2Of+ggtf ncPK4hublW92enkMgLBC/TOUKD9fVknnjuGzE9p989SsEEBCEvuNd4oFoTa/D7dX6FwG VNVg== X-Gm-Message-State: AFqh2krbwI0ZTgPknDVOZ2I2wf14nyYi3lSY+XFIUaI/NC3xQz6rbSCk KjVEHG5pz9XSySGpctqhiW/hbpsZR34= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a0d:c2c1:0:b0:4ad:5c08:7e67 with SMTP id e184-20020a0dc2c1000000b004ad5c087e67mr1617563ywd.75.1672967605381; Thu, 05 Jan 2023 17:13:25 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 6 Jan 2023 01:12:39 +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-7-seanjc@google.com> Subject: [PATCH v5 06/33] KVM: x86: Don't inhibit APICv/AVIC if xAPIC ID mismatch is due to 32-bit ID 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754233922644554859?= X-GMAIL-MSGID: =?utf-8?q?1754233922644554859?= Truncate the vcpu_id, a.k.a. x2APIC ID, to an 8-bit value when comparing it against the xAPIC ID to avoid false positives (sort of) on systems with >255 CPUs, i.e. with IDs that don't fit into a u8. The intent of APIC_ID_MODIFIED is to inhibit APICv/AVIC when the xAPIC is changed from it's original value, The mismatch isn't technically a false positive, as architecturally the xAPIC IDs do end up being aliased in this scenario, and neither APICv nor AVIC correctly handles IPI virtualization when there is aliasing. However, KVM already deliberately does not honor the aliasing behavior that results when an x2APIC ID gets truncated to an xAPIC ID. I.e. the resulting APICv/AVIC behavior is aligned with KVM's existing behavior when KVM's x2APIC hotplug hack is effectively enabled. If/when KVM provides a way to disable the hotplug hack, APICv/AVIC can piggyback whatever logic disables the optimized APIC map (which is what provides the hotplug hack), i.e. so that KVM's optimized map and APIC virtualization yield the same behavior. For now, fix the immediate problem of APIC virtualization being disabled for large VMs, which is a much more pressing issue than ensuring KVM honors architectural behavior for APIC ID aliasing. Fixes: 3743c2f02517 ("KVM: x86: inhibit APICv/AVIC on changes to APIC ID or APIC base") Reported-by: Suravee Suthikulpanit Cc: stable@vger.kernel.org Reviewed-by: Maxim Levitsky Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 191b5a962700..2183a9b8efa5 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2078,7 +2078,12 @@ static void kvm_lapic_xapic_id_updated(struct kvm_lapic *apic) if (KVM_BUG_ON(apic_x2apic_mode(apic), kvm)) return; - if (kvm_xapic_id(apic) == apic->vcpu->vcpu_id) + /* + * Deliberately truncate the vCPU ID when detecting a modified APIC ID + * to avoid false positives if the vCPU ID, i.e. x2APIC ID, is a 32-bit + * value. + */ + if (kvm_xapic_id(apic) == (u8)apic->vcpu->vcpu_id) return; kvm_set_apicv_inhibit(apic->vcpu->kvm, APICV_INHIBIT_REASON_APIC_ID_MODIFIED);