From nobody Tue Nov 29 13:57:57 2022 X-Original-To: dev-commits-src-branches@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 4NM3nf0cHjz4htbT; Tue, 29 Nov 2022 13:57:58 +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 4NM3nf06gjz4Bq0; Tue, 29 Nov 2022 13:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669730278; 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=VnTbXxTHps6F4tH+Ji9xJwnV0wGhvgzyMqnsU8zn+ZI=; b=FqmnKmsdSC4YHpthyJgyS22yxX+njUBatTauO0cZcgxvYUsK1m2kRk+cr6CCFnTVEjUKPl o99yUVHVZc3D04mc5WPEwBOledSkwwTvc+1Bkf4Hx1IAMmy2hytx5tvDewXYPiku5k7Nyt RfLnnDvwCovRuOyUkTRb782mn7ES8x1gguEdnTQYjGeAZOkqK19jHZpMd/dVHckJfNuUML 7F7VzVDa46Hp6UlesxFGEW2X0/dCpLlhIEBF+PwSI8axRJWeF+t/gkMHR1uPC+S2thFrxP 4Nc+Kjfve1b2yOyBNQXeBiPynXHhjy4aTCK+iqj5WPSkASYTJQXEyj/NPSK/8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669730278; 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=VnTbXxTHps6F4tH+Ji9xJwnV0wGhvgzyMqnsU8zn+ZI=; b=WwxLZ73uY9OyUySu8jAZIF84mBh786m+P/A8lRyP1dXhsm23GtfLombEZ0neDU4iEsHWtT TlUWlEOpoMKsm+Tb305YuXxco0o/0zcwUPIBgmH79laBK87G1U63j3Vqg5iDfnO+POlGEb CV15msjJhiZ8P0JxXEKpIv/zZv+KSnsffrw2lqjtJtZa/aSAexGOJVBS3uis0z08+AG1nP C5eWQtmVhD68P6FaWAJWZ1qKxtY0z15Y9NiEp3Kpve1axSCPMNIyjWsPcYrrZCjLLjtW5v ZFWQpJHTXT5xxkV72MfIvo0StB/PMyPEv2v7sgEllhfKhhJOjBDIfohrPd6r4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669730278; a=rsa-sha256; cv=none; b=jQQNuCwNsrwM3cuZd56G7J7a0RMmKxiukWgNm+vJOO8rp7cIzOJtRQJecOLW1TLRWxxm5C cnngOM/7sE44lFzbBrUR+XqNahOXZyvywBEBlGjffmgVSw3FEMADp88HAf5b75lG0yNDwT zKwStKWI9Pzw6llYjmT7LAHBRWKBP1Nt1/vxBc89HOBok93uGHVcrsAYINC4LIHj7kGYWS 8fnNvzqqcDM25Jij1PYUlKsDvJNKd1Vqb2b/CFj/hq/Uw0Pl03UBV3NjtIWKA7Lxz5qi0U 3u2j89CBjodzCbGLVxLiq0Hs3tCpwxbSqKx53LcWoJd7xFVT7OVfghOyN3GK0g== 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 4NM3nd6FW4zKDV; Tue, 29 Nov 2022 13:57:57 +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 2ATDvv0B029322; Tue, 29 Nov 2022 13:57:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATDvvZr029321; Tue, 29 Nov 2022 13:57:57 GMT (envelope-from git) Date: Tue, 29 Nov 2022 13:57:57 GMT Message-Id: <202211291357.2ATDvvZr029321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 59339f3a16c0 - stable/13 - vmm: remove unneccessary rendezvous assertion List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 59339f3a16c0aacbdb789b8600365f576a6a6a31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=59339f3a16c0aacbdb789b8600365f576a6a6a31 commit 59339f3a16c0aacbdb789b8600365f576a6a6a31 Author: Corvin Köhne AuthorDate: 2022-11-17 06:51:51 +0000 Commit: Corvin Köhne CommitDate: 2022-11-29 13:53:09 +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 (cherry picked from commit fde8ce889201bf7fe86d7a3b3dfe2abf27cd2d73) --- sys/amd64/vmm/vmm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index fc7ea3d7b4be..4de924287336 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1696,8 +1696,6 @@ vm_exit_rendezvous(struct vm *vm, int vcpuid, uint64_t rip) { struct vm_exit *vmexit; - KASSERT(vm->rendezvous_func != NULL, ("rendezvous not in progress")); - vmexit = vm_exitinfo(vm, vcpuid); vmexit->rip = rip; vmexit->inst_length = 0;