Skip to content

Commit 56530f5

Browse files
stevecapperarmRussell King
authored andcommitted
ARM: 8579/1: mm: Fix definition of pmd_mknotpresent
Currently pmd_mknotpresent will use a zero entry to respresent an invalidated pmd. Unfortunately this definition clashes with pmd_none, thus it is possible for a race condition to occur if zap_pmd_range sees pmd_none whilst __split_huge_pmd_locked is running too with pmdp_invalidate just called. This patch fixes the race condition by modifying pmd_mknotpresent to create non-zero faulting entries (as is done in other architectures), removing the ambiguity with pmd_none. [[email protected]: using L_PMD_SECT_VALID instead of PMD_TYPE_SECT] Fixes: 8d96250 ("ARM: mm: Transparent huge page support for LPAE systems.") Cc: <[email protected]> # 3.11+ Reported-by: Kirill A. Shutemov <[email protected]> Acked-by: Will Deacon <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Steve Capper <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 6245318 commit 56530f5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/include/asm/pgtable-3level.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ PMD_BIT_FUNC(mkyoung, |= PMD_SECT_AF);
250250
#define pfn_pmd(pfn,prot) (__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))
251251
#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot)
252252

253-
/* represent a notpresent pmd by zero, this is used by pmdp_invalidate */
253+
/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */
254254
static inline pmd_t pmd_mknotpresent(pmd_t pmd)
255255
{
256-
return __pmd(0);
256+
return __pmd(pmd_val(pmd) & ~L_PMD_SECT_VALID);
257257
}
258258

259259
static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

0 commit comments

Comments
 (0)