From fc9a2b80c4c77096e163cb4a812c41e7e591f2fa Mon Sep 17 00:00:00 2001 From: Joseph Koshy Date: Thu, 9 Mar 2006 02:08:12 +0000 Subject: [PATCH] When a process is de-configuring a log file, also stop all of its PMCs that require a log file to operate. This change should fix PR 90269. PR: kern/90269 MFC after: 1 week --- sys/dev/hwpmc/hwpmc_logging.c | 6 ++---- sys/dev/hwpmc/hwpmc_mod.c | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index ff6298e6f04d..f901cbe0392c 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -619,10 +619,8 @@ pmclog_deconfigure_log(struct pmc_owner *po) if ((po->po_flags & PMC_PO_OWNS_LOGFILE) == 0) return EINVAL; - /* remove this owner from the global SS pmc owner list */ - if (po->po_sscount) - LIST_REMOVE(po, po_ssnext); - + KASSERT(po->po_sscount == 0, + ("[pmc,%d] po=%p still owning SS PMCs", __LINE__, po)); KASSERT(po->po_file != NULL, ("[pmc,%d] po=%p no log file", __LINE__, po)); diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 2a8b0fb65333..9c7b3b22ad3c 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -2408,6 +2408,7 @@ pmc_syscall_handler(struct thread *td, void *syscall_args) case PMC_OP_CONFIGURELOG: { + struct pmc *pm; struct pmc_owner *po; struct pmc_op_configurelog cl; struct proc *p; @@ -2436,8 +2437,12 @@ pmc_syscall_handler(struct thread *td, void *syscall_args) else if (po->po_flags & PMC_PO_OWNS_LOGFILE) { pmclog_process_closelog(po); error = pmclog_flush(po); - if (error == 0) + if (error == 0) { + LIST_FOREACH(pm, &po->po_pmcs, pm_next) + if (pm->pm_flags & PMC_F_NEEDS_LOGFILE) + pmc_stop(pm); error = pmclog_deconfigure_log(po); + } } else error = EINVAL; }