Skip to contentSkip to conversation

ARM-related ptep_to_address() fix

PATCH William Lee Irwin III 1 participant 1 message Apr 17, 2004 Generic include/asm header files

lore
Share & tools
lore
#0 lore raw

rmk mentioned that ARM was borked as the relation, assumed by generic rmap, PTRS_PER_PTE*sizeof(pte_t) == PAGE_SIZE, fails to hold. The following patch, developed jointly with him (or depending on POV, by him with me acting as codemonkey), is reported to resolve the issue.

Specifically, while ARM dedicates an entire PAGE_SIZE -sized block of memory to each PTE table, the PTE table itself only spans half that, the remainder being dedicated to hardware-interpreted structures. As the hardware structure must be contiguous, wider ptes can't be used. So the core-visible PTE table only spans PAGE_SIZE/2 bytes, violating the assumption. This corrects masking and scaling done in ptep_to_address().

I'm aware hugh and andrea's patches address this by blowing away the dependence on this address calculation altogether, so if anything this should be considered a stopgap measure if not dropped on account of the imminent merging of hugh and/or andrea's code.

-- wli

include/asm-generic/rmap.h +2 -1
Index: wli-2.6.5-mm6/include/asm-generic/rmap.h
===================================================================
@@ -57,7 +57,8 @@
 {
 	struct page * page = kmap_atomic_to_page(ptep);
 	unsigned long low_bits;
-	low_bits = ((unsigned long)ptep & ~PAGE_MASK) * PTRS_PER_PTE;
+	low_bits = ((unsigned long)ptep & (PTRS_PER_PTE*sizeof(pte_t) - 1))
+			* (PAGE_SIZE/sizeof(pte_t));
 	return page->index + low_bits;
 }