From nobody Wed Jun 18 16:01:12 2025 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 4bMpPj1fdNz5pnHf; Wed, 18 Jun 2025 16:01:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMpPh5nrBz3mvR; Wed, 18 Jun 2025 16:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750262472; 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=wawMQHhIlGSGBA6HDh4RDJ9GqdJLdMLC04qvLoQGReA=; b=npbqwwX+fR/PiPMKgFfIxagLcHe6G9rRMn8EnIliy4jeUfyVOiOcfF1kqcra/hm++N+Hwe G1TrLvlAmXdx74NGQDnPihRmERpjzVPX3n+vcDi2N0PbKsis0Dpg5/T3vwxzMHVs7jHEw/ U/TlrVcz6Ezm9HHuNcbqKeAlAgoa+ruVSiWpHbn+9NRiYka8VGYSGRvS0hCihOCh/6OL8V WeKzZ4Hdw+hhASai6YoFDtLPT1UMmZQolU1Zce3ZC0laTrPtSjR7UwEMa5b3/RPPsCSvOt ssDso+NwBVouBN37vstcyNoruyq1FWwCMxsa1Y1JVfRHhnF029PgH5ihXuRF5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750262472; 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=wawMQHhIlGSGBA6HDh4RDJ9GqdJLdMLC04qvLoQGReA=; b=wFZU9g+tPJVV61OjS86zsMvv+5SNveprW9q4dK547ehzzcU5tV/9rodpGCMyXKc9sxWq/c Jw/8LLQsHdKY2rmf3sKuRzLo6OjMGmwC7EmyZSEn4E+WyO1cI1qOfF0jc6OXgTITmFgrvm Jd4MmG7DacMb/u9XTYuW4DOhOThpHxYAlV7DWL4VtgXP5D5CjfahnO19na+Wa8aZbUhjEa fx0RTfa9CSBgSOQHGsfJ+gTC8Wo5kjbCDtAw0UhrmfJwUHjH/9mDSOLhOEGe7NNqlcrsF1 78vL56fcWRB+HEu6WarGtYPaLsaEDs9DqJZOqd9OKH+qm3DsNWcN2TC7EkldSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750262472; a=rsa-sha256; cv=none; b=jKCzYB1fqqkE9haqaXcO8AzeZFlWBmEPoHyi22vH60L1q8TcOc0Sb1foOguFQ8HqD5emXc uE9ZnvsfHF9lRI/GJfANisOncqCXnhAsxHOtMwhySPAsdLcNtzK1kH4JHA0z1G7xWj/Nnt D7GQFVyXC+DvtJTJXULyeP09BTDgg52uUAkNbAYd1tXVLkm2AFo1xnd5sjG5r8voTV1jSF BxabNip7rwJo5cw+d23xoZyxOhN1VNeizYEN6yZGUvNVlmX6/BeVoJj0aGiAunptOqAErt hzrWo4he2KolUL7ehRjRbv7kO/XENXH/IhdtsGVV4V3Zm9t+nNYsbw198CuCdQ== 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 4bMpPh56zZzcG6; Wed, 18 Jun 2025 16:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55IG1Cva082013; Wed, 18 Jun 2025 16:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55IG1ChL082010; Wed, 18 Jun 2025 16:01:12 GMT (envelope-from git) Date: Wed, 18 Jun 2025 16:01:12 GMT Message-Id: <202506181601.55IG1ChL082010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 013c58ced6ae - main - sched_ule: 32-bit platforms: Fix runq_print() after runq changes 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 013c58ced6aef26bad7ca5c6eb829b9d586f6edb Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=013c58ced6aef26bad7ca5c6eb829b9d586f6edb commit 013c58ced6aef26bad7ca5c6eb829b9d586f6edb Author: Olivier Certner AuthorDate: 2025-06-18 15:15:18 +0000 Commit: Olivier Certner CommitDate: 2025-06-18 16:00:13 +0000 sched_ule: 32-bit platforms: Fix runq_print() after runq changes The compiler would report a mismatch between the format and the actual type of the runqueue status word because the latter is now unconditionally defined as an 'unsigned long' (which has the "natural" platform size) and the format expects a 'size_t', which expands to an 'unsigned int' on 32-bit platforms (although they are both of the same actual size). This worked before as the C type used depended on the architecture and was set to 'uint32_t' aka 'unsigned int' on these 32-bit platforms. Just fix the format (use 'l'). While here, remove outputting '0x' by hand, instead relying on '#' (only difference is for 0, and is fine). runq_print() should be moved out of 'sched_ule.c' in a subsequent commit. Reported by: Jenkins Fixes: 79d8a99ee583 ("runq: Deduce most parameters, remove machine headers") MFC after: 1 month Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation --- sys/kern/sched_ule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 0002424fa547..508ec0ab97ec 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -444,7 +444,7 @@ runq_print(struct runq *rq) int i; for (i = 0; i < RQSW_NB; i++) { - printf("\t\trunq bits %d 0x%zx\n", + printf("\t\trunq bits %d %#lx\n", i, rq->rq_status.rq_sw[i]); for (j = 0; j < RQSW_BPW; j++) if (rq->rq_status.rq_sw[i] & (1ul << j)) {