From patchwork Wed Feb 24 13:17:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8406211 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 85745C0553 for ; Wed, 24 Feb 2016 13:22:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC967202E9 for ; Wed, 24 Feb 2016 13:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87A912034C for ; Wed, 24 Feb 2016 13:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755492AbcBXNVO (ORCPT ); Wed, 24 Feb 2016 08:21:14 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33732 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755288AbcBXNSE (ORCPT ); Wed, 24 Feb 2016 08:18:04 -0500 Received: by mail-wm0-f65.google.com with SMTP id c200so2870463wme.0; Wed, 24 Feb 2016 05:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=F53+85/hWaiqYYu1w9JnoeU7yylFvJgn8kOo4mQ9hUs=; b=Wly+KMPYikA0sza8N9KJu39iay24nmW0Kxt9DR659uRcUoaC4PlY67zKQbXx8f+Vnu 2JSJiWIOra+zhdwEHDjsZhb2FLeoDV7igQOe1CkgXbOvEhWmcZxBH+pUkwCODIjF3ij9 DpOquyCu4UCizNLYUfBImaaXF5i0p3h56o2L5951cTEdprjxjzSX/XyF9eb+nZK41fS2 GspaHngGf96iMMRMG+DMjIyMPeeaEXqxGuyTMD+cDMGeBXHBfoAgk7vbvLVZCxdPAX4D ZRLr5RjDhQyB9yTP1syaUEOuRmzNsR/4/PSDTGcYXyPsogM2NVNNRfig1B6KZVtcItq0 PU/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=F53+85/hWaiqYYu1w9JnoeU7yylFvJgn8kOo4mQ9hUs=; b=KeuPm0VcRBSVAp/GfqAkDEgLGgxxwjwC6d0ke0rKtQvkjF9tkPRSdhy5LgN+lAvbWA q3I6s3uRSTBYONJ1MbFLSJsiLjiww5fXzLj1gKj2mGZ+ygNwI2pM7FAh7CnO/k5/ubz5 Ovt6ptUu7O69sEPE0bZSgyxyzoz7wsyCPrHCeTTeYG7OGibnFh3Rd1ZuVk5pCtOldISQ CS5ZmU/cN0aWEqFt9Ha5wF2hSImdxiQjGMAq+pTNk/9NaCXeUYCuabidNDmZ6SllV15a PMnxzyg8Em0IHttUI2qT2IoECtn7qdnssUJh1ROa/WdgWSEwWBMvMSecLvF0qm8euQPX c0FA== X-Gm-Message-State: AG10YOQOvOp70Ubfr9yaBV65h2Z/qP/hkzwMC51yyNFJCrhSgUB458n/lI/QQu2gMtaIBA== X-Received: by 10.28.55.76 with SMTP id e73mr25203233wma.53.1456319882948; Wed, 24 Feb 2016 05:18:02 -0800 (PST) Received: from 640k.lan (94-39-138-146.adsl-ull.clienti.tiscali.it. [94.39.138.146]) by smtp.gmail.com with ESMTPSA id u9sm31363044wmd.4.2016.02.24.05.18.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2016 05:18:02 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: yoshikawa_takuya_b1@lab.ntt.co.jp, guangrong.xiao@linux.intel.com, mtosatti@redhat.com Subject: [PATCH 05/12] KVM: MMU: use kvm_sync_page in kvm_sync_pages Date: Wed, 24 Feb 2016 14:17:46 +0100 Message-Id: <1456319873-34182-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456319873-34182-1-git-send-email-pbonzini@redhat.com> References: <1456319873-34182-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the last argument is true, kvm_unlink_unsync_page is called anyway in __kvm_sync_page (either by kvm_mmu_prepare_zap_page or by __kvm_sync_page itself). Therefore, kvm_sync_pages can just call kvm_sync_page, instead of going through kvm_unlink_unsync_page+__kvm_sync_page. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index c440a28822b7..240c0dbb140f 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1957,8 +1957,7 @@ static void kvm_sync_pages(struct kvm_vcpu *vcpu, gfn_t gfn) continue; WARN_ON(s->role.level != PT_PAGE_TABLE_LEVEL); - kvm_unlink_unsync_page(vcpu->kvm, s); - if (!__kvm_sync_page(vcpu, s, &invalid_list, false)) + if (!kvm_sync_page(vcpu, s, &invalid_list)) flush = true; }