From nobody Mon Jul 28 13:31:43 2025 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 4brKBn49hFz634r9; Mon, 28 Jul 2025 13:31:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brKBm0XTKz3v2G; Mon, 28 Jul 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709504; 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=GyeObK8ROMRbm4cF7YBX45jFqguqqE9z3RYCEV2rwtU=; b=VEyHv7UFOA+JKbReiz5wX4q8b5Bm9H2z5qaxtgNux4xsHOtqzreHzywS0Z+IQ/6RukHVFw Ox+gDdkHxe3CwR5qXYQ4j+guj6XnoLZWy1EsILIg0rHsHJCcGDMnW7fsgATOuF+4FrcJYj 3k0karZCEeBtJ/Y3PDJNKK7e6uUjhFwiuZLaCUAYse+ykUnOC7GLBxFFDXMf1um7uXXGHo Fd6z7ec9R0B6J+JyCts8twOAH7Up5xz/9ZpRb5OZE2jUKHPPZ543JvkRXW2uM8v/U73mNp kalupfJpkHiuPwuQWSSYGB2cL+RZcAQ6NHbZYunbd0eEz7mh6Rwsa3SBDocDVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709504; 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=GyeObK8ROMRbm4cF7YBX45jFqguqqE9z3RYCEV2rwtU=; b=HRptAn7WqQplfUhq/B0UlMlIwsppiV8AcJnikZ7YdLhiTlp88z91gr6w5av81rjFgeachZ o0p1EfH1E8yLHZgxUs3kHjH+C1/e/obke8TN8nPB6lgJ/OWvRNnNlR5lIVHikljr0ducNG HSM8f6ZkE8WXpVH7rWZvCE4JYOIZ0rAi7XsIHza8x/r/2yY4kRB75p9Q2wflUkBVyI3nAS vaGO11lf9sw1tmyVxIdF/Aji29oqAfV3KCEURTE+5K8xGWIIqKrU6150rO3nfQb6/x27JZ uCwFg6MPAcu/vvMEnFseuoqaDwU6dd9Y/J8/oVarwdR/O+sfmDiHvNXTguaezg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753709504; a=rsa-sha256; cv=none; b=EjHLkW6lZ2FFeg35rUeAEjzlvy48yuJAPpm/RsB7tEbEXUHFtlOSZ+DUuetfiEySkaleWe ET7G38VDQvi3iUcP47vzCIWexLqjgJXJ+ob30KEoROtJu81p+NxMYNWpDoUKBQDR6Dqy2L XmOGucMRubb3wTAfVuXuBL8edLBayhLN0rsQNFOKi5h72p/v9MlGwySBf/+wwMrk0oD3l4 WUD/JGgo0OenGaIbf1z4KV6X6F6cwiKrmFpoes4MdLH3eTJ+HF8pW6bPkgL1DRWMceDYIr snsn5x8lRIlAy4LqMBiSRZ7J4/iAwyZhBO0a0IamdmRdk8IpNy9doAlUhhFo1A== 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 4brKBl6hRkznRb; Mon, 28 Jul 2025 13:31:43 +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 56SDVhiJ082296; Mon, 28 Jul 2025 13:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SDVhDL082293; Mon, 28 Jul 2025 13:31:43 GMT (envelope-from git) Date: Mon, 28 Jul 2025 13:31:43 GMT Message-Id: <202507281331.56SDVhDL082293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: c7bb3ca85e5a - stable/14 - runq: Fix printing status word bits 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c7bb3ca85e5a8d7916fc2828aa2a47aebddb0294 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c7bb3ca85e5a8d7916fc2828aa2a47aebddb0294 commit c7bb3ca85e5a8d7916fc2828aa2a47aebddb0294 Author: Olivier Certner AuthorDate: 2025-06-20 02:26:28 +0000 Commit: Olivier Certner CommitDate: 2025-07-28 13:28:46 +0000 runq: Fix printing status word bits 'rqsw_t' is 'unsigned long', strictly longer than integers on 64-bit platforms. While here, factor out the print format for a status word. Fixes: d2ac231616f0 ("Make the run queue parameters machine dependent...") MFC after: 1 month Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation (cherry picked from commit 3e5aeb20645fa0a67ce50d96c5136de14067a944) --- sys/kern/kern_switch.c | 11 ++++++++--- sys/sys/runq.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index bd0d987594ea..917f73682564 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -326,7 +326,9 @@ runq_sw_set_not_empty_op(int idx, int sw_idx, rqsw_t sw_bit, rqsw_t *swp) rqsw_t old_sw __unused = *swp; *swp |= sw_bit; - CTR4(KTR_RUNQ, "runq_sw_set_not_empty: idx=%d sw_idx=%d bits=%#x->%#x", + CTR4(KTR_RUNQ, + "runq_sw_set_not_empty: idx=%d sw_idx=%d " + "bits=" RQSW_PRI "->" RQSW_PRI, idx, sw_idx, old_sw, *swp); return (0); } @@ -349,7 +351,9 @@ runq_sw_set_empty_op(int idx, int sw_idx, rqsw_t sw_bit, rqsw_t *swp) rqsw_t old_sw __unused = *swp; *swp &= ~sw_bit; - CTR4(KTR_RUNQ, "runq_sw_set_empty: idx=%d sw_idx=%d bits=%#x->%#x", + CTR4(KTR_RUNQ, + "runq_sw_set_empty: idx=%d sw_idx=%d " + "bits=" RQSW_PRI "->" RQSW_PRI, idx, sw_idx, old_sw, *swp); return (0); } @@ -525,7 +529,8 @@ last_mask: goto return_idx; return (-1); return_idx: - CTR4(KTR_RUNQ, "runq_findq: bits=%#x->%#x i=%d idx=%d", + CTR4(KTR_RUNQ, + "runq_findq: bits=" RQSW_PRI "->" RQSW_PRI " i=%d idx=%d", (*rqsw)[i], w, i, idx); return (idx); } diff --git a/sys/sys/runq.h b/sys/sys/runq.h index fb9b9908fe57..997c131b24b1 100644 --- a/sys/sys/runq.h +++ b/sys/sys/runq.h @@ -60,6 +60,7 @@ struct thread; typedef unsigned long rqsw_t; /* runq's status words type. */ #define RQSW_BPW (sizeof(rqsw_t) * NBBY) /* Bits per runq word. */ +#define RQSW_PRI "%#lx" /* printf() directive. */ /* Number of status words to cover RQ_NQS queues. */ #define RQSW_NB (howmany(RQ_NQS, RQSW_BPW))