From nobody Fri Oct 10 13:24:40 2025 X-Original-To: dev-commits-src-all@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 4cjnXS5s7zz6C2J3; Fri, 10 Oct 2025 13:24:40 +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 4cjnXS5Mgcz3FNX; Fri, 10 Oct 2025 13:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760102680; 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=tZichSZuY6+Qg5LcV0i00T7DeYzpL4+rZq1WhAFC2Lk=; b=MYVko5wZjNH69lCpkP3q64yddyy6nd4kfUmfux8gP/soy+X1lXsParPfmi/7enBrsHG3Jx KtdRuurUVul4S+vRvcZgE/KWvZDb0MDNf/sWZR4w0Cuie1ohB3wHkaQrrdiN3Xr6+rcJoZ hcU/vI0xN/ekW/0H5b7bl3n1k86wBDONm0WcOimkfEbrsMtB1ZcUP56kIbi4BEgmy+Yt/q FtZdlyTHZXLoCB2kok6W/hsBXDDxJMRENvJLaDkdlTqu9GRCJCKRLIrExRcUMFGgdsDe/M 6ZvSfKkMVy/LDOeZ7SoFN92N5AbMbr1w+XdTxo2w61+ErJj0my5gE75VaW3SVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760102680; 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=tZichSZuY6+Qg5LcV0i00T7DeYzpL4+rZq1WhAFC2Lk=; b=E78J5uuBZDd6fKMhkqg7iXmWOEm1dmmbRjkpLYs7bGUXtWgNkgXumEnkgsE1D1whJmXGFa Tc/JFyNrOxMyClC9fa4GSgnD4yzVcGASGFCF8uEeBRY9kLWDB5FMs2Obw7QapRYbrNw24X EppX+pcFhb8h2Et35FaO4dCppaR10zz7VxOSWlU03FbbJffLthFzFKqjkeFmx68EYH9Gut zhL+RWwoAEmVg+q54sYOVB0l7kU7lQ0RbmfjbbdfIOWCtU7SBrMMPCPki45cDBh1hJ76kd vv4bZaXRcgdkFlPv+SkW8KFW6sAphvvje/I0qHuk0TwSfwgfCc5gFiszQnEULQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760102680; a=rsa-sha256; cv=none; b=ByAPxIIvR7godwZ+TZNFPncoG/yqkaKqRRNZMxrJsEKAnbr9GVXnr6Nwb553CeGF8AmnTa 2iCDl+IbdmzIE6Y20ZwzGY1TiUvkNrGRx08ch4swAI6DsXVFKSSJqRYTpOV8TPwa2x5K9B LYeUYA5aVTsnuSrbKEW6Gn2wsYs0tykAR2K88eTM1QQ0xWlzFySEQsVC9Q5fXZlPltzeQm 56bA4UNUEla+cbklIPIpYo7gr2G5RQwij5pdl1dSzEDCujyIctHEHxG/P4tBQd7+YrdUkw VFCY3cZSeIgcOMkt/64acsFG9UXf+kuRx+sTJcnF9i7GOkh0sco0WGDTTip/Eg== 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 4cjnXS4hZYz14Mq; Fri, 10 Oct 2025 13:24:40 +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 59ADOeKE073771; Fri, 10 Oct 2025 13:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ADOemo073768; Fri, 10 Oct 2025 13:24:40 GMT (envelope-from git) Date: Fri, 10 Oct 2025 13:24:40 GMT Message-Id: <202510101324.59ADOemo073768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 756fa1c09673 - main - vmm: Unify implementations of vcpu_cleanup() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 756fa1c09673ba555f603574af5943f455daff90 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=756fa1c09673ba555f603574af5943f455daff90 commit 756fa1c09673ba555f603574af5943f455daff90 Author: Mark Johnston AuthorDate: 2025-10-10 13:16:45 +0000 Commit: Mark Johnston CommitDate: 2025-10-10 13:22:40 +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 --- 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); }