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=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 DA5B4C433E0 for ; Wed, 13 Jan 2021 15:52:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89BE5233FC for ; Wed, 13 Jan 2021 15:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbhAMPvs (ORCPT ); Wed, 13 Jan 2021 10:51:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:37552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726531AbhAMPvr (ORCPT ); Wed, 13 Jan 2021 10:51:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E50042339F; Wed, 13 Jan 2021 15:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610553067; bh=1Z8kzuRj8UI/6fvft+ap1+v80qkzAnNOJX1YJ8zkw2w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=A2x/KI16upUQfU/SupIDBtGzUJm/3Ba0U76DvtygD4kBsZT4yL320QjAc8pGXdhD5 jpp52yBL1NW6dHqL+ADNpodo95YEUm7rCTF0QmTuKWktEilswXn9z9FwxPLsxJua5h IB48KpyHJu/JSGn8WbDbKp1QyGPPDo7F8Q/tqY367FG3Xa4hHl1S6r8DTlE/AREnIo d7UMs90WTpNmBegxk3rVDvHn8Wyh3gF27h1eoALdDp1SPblwOgmqZik21LE9b4ida7 9nVPN/ZmX+qD8twK0+twH7adJ9tZbV7JcGUaGwNV7bqwi5Al4sjBJ/CPkM6e4apk/f bAg0AFwUa7RZw== Date: Wed, 13 Jan 2021 15:51:01 +0000 From: Will Deacon To: Yanan Wang Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marc Zyngier , Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , Gavin Shan , Quentin Perret , wanghaibin.wang@huawei.com, yezengruan@huawei.com, zhukeqian1@huawei.com, yuzenghui@huawei.com Subject: Re: [PATCH v2 3/3] KVM: arm64: Mark the page dirty only if the fault is handled successfully Message-ID: <20210113155101.GB11892@willie-the-truck> References: <20201216122844.25092-1-wangyanan55@huawei.com> <20201216122844.25092-4-wangyanan55@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201216122844.25092-4-wangyanan55@huawei.com> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 16, 2020 at 08:28:44PM +0800, Yanan Wang wrote: > We now mark the page dirty and set the bitmap before calling fault handlers > in user_mem_abort(), and we might end up having spurious dirty pages if > update of permissions or mapping has failed. > So, mark the page dirty only if the fault is handled successfully. > > Let the guest directly enter again but not return to userspace if we were > trying to recreate the same mapping or only change access permissions > with BBM, which is not permitted in the mapping path. > > Signed-off-by: Yanan Wang > --- > arch/arm64/kvm/mmu.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 75814a02d189..72e516a10914 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -879,11 +879,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > if (vma_pagesize == PAGE_SIZE && !force_pte) > vma_pagesize = transparent_hugepage_adjust(memslot, hva, > &pfn, &fault_ipa); > - if (writable) { > + if (writable) > prot |= KVM_PGTABLE_PROT_W; > - kvm_set_pfn_dirty(pfn); > - mark_page_dirty(kvm, gfn); > - } > > if (fault_status != FSC_PERM && !device) > clean_dcache_guest_page(pfn, vma_pagesize); > @@ -911,6 +908,19 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > memcache); > } > > + /* Mark the page dirty only if the fault is handled successfully */ > + if (writable && !ret) { > + kvm_set_pfn_dirty(pfn); > + mark_page_dirty(kvm, gfn); > + } > + > + /* Let the guest directly enter again if we were trying to recreate the > + * same mapping or only change access permissions with BBM, which is not > + * permitted in the mapping path. > + */ > + if (ret == -EAGAIN) > + ret = 0; Maybe just 'return ret != -EAGAIN ? ret : 0;' at the end of the function? Will 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=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 7E57CC433DB for ; Wed, 13 Jan 2021 15:53:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2318F233FD for ; Wed, 13 Jan 2021 15:53:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2318F233FD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=k1UW8AvZAe2svPj4IxXxdAOxO57B3hU3AgfxLgMjnqM=; b=iz6r3FGauVtV2gIRvDrVvR6Nh XDWdQUrUDfwm1/8I8S64jM2HYu6CgmQO2X0ETJSKprN1IdOJd15QOKforgiorreai5mUNC446WetE ZC3roOsVsZzqqYE1r/wbaIYDhTaL5DaX83tv7F0JHLQIPfknpFCWV5V5yt/s4OxEnY8KasFVrVFFC 7c1hmKFEKFl+uDAjHexvuT7CSxdZjGruWKs/wvs/WP3WvVVVOqnQuD5B5kirIunCuaOk5oZc7Mi0O k9OA2vDD6WUsD3xacv1KdEjDgEjpqELka2Re43JlgWjWqnIsFCT2vWfTOM8q/waHbCs65JSzjh/Dc Mii1NC6gg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kziQQ-0007hR-9o; Wed, 13 Jan 2021 15:51:10 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kziQO-0007gi-GD for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 15:51:09 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E50042339F; Wed, 13 Jan 2021 15:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610553067; bh=1Z8kzuRj8UI/6fvft+ap1+v80qkzAnNOJX1YJ8zkw2w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=A2x/KI16upUQfU/SupIDBtGzUJm/3Ba0U76DvtygD4kBsZT4yL320QjAc8pGXdhD5 jpp52yBL1NW6dHqL+ADNpodo95YEUm7rCTF0QmTuKWktEilswXn9z9FwxPLsxJua5h IB48KpyHJu/JSGn8WbDbKp1QyGPPDo7F8Q/tqY367FG3Xa4hHl1S6r8DTlE/AREnIo d7UMs90WTpNmBegxk3rVDvHn8Wyh3gF27h1eoALdDp1SPblwOgmqZik21LE9b4ida7 9nVPN/ZmX+qD8twK0+twH7adJ9tZbV7JcGUaGwNV7bqwi5Al4sjBJ/CPkM6e4apk/f bAg0AFwUa7RZw== Date: Wed, 13 Jan 2021 15:51:01 +0000 From: Will Deacon To: Yanan Wang Subject: Re: [PATCH v2 3/3] KVM: arm64: Mark the page dirty only if the fault is handled successfully Message-ID: <20210113155101.GB11892@willie-the-truck> References: <20201216122844.25092-1-wangyanan55@huawei.com> <20201216122844.25092-4-wangyanan55@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201216122844.25092-4-wangyanan55@huawei.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_105108_686517_CE1F075F X-CRM114-Status: GOOD ( 20.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gavin Shan , Suzuki K Poulose , Marc Zyngier , Quentin Perret , linux-kernel@vger.kernel.org, yezengruan@huawei.com, James Morse , linux-arm-kernel@lists.infradead.org, Catalin Marinas , yuzenghui@huawei.com, wanghaibin.wang@huawei.com, zhukeqian1@huawei.com, Julien Thierry Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Dec 16, 2020 at 08:28:44PM +0800, Yanan Wang wrote: > We now mark the page dirty and set the bitmap before calling fault handlers > in user_mem_abort(), and we might end up having spurious dirty pages if > update of permissions or mapping has failed. > So, mark the page dirty only if the fault is handled successfully. > > Let the guest directly enter again but not return to userspace if we were > trying to recreate the same mapping or only change access permissions > with BBM, which is not permitted in the mapping path. > > Signed-off-by: Yanan Wang > --- > arch/arm64/kvm/mmu.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 75814a02d189..72e516a10914 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -879,11 +879,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > if (vma_pagesize == PAGE_SIZE && !force_pte) > vma_pagesize = transparent_hugepage_adjust(memslot, hva, > &pfn, &fault_ipa); > - if (writable) { > + if (writable) > prot |= KVM_PGTABLE_PROT_W; > - kvm_set_pfn_dirty(pfn); > - mark_page_dirty(kvm, gfn); > - } > > if (fault_status != FSC_PERM && !device) > clean_dcache_guest_page(pfn, vma_pagesize); > @@ -911,6 +908,19 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > memcache); > } > > + /* Mark the page dirty only if the fault is handled successfully */ > + if (writable && !ret) { > + kvm_set_pfn_dirty(pfn); > + mark_page_dirty(kvm, gfn); > + } > + > + /* Let the guest directly enter again if we were trying to recreate the > + * same mapping or only change access permissions with BBM, which is not > + * permitted in the mapping path. > + */ > + if (ret == -EAGAIN) > + ret = 0; Maybe just 'return ret != -EAGAIN ? ret : 0;' at the end of the function? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel