github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

dm: vhpet: fix vHPET memory leak on device reset

Browse Source 
Need to properly remove and free its MMIO entry during deinit.

Tracked-On: #2453
Signed-off-by: Peter Fang <peter.fang@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Peter Fang 2019-01-28 16:09:43 -08:00 committed by wenlingz
parent c855b78230
commit 24cf377d5d
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devicemodel/hw/platform/hpet.c
View File

@ -90,13 +90,20 @@ static int hpet_debug;
#define WPRINTF(params) (printf params) #define WPRINTF(params) (printf params)
static struct mem_range vhpet_mr = {
.name = "vhpet",
.base = VHPET_BASE,
.size = VHPET_SIZE,
.flags = MEM_F_RW
};
struct vhpet_timer_arg { struct vhpet_timer_arg {
struct vhpet *vhpet; struct vhpet *vhpet;
int timer_num; int timer_num;
bool running; bool running;
}; };
static struct vhpet { struct vhpet {
struct vmctx *vm; struct vmctx *vm;
bool inited; bool inited;
@ -117,7 +124,7 @@ static struct vhpet {
} tmrlst[3]; } tmrlst[3];
int tmridx; int tmridx;
} timer[VHPET_NUM_TIMERS]; } timer[VHPET_NUM_TIMERS];
} __vhpet; /* one vHPET per VM */ };
/* one vHPET per VM */ /* one vHPET per VM */
@ -126,9 +133,12 @@ static pthread_mutex_t vhpet_mtx = PTHREAD_MUTEX_INITIALIZER;
static const struct itimerspec zero_ts = { 0 }; static const struct itimerspec zero_ts = { 0 };
static inline struct vhpet * /* one vHPET per VM */
static struct vhpet *
vhpet_instance(void) vhpet_instance(void)
{ {
static struct vhpet __vhpet;
return &__vhpet; return &__vhpet;
} }
@ -906,7 +916,6 @@ vhpet_init(struct vmctx *ctx)
uint64_t allowed_irqs; uint64_t allowed_irqs;
struct vhpet_timer_arg *arg; struct vhpet_timer_arg *arg;
struct acrn_timer *tmr; struct acrn_timer *tmr;
struct mem_range mr;
vhpet = vhpet_instance(); vhpet = vhpet_instance();
@ -955,15 +964,11 @@ vhpet_init(struct vmctx *ctx)
} }
} }
mr.name = "vhpet"; vhpet_mr.handler = vhpet_handler;
mr.base = VHPET_BASE; vhpet_mr.arg1 = vhpet;
mr.size = VHPET_SIZE; vhpet_mr.arg2 = 0;
mr.flags = MEM_F_RW;
mr.handler = vhpet_handler;
mr.arg1 = vhpet;
mr.arg2 = 0;
error = register_mem(&mr); error = register_mem(&vhpet_mr);
if (error) { if (error) {
vhpet_deinit_timers(vhpet); vhpet_deinit_timers(vhpet);
@ -990,6 +995,8 @@ vhpet_deinit(struct vmctx *ctx)
goto done; goto done;
vhpet_deinit_timers(vhpet); vhpet_deinit_timers(vhpet);
unregister_mem(&vhpet_mr);
vhpet->inited = false; vhpet->inited = false;
done: done: