From nobody Fri Jun 24 14:41:12 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 0E4BD877DD5; Fri, 24 Jun 2022 14:41:13 +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 4LV0DS5xMxz4pdN; Fri, 24 Jun 2022 14:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656081672; 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=iCmQwtgV774NsGggA4lWU7t3Lck+URzvDXxeg2ceLO8=; b=f8p+O8OL4itl27bjqo9rtInRgOTkMOYjhvtPqMlGDHPPoOcbMAXd2AXMz1sH/nuVRYiIZK 0aglXno6RGiZl1g6RP9fJOZdSQEEbV1kGpsvOnI1KDg4G5x6a9ohNvCPMPt89fnzaEyBQT 5samC3xhyI+DeiLQqVkXB+rcOXuhv4nCg36YwLFn4oP4eink6pz6KuMf/XR8eOt22GhhZC /Q9iRPjVF5Rv8nqujLN6YiidvX76fapG+apgszQNUX4LrnRsTu0aRRs0bhxW1/GXGQrAhP cyGgAiEVV8TXLOqiYAP9r4pQ2KqTbebU40U3FjeGGMQQABccWYcEym4folQz/Q== 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 A0FF111C2A; Fri, 24 Jun 2022 14:41:12 +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 25OEfCDk085036; Fri, 24 Jun 2022 14:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OEfCYB085035; Fri, 24 Jun 2022 14:41:12 GMT (envelope-from git) Date: Fri, 24 Jun 2022 14:41:12 GMT Message-Id: <202206241441.25OEfCYB085035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bb5248944430 - stable/13 - vmm: move bumping VMEXIT_USERSPACE stat to the right place 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb5248944430a092d338ff4847adf83640effd48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656081672; 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=iCmQwtgV774NsGggA4lWU7t3Lck+URzvDXxeg2ceLO8=; b=bWRIAyFAULCFNv6HAXLfhrU1rNZcIP2uEAtjGYHpW5YCOSOoPXKTbQfgpEn11Qxl7z6fH7 DbYQDtOj1Di9YDcpXp8aRz0FhRJ23JUWSnDmdwdBVUaVhcZ+9zAEi6onR+dCxwEJqlLqAV PbtqTiA2tbzm6VsC3KCcxN1v9Kkd3AVGRti/wuBy71fDPNVGPn0dc2aHfJ47F6fMI8ZFc2 c1xRb0eL+fGHwRIp5HIiPfvAL2HaKtVysYpn8TWyhz2z1Oagp5SvOYMLa8YV/mPnjgXVd4 1nj4xb6auwo9j4yoCNiIt4plXJi07pQb7rNOXuLEPw2br68kInHU4Zl4LgMOsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656081672; a=rsa-sha256; cv=none; b=ymds+rCFH/ADCjmL2nG5CM6NE1EISrqGed3hwUATdmZIU+UDGBp8oA+og7ZY9p52CA2i3b /9np08QfxZCGLKYcdWGr0+Lvld4aJfy6uczlOXvXcSTeZ77mC7HcUptnipxe7ZGscVV9S9 uAcxLX3WOP9R+2EnQwTvrYL7y1AcoTE34SFkV7i0uOGwyEtJBNI2+JIqHrSRAPD/jyjO+9 IAh1/CwAd0cOOXjJSzVQau6v0w8NLJdfd+7sUyKKJWIa4pKdVVrdbgcSetLIezyiulyQGg x6njwWfotreU58tcgMpissJhM7Fyd3e9+WhW1dioKT2EZ+lOatkOQ6f5Qa4pJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5248944430a092d338ff4847adf83640effd48 commit bb5248944430a092d338ff4847adf83640effd48 Author: Vitaliy Gusev AuthorDate: 2022-06-09 12:57:25 +0000 Commit: Mark Johnston CommitDate: 2022-06-24 14:40:48 +0000 vmm: move bumping VMEXIT_USERSPACE stat to the right place Statistic for "number of vm exits handled in userspace" should be increased in vm_run() instead of vmx_run() because in some cases vm_run() doesn't exit to userspace and keeps entering the guest. Also svm_run's implementation even wrongly misses that stat. Reviewed by: markj (cherry picked from commit e7d34aeda4e6fba68343dfcaf5e4aeed83a0ec87) --- sys/amd64/vmm/intel/vmx.c | 3 --- sys/amd64/vmm/vmm.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 62d9c64847d6..d4e0d2c65650 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -3184,9 +3184,6 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pmap, handled, vmexit->exitcode); } - if (!handled) - vmm_stat_incr(vm, vcpu, VMEXIT_USERSPACE, 1); - VCPU_CTR1(vm, vcpu, "returning from vmx_run: exitcode %d", vmexit->exitcode); diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index f6ed99a6efbf..587a5bfdfa65 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1821,6 +1821,7 @@ restart: if (error == 0 && retu == false) goto restart; + vmm_stat_incr(vm, vcpuid, VMEXIT_USERSPACE, 1); VCPU_CTR2(vm, vcpuid, "retu %d/%d", error, vme->exitcode); /* copy the exit information */