From nobody Tue Jul 19 13:48:16 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 4LnKsr6Nv5z4XLtS; Tue, 19 Jul 2022 13:48:16 +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 4LnKsr5pyGz3VXT; Tue, 19 Jul 2022 13:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658238496; 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=JbCyauAteWSOF6XcY+pNs2UhzOmRLr/GFRyF41QhQPA=; b=GwyU8uswkWVIcfSDb2M+H5dBJQeimkYfDjmkCEN6xewNC7fRT0LCCssKCDtmHqmO+Sr0Gt ksriWM45HqAEJ2411FCSct+yxR0PxNazrbXbqPhaRmM2zjrldZ50DfoTftm/Abi8xYT69n AV2hKFG3TCQkTNJ66IYprNXVRViEu6lHDn8hsh0ePbpohjl7q3OOf+VQQ17h5fALrSui+3 +IgqhtCcHE0D+1RWV59g+CgcqzP38pn4MrPHQTtf3ENJsDut+tfnpbiW6VyJIUKZunR6Xg ogxl+83SfS0V2d+2SVe4eGh29gBkfIDbieryq5ugMzdnNQMo+sNWMBXpHLM9sg== 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 4LnKsr4xDVzLY5; Tue, 19 Jul 2022 13:48:16 +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 26JDmGvc024573; Tue, 19 Jul 2022 13:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JDmGIq024572; Tue, 19 Jul 2022 13:48:16 GMT (envelope-from git) Date: Tue, 19 Jul 2022 13:48:16 GMT Message-Id: <202207191348.26JDmGIq024572@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: 0a356f1eb989 - stable/13 - vm_object: Assert that overcommit charge is released in the object dtor 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: 0a356f1eb9890c691364bdfed942f7b1bf758ab6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658238496; 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=JbCyauAteWSOF6XcY+pNs2UhzOmRLr/GFRyF41QhQPA=; b=ImAbeLAUosBddvCxCVYBPLwzoOOZlv9K6mym36PmoN3EKcDN8R78m6Fi4jeJmZT2jxeCGz cOX5p7gGkvAPKaIv6kwo2NaFuOvkIwlyrrYSGam1QmwC8p6ByY0TzLxwt93g1Jhlz3qQZZ ukEsw1c91RiGEhgT12b/vreGWIg1BX2nH3IYRLNq/5KdGdDrAj1Vv4eLEMfGb+jSzqT8pW qzxg+6fOrZB1QEqOgmrWkLeZacCUbLOCMzPjr1TFXGCGj+J57nML234V0tQTBCfPDIWDPj whtBT2r6LL6YZcbHp4kVx03u3rEIRuV6alFAJnsenKKhFanG6fhmJF+Jplro9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658238496; a=rsa-sha256; cv=none; b=tUiJtcNeimTtfcRtce5ylZsVDiDy5mp9daL4gZcgSrH9EQEswMoEzJBAL99+0byGi5SH7T Wss8/zFO+eEEveXbCo/R0w4qa786RneW3PDFU+fcKsv8S9tk93ePsUxXg6DgUxxGKEHNVf QV1xa3G20y7jVjg4Iy5YeUC5EbGC7sqdJRqPFZQ2Kpr++Al29xc0PT5NJie5VL6MGI65O7 FZZpMdah5iXCWfM5HAnCGdylqEuivsGNpeVIHoX/U3A4PcIeLz2dsibGukJeNl0MX4ii7t ZGBNbJ86UXb/YMw2Al/D5gH5FJ+cXm1X85ceGThE7uUXJB3vGkZgQwByL2pRjg== 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=0a356f1eb9890c691364bdfed942f7b1bf758ab6 commit 0a356f1eb9890c691364bdfed942f7b1bf758ab6 Author: Mark Johnston AuthorDate: 2022-07-12 12:53:05 +0000 Commit: Mark Johnston CommitDate: 2022-07-19 13:36:32 +0000 vm_object: Assert that overcommit charge is released in the object dtor Reviewed by: alc, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit e1979b45b63725972d394562f95d89f8cc9a0bb4) --- sys/vm/vm_object.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index efd646cf52e0..4272a734b233 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -204,6 +204,9 @@ vm_object_zdtor(void *mem, int size, void *arg) KASSERT(object->type == OBJT_DEAD, ("object %p has non-dead type %d", object, object->type)); + KASSERT(object->charge == 0 && object->cred == NULL, + ("object %p has non-zero charge %ju (%p)", + object, (uintmax_t)object->charge, object->cred)); } #endif