From nobody Mon Apr 08 20:26:05 2024 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 4VD0wZ0JFmz5Hj00; Mon, 8 Apr 2024 20:26:06 +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 4VD0wY4qcmz3yvD; Mon, 8 Apr 2024 20:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712607965; 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=c0e5uPwC4IpC1IgOOy+sX0GXZZlrq95jiWhX4gcYGdY=; b=VGC9p1nReD3B/4Eerr3fnlEEvkOJdrmDpUs0U1koWpAa6IiOYr3I7t0SWtCchga4IwO2D1 EAHKDj9p238W3XtsSSVBCxjsosSrl32O5UTcVx7Se7y0N9yQniI33YbTcfhNbQGZHG59mq 3kDw1F+P/j3kTFganM31uGfKs3gd7psINcJDAeSJ21HtSsp9UgW5lJUjvtE++njHEfHX4D eNpuYL+p5/1Zk1tYPJZt6aFTK24fHwUpG2ncUo80khuktHa4uokYoucAWIP4C6OgLAtx8C whXoBLNM7MkFEEuC9CSiERaKqh7EvdJXzTKgQ/aBu+XlnNWYuA0CslP7TFw2cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712607965; a=rsa-sha256; cv=none; b=E/WkxqtCAA8lDMOK9cdLcJMEi6n8LULPx+0maFUqurOLFdiqLUbeXB5uCdQUs2xu1rdFuP ImltY92kaXP+7QJiBC74WwCil9ZSHCeIhuZu+TNhrb1PgXYOu/qCitUp2zoJIRnK5NKs2D eITkMMko/XNvG8qBxbKtQ2KZpIieDWzQ4jI9plzuoy+ExGa1BMzKhIQSQqOgpA3zUEyv8d 9H2iTgLOXf5PQncfJYfuar3OZGflzpmEH/d4+LL6hVcslkfZha39RCa9rXCB0dvDYa1fI+ 2/cj+457vlhitqPRSAicpS5YB/CIewVaiJJ1gn2A4uU0GxKAs5Z7VuD1NwEV3Q== 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=1712607965; 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=c0e5uPwC4IpC1IgOOy+sX0GXZZlrq95jiWhX4gcYGdY=; b=A2vfe0GHLXoizj9uj1w2kd/mx/AXqJZI6WAJWD8D+B+6KzrqUi9mW1Kz8EM+i+mSPTtbBc 68TFXZT19l0HBxRJGCCK3EfkjrRA7wR/8kcJ3FbzbhL4aMfmZ8xIMu7Pge4d8A9uXZzxoz GD2j8Q+aj1scQLfWZRo2nkU8D96bMpZ4WqgRLp+3Ap0MLjp75zTLRcH0u/KME2057KG1e8 7xOXSXKc4ToBOondNSIULlHIP3z0T4RB1rMYR7qVYu07OfEdRLI9k+DlaH4pzTFla2pex3 8HNMW5Jz5vl8maKaPLvtpwS9hCb3N1sMlsccscTwxC4NgXx5LKU6nhALM8dnfw== 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 4VD0wY4Q8kzQRy; Mon, 8 Apr 2024 20:26:05 +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 438KQ5rx040627; Mon, 8 Apr 2024 20:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438KQ5wF040624; Mon, 8 Apr 2024 20:26:05 GMT (envelope-from git) Date: Mon, 8 Apr 2024 20:26:05 GMT Message-Id: <202404082026.438KQ5wF040624@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: 092dd9545f65 - stable/13 - ddp: Clear active DDP buffer members to NULL to pacify an assertion 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 092dd9545f65b18967390e269107d85fd309d7be Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=092dd9545f65b18967390e269107d85fd309d7be commit 092dd9545f65b18967390e269107d85fd309d7be Author: John Baldwin AuthorDate: 2024-03-20 22:28:43 +0000 Commit: John Baldwin CommitDate: 2024-04-08 18:06:58 +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 (cherry picked from commit 25429e274371eba9a90ea27cbf73e88329916e0d) --- 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 ff63b25c4db0..961e069c1f83 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 + } } void