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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55E9EC433EF for ; Wed, 17 Nov 2021 16:46:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D28461A56 for ; Wed, 17 Nov 2021 16:46:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239214AbhKQQtF (ORCPT ); Wed, 17 Nov 2021 11:49:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28493 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231874AbhKQQtD (ORCPT ); Wed, 17 Nov 2021 11:49:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637167564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fhLSkq7C8N1ez43dYmKR5gusfkLEVqMLGom5ncEvLCA=; b=LZPSTG46HiWghi4L7RDZZjRV/k9f87iWJGqn8DlTml+jdYtK/dyojPTfFUeRMe/zyOP3Nd mGvjoRyhBjhiywPhZ7hHQRO0geTORcrVcAGakNsnUD+901tam7aUK90kTJeR6nsCyIarGh A+K+UapL/bzPoXOI3CRqZ7+Z93oeass= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-222-FYk1g7h7M023ldpfNuw1uQ-1; Wed, 17 Nov 2021 11:46:01 -0500 X-MC-Unique: FYk1g7h7M023ldpfNuw1uQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D63B180DDEB; Wed, 17 Nov 2021 16:45:58 +0000 (UTC) Received: from [10.39.192.245] (unknown [10.39.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD74F5D9DE; Wed, 17 Nov 2021 16:45:55 +0000 (UTC) Message-ID: Date: Wed, 17 Nov 2021 17:45:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH 1/2] KVM: x86/mmu: Skip tlb flush if it has been done in zap_gfn_range() Content-Language: en-US To: Hou Wenlong , kvm@vger.kernel.org Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org References: <5e16546e228877a4d974f8c0e448a93d52c7a5a9.1637140154.git.houwenlong93@linux.alibaba.com> From: Paolo Bonzini In-Reply-To: <5e16546e228877a4d974f8c0e448a93d52c7a5a9.1637140154.git.houwenlong93@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/17/21 10:20, Hou Wenlong wrote: > If the parameter flush is set, zap_gfn_range() would flush remote tlb > when yield, then tlb flush is not needed outside. So use the return > value of zap_gfn_range() directly instead of OR on it in > kvm_unmap_gfn_range() and kvm_tdp_mmu_unmap_gfn_range(). > > Fixes: 3039bcc744980 ("KVM: Move x86's MMU notifier memslot walkers to generic code") > Signed-off-by: Hou Wenlong > --- > arch/x86/kvm/mmu/mmu.c | 2 +- > arch/x86/kvm/mmu/tdp_mmu.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 354d2ca92df4..d57319e596a9 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -1582,7 +1582,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) > flush = kvm_handle_gfn_range(kvm, range, kvm_unmap_rmapp); > > if (is_tdp_mmu_enabled(kvm)) > - flush |= kvm_tdp_mmu_unmap_gfn_range(kvm, range, flush); > + flush = kvm_tdp_mmu_unmap_gfn_range(kvm, range, flush); > > return flush; > } > diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c > index 7c5dd83e52de..9d03f5b127dc 100644 > --- a/arch/x86/kvm/mmu/tdp_mmu.c > +++ b/arch/x86/kvm/mmu/tdp_mmu.c > @@ -1034,8 +1034,8 @@ bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range, > struct kvm_mmu_page *root; > > for_each_tdp_mmu_root(kvm, root, range->slot->as_id) > - flush |= zap_gfn_range(kvm, root, range->start, range->end, > - range->may_block, flush, false); > + flush = zap_gfn_range(kvm, root, range->start, range->end, > + range->may_block, flush, false); > > return flush; > } > Queued both, thanks. Paolo