From nobody Wed Mar 20 22:34:36 2024 X-Original-To: dev-commits-src-main@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 4V0Ngc3GCVz5F6cW; Wed, 20 Mar 2024 22:34:36 +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 4V0Ngc2kdMz4f3X; Wed, 20 Mar 2024 22:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974076; 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=nNbLGbGIKWOEXqoS6VZq4kGoiPB5TbhlLe91zXdgQ/E=; b=stdu0kHNahfsJQaqp17vuCpFMKc1ShMXUZEYcrWWCRosClmSgzYNy7oYJiuiM5+fn/Vt0f NIe6g2RVIWfEjc/fKu9HTTWVHg4Ym3CMNjxQdQjnDjRUpK2KBOv95l6/VS0slS4Csku6cF gWvLO0ux1e1NJ5RVoPo4tECsGpKnyNusq77WZ98/sVYwB1j7SPTn49vVeN5ERN9srujVfQ zcy44z1AslVucuzoHoIABATKBWASUBR+j08+tfDlWZiFjYyTGpZPiAqjElCsmma2yXY4bx gBdOBXoAUMgtzma2c2HZlQduv850wWmmkybUels1QW0xfcdu28AdhLxlW5hndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974076; a=rsa-sha256; cv=none; b=JHxp96O9AxySAQUdoEXGRZw2BXsAYgPerGcZhrFrrKNv/luGydJjy8sV0U22NKHl/k2upF BLYemY/f++fSigeyDHuY6zetfoo9nDbVUtkrJZHh/3973naeEsy28NDJ9slUonuB1HgwkO YiXuGPQKT4ly7H3+4q5jMxx/9sSfynvmP6SV7XM1uL/H//myjbm2OVKoPEd1M0TmF6XK+Q Isit0ixCPEJNY1alJEIx7YRTM9QYSnNTiKGh1p5ZrlDKkP/jHg1wsd0HE4CWW5ZgjudW1V keLBexYLB5Njq3IT63PWprrwsTOsDD9haMoAag0ELL7h5KMafUn7BkDBnVhKZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974076; 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=nNbLGbGIKWOEXqoS6VZq4kGoiPB5TbhlLe91zXdgQ/E=; b=Rw4yb799ot711xylZ8zV7Sph+vsCaOp3F/ADyKOqG+DUHyYHizjJNW6gtWtJauCBZuuBPw NsWcJxLYyaHgo01ro3DOe4ps+9xkFo0nn+DLO4TBAeUTWY2emiGiZL8UarBk58lmLnY+dh BSyB1d46PIVEylIMZ7Ssq4dBRS20lFoMt2NxXPEJOO3F1Bj3LPmvCQJ7ZctqLr1HZAJcnO 6MGcyEHIQHwmYUkU0dQGQE/hLHOZHHVa4gJFuckyedLO4wpqEZ20E6nNYx8p7twWfa3RMS Lgnuays7ZrVyYdJd5wFDRqKqe5pxO48lI2nX+MdPgPBCRkMPhCtut6r01dH9jA== 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 4V0Ngc2KXvz17wK; Wed, 20 Mar 2024 22:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42KMYaGq047798; Wed, 20 Mar 2024 22:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMYad0047796; Wed, 20 Mar 2024 22:34:36 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:34:36 GMT Message-Id: <202403202234.42KMYad0047796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 25429e274371 - main - ddp: Clear active DDP buffer members to NULL to pacify an assertion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 25429e274371eba9a90ea27cbf73e88329916e0d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=25429e274371eba9a90ea27cbf73e88329916e0d commit 25429e274371eba9a90ea27cbf73e88329916e0d Author: John Baldwin AuthorDate: 2024-03-20 22:28:43 +0000 Commit: John Baldwin CommitDate: 2024-03-20 22:28:43 +0000 ddp: Clear active DDP buffer members to NULL to pacify an assertion Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43999 --- sys/dev/cxgbe/tom/t4_ddp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 89cb7269e218..1cd1ea68826c 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -186,10 +186,17 @@ free_ddp_buffer(struct tom_data *td, struct ddp_buffer *db) */ if (!aio_clear_cancel_function(db->job)) ddp_complete_one(db->job, 0); +#ifdef INVARIANTS + db->job = NULL; +#endif } - if (db->ps) + if (db->ps) { free_pageset(td, db->ps); +#ifdef INVARIANTS + db->ps = NULL; +#endif + } } static void