From nobody Thu Aug 17 22:11:31 2023 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 4RRfNh17n7z4qDqZ; Thu, 17 Aug 2023 22:11:32 +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 4RRfNh0XF6z4ZM2; Thu, 17 Aug 2023 22:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310292; 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=cvw5E2FszLHfbA3M1D+uvW0qq3JRzJnSFhb96o15m48=; b=HhTO8KM+13En4i5BNys2IFynpQKNlKzB+WfgxIFPgnVg1su7jIcqVVNhblh6Xg/p+1odKZ kMnYJsLwrtArucRoHwaUMvAqkKP7O5+9hl1wXohJCN2sDhtI08mUW5xQThPx4n5sf4CDLa Z1ZtAy1YRuequfbe5ksuRTy1F4TZ4PnvCi/oDdj6P0N0yzi0mU2+GTNmpoAmv2CkwM2Qu+ 2NdsnA8eUeRPYjiw83ZXZGhmKMLLKWJ9UowYlm2h4vESf5cxWlKer65BrJKmvvzB8fEeR8 H+U9WzgOGYEI9vV0FjlMEc/0nkNMoLPkXAcIJAN7UYHmwTFO5IDQq4Mc8v1M+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310292; 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=cvw5E2FszLHfbA3M1D+uvW0qq3JRzJnSFhb96o15m48=; b=uk9xIAtyJ6kDrfyIjhZPFG4ftZEEmAoSwjUBoPYpqvCdFxh/aABLOv29ORgIu22liHggOC pjcjhBPUxUJMuuz/E7n3VzZj6aExmt7fl3peymgvzLn42vz+xjS37UyucjsTHsccuG4CM3 Xz8vPokG2hEw81nH9J60Gmx1lOW+CJsKbKF3qz8EGIJZFdgsZDTfd6DJusEg913GuQqxKq 6VXFuSfcWuq3N/nCFqpKoq2FrZv8mFzTmcapEqkLiWz85g0eThJRI4VBhhVneFB+B2kr9F IDE5S+2f7yK0sVonw757Efs9PokESUFvpky1Xs5DcLZo5Ref5cVQGV+6jQj6cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692310292; a=rsa-sha256; cv=none; b=vbV/X09UPFgS4GFI7Gig0u8Wew4yx4vlH99n5Zh9LzoTuDA9GKcZjYybZuUkdV49GG3yW1 MRi+3Y5OeblnL3eHhauP+TMatplBMOSkXMgWHIToKKv5r7CVCF9gvqTDa+AoITu5D+fKV8 PVt2E8gNVP/WrMZOFra48BcsRsANqavhkHK7D3iUqjT24y5PGLe64xafLu9BROJHxV3TOg lpmaYuTTX53dZGz7Pn0V1DAeb+/OQABA2WaKd4IIhYAGvrd5Vpb+4SdgHxv/3D2F5rlsJp T0DZhEFh7UMsPWuMgq9qc9cvwLVIjV8NH4fWzRjszHEKtNgNo+mO5EL4ygH/eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRfNg6dWDzrRk; Thu, 17 Aug 2023 22:11:31 +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 37HMBVoK011811; Thu, 17 Aug 2023 22:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HMBVVd011808; Thu, 17 Aug 2023 22:11:31 GMT (envelope-from git) Date: Thu, 17 Aug 2023 22:11:31 GMT Message-Id: <202308172211.37HMBVVd011808@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: 5ad59b91535f - main - intr: merge interrupt table uses of MAXCOMLEN into INTRNAME_LEN 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5ad59b91535f2df176c132be10e344c4a302f619 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ad59b91535f2df176c132be10e344c4a302f619 commit 5ad59b91535f2df176c132be10e344c4a302f619 Author: Elliott Mitchell AuthorDate: 2023-01-20 02:24:32 +0000 Commit: Mark Johnston CommitDate: 2023-08-17 22:10:02 +0000 intr: merge interrupt table uses of MAXCOMLEN into INTRNAME_LEN The repeated uses of `MAXCOMLEN + 1` seem a bit hazardous. If there was a future need to change the size, the repeats will be troublesome. Merge everything into `#define INTRNAME_LEN` (matches the name used by INTRNG). Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38455 --- sys/powerpc/powerpc/intr_machdep.c | 9 +++++---- sys/x86/x86/intr_machdep.c | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index d64d15775ab5..69a6bda1337f 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -127,6 +127,7 @@ static u_int nirqs = 0; /* Allocated IRQs. */ #endif static u_int stray_count; +#define INTRNAME_LEN (MAXCOMLEN + 1) u_long *intrcnt; char *intrnames; size_t sintrcnt = sizeof(intrcnt); @@ -152,8 +153,8 @@ static void intrcnt_setname(const char *name, int index) { - snprintf(intrnames + (MAXCOMLEN + 1) * index, MAXCOMLEN + 1, "%-*s", - MAXCOMLEN, name); + snprintf(intrnames + INTRNAME_LEN * index, INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, name); } static void @@ -177,10 +178,10 @@ intr_init_sources(void *arg __unused) #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTR, M_WAITOK | M_ZERO); - intrnames = mallocarray(nintrcnt, MAXCOMLEN + 1, M_INTR, M_WAITOK | + intrnames = mallocarray(nintrcnt, INTRNAME_LEN, M_INTR, M_WAITOK | M_ZERO); sintrcnt = nintrcnt * sizeof(u_long); - sintrnames = nintrcnt * (MAXCOMLEN + 1); + sintrnames = nintrcnt * INTRNAME_LEN; intrcnt_setname("???", 0); intrcnt_index = 1; diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 4a1bc942234a..b8dbe3611a42 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -93,6 +93,7 @@ u_int num_io_irqs; static int assign_cpu; #endif +#define INTRNAME_LEN (MAXCOMLEN + 1) u_long *intrcnt; char *intrnames; size_t sintrcnt = sizeof(intrcnt); @@ -187,10 +188,10 @@ intr_init_sources(void *arg) #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTR, M_WAITOK | M_ZERO); - intrnames = mallocarray(nintrcnt, MAXCOMLEN + 1, M_INTR, M_WAITOK | + intrnames = mallocarray(nintrcnt, INTRNAME_LEN, M_INTR, M_WAITOK | M_ZERO); sintrcnt = nintrcnt * sizeof(u_long); - sintrnames = nintrcnt * (MAXCOMLEN + 1); + sintrnames = nintrcnt * INTRNAME_LEN; intrcnt_setname("???", 0); intrcnt_index = 1; @@ -428,8 +429,8 @@ static void intrcnt_setname(const char *name, int index) { - snprintf(intrnames + (MAXCOMLEN + 1) * index, MAXCOMLEN + 1, "%-*s", - MAXCOMLEN, name); + snprintf(intrnames + INTRNAME_LEN * index, INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, name); } static void @@ -442,14 +443,14 @@ intrcnt_updatename(struct intsrc *is) static void intrcnt_register(struct intsrc *is) { - char straystr[MAXCOMLEN + 1]; + char straystr[INTRNAME_LEN]; KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); mtx_lock_spin(&intrcnt_lock); MPASS(intrcnt_index + 2 <= nintrcnt); is->is_index = intrcnt_index; intrcnt_index += 2; - snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", + snprintf(straystr, sizeof(straystr), "stray irq%d", is->is_pic->pic_vector(is)); intrcnt_updatename(is); is->is_count = &intrcnt[is->is_index];