Skip to content

Commit

Permalink
x86, mm: is_untracked_pat_range() takes a normal semiclosed range
Browse files Browse the repository at this point in the history
is_untracked_pat_range() -- like its components, is_ISA_range() and
is_GRU_range(), takes a normal semiclosed interval (>=, <) whereas the
PAT code called it as if it took a closed range (>=, <=).  Fix.

Although this is a bug, I believe it is non-manifest, simply because
none of the callers will call this with non-page-aligned addresses.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20091119202341.GA4420@sgi.com>
  • Loading branch information
H. Peter Anvin committed Nov 24, 2009
1 parent 55a6ca2 commit 8a27138
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size,
/*
* PAT type is always WB for untracked ranges, so no need to check.
*/
if (x86_platform.is_untracked_pat_range(paddr, paddr + size - 1))
if (x86_platform.is_untracked_pat_range(paddr, paddr + size))
return 1;

/*
Expand Down
6 changes: 3 additions & 3 deletions arch/x86/mm/pat.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
}

/* Low ISA region is always mapped WB in page table. No need to track */
if (x86_platform.is_untracked_pat_range(start, end - 1)) {
if (x86_platform.is_untracked_pat_range(start, end)) {
if (new_type)
*new_type = _PAGE_CACHE_WB;
return 0;
Expand Down Expand Up @@ -505,7 +505,7 @@ int free_memtype(u64 start, u64 end)
return 0;

/* Low ISA region is always mapped WB. No need to track */
if (x86_platform.is_untracked_pat_range(start, end - 1))
if (x86_platform.is_untracked_pat_range(start, end))
return 0;

is_range_ram = pat_pagerange_is_ram(start, end);
Expand Down Expand Up @@ -588,7 +588,7 @@ static unsigned long lookup_memtype(u64 paddr)
int rettype = _PAGE_CACHE_WB;
struct memtype *entry;

if (x86_platform.is_untracked_pat_range(paddr, paddr + PAGE_SIZE - 1))
if (x86_platform.is_untracked_pat_range(paddr, paddr + PAGE_SIZE))
return rettype;

if (pat_pagerange_is_ram(paddr, paddr + PAGE_SIZE)) {
Expand Down

0 comments on commit 8a27138

Please sign in to comment.