From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 484EFC433EF for ; Tue, 12 Jul 2022 01:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232213AbiGLB4T (ORCPT ); Mon, 11 Jul 2022 21:56:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232178AbiGLB4K (ORCPT ); Mon, 11 Jul 2022 21:56:10 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0431348EB6 for ; Mon, 11 Jul 2022 18:56:09 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id u11-20020a654c0b000000b00415ed4acf16so1869379pgq.22 for ; Mon, 11 Jul 2022 18:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=PC+WzugTfmpy8a4WKm922TF8iM8VxRFbGcTUFeFJFUA=; b=dRcboDDcrZAYrd71m94Ycc8GP++lO01Mw65EabvxrzY7DT+fBpk8CpGN5DPjGFBWB2 N7spNflEsIhcmfmRVNeu4wibUWR2Y4Rc1SMDcZnhN01IEwiYUgCSRumePuJidX2VEV1n puIU/gdKRMH0estJWRyFYszf52cJvBZLBfh2m/+YGZ7Z83lPVaJjmLmKKMW8vjC1zaaU vR0RxBCADn9X70kittmw8EZ4sul5azpQGWOXOheC1aWrSKwrKB7xh2m2qZq79SxJPbmp c0xRTHzdhHMyxFpVYio32OHKeuFtsiNPcUQA8PlK8PFA8tXn2W5nxUPAQh2GQvIg5yl4 W/8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=PC+WzugTfmpy8a4WKm922TF8iM8VxRFbGcTUFeFJFUA=; b=GMEtTLOqe07qgrIuAi8v5sapiBew7OjEYDFxJ9sKWX9b/033et1sVEhQXPWR/71xDI +qDmaxHPrtkcZARuozxDxTxN5jajrWCyP6UcD9Rx/nJtkBnLq48bo7sApph/k30GThvA YUOnTS94mynOv9zHrtbKh9PsNYduNBwFmffLqB1vv/hwHq1ja+re/5ZdFzVW8y907Hme SoqsdHLus7yvQjfV99ya9d+pcFXHqaC0jsp0MpneM/duuw643r1i1i+o0lQ8Xr9skXMX 00Tlnn8htTKgsaz0dhnmnCFJHMxTuPlXcPOppaKkX2xdOZyVnscG9Dga/j9x/8sEJ8Kj m9mQ== X-Gm-Message-State: AJIora9Gd7dbfCmsT3WbIWEGO8+HN8QaTwCYJhLwokgvOEvtULa7wJtx 4D98M78Ecq4WhQXDIAARoWeCmdpz6wk= X-Google-Smtp-Source: AGRyM1tbvpN8xCTuIoKBvGHUKvfp9hDoKb+F2XgNGjI8r5pEWBxxOjE85vknj97IAgTR2/GMvXnUWEZOuN8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:c94e:b0:16c:4d5e:5dfc with SMTP id i14-20020a170902c94e00b0016c4d5e5dfcmr7252805pla.56.1657590968548; Mon, 11 Jul 2022 18:56:08 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:57 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-5-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 4/5] KVM: x86/mmu: Use innermost rmap zap helper when recycling rmaps From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use ____kvm_zap_rmaps() directly when recycling rmaps instead of bouncing through kvm_zap_rmaps() and __kvm_zap_rmaps(). Calling kvm_zap_rmaps() is unnecessary and odd as it requires passing dummy parameters; passing NULL for @slot when __rmap_add() already has a valid slot is especially weird and confusing. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index fbe808bb0ce1..496672ffaf46 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1596,7 +1596,7 @@ static void __rmap_add(struct kvm *kvm, rmap_count = pte_list_add(cache, spte, rmap_head); if (rmap_count > RMAP_RECYCLE_THRESHOLD) { - kvm_zap_rmaps(kvm, rmap_head, NULL, gfn, sp->role.level, __pte(0)); + ____kvm_zap_rmaps(kvm, rmap_head); kvm_flush_remote_tlbs_with_address( kvm, sp->gfn, KVM_PAGES_PER_HPAGE(sp->role.level)); } -- 2.37.0.144.g8ac04bfd2-goog