From nobody Fri Jun 20 02:42:53 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 4bNhbd6tL4z5yLlD; Fri, 20 Jun 2025 02:42:53 +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 4bNhbd5l0cz3VQh; Fri, 20 Jun 2025 02:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750387373; 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=7BomCPUwDfI/TabycMBOGpsl+0K371J6XaDDRmNcbkY=; b=lgt5wYdypqD5yctchiNyz0qclMq4Z1tguy7Ml/voabqWoT1hayS859PR3W87o+KGl8PvG7 nqx2U+VjM1PmXKrpe3gwIlxPbgsryd4FtvUje21JGx0Rlq5pU3B6XBuCOGGEMLyX6uAudZ 4pLoDwNue7g1Kc29szmotgbKUb+3sn4Hc7mcFHi4Ab3Pm916Y+Kj0Rl8pGPA4Fa8XaJd5K +EKsR9YHY6QuEuNWrPdglmpcv09LE0qoiWDi20x3BYMHlccipVQOsPCsPUme+Z3HrpVjKp e3qvf0eTdP1R9JiV0qIxIxr+P1Lz2YCowb1f9qvpLRmJvc5L4xfkaRghYLRM2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750387373; 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=7BomCPUwDfI/TabycMBOGpsl+0K371J6XaDDRmNcbkY=; b=bJfWkbZc6qnp6dXMN94Ia7MXZR82JnhnKAaNofqR/Z3t11OT/+tLJSDAMOxqRUvg1KoAff eEpU9++woZpOIPIMbfbSVokKAPr1AdF6yCdlAUrdNsAaKPZ8a8YqwxDe5AqHi7i55NiYEF 2BgblTlIV+Kf+gkAJ3/LcG0Vy5xK3W5vgNuH8vqDnabYC7zd+IK1Ezm/FRLbM03pGW+3cq E10zkIUSYiOOO80XSTl0NDB7APimNyhXMi0nraJ+rmgKa9Kgvk1OHZZqbp5Lji4Gbv3dUA BdeVmUkX8MfGn0EXKZ1nUBAaZ1alwNFEOJWfS+dW36mhu29n28szexorKsU9ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750387373; a=rsa-sha256; cv=none; b=vu5Sg0/EK3JxeIUaA4DteDBFoxmrZ0Wk7Fqlo7Ks7LQIraOeI5/zLW0sgHbab88nUzk6O6 tF7T9qLcl0WrU97jUdINCP8T12JcPWv7Gn/x5pGhDR78RDA6oNYp2hOiWHKRNYn1G265h4 jFOzrvNqxJRPlbZI+m4qbMKupNsIWjCwkqrkGFxj+rR+JLKl9TbpH5P6CBz1lN6H8lH/go 6xCrnLUPaPuMhHF4s7jZqUwTd/2MTQOZEp2J+L41nm1nDsYt/NIFj6/LCiNzWheNjSyjGH RaV7Wygdz00051FpolJF/3ev+8XN0juV9rYBGafhD23QLpdSWcbaJ0fWF5kCaQ== 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 4bNhbd4tLLz9Vw; Fri, 20 Jun 2025 02:42:53 +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 55K2grKu093629; Fri, 20 Jun 2025 02:42:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55K2gr8d093626; Fri, 20 Jun 2025 02:42:53 GMT (envelope-from git) Date: Fri, 20 Jun 2025 02:42:53 GMT Message-Id: <202506200242.55K2gr8d093626@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: 3e5aeb20645f - main - runq: Fix printing status word bits 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: 3e5aeb20645fa0a67ce50d96c5136de14067a944 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5aeb20645fa0a67ce50d96c5136de14067a944 commit 3e5aeb20645fa0a67ce50d96c5136de14067a944 Author: Olivier Certner AuthorDate: 2025-06-20 02:26:28 +0000 Commit: Olivier Certner CommitDate: 2025-06-20 02:42:11 +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 --- 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))