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

bhyve: Allocate mmio_hint array based on number of guest CPUs.

Browse Source 
This avoids an instance of hardcoding VM_MAXCPU in userspace.

Reviewed by:	grehan
Differential Revision:	https://reviews.freebsd.org/D34489
This commit is contained in:
John Baldwin 2022-03-09 15:38:49 -08:00
parent 6c4afed566
commit 730510dc1a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bhyve/bhyverun.c
View File

@ -1445,7 +1445,7 @@ main(int argc, char *argv[])
exit(4);
}
init_mem();
init_mem(guest_ncpus);
init_inout();
kernemu_dev_init();
init_bootrom(ctx);

9
usr.sbin/bhyve/mem.c
View File

@ -68,7 +68,8 @@ RB_HEAD(mmio_rb_tree, mmio_rb_range) mmio_rb_root, mmio_rb_fallback;
* consecutive addresses in a range, it makes sense to cache the
* result of a lookup.
*/
static struct mmio_rb_range *mmio_hint[VM_MAXCPU];
static struct mmio_rb_range **mmio_hint;
static int mmio_ncpu;
static pthread_rwlock_t mmio_rwlock;
@ -352,7 +353,7 @@ unregister_mem(struct mem_range *memp)
RB_REMOVE(mmio_rb_tree, &mmio_rb_root, entry);
/* flush Per-vCPU cache */
for (i=0; i < VM_MAXCPU; i++) {
for (i = 0; i < mmio_ncpu; i++) {
if (mmio_hint[i] == entry)
mmio_hint[i] = NULL;
}
@ -367,9 +368,11 @@ unregister_mem(struct mem_range *memp)
}
void
init_mem(void)
init_mem(int ncpu)
{
mmio_ncpu = ncpu;
mmio_hint = calloc(ncpu, sizeof(*mmio_hint));
RB_INIT(&mmio_rb_root);
RB_INIT(&mmio_rb_fallback);
pthread_rwlock_init(&mmio_rwlock, NULL);

2
usr.sbin/bhyve/mem.h
View File

@ -52,7 +52,7 @@ struct mem_range {
#define MEM_F_RW 0x3
#define MEM_F_IMMUTABLE 0x4 /* mem_range cannot be unregistered */
void init_mem(void);
void init_mem(int ncpu);
int emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie,
struct vm_guest_paging *paging);