From nobody Wed Oct 29 12:50:26 2025 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 4cxRtC18Rhz6DfcQ; Wed, 29 Oct 2025 12:50:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxRtB6GYGz4J17; Wed, 29 Oct 2025 12:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742226; 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=oRQ1+6Yg6E5F2OKGT0isJ4/jPLWvdUkgaMbddz2/iT4=; b=gZnL1Ce2j2gdil3HPmutvVB3F5MeJGbvtcxXHayqWVP0PIkoH5C9ng1qkfmyzhFhu0A/Y0 jLRC/XQpJKU6Nvt1QPTbfi9nybr4ECmVsXZVbNjO6CEpXn9xSjfTTEN0eMMTKdCNr0YHBs EeEVTRlNCfI3DaCS8zoBhDAvUYOJ9oKK//Zq+oPD6+7mv0UVZsELaqNbABvLVqfPrlEIDs KOp1lFVZSiQYxCIUCFB2wKOr9LWBofW/97JgKNmvYBQLidxq3SYl5NYdtU8p0Mlb3K+J4X KDfmB0VKbhMCN/OBhfS9lDP5eTgSonW2RsGlqN3gnaE97PoFSRD0bUrRLX+e0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742226; 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=oRQ1+6Yg6E5F2OKGT0isJ4/jPLWvdUkgaMbddz2/iT4=; b=eDC1HXuILjQ1yryi52AZTP8e2ZIPA1cRB35c/Jyc0l25q5mhMmSMskcoJmQR3xPx1cgrnO O8bYOx7fSibfb7eFv9gehZbtI076aFbluByVH/j0gCaAy/8sQTtDG8Do+m2MrCFDpp1kIy Bpyntum3CDFzFokemIwEqvDb5r0p6BF0tQr4SturYiZ+mYIuHDkQTzdwStLby7XeKBC7Zc RNyFamVwrqVk8wlPzz3tQI4lpBbQN4BUdzgPqwo7fSQ26QzzbSIFKB8dlUixqGQkZKjpm3 hyXiM56atz+cLGjJYl8aopX4Zpr6gBsEUbxMrng86S9/exdwW/N7AZpQ/Rv7Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761742226; a=rsa-sha256; cv=none; b=FrUsX9zKc7u0X+aZ5MqnV1ll35oXa4dAQCThd3ptI90Ke/QTrOBy+nBWgBjmjQuAk7VBUz KVja4T4I3Dh5tw8Y0sWmu+KpNA2uRrvqff4kbphWOFnYbQX9eYUCffYVz9AGBCcEBQCjXv 2hRPeTHQTDqQZQTynz/Bw0mINFp6CYOsdT574Trq5gXyKs+xlNlsPWPClmA7nqm526FtKU a3gjc3Lbgk8/4UHfCXBbrQB8ba958A2FQ9RjZFtso88GqvTH6hgC5HtMiqiOpEn2wDZIU1 yE5eh2lYtj9iKa3m6uFgTg9MADX1GcaSBbYv+bbJ0302dHkg8rV6y6DPyghMZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxRtB5Z7Rzd9J; Wed, 29 Oct 2025 12:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59TCoQVb021110; Wed, 29 Oct 2025 12:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TCoQYA021108; Wed, 29 Oct 2025 12:50:26 GMT (envelope-from git) Date: Wed, 29 Oct 2025 12:50:26 GMT Message-Id: <202510291250.59TCoQYA021108@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: a0b365dad4de - stable/15 - vmm: Unify implementations of vcpu_cleanup() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: a0b365dad4de3a65972bcb810c34dc79eaff0653 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a0b365dad4de3a65972bcb810c34dc79eaff0653 commit a0b365dad4de3a65972bcb810c34dc79eaff0653 Author: Mark Johnston AuthorDate: 2025-10-10 13:16:45 +0000 Commit: Mark Johnston CommitDate: 2025-10-29 12:46:49 +0000 vmm: Unify implementations of vcpu_cleanup() Different vmm implementations were freeing the per-vCPU structure in different places. Make the implementations consistent. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53010 (cherry picked from commit 756fa1c09673ba555f603574af5943f455daff90) --- sys/arm64/vmm/vmm.c | 3 +-- sys/riscv/vmm/vmm.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index a551a2807183..5a0b627b2fe2 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -274,6 +274,7 @@ vcpu_cleanup(struct vcpu *vcpu, bool destroy) vmm_stat_free(vcpu->stats); fpu_save_area_free(vcpu->guestfpu); vcpu_lock_destroy(vcpu); + free(vcpu, M_VMM); } } @@ -585,8 +586,6 @@ vm_cleanup(struct vm *vm, bool destroy) vmmops_vmspace_free(vm->vmspace); vm->vmspace = NULL; - for (i = 0; i < vm->maxcpus; i++) - free(vm->vcpu[i], M_VMM); free(vm->vcpu, M_VMM); sx_destroy(&vm->vcpus_init_lock); } diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index ec4514f70fa6..b1e5c0e52ac8 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -174,6 +174,7 @@ vcpu_cleanup(struct vcpu *vcpu, bool destroy) vmm_stat_free(vcpu->stats); fpu_save_area_free(vcpu->guestfpu); vcpu_lock_destroy(vcpu); + free(vcpu, M_VMM); } } @@ -453,8 +454,6 @@ vm_cleanup(struct vm *vm, bool destroy) vmmops_vmspace_free(vm->vmspace); vm->vmspace = NULL; - for (i = 0; i < vm->maxcpus; i++) - free(vm->vcpu[i], M_VMM); free(vm->vcpu, M_VMM); sx_destroy(&vm->vcpus_init_lock); }