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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F49AC433ED for ; Tue, 20 Apr 2021 10:42:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2CF1611C9 for ; Tue, 20 Apr 2021 10:42:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231839AbhDTKma (ORCPT ); Tue, 20 Apr 2021 06:42:30 -0400 Received: from mga17.intel.com ([192.55.52.151]:34983 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbhDTKmR (ORCPT ); Tue, 20 Apr 2021 06:42:17 -0400 IronPort-SDR: h3Kv0EleMmw23fIm+hj4ynT4Rwwnvh+SvnNXnRwO8V+kj2NGq4JZ6HrJq+ghFQjQV4MxmirCTZ 5nlah8fCVLmw== X-IronPort-AV: E=McAfee;i="6200,9189,9959"; a="175590768" X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="175590768" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 03:41:45 -0700 IronPort-SDR: EeiCmqXixC7KxA1zVLISY0ltSE0IUkR07xAk2j3DlYPHqGQ8dNMUVNjv9GodX4FdBgQEPql7o9 4MfGPjYca4Iw== X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="426872789" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 03:41:45 -0700 From: Isaku Yamahata To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson Cc: isaku.yamahata@gmail.com, Isaku Yamahata Subject: [RFC PATCH 07/10] KVM: x86/mmu: make fast_page_fault() receive single argument Date: Tue, 20 Apr 2021 03:39:17 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Convert fast_page_fault() to receive single argument, struct kvm_page_fault instead of many arguments. No functional change is intended. Signed-off-by: Isaku Yamahata --- arch/x86/kvm/mmu/mmu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index a16e1b228ac2..ce48416380c3 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3043,9 +3043,11 @@ static bool is_access_allowed(u32 fault_err_code, u64 spte) /* * Returns one of RET_PF_INVALID, RET_PF_FIXED or RET_PF_SPURIOUS. */ -static int fast_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, - u32 error_code) +static int fast_page_fault(struct kvm_page_fault *kpf) { + struct kvm_vcpu *vcpu = kpf->vcpu; + gpa_t cr2_or_gpa = kpf->cr2_or_gpa; + u32 error_code = kpf->error_code; struct kvm_shadow_walk_iterator iterator; struct kvm_mmu_page *sp; int ret = RET_PF_INVALID; @@ -3704,7 +3706,7 @@ static int direct_page_fault(struct kvm_page_fault *kpf) return RET_PF_EMULATE; if (!is_tdp_mmu_root(vcpu->kvm, vcpu->arch.mmu->root_hpa)) { - r = fast_page_fault(vcpu, gpa, error_code); + r = fast_page_fault(kpf); if (r != RET_PF_INVALID) return r; } -- 2.25.1