From nobody Fri Sep 09 13:55:33 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 4MPHZF4Xqvz4bT5T; Fri, 9 Sep 2022 13:55:33 +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 4MPHZF45Frz3hQv; Fri, 9 Sep 2022 13:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662731733; 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=vfpSp4/ii7o667853viTdExb9NQJef+oW5msDfFZyA4=; b=p4ZueHvQVdaxppBNHldRuYR1IXXIPr7rl1A4HIX0Wj4snUa8PaTHBOXn6xDT09mumOH51r fVCGK0KtMi86x66oClOEQpoGVDv5t1ZGdPf2Yn7F7S2ryiqJylw1eCrqaFmNxN1DSmDPvi K6Xdzxa/ei3MaoWgwI6heaxBYwHQrrp0OD/2gR8y4ghkadk+gy4qElytTPMTQd2FjcG81z WXDPsch/qF+VQI1lhSg5pT55AcR9LOMnX65FUXtVX/xHBKmY7ppqoiXn2Mf7GsbG/8VNdS lTmvn2MqXc6Jc2yO5rbKbqZ4nlUEJtJWYlSuAC5/9zEXVeTFV4pQJCcq6sBTMA== 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 4MPHZF32jJz1DJq; Fri, 9 Sep 2022 13:55:33 +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 289DtX6Y093549; Fri, 9 Sep 2022 13:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289DtXCA093548; Fri, 9 Sep 2022 13:55:33 GMT (envelope-from git) Date: Fri, 9 Sep 2022 13:55:33 GMT Message-Id: <202209091355.289DtXCA093548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 83b65d0ae132 - main - Revert "vmm: Remove unneeded variable maxcpus" 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83b65d0ae132a4c7deba302ff57bfae886309df6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662731733; 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=vfpSp4/ii7o667853viTdExb9NQJef+oW5msDfFZyA4=; b=Q/SoYpLmVbBnN7mPJVrd8hqKTeRECqj4atLdNeOjoYCIkhB23npVC22xUm0h9VS8FTmb0y g+6Ij2qC4QJpHN4x590of2UP4L/JQc3+Duf1X18LMpbuCCozpry4nU8ec3PJmkD+RhkVby qxHGKD1B6l0VVCJjfxoRS0AlznlCBWxQhnp/tDn+imHsnLqv0anqG1EHFPlFSXzoO/xfx4 IK2bqGfh1p2cnkOToSdjz/9nenRbDn184QzJQljgM8mPS19Czf8uZH5uv3xsDZ/V+RCe6Q U0YvvSHrUTsaGjZfw7ceWjCr7mUiSPgTNSdliLHdVP5bnBBsNF4xrRwRMEkGcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662731733; a=rsa-sha256; cv=none; b=qGjNG6klAnj/eh9bhvySsZF1FTKh3ztIe3Re4yV+CgwoGxG9EbcGrXZMZ6ZYA9GwNsy7WR W0aFWLtuwXgSlO6ZNRTYpnHMK9C904vhdTJKAS23X5iiGtZgY1JIJPMwVKlQ7fHuwVLWD6 EWN1VM24rV/Uso8InIBk7qjA204pw2LC/f3Lbm9uZbbq5uFJSArpjii/GmiE9YStg1e5M8 1CCDTNAB+1xQEdZKZEjrB6EcJNIItqLU8LwmJDtLqNCdNZ8pXmKxgym/XLC8qvsmLJ6+3J TWSht+9yghzQYBmoG6DUebGWDq/J1ItQ1++kazmfiAWFclyJBhBrnh2zUtHKUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=83b65d0ae132a4c7deba302ff57bfae886309df6 commit 83b65d0ae132a4c7deba302ff57bfae886309df6 Author: Emmanuel Vadot AuthorDate: 2022-09-09 13:54:56 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-09 13:54:56 +0000 Revert "vmm: Remove unneeded variable maxcpus" This reverts commit 653c36179d9ee587e4d5e4668fd73d6c3d318ef8. --- sys/amd64/vmm/io/vlapic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 5eda9a8b3616..dc9b00d2316e 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -964,6 +964,7 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) struct vlapic *vlapic2; struct vm_exit *vmexit; struct LAPIC *lapic; + uint16_t maxcpus; lapic = vlapic->apic_page; lapic->icr_lo &= ~APIC_DELSTAT_PEND; @@ -978,6 +979,9 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) phys = (icrval & APIC_DESTMODE_LOG) == 0; shorthand = icrval & APIC_DEST_MASK; + maxcpus = vm_get_maxcpus(vlapic->vm); + + VLAPIC_CTR2(vlapic, "icrlo 0x%016lx triggered ipi %d", icrval, vec); switch (shorthand) {