d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwpmc: don't enter epoch section across mmap hook

Browse Source
This commit is contained in:
Matt Macy 2018-05-29 18:03:48 +00:00
parent 6c3c319414
commit b99aa0fbb2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/hwpmc/hwpmc_mod.c
View File

@ -1717,7 +1717,7 @@ pmc_process_mmap(struct thread *td, struct pmckern_map_in *pkm)
const struct pmc_process *pp;
freepath = fullpath = NULL;
epoch_exit_preempt(global_epoch_preempt);
MPASS(!in_epoch());
pmc_getfilename((struct vnode *) pkm->pm_file, &fullpath, &freepath);
pid = td->td_proc->p_pid;
@ -1743,6 +1743,7 @@ pmc_process_mmap(struct thread *td, struct pmckern_map_in *pkm)
done:
if (freepath)
free(freepath, M_TEMP);
epoch_exit_preempt(global_epoch_preempt);
}

2
sys/kern/vfs_vnops.c
View File

@ -2494,7 +2494,7 @@ vn_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t size,
if ((prot & VM_PROT_EXECUTE) != 0 && error == 0) {
pkm.pm_file = vp;
pkm.pm_address = (uintptr_t) *addr;
PMC_CALL_HOOK(td, PMC_FN_MMAP, (void *) &pkm);
PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_MMAP, (void *) &pkm);
}
}
#endif

3
sys/sys/pmckern.h
View File

@ -217,7 +217,8 @@ do { \
*/
#define PMC_CALL_HOOK_UNLOCKED(t, cmd, arg) \
do { \
if (pmc_hook != NULL) \
MPASS(!in_epoch()); \
if (pmc_hook != NULL) \
(pmc_hook)((t), (cmd), (arg)); \
} while (0)