Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Arm CMN perf: fix the DTC allocation failure path which can end up
erroneously clearing live counters
- arm64/mm: fix hugetlb handling of the dirty page state leading to a
continuous fault loop in user on hardware without dirty bit
management (DBM). That's caused by the dirty+writeable information
not being properly preserved across a series of mprotect(PROT_NONE),
mprotect(PROT_READ|PROT_WRITE)
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify
perf/arm-cmn: Fail DTC counter allocation correctly
+7
-1
+6
arch/arm64/include/asm/pgtable.h
+6
arch/arm64/include/asm/pgtable.h
···
834
834
pte = set_pte_bit(pte, __pgprot(PTE_DIRTY));
835
835
836
836
pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
837
+
/*
838
+
* If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware
839
+
* dirtiness again.
840
+
*/
841
+
if (pte_sw_dirty(pte))
842
+
pte = pte_mkdirty(pte);
837
843
return pte;
838
844
}
839
845