From nobody Mon Nov 21 07:20:26 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NFzLg0xK5z4hskf; Mon, 21 Nov 2022 07:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NFzLg04Vwz3F4K; Mon, 21 Nov 2022 07:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669015227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+kJngGy+DljElmEBST7Sk/WpgAI3qA5Q3xtQdJ4+mI=; b=kItJXfFXcnyxeJ5SYGtc/wkUb4TMyUugCa0ISNrWvgUMqqrtpwJQI+BKaZDClj1YLTa/Lq h6ohW79nu8g7UoYEy5clrpkvYKRUPFT8sVV3tU+B/XwXp9hQFKWd5YiOKu3MuDKTYDF+6B IfL4FLT9cp5EfUltl4M1kp4YnUSDV8t0ayjb98EMWaWtnomimIzDjwk/EIK6Wk2AGQ4jwP MZ4xsdMvYnIxuWsSL8IAl6h1XqupV0HzabRQ/8zVLiUHTWZSvILNOJTcOKZpZWp0huS3aZ GhxhjilNSOGsY9aVgFzXK7/Ukq/mKhQqQci48PfjN9mAvJ1MrPs4vW1i0M/vdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669015227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+kJngGy+DljElmEBST7Sk/WpgAI3qA5Q3xtQdJ4+mI=; b=flkDfb8FU40kmIbTPHV/1q59EfwrRq+Ed9IAoWAM6HvdmtVv+j7SOoLaXJMV6iAGRLxpri i7JWvDbaUtLsvPKlOLOwF6LOEHR7At623EIyYrU0GYIjKTMCLWw6PNRsh6N4N8zV8uOpMf MBKKArqLXdaogFmLXNyBwbnAc77e/EtiZ+c8/57OQ32QwJO9wfjNI8czQL4aOYWr/vItGN epJH37tbIeqkH5uSaXRmn3h/3hgj7ivSy+ruwTg2/TdTOPYvfnSM7dF3CeT/DczaFNJWyX 1Rf5I8k3oyU1//pNcrEQU8StS79Wx0ycqpD9MxrCoIGrScg67Nm9wNBA/p0EsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669015227; a=rsa-sha256; cv=none; b=msSsZv877NoVJA7Ph5f0KsyMq7k1k70kRA4cO2o3Kv22UrH5ruUwg7ua9s9vTtnYftfILB KAF9lYtV1+h1FPrDzbmxxJe55i+bSE+/0pnXDQGIbUfdF93U15sbkxXadyi0YZtLZ1c5oX BGWO4mnLt9sgnKwi7pEbMY1dqDSryhrzFfukJcgr3kJcp2zE7phNzFS134QL/+s9B9Ih8J Vdcu4dqg4nwxBc25ihkm2A7nHo7KRY/iH+t3cer2vJeZHN29FeIWIi+9bAmWNp+ybu+M3U MCtl3WvWYZ1Ru/KHjCZBWXk3COmVCZv3i3Szr6g0FQq4DtcZyhKk1eBQGx+OQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NFzLf62h4zvX7; Mon, 21 Nov 2022 07:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AL7KQIo025325; Mon, 21 Nov 2022 07:20:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AL7KQ9d025324; Mon, 21 Nov 2022 07:20:26 GMT (envelope-from git) Date: Mon, 21 Nov 2022 07:20:26 GMT Message-Id: <202211210720.2AL7KQ9d025324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: fde8ce889201 - main - vmm: remove unneccessary rendezvous assertion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73 commit fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73 Author: Corvin Köhne AuthorDate: 2022-11-17 06:51:51 +0000 Commit: Corvin Köhne 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;