diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2015-09-11 18:22:01 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-09-14 12:28:41 +0100 |
| commit | 62d96c71d248834af2891293dc23cc344ae2ec36 (patch) | |
| tree | 0cab58cfe00d23e610a671f13ed7dc3e2ee66903 /arch/arm64 | |
| parent | b847415ce96efef819534b230d84695b1bc6d36b (diff) | |
| download | linux-62d96c71d248834af2891293dc23cc344ae2ec36.tar.gz linux-62d96c71d248834af2891293dc23cc344ae2ec36.tar.bz2 linux-62d96c71d248834af2891293dc23cc344ae2ec36.zip | |
arm64: Fix pte_modify() to preserve the hardware dirty information
The pte_modify() function with hardware AF/DBM enabled must transfer the
hardware dirty information to the software PTE_DIRTY bit. However, it
was setting this bit in newprot and the mask does not cover such bit.
This patch sets PTE_DIRTY on the original pte which will be preserved in
the returned value.
Fixes: 2f4b829c625e ("arm64: Add support for hardware updates of the access and dirty pte bits")
Cc: Julien Grall <julien.grall@citrix.com>
Tested-by: Julien Grall <julien.grall@citrix.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 69207f016891..31df98adf005 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -503,7 +503,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) PTE_PROT_NONE | PTE_WRITE | PTE_TYPE_MASK; /* preserve the hardware dirty information */ if (pte_hw_dirty(pte)) - newprot |= PTE_DIRTY; + pte = pte_mkdirty(pte); pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask); return pte; } |