From patchwork Sat Feb 11 01:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vipin Sharma X-Patchwork-Id: 55670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1279879wrn; Fri, 10 Feb 2023 17:51:48 -0800 (PST) X-Google-Smtp-Source: AK7set/D3ZwkBTzJnCOvJGj5O5uFlWQRBhbUK6Nl9HTQ5R1Ke2u0GFeD+tlLuJkAzupzjqP3E6q3 X-Received: by 2002:a17:907:7fa5:b0:8b0:2397:8003 with SMTP id qk37-20020a1709077fa500b008b023978003mr945208ejc.29.1676080308607; Fri, 10 Feb 2023 17:51:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676080308; cv=none; d=google.com; s=arc-20160816; b=aQIUd0SsQCtTePhuC/2P+7Pb7dZHFrIeeVhlwAXk74T/icWfyQbNYH+z96dAsn/Oua eHUqRLE0w50H6ahM7by2VgAXi8vFzBWc+eMZM0dcbgRvAPZYXFnnqG0GkYSCSk5lt46p dOHG53ZINSeDK2GurZZbGXjjyG3io05Xc/ITcKYhHaWqf2grWi+MbSQtxLTvaMgYkpPx un+9sNV7hYmujHjXMuGUyBlV5ZkDdfMKFHysSQ1aIm94xUmSyfo1Tzz+VK5OtBTtZ2h1 vG0YjzMhhi0ZmxrLq4NSWQX6b2vXNVhVIrTWcJl/mT2V3kDpNWcrH98UtrEz8q2ZsycW 2o4w== 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:dkim-signature; bh=+gGMkWLRs9fWzgoKMZp1xjTHNEtbWSt2tA+J164dR+I=; b=oQ9g2s3TwwNbByasgxZ+9/Er8qDT/SQvSuCpyKtK1ddcVDKdJqUWmUwaKY/V+7CGoL +bF3nnSJ+qRm01cNjzRreuARDClVkFQ+IW7Exsuo114QrAvMWL52H6su53D8Sv9hGIRY z+SWVKq3bFqGzMUEJ4VXSDyr5u9LnAKGTiXhugz9R5id+xX1gD8skJ+gWy4xy5EZCxKO BVbefMUTg95X4byYRXWHwlmRsfMOm6x+lAzqBQq3RbNn5ZoTbuRkdvxQLUPOr870tWc/ lsb2fQtHteMnfMyh8dg8Gghwi18zrK849vlj8wIef7+WvxaildEHlJMYnNyuw/09h7pn BIsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=n4w2JvSZ; 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 gk16-20020a17090790d000b00877da429e45si5918575ejb.922.2023.02.10.17.51.25; Fri, 10 Feb 2023 17:51:48 -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=n4w2JvSZ; 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 S229779AbjBKBqv (ORCPT + 99 others); Fri, 10 Feb 2023 20:46:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbjBKBql (ORCPT ); Fri, 10 Feb 2023 20:46:41 -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 323D584B96 for ; Fri, 10 Feb 2023 17:46:40 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id pj9-20020a17090b4f4900b00232cca91108so3165226pjb.7 for ; Fri, 10 Feb 2023 17:46:40 -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:from:to:cc:subject:date:message-id:reply-to; bh=+gGMkWLRs9fWzgoKMZp1xjTHNEtbWSt2tA+J164dR+I=; b=n4w2JvSZxbvAx7VDuTa8a6gnidk7+fM4SN3MoyITzRdo8Zusatugfb0N1mp7zDdAtm nkhT4ceurl+KSeBYu9KzUTa8oFiachS16q0TOsJhkSXmoY5VcCxLGE77JXnMLtd4AlJm nYaND+RHtk6DaGb8UbXmjF67jjmu7+tbRomwRl8q4whlT68/prZH4lf6oAKIuMqg3Oog 7jRUqsAdomH6eGOi5pQpQdIXfWvKdc17woQPwGK56J49NXm1kQFEkeER/UbFB7IRBE4E ds6/M+/hv1rxXm244otjozs+JI1/o3dSAAc9NOQzc/cN4c27HBZFHrDd9YmeV9F+D+Ts TwYQ== 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:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+gGMkWLRs9fWzgoKMZp1xjTHNEtbWSt2tA+J164dR+I=; b=70nst99rhzxxhXMXH7Pq9k5128Jd9Iehxi4GpyfW/a0OvE77Bl+pvQZw6KfWuBoiTu bJ7untnKu/aJXwoEb1RvS6MHHUlDVdPQgNwlxRTpEN9a5W6YdHmNVHf2CAkhBtYyuPFm VotSfWvLxYC3vlqDjoCsxGn7NY440PIht4bVUKvb02CwbOviF6bBiw4K3A/eCjHFNShI qLARFzGOw/Lsy+grzRKCdLO5iydNx4p7OjB2if0grraVG/rr0GGRWTowzqtj5az54EUD /+W9MW8KfioJJz6rRetUG3nWnNmHl8ewSa9bbhntt8OgOK4aTGjG/PaX+OOPwX7qmJF2 YKqw== X-Gm-Message-State: AO0yUKU5ywmaEgkkTtXOrTtRoZywLsxx2AM1fINsIQ6JYul6mgvrlFqG ertfRLvKOhq5cHV8QVJIY6AW9Krf7yRo X-Received: from vipin.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:479f]) (user=vipinsh job=sendgmr) by 2002:a17:902:e84f:b0:189:6df9:4f85 with SMTP id t15-20020a170902e84f00b001896df94f85mr4137680plg.27.1676079999320; Fri, 10 Feb 2023 17:46:39 -0800 (PST) Date: Fri, 10 Feb 2023 17:46:23 -0800 In-Reply-To: <20230211014626.3659152-1-vipinsh@google.com> Mime-Version: 1.0 References: <20230211014626.3659152-1-vipinsh@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog Message-ID: <20230211014626.3659152-5-vipinsh@google.com> Subject: [Patch v3 4/7] KVM: x86/mmu: Optimize SPTE change for aging gfn range From: Vipin Sharma To: seanjc@google.com, pbonzini@redhat.com, bgardon@google.com, dmatlack@google.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Vipin Sharma 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?1757497585442677529?= X-GMAIL-MSGID: =?utf-8?q?1757497585442677529?= No need to check all of the conditions in __handle_changed_spte(). Aging a gfn range implies resetting access bit or marking spte for access tracking. Use atomic operation to only reset those bits. This avoids checking many conditions in __handle_changed_spte() API. Also, clean up code by removing dead code and API parameters. Signed-off-by: Vipin Sharma Reviewed-by: David Matlack --- arch/x86/kvm/mmu/tdp_mmu.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index c895560244de..5d6e77554797 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -758,13 +758,6 @@ static inline void tdp_mmu_set_spte(struct kvm *kvm, struct tdp_iter *iter, _tdp_mmu_set_spte(kvm, iter, new_spte, true); } -static inline void tdp_mmu_set_spte_no_acc_track(struct kvm *kvm, - struct tdp_iter *iter, - u64 new_spte) -{ - _tdp_mmu_set_spte(kvm, iter, new_spte, false); -} - #define tdp_root_for_each_pte(_iter, _root, _start, _end) \ for_each_tdp_pte(_iter, _root, _start, _end) @@ -1251,32 +1244,41 @@ static __always_inline bool kvm_tdp_mmu_handle_gfn(struct kvm *kvm, /* * Mark the SPTEs range of GFNs [start, end) unaccessed and return non-zero * if any of the GFNs in the range have been accessed. + * + * No need to mark corresponding PFN as accessed as this call is coming from + * the clear_young() or clear_flush_young() notifier, which uses the return + * value to determine if the page has been accessed. */ static bool age_gfn_range(struct kvm *kvm, struct tdp_iter *iter, struct kvm_gfn_range *range) { - u64 new_spte = 0; + u64 new_spte; /* If we have a non-accessed entry we don't need to change the pte. */ if (!is_accessed_spte(iter->old_spte)) return false; - new_spte = iter->old_spte; - - if (spte_ad_enabled(new_spte)) { - new_spte &= ~shadow_accessed_mask; + if (spte_ad_enabled(iter->old_spte)) { + iter->old_spte = tdp_mmu_clear_spte_bits(iter->sptep, + iter->old_spte, + shadow_accessed_mask, + iter->level); + new_spte = iter->old_spte & ~shadow_accessed_mask; } else { + new_spte = mark_spte_for_access_track(iter->old_spte); + iter->old_spte = kvm_tdp_mmu_write_spte(iter->sptep, + iter->old_spte, new_spte, + iter->level); /* * Capture the dirty status of the page, so that it doesn't get * lost when the SPTE is marked for access tracking. */ - if (is_writable_pte(new_spte)) - kvm_set_pfn_dirty(spte_to_pfn(new_spte)); - - new_spte = mark_spte_for_access_track(new_spte); + if (is_writable_pte(iter->old_spte)) + kvm_set_pfn_dirty(spte_to_pfn(iter->old_spte)); } - tdp_mmu_set_spte_no_acc_track(kvm, iter, new_spte); + trace_kvm_tdp_mmu_spte_changed(iter->as_id, iter->gfn, iter->level, + iter->old_spte, new_spte); return true; }