From nobody Mon Mar 25 22:32:20 2024 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 4V3SNh5H8Nz5FRqw; Mon, 25 Mar 2024 22:32:20 +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 4V3SNh3z44z4D3l; Mon, 25 Mar 2024 22:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711405940; 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=jh2vnTJS43rcgGmhMT582GCYALCv8jVUNTKz8yiwMVA=; b=W3KcCd80SJhdYrojdsIJFe/tKt+6N3xL6sybtw9SA+HYfAHuV6CWtXqG0kGIquUUm3zrO6 ti/c3m2WfL2iwKl6SW8PMpJrQaCNum3+orZcGnD2IIDNmdHQZuphDe+wDZ5VZ98PvUCqPl CrAE7q3bIo78glbTtPzpsKv5YCkaFLu3tGdBNdux4rCv5FjJHiU1LHm8y+qIX8fFKk5Rpe Sg/dwBc0WOtQCLHu0lb9Cis8nB4t4CyYjgvW359UfxeXYunbXVQz7QpmnqPqcrb96W6fzw 7WAJB/HtiBRLBj2PgfFid4y6N/0uiuDjgXTG9IX7krqQc7bPbzHPwRoPUmDIZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711405940; a=rsa-sha256; cv=none; b=g/FHO1TqS6u01erahnjRe54cXrVCdxFS7eaexNyc/QcrMTlNdRByYY/Y+umxk/QYE5A/8Q GfcTdD9tPyOq7DdutpTEAdIPN5jix5kqSkb7dRMrKCAfHr9m5PKpBxA1NN3MbOHmJGjszk VhKzjXmHQskvWQL1IB/db7QaP/mvqMWTWfze8Tf5bppXOqnuVL7ef73thfeLeOjSUY/KiW 4+kbOgvxcp1bDH9W51DHdNxFzabBFtV/oAEd3wTLEuBuZcrLMGCYjhXeqYJTP3sZvjZai3 iZsLkFpSYfjq0kT6V6RxAZu7f22xlI8hBIWEvAc9YE+0aj+jcSO+1bjj5FNfYQ== 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=1711405940; 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=jh2vnTJS43rcgGmhMT582GCYALCv8jVUNTKz8yiwMVA=; b=fTdJoENhYACPDi7gIGBQNO8/2RTNInqjLNw/mB2cF9XbYC9QBarI2plkKbTnEX+iUnKK4n 1XMEqRfgpvjBDylRH9GC0WzfLki/czA77FCJSJmI1TZeZCetBYXqLzkHkyEy60W8cFV5zV X/Gby85bL3VI0ZhwVVY3Ej1ndlUq5BjSzXMTsSO5fvDhbMbbnpY/0CCLUzXHEeoR999LyO AlH/VKvGCpLVVQ3gquc0bJu7G0NHArqfTcrexAP2GCDM3Au5M0RSR9klcdFM6cXbgJiXt1 2C3Pm9tUPXyVHo3stgIelJhf+8JkETIxgRSQaXe9CogRzM+P7ay2kDDKys8k+w== 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 4V3SNh2ktmzb6F; Mon, 25 Mar 2024 22:32:20 +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 42PMWKUw057581; Mon, 25 Mar 2024 22:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42PMWKOQ057578; Mon, 25 Mar 2024 22:32:20 GMT (envelope-from git) Date: Mon, 25 Mar 2024 22:32:20 GMT Message-Id: <202403252232.42PMWKOQ057578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 495bdd698e42 - stable/14 - linuxkpi: remove invalid KASSERT from hash_add_rcu 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 495bdd698e426a5f19ed13a73062c2158618f7b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=495bdd698e426a5f19ed13a73062c2158618f7b7 commit 495bdd698e426a5f19ed13a73062c2158618f7b7 Author: Ed Maste AuthorDate: 2024-01-29 14:25:40 +0000 Commit: Ed Maste CommitDate: 2024-03-25 22:31:44 +0000 linuxkpi: remove invalid KASSERT from hash_add_rcu hash_add_rcu asserted that the node's prev pointer was NULL in an attempt to detect addition of a node already on a list, but the caller is not required to provide a zeroed node. Reported in https://github.com/freebsd/drm-kmod/issues/282 Reviewed by: bz, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43645 (cherry picked from commit 7e77089dccd702eb767350a8bd3d20102c4fb591) --- sys/compat/linuxkpi/common/include/linux/hashtable.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/hashtable.h b/sys/compat/linuxkpi/common/include/linux/hashtable.h index 5703d6282ad7..55755c354959 100644 --- a/sys/compat/linuxkpi/common/include/linux/hashtable.h +++ b/sys/compat/linuxkpi/common/include/linux/hashtable.h @@ -92,8 +92,6 @@ __hash_node_type_assert(struct hlist_node *node) #define hash_add_rcu(ht, node, key) do { \ struct lkpi_hash_head *__head = &(ht)[hash_min(key, HASH_BITS(ht))]; \ __hash_node_type_assert(node); \ - KASSERT(((struct lkpi_hash_entry *)(node))->entry.cle_prev == NULL, \ - ("node is already on list or was not zeroed")); \ CK_LIST_INSERT_HEAD(&__head->head, \ (struct lkpi_hash_entry *)(node), entry); \ } while (0)