Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Mon, 11 Dec 2023 18:42:36 +0000
From:   Will Deacon <will@kernel.org>
To:     James Houghton <jthoughton@google.com>
Cc:     Steve Capper <steve.capper@arm.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Muchun Song <songmuchun@bytedance.com>,
        Anshuman Khandual <anshuman.khandual@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Ryan Roberts <ryan.roberts@arm.com>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] arm64: mm: Always make sw-dirty PTEs hw-dirty in
 pte_modify
Message-ID: <20231211184236.GB26462@willie-the-truck>
References: <20231204172646.2541916-1-jthoughton@google.com>
 <20231204172646.2541916-3-jthoughton@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231204172646.2541916-3-jthoughton@google.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Mon, Dec 04, 2023 at 05:26:46PM +0000, James Houghton wrote:
> Make it impossible to create a sw-dirty, hw-clean PTE with pte_modify.
> Such a PTE should be impossible to create, and there may be places that
> assume that pte_dirty() implies pte_hw_dirty().
> 
> Signed-off-by: James Houghton <jthoughton@google.com>

I'm not sure how, but you seem to be missing the '---' separator and the
diffstat here, so I suspect this might confuse tools such as b4 which try
to apply the patch directly.

> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> index b19a8aee684c..79ce70fbb751 100644
> --- a/arch/arm64/include/asm/pgtable.h
> +++ b/arch/arm64/include/asm/pgtable.h
> @@ -834,6 +834,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
>  		pte = set_pte_bit(pte, __pgprot(PTE_DIRTY));
>  
>  	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
> +	/*
> +	 * If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware
> +	 * dirtiness again.
> +	 */
> +	if (pte_sw_dirty(pte))
> +		pte = pte_mkdirty(pte);
>  	return pte;

Looks like this is a fix for Catalin to pick up (patch #1 isn't necessary
afaict).

Will