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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D56CC3DA7F for ; Wed, 31 Jul 2024 08:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1i19l7d1eZbhVp7fQ4bZoRAfF6lLDsSZcH8bPmRvWiA=; b=dMgJ3vMiGNMKyLhZM9SVLKCIdO XGVS7ISKU+ePH5b8W8RH+H5jOdYHwg+87dO/yIBz6/GcExvKzp/Bb3+Iw+/IGVNq0U6ksu1I4xxlw eNZUodshaOlbLxZkrduIV2SL/mmuShFR9tb8B22tGFDBZ2DkM0R5+coikLxjV3xOqvamUCr1kT+WF G3VN826RnG7mWNCQiJERSl5DV6WhHOoMoioVsTyfRqeDn2Brq8Z+KSZsSughYUj5C9tYuuHD0Pf5Q FNCpKaLm9v15yK2ISyOoyc1dSm2qh9jqZaU4Z0HFi7VMaE44kXl61JnBfsIMH1f4auw+mhbNHV7SV 9p5LkV0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ4RU-00000000GdE-01hP; Wed, 31 Jul 2024 08:12:16 +0000 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ4Qr-00000000GLj-2C5y for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 08:11:40 +0000 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a7ab76558a9so119819866b.1 for ; Wed, 31 Jul 2024 01:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1722413496; x=1723018296; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1i19l7d1eZbhVp7fQ4bZoRAfF6lLDsSZcH8bPmRvWiA=; b=DCmH8AkwM9DTKyHwPG4H2f1g5EQKqLYQTVcbQcy2+0jcZ4M2Tcq1SNMsJ0vl9xucdX OkBVzSPlu9XxIaDCAhFj+0+pbinqBDuknWAFU/ptNknPPyoQZA++l8pc1ok88tcuzS8s bunsYBlMUnc+4RqWzGE4aAS8ntlElvX4K0/euyACk0/6SK/ZUvFAQOj3ZCj7qhvfJz3R BMJ/SPT1d1eyFD2Y+lk+KnXheJ7bJGN+pfC8uXUVeyVUJaztKWNAWyVPheXKX7zT4kI1 uOfZWe9dT3WVeTAt4CPtdWMi/DB7y1WypFkd/R+hnAOfKfDKaDniTpCBpn5Vd8bKLB3Q L/UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722413496; x=1723018296; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1i19l7d1eZbhVp7fQ4bZoRAfF6lLDsSZcH8bPmRvWiA=; b=tFnoaxHxv1WBK/nteADW5IApoxHTcbfHzd6/DhMbT6ccWbhUuqxrv9pC0YWewqT40z LNRDaXu1NJ0Fh1XzuRhbyFDr1mQBa6F4xwGM5W8w9k8dfQS/86gYorDas8mwWpVUXDGt ziDP8KTa8AnoGstNhjmzeWkECKGLTdcxi7Zh0kOGaibQIuhwgq+PT7zpp0Z74PM0jdkV qDBPwIdshHgLYdO+O6g7t5HOX50ZnBLnjC0ehsUXr37vfsY5U39bMNWRCrh4twEoez13 B2OR6pGro9AO3cNAHhuoaZ9SXx6lOWQvFfmr4mDx62AJFaZR8m6AZUgI1ic+g2JFf6IN 3iUg== X-Forwarded-Encrypted: i=1; AJvYcCXEFCQdAKJgoZtXLLS4Lth8WKCsXSUvT7nD995g0phShoIdo9dd7rPRojh8/5D4MOVBXJG1fmy8D078JKy8/X/gYKTECyP5AqAFiWKj20w5sYk00I8= X-Gm-Message-State: AOJu0Yw934L9WO7/UrJ5FEdog/OFkRSmbl6tZf6lXul/LY68vu0pDE42 FFYTJ4/n/l3Vu7lY++f7Y5a0uImjuPFrSIiyEJnsjcHeiG9pBZI6syk1DQkStEk= X-Google-Smtp-Source: AGHT+IEAM3rgFV5Nss1oeOJc4d0T/p6GjpLY5HpQ/UfV3bepvtCwNBml7jly3uQHrfiUKxZe0LrJkQ== X-Received: by 2002:a17:907:60cb:b0:a7d:88c4:2897 with SMTP id a640c23a62f3a-a7d88c437b8mr269366466b.2.1722413495475; Wed, 31 Jul 2024 01:11:35 -0700 (PDT) Received: from localhost (2001-1ae9-1c2-4c00-20f-c6b4-1e57-7965.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:20f:c6b4:1e57:7965]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acadb8361sm734690366b.207.2024.07.31.01.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 01:11:35 -0700 (PDT) Date: Wed, 31 Jul 2024 10:11:34 +0200 From: Andrew Jones To: Sean Christopherson Cc: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, David Matlack , David Stevens Subject: Re: [PATCH v12 56/84] KVM: RISC-V: Mark "struct page" pfns dirty iff a stage-2 PTE is installed Message-ID: <20240731-0456655970f6ae99f907de43@orel> References: <20240726235234.228822-1-seanjc@google.com> <20240726235234.228822-57-seanjc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240726235234.228822-57-seanjc@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240731_011137_597288_E1AA027F X-CRM114-Status: GOOD ( 18.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jul 26, 2024 at 04:52:05PM GMT, Sean Christopherson wrote: > Don't mark pages dirty if KVM bails from the page fault handler without > installing a stage-2 mapping, i.e. if the page is guaranteed to not be > written by the guest. > > In addition to being a (very) minor fix, this paves the way for converting > RISC-V to use kvm_release_faultin_page(). > > Signed-off-by: Sean Christopherson > --- > arch/riscv/kvm/mmu.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c > index b63650f9b966..06aa5a0d056d 100644 > --- a/arch/riscv/kvm/mmu.c > +++ b/arch/riscv/kvm/mmu.c > @@ -669,7 +669,6 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > goto out_unlock; > > if (writable) { > - kvm_set_pfn_dirty(hfn); > mark_page_dirty(kvm, gfn); > ret = gstage_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT, > vma_pagesize, false, true); > @@ -682,6 +681,9 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > kvm_err("Failed to map in G-stage\n"); > > out_unlock: > + if ((!ret || ret == -EEXIST) && writable) > + kvm_set_pfn_dirty(hfn); > + > spin_unlock(&kvm->mmu_lock); > kvm_set_pfn_accessed(hfn); > kvm_release_pfn_clean(hfn); > -- > 2.46.0.rc1.232.g9752f9e123-goog > Reviewed-by: Andrew Jones