Avoid duplicated calls to pmap_page_get_memattr().
Avoid logging inconsistency for the /dev/mem device at all. The driver leaves memattr intact, and the corrective action in the device pager handles it right. In the logged warning, name the driver we blame, and show memory attributes values. Reported and tested by: pho Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D6149
This commit is contained in:
parent
e1da986b54
commit
e9d37c9f8d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298891
@ -299,7 +299,7 @@ old_dev_pager_fault(vm_object_t object, vm_ooffset_t offset, int prot,
|
||||
struct cdevsw *csw;
|
||||
struct file *fpop;
|
||||
struct thread *td;
|
||||
vm_memattr_t memattr;
|
||||
vm_memattr_t memattr, memattr1;
|
||||
int ref, ret;
|
||||
|
||||
memattr = object->memattr;
|
||||
@ -327,10 +327,18 @@ old_dev_pager_fault(vm_object_t object, vm_ooffset_t offset, int prot,
|
||||
|
||||
/* If "paddr" is a real page, perform a sanity check on "memattr". */
|
||||
if ((m_paddr = vm_phys_paddr_to_vm_page(paddr)) != NULL &&
|
||||
pmap_page_get_memattr(m_paddr) != memattr) {
|
||||
memattr = pmap_page_get_memattr(m_paddr);
|
||||
printf(
|
||||
"WARNING: A device driver has set \"memattr\" inconsistently.\n");
|
||||
(memattr1 = pmap_page_get_memattr(m_paddr)) != memattr) {
|
||||
/*
|
||||
* For the /dev/mem d_mmap routine to return the
|
||||
* correct memattr, pmap_page_get_memattr() needs to
|
||||
* be called, which we do there.
|
||||
*/
|
||||
if ((csw->d_flags & D_MEM) == 0) {
|
||||
printf("WARNING: Device driver %s has set "
|
||||
"\"memattr\" inconsistently (drv %u pmap %u).\n",
|
||||
csw->d_name, memattr, memattr1);
|
||||
}
|
||||
memattr = memattr1;
|
||||
}
|
||||
if (((*mres)->flags & PG_FICTITIOUS) != 0) {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user