From nobody Fri Nov 18 18:26: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 4NDQGf0Lbzz4d82f; Fri, 18 Nov 2022 18:26:34 +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 4NDQGd6WmFz4Hy1; Fri, 18 Nov 2022 18:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795994; 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=FfmAhYyEhbEkb9XgV0eQc5G2mTS2yteOjtJVL7wn7rs=; b=yQ/L7+fSc5/hzsqxiSLIUFaTS87jDotvFJl0lr4bwHXRm1YNkIhHlDZYWR/F/eFH52vG8X ro2L/L6gFMPtGg8zQmk+slatrYDJoPSEayL3cGN0ZbTFP8HHKSFNWQZ4JtWBFk7d+9Mja1 4MZGYhc+KFYM00fcRo3rCE5dJypnEjoZv++lue1VpAYi+AvZBKCN2CS6j9jstPC8yuQ1qU Z85ftZ2GwHgOVXF0OKQPJE3hiBJ74+oaGDCU2Nn6HzgShwf+Vov7LlojoAPoFj1iIqnQF6 PRqK7zz2JhDOOzP3YDO3PU4yl2EOgf/jacThPoGlETjbS+i1nmtzHIWRyEz7Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795994; 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=FfmAhYyEhbEkb9XgV0eQc5G2mTS2yteOjtJVL7wn7rs=; b=h6OcOQ1G7eftek5r/BYj+VFgWvToHhvtbwYP1BpSc6j8Q6HwBPfBTxhEeK3Q8pvIr34l2F 2bxmcKaDWziBgIehpNaxeQG7ibPjlAHQgR2s9hyeAIEDS+y3XuL0yStxQ2d3QKqylUJdhs FVSTm6xn+CabnlGN/X+B0Z0lPKdFP/l7xrwh1kkcltCW4Hi/X9OcZHytoYAR3p2jmA5qso ZKjeCq1gNNzDhNXVYJILyP0YghGlad53yo/29qgLh4kckgbR+HHRO9R73TCpLScUH9fWWz 9mo4TSXVwlVj2QjM06RuPdK31itXcEAB7ewjsdjNz0Xp97kmhEkPtqTBHIbk3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668795994; a=rsa-sha256; cv=none; b=klS0AbQyLgf6o7h4PFO932/7FjDA8vUc9nEFU2K/NJOFD3ObbyJtTqbXGvGageFrqnn9kE x57PxnYa3HlXAvOmFK8owC69omvTCnDnJar86LFXuasEwdDR0dpw7mrKtS3QHlzZWk5xMJ d5bLj08BqE4Z0G2Ceep0Yauvm8spYp+3GLohNLvrxq6uauv2WkWRdN513tdcOS6hnSUu/2 5p8h+FABdbFsBWUroRQ4JqEKrw3eUbOa4YEUqbQaES7ZJeyDzE9CXxBePYmh7EazRuej2R V0lajR4zftUFsBFac2l1AwVZNnLIv1cnRxWEevib1KAxDEZf4c2G1h8D2qjW/w== 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 4NDQGd5cfDzG35; Fri, 18 Nov 2022 18:26: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 2AIIQXKN030165; Fri, 18 Nov 2022 18:26:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIQXGK030164; Fri, 18 Nov 2022 18:26:33 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:26:33 GMT Message-Id: <202211181826.2AIIQXGK030164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d030f941e63f - main - vmm: Use VLAPIC_CTR* in more places. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d030f941e63f5b20efa14833912aae29ff737fcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d030f941e63f5b20efa14833912aae29ff737fcf commit d030f941e63f5b20efa14833912aae29ff737fcf Author: John Baldwin AuthorDate: 2022-11-18 18:00:59 +0000 Commit: John Baldwin CommitDate: 2022-11-18 18:25:36 +0000 vmm: Use VLAPIC_CTR* in more places. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37155 --- 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); }