From nobody Thu Jan 26 19:47:40 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 4P2rpP0vd4z3bn57; Thu, 26 Jan 2023 19:47:41 +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 4P2rpP0TGdz3C5s; Thu, 26 Jan 2023 19:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762461; 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=dXanuOx0a3Jl/bVLrytt6ymTXDBkbMam+F+Tj/Os8Ac=; b=x6GVWEHMFBOPgWI9yD2x54mwyhBX5Q39w+9/BY5QQMIHO0fqEq0HJ7CzRD3EaJFkaCmkV7 H2iXhk9WPRRK9GsLvy7VSkPddj00Vz4mbu9Bl16D3F3tjP4cNIglVGFSW2s2n0Y0AD36De /baDWpgbHTnhfY8Et7uMug8KRH5HqNrjhobDm+QjMnDCAdMyZJB2E1ZoMH3cFjk9+zeUDU zj0wck4T2AHpwffIyO/Osre/nPxnB0BId0X7LO5Zgo0Cqn4zmwSLtAtaN5c6phoqLFnDb2 ofsrKbLWrCGCUCS9ERIa2VUHk8zEpaplIekvqFRw0Yb718Q9Zaz2UmIA65jNVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762461; 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=dXanuOx0a3Jl/bVLrytt6ymTXDBkbMam+F+Tj/Os8Ac=; b=eT4eSn7QFXCRxXPI10g04Rl/pwnULvfi/VNjY8MqizV/o99ksdiOIGVuU6X6Poabx+jirU /1rr3Aaw2fJo28GlleztzxuhTxPOKvyHSiwY5WMrZh+mZOQQj/02+DTHl+P5Z3YRLl69v3 PNgAOZjrbcxW4U9nz2nCVFZPeMmvr/t+jML0xk1xiwZY2efpdDfGR8FnUSAb2wA1MxoTEl vdBBXw47JQWx4KSn9MK2dvJz5Kzg7YsB2FJCakP8tDKLvm7A17Wz+u3fl1NObCH03OFOUW fRVqwSzK0UMwiOgbIQ4/BbXz924AYGbxu8pvvIzO7rnnLbeog4jL3OukNs9Xag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762461; a=rsa-sha256; cv=none; b=TuAC/cNoi7YZ9IzZLHc58Pk3I8PG/Mc5cI80z8S7Wf7n9GE8Vmenle4ob7zxeehdOpGyrr DnR6gP58UR3QJjxNzcPZD2Sr0wSD/lLAkMpSq8ZIg2FbXbFOeWhYMdoWQhWqsO44fWeUqp 2nubiY9lJC5Ft6urYlkGJ1Mowro6dxPts/aLSvQXMC9UfFNZPQaCwbCdB5/tQEBtP7V9oS 2LEbLZzAIxzRHkmPMF3hfbMjYjU9Y+8i4uxwIezzrvrK+YtLO6LDTsGp79HsMP2E4kFRR5 gko7ZKvNfuYvsBeVPnR9QE3L7/V1hItTd8yVSM7WkoTTSiFuxdjSofqCPsykOA== 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 4P2rpN6g3Czhkt; Thu, 26 Jan 2023 19:47:40 +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 30QJlePI006934; Thu, 26 Jan 2023 19:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJlelR006933; Thu, 26 Jan 2023 19:47:40 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:47:40 GMT Message-Id: <202301261947.30QJlelR006933@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: fca65e1baa1d - stable/13 - libvmmapi: Add vm_close() 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: fca65e1baa1d05d7e98e0f05193cc94c637944b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fca65e1baa1d05d7e98e0f05193cc94c637944b0 commit fca65e1baa1d05d7e98e0f05193cc94c637944b0 Author: Vitaliy Gusev AuthorDate: 2022-06-30 21:21:57 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:29:22 +0000 libvmmapi: Add vm_close() Currently there is no way to safely free a vm structure without leaking the fd. vm_destroy() closes the fd but also destroys the VM whereas in some cases a VM needs to be opened (vm_open) and then closed (vm_close). Reviewed by: jhb Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D35073 (cherry picked from commit f0880ab791a510391a12f2ab7b01889b6774bca0) --- lib/libvmmapi/vmmapi.c | 9 +++++++++ lib/libvmmapi/vmmapi.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c index 4fc9c4dc69e9..454d7ee21b36 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -142,6 +142,15 @@ err: return (NULL); } +void +vm_close(struct vmctx *vm) +{ + assert(vm != NULL); + + close(vm->fd); + free(vm); +} + void vm_destroy(struct vmctx *vm) { diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h index c8454150f0b1..b26f12f7c60e 100644 --- a/lib/libvmmapi/vmmapi.h +++ b/lib/libvmmapi/vmmapi.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -118,6 +119,7 @@ int vm_munmap_memseg(struct vmctx *ctx, vm_paddr_t gpa, size_t len); int vm_create(const char *name); struct vmctx *vm_open(const char *name); +void vm_close(struct vmctx *ctx); void vm_destroy(struct vmctx *ctx); int vm_limit_rights(struct vmctx *ctx); int vm_parse_memsize(const char *optarg, size_t *memsize);