From patchwork Fri Jan 6 01:12:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 39866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp577079wrt; Thu, 5 Jan 2023 17:16:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvcGelz5NU+etjvYUIDRHvO8n7uzC3LkcV+t9liBx3aeCBYuJ1pzGj49xKsFjTx37tc9VxL X-Received: by 2002:a17:906:9f12:b0:7c1:61a6:2cd2 with SMTP id fy18-20020a1709069f1200b007c161a62cd2mr45473960ejc.9.1672967779016; Thu, 05 Jan 2023 17:16:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672967779; cv=none; d=google.com; s=arc-20160816; b=JVRQPzBFZLB1CrGEG2joytsQxVlHDuyaPcf6F+AqPR5Z37EW8KXXhbPAJwxPlMtJRA K5nTmnsqKl+yEoU0aIvvAHvFU4gnV35yeUAbQ8TW35VJ6VfMYnHAkmBlkmgIsM0N0+9r 5uK0cACCX3Gqx/P4lZHalxvknyxNLxF3x/g58DxYOAdBftSSillneb1tHDbJdmzGAsRv a64DopWUj9UJWqYZ9UzlAaMlii8BuqRqI9NldNSG1TB6PjM9VT+8SlPhAqkbg03hJXIl 03KsjDi3xIItV0I4kK00Q3ho7U+wVmE2sCz4aDH/GP//0WKwmjR94O9pmsBWIjB1wB23 hLKw== 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=dY73TyImmD0wCqNL26nvzhCHfX8vBgtKvyMOXbN+v1I=; b=hKPykSB8kTEAR6I20woMAKBWVCgf8NPSGFvvtgQn9nQHf5cZ8TklTFbpohW678UaFM Pm8SuA0wv1VE9/doyb/eXCVrrWLetFIhp19y8Z42SHJIPi+NAEqv8Yy9BUGMB4AJnT1n utawpwvzYB8QIhe4KC9T6dsquqDtENuubXCs8ITKMPTgL1zt2xeWzfXTks4zQs1mq1Cn nQMRPoLEPlWYXkY153gx8I//f9gCk7E80tm+4fDh4fkCxq1PbcuDpFFVY/x+HiLU104p zIPIodmzgsA2/7l5gY5IOjqdTsvbZFbC5LlSB9OWVYUx3+JSMEPKKjuBtQhlKnQnw0YT jd6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=B861zubB; 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 dd12-20020a1709069b8c00b0082b7e633997si38506012ejc.434.2023.01.05.17.15.54; Thu, 05 Jan 2023 17:16:18 -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=B861zubB; 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 S231667AbjAFBOl (ORCPT + 99 others); Thu, 5 Jan 2023 20:14:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236843AbjAFBNk (ORCPT ); Thu, 5 Jan 2023 20:13:40 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5728A71FF6 for ; Thu, 5 Jan 2023 17:13:38 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id a11-20020a17090a8c0b00b00226cdbf8bbcso1917799pjo.5 for ; Thu, 05 Jan 2023 17:13:38 -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=dY73TyImmD0wCqNL26nvzhCHfX8vBgtKvyMOXbN+v1I=; b=B861zubBIjRS4M7hrE2P/lP1yiAP6O9QSDe8ztqdzZ75i+UmjMLuMJpNqdL1Elk8v/ RAAfOXEHLS8mwZoF3qdVZsbOy4/D5cBa1NaNov3OMq4WhgX+YWKDc18ZxIck79I1eX76 1S9Dd/6XPyWvlMNYGUn+0Bxbfx7NM3Bb8F2MkBes6HJ441yQNZ9yJnSAr6SZrWwUMgF0 F6fMSah5f8GauF6VTpl4lM81mhmTu8PAsbyUeUc8I9prYkJWnHInHrRzbBeahfU3Lci8 NUNUa/xmwowTdGQxAb69BtM7JoxrsfzEZIYUinrzK/gKYn1gTY4gK8xbr8v0C/Ggak2O zMHQ== 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=dY73TyImmD0wCqNL26nvzhCHfX8vBgtKvyMOXbN+v1I=; b=XJLGe8j0VLA7j+luMlBPMxbVvHGNFfJMrkhGOhr6c//QGf7j5kk5DiPD3e9rVnqbR3 FJjGEh0XNqvfSO/ClHW3e08PJKlp9WPYSEA55JwgTCEJjCgbuUmTUS+aDR6bx/BNLZMs rPeHnkDV2WzF/N9PkLn/SRoTaky0dZwbxlc99zY4XFLYMFleydeXyjCrhvWNU/F108AD QtRrx8GcfWM6HRma5ZJysflvSyDPjRK/gLt+9nGUbmhTo5uhDyi8aCSOSTlWJXneajuk F4XHOWkFuYRzkKMSYQy2jWONwQJ3qk12dIBbOY4AlHh0U39iQWXvUH9l28e5kYw+7afC eYpg== X-Gm-Message-State: AFqh2kpy2mg463Sl/dVFC8mAoXBiJ0dWxAbE7zW0GrexUaNXjLzWVxT3 lY8xhl2sb0MIvNKd52QBn1xNLCOx2tw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:aa7:999c:0:b0:582:74a2:1e4e with SMTP id k28-20020aa7999c000000b0058274a21e4emr1235081pfh.26.1672967617919; Thu, 05 Jan 2023 17:13:37 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 6 Jan 2023 01:12:47 +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-15-seanjc@google.com> Subject: [PATCH v5 14/33] Revert "KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible" 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?1754233861743102471?= X-GMAIL-MSGID: =?utf-8?q?1754233861743102471?= Due to a likely mismerge of patches, KVM ended up with a superfluous commit to "enable" AVIC's fast path for x2AVIC mode. Even worse, the superfluous commit has several bugs and creates a nasty local shadow variable. Rather than fix the bugs piece-by-piece[*] to achieve the same end result, revert the patch wholesale. Opportunistically add a comment documenting the x2AVIC dependencies. This reverts commit 8c9e639da435874fb845c4d296ce55664071ea7a. [*] https://lore.kernel.org/all/YxEP7ZBRIuFWhnYJ@google.com Fixes: 8c9e639da435 ("KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible") Suggested-by: Maxim Levitsky Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/avic.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 0f67fd34ef99..e4b5f8b14882 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -378,7 +378,17 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source logid_index = cluster + __ffs(bitmap); - if (!apic_x2apic_mode(source)) { + if (apic_x2apic_mode(source)) { + /* + * For x2APIC, the logical APIC ID is a read-only value + * that is derived from the x2APIC ID, thus the x2APIC + * ID can be found by reversing the calculation (done + * above). Note, bits 31:20 of the x2APIC ID are not + * propagated to the logical ID, but KVM limits the + * x2APIC ID limited to KVM_MAX_VCPU_IDS. + */ + l1_physical_id = logid_index; + } else { u32 *avic_logical_id_table = page_address(kvm_svm->avic_logical_id_table_page); @@ -393,23 +403,6 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source l1_physical_id = logid_entry & AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK; - } else { - /* - * For x2APIC logical mode, cannot leverage the index. - * Instead, calculate physical ID from logical ID in ICRH. - */ - int cluster = (icrh & 0xffff0000) >> 16; - int apic = ffs(icrh & 0xffff) - 1; - - /* - * If the x2APIC logical ID sub-field (i.e. icrh[15:0]) - * contains anything but a single bit, we cannot use the - * fast path, because it is limited to a single vCPU. - */ - if (apic < 0 || icrh != (1 << apic)) - return -EINVAL; - - l1_physical_id = (cluster << 4) + apic; } }