From nobody Mon Apr 08 19:04:46 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 4VCz6l1ZnYz5HYmb; Mon, 8 Apr 2024 19:04:47 +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 4VCz6k6v8Bz4h8N; Mon, 8 Apr 2024 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603087; 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=yndoYaoLE3h2WHBtiBRqGffwFPZgou6yIT5xl5UA0OE=; b=Oh+Lu3nLIsqRwKQTK7o0eYvcUPrMoCWmE813tlNcP1Xq+sj6aBC3fA2YQqqoi8Eh2R6YXe atId6s7YqFWYktIPSlUHAv/PXK4MxLcA6lBn77KaL13AU8myg/wqMEGpMqCOVxGGOGaNGH Chpa2cStmxNQx63wN2aYRxPwjLj2RlLyUNaKOmJofr8Mp2OWHp7hOsnxEoC4KirR9eRpzL HbRRywtZK/3dzjpwomZTCsEJo2BoXwEV5Yx1Ubo0ecByEyOnIA+aLW3VrZDTb8hr1qmD+z /EnaygRe6nInkPhVExcdwYmzenGAsaZSFMJJ1tbLYbZW0pHsxSV8jwAxJjSnjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603087; a=rsa-sha256; cv=none; b=mY9864avHCQSYLhedKKg6gZ27C6s5rszxawlzy53K9eEPSNTvw7+lMj0z+MphxTQnsKCod Z0m/QeEQJzYwniZMJ6+ivzty+4Q/j4qo7NRdvUjpaQ4YEEmPXvws37rtxPOWlVwNBoQw1Y 03XvNhis+5lTzE7pSROten1Q7lvudQmultdBa3cDCo4n1s5rHQgnvJg444X/mNXGwhdc3S VZZ7rbMx07O+xBuGkao5zPibc66pi6wgBV70lH6Lbt+Srp/GDF1ODeyP1hGFAU76olx7tH ipwV/0mIuVKevRKVNPfWFOt4EQCXR8loagy/79jel+FUF2k83YOjMB1rbQNIKQ== 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=1712603087; 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=yndoYaoLE3h2WHBtiBRqGffwFPZgou6yIT5xl5UA0OE=; b=UO1lJr82lj/1HdnCZrrZCBqXs568Hx4kRNGf+I+Hz/YkQ9Awwo2StJX0AlToYpickCtGZv TXmeZ2FdPgUCfPFgOORPiSTJRVqI5LtpfwMpNctDmXCKblcfOe5YpTeT/XX4AavyK4Y2Jk 7KJXgkfNP1BYSmeIP29rX/lPKkmcWML1emBJ53NMNzzsigWSVQxjsmRbhmZWneUcYbRX/d oS0AGqy0ArY2nNcFkSyF4u78Pi56lJvgxXhO0/zOv/1D1RfSE4wNxkMJM9ZP6XXR6ajdnw fbaJ4x1Xhk7eYw+cTfqJXGbLUK+ZTT92u6xyR9TwtKRPo0ex24QMbyFJro3zbw== 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 4VCz6k6TySzMxB; Mon, 8 Apr 2024 19:04:46 +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 438J4khO095122; Mon, 8 Apr 2024 19:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4kZY095119; Mon, 8 Apr 2024 19:04:46 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:46 GMT Message-Id: <202404081904.438J4kZY095119@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: d4ad8432aa57 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: d4ad8432aa5791e3b1c352c7f1758d416b2405c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ad8432aa5791e3b1c352c7f1758d416b2405c6 commit d4ad8432aa5791e3b1c352c7f1758d416b2405c6 Author: John Baldwin AuthorDate: 2024-03-20 22:28:43 +0000 Commit: John Baldwin CommitDate: 2024-04-08 18:06:53 +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 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