From nobody Thu Aug 31 13:55:36 2023 X-Original-To: dev-commits-src-branches@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 4Rc2k04njSz4sCFy; Thu, 31 Aug 2023 13:55:36 +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 4Rc2k042Wgz3YmW; Thu, 31 Aug 2023 13:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693490136; 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=OJAPupifObEsI0fN5nn9dovCsfK/zBwdqpgTMIIOCQI=; b=Ur2XBqcPruDGalhM/X0lo8gtK25dpQafAJ4ykdbtztpAKAqFX+gaMObJAU5JFkUFlQUq2k TL+1c0QlUDScAGPdxtHuoe9cC6mZZMNzJTfsGgd4D6+Z7T0WWpw+RTpPNcZQx5Y8BuoOE3 4wii2MynZTu/OVMwR7nb5MgofKVmkEQAKyGShd2Qm718EOEqYpqkIg6H75h298ifgAb0jj iGpDo50q2XtA8tOWpE2RfzDoTChdaeKXn3CnWZItIYONubHuGlQ+BTx+8S0hoGSKyHDyvK bFVQy55MYUBZUnuF+90b5FhOLJqIRITq60i9FcbOlVrm76H3BNm8jiC84AiVeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693490136; a=rsa-sha256; cv=none; b=JiXOre5de8dDgs5gzyg7nub6JE4O09jxUUtW7hhm2pmrpJRVmIS31spw5uuztM2YaYWQd/ X/v07/xmMO3sIvPA907JZFflEBewLJTH9oStYoN/+f1+9HTZf+wDE8RvDq0a4Eay098HiY qm7lDJ+hfWmG9IqZ1eb4IUX3X0vMDr55KTOhS3E3o9T4/hiuo4wj+pHrjlZ7nHJ2ZO27ym WvBp6lTrEBqtl2n09ZCeVTpCJref/qRQRI22IWnKcVXcEMJx6WoNCrPmPZHoNQStDRxc4Y 0hLoeGvxeCoZxSq2uTJANDZm0ZmZV98ZRQ+yGY/pEQTrNeu9NGt3O+/9nOKgpA== 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=1693490136; 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=OJAPupifObEsI0fN5nn9dovCsfK/zBwdqpgTMIIOCQI=; b=bjO4o4TxRWRfy3Y5XHVuCIO1934djqF0SNBUmkdz5LKAWGAVdcicLA6DBjzEKpfsjZxkI2 Ae2syjJo5KS81Z0N4KG2Kgo7K6P3ZPQ560hDYYIf5pSAJNRsMOF/GtKjdVG5h9RuDBz5Nc 8Rxl78/dpv0a2E1XeocOSCCC66fD3Y4brFYjFwewutPlWlQBHJl5QY9zXKogNkDNvLbHFi nBPjMH3x9Y1IlTQ29Ri/8NCLvsN9IQWgPdn/kxaRMYiOpu3dhu1tZfVYFZQOamLPD07vEC s1xxeUKu+Y+pvlFAiCmDiFzdvB5/EZCVb1HhDn2cTPcUmJoXWij2ZuparZZAKA== 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 4Rc2k035zzz5lR; Thu, 31 Aug 2023 13:55:36 +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 37VDta0j083299; Thu, 31 Aug 2023 13:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37VDtarr083296; Thu, 31 Aug 2023 13:55:36 GMT (envelope-from git) Date: Thu, 31 Aug 2023 13:55:36 GMT Message-Id: <202308311355.37VDtarr083296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b5f0f20e9bd1 - stable/13 - intr: merge interrupt table uses of MAXCOMLEN into INTRNAME_LEN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b5f0f20e9bd1999d9c606f2a20a08a54c7f5ccfe Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5f0f20e9bd1999d9c606f2a20a08a54c7f5ccfe commit b5f0f20e9bd1999d9c606f2a20a08a54c7f5ccfe Author: Elliott Mitchell AuthorDate: 2023-01-20 02:24:32 +0000 Commit: Mark Johnston CommitDate: 2023-08-31 13:24:05 +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 (cherry picked from commit 5ad59b91535f2df176c132be10e344c4a302f619) --- 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 605f436804d4..c314a2c928bc 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -129,6 +129,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); @@ -154,8 +155,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 @@ -179,10 +180,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 b89af6c4c2a1..d7c325c82399 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -95,6 +95,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); @@ -189,10 +190,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; @@ -430,8 +431,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 @@ -444,14 +445,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];