Re: [PATCH] mm: fix page_mkclean_one (was: 2.6.19 file content corruption on ext3)

[Martin Schwidefsky <schwidefsky@de.ibm.com>]

On Thu, 2006-12-21 at 00:03 +0100, Peter Zijlstra wrote:
> current version

Nitpicking ..

> @@ -444,17 +444,18 @@ static int page_mkclean_one(struct page
>  	if (!pte)
>  		goto out;
> 
> -	if (!pte_dirty(*pte) && !pte_write(*pte))
> -		goto unlock;
> +	while (pte_dirty(*pte) || pte_write(*pte)) {
> +		pte_t entry;
> 
> -	entry = ptep_get_and_clear(mm, address, pte);
> -	entry = pte_mkclean(entry);
> -	entry = pte_wrprotect(entry);
> -	ptep_establish(vma, address, pte, entry);
> -	lazy_mmu_prot_update(entry);
> -	ret = 1;
> +		flush_cache_page(vma, address, pte_pfn(*pte));
> +		entry = ptep_clear_flush(vma, address, pte);
> +		entry = pte_wrprotect(entry);
> +		entry = pte_mkclean(entry);
> +		ptep_establish(vma, address, pte, entry);

Now you are flushing the tlb twice. ptep_clear_flush clears the pte and
flushes the tlb, ptep_establish sets the new pte and flushes the tlb.
Not good. Use set_pte_at instead of the ptep_establish.

> +		lazy_mmu_prot_update(entry);
> +		ret = 1;
> +	}
> 
> -unlock:
>  	pte_unmap_unlock(pte, ptl);
>  out:
>  	return ret;

-- 
blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/