From nobody Sun Jan 07 16:58:11 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 4T7Ng76dttz55QZL; Sun, 7 Jan 2024 16:58:11 +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 4T7Ng75X13z4DRx; Sun, 7 Jan 2024 16:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704646691; 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=p7FYUOnSkdrzie3LYLlaGwvYBan5AsnjeqW8RDVDNLo=; b=qYQK8WgtoPFDAN1gLTnfv3x9dbHA+HdrvnP1hzNqEmEzrKanphFEf8/0kHSRI6x4ujq5EP gb76UUD9MM6q7urUFUyL35ycGx4EdnAzCPgDYJELHqeddxDC6p0N68lbK5dfsJGFR9SqqE qW61gI4Mkx9biPCo8s3ZeBcj9jWqq5dV50vqWyo/xOcQswJIqdGTNIQL/avn5d6TiQ/JEI hrIKcOnbwjnRsniDKAGokVgConcLtCi5n7pnFhb9AEbIRWw66LyI73fCgtm44SLxw497qw 5oAy4EHYqUVGf1wrA+UYLiCTK9YndPo6BreZLlcb28VrbLgW+0yzYCypGNwXxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704646691; 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=p7FYUOnSkdrzie3LYLlaGwvYBan5AsnjeqW8RDVDNLo=; b=KwETGzmNQ7VeKspBqbBtMdQZJEHMRTLJtoTCwGP8puPa5hrx170m5NdIsS9i4eW6Zd46c7 G+qZ+hBYKc/2tjVmXbIb5nJBwS4Es40w5JthePvgNW/UnA7NW16oaYFDMpC/pQrF7e8OiB KZeKFRqkoiUaDDfKZRJLFJF+9INy84xxaF95TOB6IRnPjUGdVVWjTx5283b6ETHBmJPQK7 /z+WfGhnUJ9Bc8ZNQFCwPgSLO6mWmQnpR85a4t9z2sMAKFMt61PP+coznC8BIA+stFZ7pP 0CHL6+JP6tQ5HEIqJFH3YqTTeMHjVIbQ9C5y4st+KRkbGaSBm/SBYUCbCdszJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704646691; a=rsa-sha256; cv=none; b=UT/MIy/spKWCQuGvr3hwyhGY3Y7aCultkM5T/z0t9uYozCvYmgctz604KhD44Po9Ub6Q3B YfiNwabeY6OQ0/D6dqKRcve66LlwHj6NqWgbjO8jfdgMgC9g8PPGEXGYPkkcvcJko0jM7S s0yKVL3SGQThfEFWKW4roaGPKg3dw4SU/IlZfD+gZgZD85T5Rc/acWrZ/KMx41YbyyFzPt fDAKr2kxUCcY5AVBwsLHVXc+MAD+irJ3vhhm7mZ+TTbePkSe9/UsRBEBIbfW4C6iQsld+p 2f6KSvdpQwnLRqrjJFedCa6mIkZFfsyyiuNz+RSE/b9kKHKWEbyh+pMimGl/mw== 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 4T7Ng74dldzY9d; Sun, 7 Jan 2024 16:58:11 +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 407GwBWK029137; Sun, 7 Jan 2024 16:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407GwBpt029134; Sun, 7 Jan 2024 16:58:11 GMT (envelope-from git) Date: Sun, 7 Jan 2024 16:58:11 GMT Message-Id: <202401071658.407GwBpt029134@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: 144e7a72f476 - stable/14 - gtaskqueue: Fix a typo 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/14 X-Git-Reftype: branch X-Git-Commit: 144e7a72f476f8f8453c40532c6f95c1f9add7ae Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=144e7a72f476f8f8453c40532c6f95c1f9add7ae commit 144e7a72f476f8f8453c40532c6f95c1f9add7ae Author: Mark Johnston AuthorDate: 2023-12-31 16:36:12 +0000 Commit: Mark Johnston CommitDate: 2024-01-07 16:56:04 +0000 gtaskqueue: Fix a typo This is a no-op in practice since gtaskqueue_thread_enqueue() and taskqueue_thread_enqueue() are identical, and while _gtaskqueue_create() compares the enqueue callback pointer with gtaskqueue_thread_enqueue(), the result has no effect since TQ_FLAGS_UNLOCKED_ENQUEUE was copied directly from subr_taskqueue.c and is unused in the gtaskqueue code. Fix it anyway since it's a bug. More generally we really need to consolidate subr_taskqueue.c and subr_gtaskqueue.c. PR: 270661 MFC after: 1 week (cherry picked from commit e1f336704d308679d4178fd5063dba854b22a07b) --- sys/kern/subr_gtaskqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_gtaskqueue.c b/sys/kern/subr_gtaskqueue.c index 3558b534967d..590dd53d0ea3 100644 --- a/sys/kern/subr_gtaskqueue.c +++ b/sys/kern/subr_gtaskqueue.c @@ -614,7 +614,7 @@ taskqgroup_cpu_create(struct taskqgroup *qgroup, int idx, int cpu) qcpu = &qgroup->tqg_queue[idx]; LIST_INIT(&qcpu->tgc_tasks); qcpu->tgc_taskq = gtaskqueue_create_fast(NULL, M_WAITOK, - taskqueue_thread_enqueue, &qcpu->tgc_taskq); + gtaskqueue_thread_enqueue, &qcpu->tgc_taskq); gtaskqueue_start_threads(&qcpu->tgc_taskq, 1, PI_SOFT, "%s_%d", qgroup->tqg_name, idx); qcpu->tgc_cpu = cpu;