From nobody Thu Jan 26 22:11:47 2023 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 4P2w0g4Pyyz3c7tf; Thu, 26 Jan 2023 22:11:47 +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 4P2w0g32wSz3vXH; Thu, 26 Jan 2023 22:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771107; 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=qZ0EW0TdzyoqTPj+oraMTKEKK/tl2LJci6APBhx2Nww=; b=OtV1Ty+CowF05x0imvM7DWOTR7hPDsZYQUO/VVcMhySeS+OH5f2imrFG1RE8X9x+MMAqP5 Len0qQpWsZoisROdVqym2mEyQMGpGL+xMwvnAMoxYoT5hdF5AibnjGu9tfqX5e0+1n0Yy8 3ZYBlV9gwqfx2jmcJ/2VATrnCrr5A+FYaH4zgDiuOe73s0MHEZluWPKXe9z2+9sX+CDN7r Q4tHonHoT1NVsZK9p4WZxeYK7iXV3f+yUaFmsVmiR6k81EmQj8/xgI+7uYbzGeF61OX/eR 84vHelQmlQvnBHrdGexXFg5uTB3078/f45FHFqp7xoMFWKVcMW/scfGaNXBg3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771107; 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=qZ0EW0TdzyoqTPj+oraMTKEKK/tl2LJci6APBhx2Nww=; b=oFAYQEHfmjBC5v+UGZ5uZ4po/LG0vE0SjTCDTV2tPlJuoTsRxbVQQzEgGJ3fPck/Oxc3VP 0luomt6gsYYwItze8O59Y5yKfG8TRGV77OjebxgZmZmKLsy7QYjd8Q+B4SwNWZvqLynW3f sfEeW27y9CrC4Yhu+6K3MX3Aok4HmLBPAfQzwdcJipAnD9pGnJ7qfrHHtxoOy6B8nXShIl xaUfecWkuXpSxBQnztT2bVE0/Da7hLmRwv2n1Pvwa4NUb/HQ1nIwnY4iZEIYYmt9ZAyPJV 6hVCN0/MSc8r742mWEnKb6ojSSJaRs98PRYaIl0G8FUDVPLa4GMTNFcusfrBjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771107; a=rsa-sha256; cv=none; b=CJEyK8OofRwhn3a7LReR+dR1Wj+4eCJoYStLkFUNoCU+EY2y6Xd/kp5/AwHBR5d4EjrMKQ JX1un3bfxTWRFJ/aE/IiAg3zUqGjrGyhlmjEC/OJMlgzud67h3J80CgmNbgXiU6hKvJvDh enjfBLGrSmoYELYi3pDPb+P7BgfjhIQzfoZaoqwH/x74O4RuCM4lQi0DowfIwtdFsqFIQU qUb7c71eAYWC43NqfMvKRoo4P8rD4HHEO6i6bxwRarzIcqQzXrne3tQIcBdn2tBCWjOSyS vxAPSMpy5T+KuDrk3nAYZlZ1gJ56xq6v1n7zyVLbHRDheiUe1mMO5GOW6BZFkw== 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 4P2w0g28GQzlX4; Thu, 26 Jan 2023 22:11:47 +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 30QMBlb8021790; Thu, 26 Jan 2023 22:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBlUx021789; Thu, 26 Jan 2023 22:11:47 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:47 GMT Message-Id: <202301262211.30QMBlUx021789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: eb15017f7d2e - stable/13 - vmm: Use VLAPIC_CTR* in more places. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb15017f7d2eaf24d5af48e8305649e9b79585ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb15017f7d2eaf24d5af48e8305649e9b79585ed commit eb15017f7d2eaf24d5af48e8305649e9b79585ed Author: John Baldwin AuthorDate: 2022-11-18 18:00:59 +0000 Commit: John Baldwin CommitDate: 2023-01-26 21:45:34 +0000 vmm: Use VLAPIC_CTR* in more places. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37155 (cherry picked from commit d030f941e63f5b20efa14833912aae29ff737fcf) --- sys/amd64/vmm/intel/vmx.c | 25 ++++++++++++------------- sys/amd64/vmm/io/vlapic.c | 9 ++++----- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index ae9864343705..47e3be32c1b0 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -3703,15 +3703,15 @@ struct vlapic_vtx { #define VPR_PRIO_BIT(vpr) (1 << ((vpr) >> 4)) -#define VMX_CTR_PIR(vm, vcpuid, pir_desc, notify, vector, level, msg) \ +#define VMX_CTR_PIR(vlapic, pir_desc, notify, vector, level, msg) \ do { \ - VCPU_CTR2(vm, vcpuid, msg " assert %s-triggered vector %d", \ + VLAPIC_CTR2(vlapic, msg " assert %s-triggered vector %d", \ level ? "level" : "edge", vector); \ - VCPU_CTR1(vm, vcpuid, msg " pir0 0x%016lx", pir_desc->pir[0]); \ - VCPU_CTR1(vm, vcpuid, msg " pir1 0x%016lx", pir_desc->pir[1]); \ - VCPU_CTR1(vm, vcpuid, msg " pir2 0x%016lx", pir_desc->pir[2]); \ - VCPU_CTR1(vm, vcpuid, msg " pir3 0x%016lx", pir_desc->pir[3]); \ - VCPU_CTR1(vm, vcpuid, msg " notify: %s", notify ? "yes" : "no");\ + VLAPIC_CTR1(vlapic, msg " pir0 0x%016lx", pir_desc->pir[0]); \ + VLAPIC_CTR1(vlapic, msg " pir1 0x%016lx", pir_desc->pir[1]); \ + VLAPIC_CTR1(vlapic, msg " pir2 0x%016lx", pir_desc->pir[2]); \ + VLAPIC_CTR1(vlapic, msg " pir3 0x%016lx", pir_desc->pir[3]); \ + VLAPIC_CTR1(vlapic, msg " notify: %s", notify ? "yes" : "no"); \ } while (0) /* @@ -3769,8 +3769,8 @@ vmx_set_intr_ready(struct vlapic *vlapic, int vector, bool level) } } - VMX_CTR_PIR(vlapic->vm, vlapic->vcpuid, pir_desc, notify, vector, - level, "vmx_set_intr_ready"); + VMX_CTR_PIR(vlapic, pir_desc, notify, vector, level, + "vmx_set_intr_ready"); return (notify); } @@ -3830,8 +3830,7 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr) if (ppr == 0) return (1); - VCPU_CTR1(vlapic->vm, vlapic->vcpuid, "HLT with non-zero PPR %d", - lapic->ppr); + VLAPIC_CTR1(vlapic, "HLT with non-zero PPR %d", lapic->ppr); vpr = 0; for (i = 3; i >= 0; i--) { @@ -3985,7 +3984,7 @@ vmx_inject_pir(struct vlapic *vlapic) vlapic_vtx = (struct vlapic_vtx *)vlapic; pir_desc = vlapic_vtx->pir_desc; if (atomic_cmpset_long(&pir_desc->pending, 1, 0) == 0) { - VCPU_CTR0(vlapic->vm, vlapic->vcpuid, "vmx_inject_pir: " + VLAPIC_CTR0(vlapic, "vmx_inject_pir: " "no posted interrupt pending"); return; } @@ -4055,7 +4054,7 @@ vmx_inject_pir(struct vlapic *vlapic) intr_status_new = (intr_status_old & 0xFF00) | rvi; if (intr_status_new > intr_status_old) { vmcs_write(VMCS_GUEST_INTR_STATUS, intr_status_new); - VCPU_CTR2(vlapic->vm, vlapic->vcpuid, "vmx_inject_pir: " + VLAPIC_CTR2(vlapic, "vmx_inject_pir: " "guest_intr_status changed from 0x%04x to 0x%04x", intr_status_old, intr_status_new); } diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 76e3cd14a8f5..b3711685b70c 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -588,8 +588,7 @@ vlapic_process_eoi(struct vlapic *vlapic) } isrptr[idx] &= ~(1 << bitpos); vector = i * 32 + bitpos; - VCPU_CTR1(vlapic->vm, vlapic->vcpuid, "EOI vector %d", - vector); + VLAPIC_CTR1(vlapic, "EOI vector %d", vector); VLAPIC_CTR_ISR(vlapic, "vlapic_process_eoi"); vlapic->isrvec_stk_top--; vlapic_update_ppr(vlapic); @@ -600,7 +599,7 @@ vlapic_process_eoi(struct vlapic *vlapic) return; } } - VCPU_CTR0(vlapic->vm, vlapic->vcpuid, "Gratuitous EOI"); + VLAPIC_CTR0(vlapic, "Gratuitous EOI"); vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_GRATUITOUS_EOI, 1); } @@ -915,8 +914,8 @@ vlapic_set_tpr(struct vlapic *vlapic, uint8_t val) struct LAPIC *lapic = vlapic->apic_page; if (lapic->tpr != val) { - VCPU_CTR2(vlapic->vm, vlapic->vcpuid, "vlapic TPR changed " - "from %#x to %#x", lapic->tpr, val); + VLAPIC_CTR2(vlapic, "vlapic TPR changed from %#x to %#x", + lapic->tpr, val); lapic->tpr = val; vlapic_update_ppr(vlapic); }