git: fde8ce889201 - main - vmm: remove unneccessary rendezvous assertion
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Nov 2022 07:20:26 UTC
The branch main has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73
commit fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2022-11-17 06:51:51 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2022-11-21 07:19:36 +0000
vmm: remove unneccessary rendezvous assertion
When a vcpu sees that a rendezvous is in progress, it exits and tries to
handle the rendezvous. The vcpu doesn't check if it's part of the
rendezvous or not. If the vcpu isn't part of the rendezvous, the
rendezvous could be done before it reaches the assertion. This will
cause a panic.
The assertion isn't needed at all because vm_handle_rendezvous properly
handles a spurious rendezvous. So, we can just remove it.
PR: 267779
Reviewed by: jhb, markj
Tested by: bz
Approved by: manu (mentor)
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D37417
---
sys/amd64/vmm/vmm.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 0ebf80e94131..7e8a5c939440 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -1800,9 +1800,6 @@ vm_exit_rendezvous(struct vcpu *vcpu, uint64_t rip)
{
struct vm_exit *vmexit;
- KASSERT(vcpu->vm->rendezvous_func != NULL,
- ("rendezvous not in progress"));
-
vmexit = vm_exitinfo(vcpu);
vmexit->rip = rip;
vmexit->inst_length = 0;