Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: pat.c introduce function to check for conflicts with existing memtypes

Browse source 
... to strip down loop body in reserve_memtype.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Suresh B Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann 2008-06-20 22:07:09 +02:00 committed by Ingo Molnar
parent f6887264de
commit 64fe44c38b
1 changed files with 33 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
arch/x86/mm/pat.c
View file

@ -178,6 +178,33 @@ static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type)
return req_type; return req_type;
} }
static int chk_conflict(struct memtype *new, struct memtype *entry,
unsigned long *type)
{
if (new->type != entry->type) {
if (type) {
new->type = entry->type;
*type = entry->type;
} else
goto conflict;
}
/* check overlaps with more than one entry in the list */
list_for_each_entry_continue(entry, &memtype_list, nd) {
if (new->end <= entry->start)
break;
else if (new->type != entry->type)
goto conflict;
}
return 0;
conflict:
printk(KERN_INFO "%s:%d conflicting memory types "
"%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start,
new->end, cattr_name(new->type), cattr_name(entry->type));
return -EBUSY;
}
/* /*
* req_type typically has one of the: * req_type typically has one of the:
* - _PAGE_CACHE_WB * - _PAGE_CACHE_WB
@ -254,94 +281,37 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
/* Search for existing mapping that overlaps the current range */ /* Search for existing mapping that overlaps the current range */
where = NULL; where = NULL;
list_for_each_entry(entry, &memtype_list, nd) { list_for_each_entry(entry, &memtype_list, nd) {
struct memtype *saved_ptr;
if (entry->start >= end) { if (entry->start >= end) {
where = entry->nd.prev; where = entry->nd.prev;
break; break;
} }
if (start <= entry->start && end >= entry->start) { if (start <= entry->start && end >= entry->start) {
if (actual_type != entry->type && new_type) { err = chk_conflict(new, entry, new_type);
actual_type = entry->type;
*new_type = actual_type;
new->type = actual_type;
}
if (actual_type != entry->type) {
err = -EBUSY;
break;
}
saved_ptr = entry;
/*
* Check to see whether the request overlaps more
* than one entry in the list
*/
list_for_each_entry_continue(entry, &memtype_list, nd) {
if (end <= entry->start) {
break;
}
if (actual_type != entry->type) {
err = -EBUSY;
break;
}
}
if (err) { if (err) {
break; break;
} }
dprintk("Overlap at 0x%Lx-0x%Lx\n", dprintk("Overlap at 0x%Lx-0x%Lx\n",
saved_ptr->start, saved_ptr->end); entry->start, entry->end);
where = saved_ptr->nd.prev; where = entry->nd.prev;
break; break;
} }
if (start < entry->end) { if (start < entry->end) {
if (actual_type != entry->type && new_type) { err = chk_conflict(new, entry, new_type);
actual_type = entry->type;
*new_type = actual_type;
new->type = actual_type;
}
if (actual_type != entry->type) {
err = -EBUSY;
break;
}
saved_ptr = entry;
/*
* Check to see whether the request overlaps more
* than one entry in the list
*/
list_for_each_entry_continue(entry, &memtype_list, nd) {
if (end <= entry->start) {
break;
}
if (actual_type != entry->type) {
err = -EBUSY;
break;
}
}
if (err) { if (err) {
break; break;
} }
dprintk("Overlap at 0x%Lx-0x%Lx\n", dprintk("Overlap at 0x%Lx-0x%Lx\n",
saved_ptr->start, saved_ptr->end); entry->start, entry->end);
where = &saved_ptr->nd; where = &entry->nd;
break; break;
} }
} }
if (err) { if (err) {
printk(KERN_INFO "%s:%d conflicting memory types "
"%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
end, cattr_name(new->type), cattr_name(entry->type));
printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, " printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, "
"track %s, req %s\n", "track %s, req %s\n",
start, end, cattr_name(new->type), cattr_name(req_type)); start, end, cattr_name(new->type), cattr_name(req_type));