From patchwork Fri Jan 6 01:12:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 39863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp577029wrt; Thu, 5 Jan 2023 17:16:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5A4Cx4k8V/Z6fSqfMFB3wkotrzl6fSgh6INVEqQNyOaQtMPgX6/hc01HF4boh6yKw6QIp X-Received: by 2002:a17:906:308b:b0:7ae:cda1:76d0 with SMTP id 11-20020a170906308b00b007aecda176d0mr43146724ejv.15.1672967772235; Thu, 05 Jan 2023 17:16:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672967772; cv=none; d=google.com; s=arc-20160816; b=a/qEKNUlHzW+CbhoP6VFHY6fxPY9xuf8Pabq3kgc2KrZs/ydWDGCpWk4EhKlrfwpvS iLQ8txJ0FLC5K4GsfGXyzT5qFn7yH0MmMeccFNOrzeo6VARBa9Sw+KkA7zYTPUyu1dXy k8EP4mP86ScD9Ip5+QNjroAa1YJQpjCBWOemSQBfX5imtw0qFTla7enEh7MYyOaCWXcQ Ko724QIq0fIbEvvL0UxdP3izX7AS88VQ0SdZCcOE4+/uDSNDc5JFr3IXg8xFasBaWipO 1g4X4/HCo/8xc9EFgBwFn0HjqkwC3hqfsYQnImHXC5To1eGALj317j/j50fivITeV52d n62Q== 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=kDxvCyND+GW2720NKX+RgCL5mWGsrG1FRlKlZQabxpo=; b=kxW19h6KC0sfLJ/kf2zWePC9CRkvDlX0/JHNa+oEM2O9UYbt3vFY2qd4oW9ktFHI5n yHS76+Xn4mmUQV1LMX68icxZTlPtuSqLpTZS6onvW267UiCN2I6MzmAKrC0yJTlRxgNS FwqfiTIlgmP45RrKksnS+eIgh4d7W+DtpAvJhryO0ZWwFDUvO87tRV0mTXYVVFGk+css noWoVxGX6aGtP5ExEFVpZg167yO6bd1WBaR3uoy9DifdsZzFi2CXIyi1cdHsTKhYNtXB AzeSqa9aJ3ROmXt2U2c8v4O410tWzKpu1BuBaQEij/soTYEsyLoSyfWFvCgkd+KNnoid G4gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ReJLu44X; 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 i16-20020a1709064fd000b0073d8ccd37c2si36974728ejw.107.2023.01.05.17.15.48; Thu, 05 Jan 2023 17:16:12 -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=ReJLu44X; 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 S236952AbjAFBOd (ORCPT + 99 others); Thu, 5 Jan 2023 20:14:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236255AbjAFBNf (ORCPT ); Thu, 5 Jan 2023 20:13:35 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 372DE72D1A for ; Thu, 5 Jan 2023 17:13:35 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id 31-20020a17090a0fa200b00226e43409c2so36456pjz.9 for ; Thu, 05 Jan 2023 17:13:35 -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=kDxvCyND+GW2720NKX+RgCL5mWGsrG1FRlKlZQabxpo=; b=ReJLu44Xuh4L0IBAiISnjpPDDmPZ4zwt1bptT0oPD7m/aH0WSmyL3GOnkvXTm/nwxL QJ2LJh6tqzSOReRZuSNjKCRtIHdOrYNhOhnIRueYmyjdWqB3GFnXlunLvUvGnn4jS3+3 8ORcT4qtwKM/HGxgM9Mq6zhIXA7OV0ahXuuSC7z8ZOb4BFRxm1bbk667UvcrQgj798yj dTlMJlvImnDEKZrTB62yq9A6UHtYeivWKHoGzHpHX5Y2L+qxA3RgMEGSKLV/3jHtIAMq TFis3gn/knWcYiPuIwBJ+dNPLg/fgfC6RRqacslGH7qUqPsb+NXbhNr4R2x8JJ7H1SfC 1XFQ== 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=kDxvCyND+GW2720NKX+RgCL5mWGsrG1FRlKlZQabxpo=; b=WXViLn2QSJyd3QqJ7yW8iSbGDiVo3GTYoa+EUirOaRhoUFxW65gEWtmOWiQTQ3XTyT N/xIPxmpkbqERjuET1I/IHHm3D6DYYpj29GF5/d8sn1tqvyhxO4vcpmiddgiWdotGApz +wB2goQu7K4jiwo6t0Ms8vOpIhCKMhOzxdSe6to0ae+B5a2QKJ6mdoyRGRPeJJHCwXoI 2Md60D9KnypPwRn08cyWxsJL20CS/pJsYgQAblSO9tR+E9u1DAAh1o6DfZS8bfGBlvjx eQoVfS5C4cSMzpFgB0UpB8MItcscEHJGl+cg15AbUmCVRHgxSVMVqpiweaSe9leQFuiJ wi7Q== X-Gm-Message-State: AFqh2koiCJZwwr474yuFe2+Ln3s2MVQD8/90JVKEL5eOt5qaWYnvEKuF v2J5w/KuhwUQmC0Tmcm4FzbHgFJC2hQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a65:6748:0:b0:483:cd24:1cb7 with SMTP id c8-20020a656748000000b00483cd241cb7mr2838151pgu.190.1672967614819; Thu, 05 Jan 2023 17:13:34 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 6 Jan 2023 01:12:45 +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-13-seanjc@google.com> Subject: [PATCH v5 12/33] KVM: SVM: Compute dest based on sender's x2APIC status for AVIC kick 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=unavailable 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?1754233855170811053?= X-GMAIL-MSGID: =?utf-8?q?1754233855170811053?= Compute the destination from ICRH using the sender's x2APIC status, not each (potential) target's x2APIC status. Fixes: c514d3a348ac ("KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID") Cc: Li RongQing Signed-off-by: Sean Christopherson Reviewed-by: Li RongQing Reviewed-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 10b0e996e2e3..f2db0021c45f 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -429,6 +429,7 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, u32 icrl, u32 icrh, u32 index) { + u32 dest = apic_x2apic_mode(source) ? icrh : GET_XAPIC_DEST_FIELD(icrh); unsigned long i; struct kvm_vcpu *vcpu; @@ -444,13 +445,6 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, * since entered the guest will have processed pending IRQs at VMRUN. */ kvm_for_each_vcpu(i, vcpu, kvm) { - u32 dest; - - if (apic_x2apic_mode(vcpu->arch.apic)) - dest = icrh; - else - dest = GET_XAPIC_DEST_FIELD(icrh); - if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, dest, icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true;