From nobody Sun Dec 31 16:49:24 2023 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 4T34pD2WSqz5664f; Sun, 31 Dec 2023 16:49:24 +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 4T34pD1zvKz4dKm; Sun, 31 Dec 2023 16:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704041364; 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=i0Iea6QIgXk/GHcZ659MrguQGeMqQZfaVGCUL710GJM=; b=qEqSl1UgIhpz5fW98hs7RWzFpOSuGqRrJBa9z3u3VnQgHGmIgEmI/5oaWd9dz9tQcUVIgU W3Ip9iFQi8Dy7TCtQVsFDIT3cdKZO/ODbCc3IEzObkTos47Z/D4O2WGGvtWNXO/1vrTrOf 92SHJwcOmuDW+u1R+jX64/8YWOC7K0dtoVnhc1Kz2bEKRI98RlajDaeKV9bWWa/qGPRkTA 19COGLjTuZ+g2eVDO1k0+ryF1uOsNQ0DK4T62IVB8wkvc5av9meR85jyH+P0Pi4P3V7fh5 5gcNDC/2mR+cXeVceFsrIvVQptQiNh/WpJGJ8oiqsqmuMevFMEJanIlKJHiBiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704041364; a=rsa-sha256; cv=none; b=iwzalsW5lZ7lvKOqBHeghvdeu7DMdOZnGoMoc1DI8NLU2R9F2P+AT5Daz+Ba7UqROB0lA9 +CD81nX6HFUn7FZfKPyQg8r3kg//DMVJ83ODWu5XMzg4TbJpebYJM3HBvIBcQZYva0MKIX jSpNrBsKImRJW1ArPUfBfGIlr31i9Le7yayMi4HhvjcVY25pAYKnUMQ1Aj+utJxqBhHdHg 8fGgclwUftJZmWsrmtoZJaH1yrUBJqrdGeEQRUNCE5096zY2/hosy2RqOamdGO3ttuzDo4 O4F3qvHH7qCrcDnffWzrV7Fwq35899oqDeGKWMrDO7/UbyxF17ADx6u2zr1lhA== 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=1704041364; 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=i0Iea6QIgXk/GHcZ659MrguQGeMqQZfaVGCUL710GJM=; b=faN6KOHoGbuY47HHhLOnei9syqG/M5cXkSTPgYPKcgHpeydp49KS1IdpBcQjvnoBtf2Z9o HCNbHES5p7z10VCElcFBcQwJuyt30aE0orFFmncHveU1qrYxtH+zl4YllGQvb9H83NCAKZ 99Z3tRUhbf7K3lhd8Cl2Yz3TLKoClodosMA5FM8sV499fCkDs9877iXJi6xF4jA6DOWTvE 6keaRH75w1P53mFJb9y+118+czPX4PMgTaef3fnEU4CzH0CrNIpV1Pb5OnyhHnAM/loFpz H8whFnKbCWVjmKhIyJoa3JZjYWmvZUcgdrs7fkYi8TCaX24zVmC7tOGVAaMzPQ== 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 4T34pD13Vxzj6F; Sun, 31 Dec 2023 16:49:24 +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 3BVGnO6w077061; Sun, 31 Dec 2023 16:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BVGnOva077058; Sun, 31 Dec 2023 16:49:24 GMT (envelope-from git) Date: Sun, 31 Dec 2023 16:49:24 GMT Message-Id: <202312311649.3BVGnOva077058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e1f336704d30 - main - gtaskqueue: Fix a typo 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1f336704d308679d4178fd5063dba854b22a07b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1f336704d308679d4178fd5063dba854b22a07b commit e1f336704d308679d4178fd5063dba854b22a07b Author: Mark Johnston AuthorDate: 2023-12-31 16:36:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-31 16:49:08 +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 --- 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 e68e1b9318fa..120ffaba874a 100644 --- a/sys/kern/subr_gtaskqueue.c +++ b/sys/kern/subr_gtaskqueue.c @@ -613,7 +613,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;