From: mpi Date: Wed, 1 Sep 2021 14:03:24 +0000 (+0000) Subject: Prevent lock ordering issue by raising ipl level of vcpu_pool to IPL_MPFLOOR. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1be9dae600aab5404a2f31a926b46f16f5c70297;p=openbsd Prevent lock ordering issue by raising ipl level of vcpu_pool to IPL_MPFLOOR. Reported-by: syzbot+c8905496cd61610f77e2@syzkaller.appspotmail.com ok mlarkin@ --- diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index b75e10f51dd..1adcc26b3f1 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.287 2021/08/31 17:40:59 dv Exp $ */ +/* $OpenBSD: vmm.c,v 1.288 2021/09/01 14:03:24 mpi Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -430,7 +430,7 @@ vmm_attach(struct device *parent, struct device *self, void *aux) pool_init(&vm_pool, sizeof(struct vm), 0, IPL_NONE, PR_WAITOK, "vmpool", NULL); - pool_init(&vcpu_pool, sizeof(struct vcpu), 64, IPL_NONE, PR_WAITOK, + pool_init(&vcpu_pool, sizeof(struct vcpu), 64, IPL_MPFLOOR, PR_WAITOK, "vcpupl", NULL); vmm_softc = sc;