From nobody Fri Feb 13 11:57:54 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 672994594A for ; Tue, 28 May 2024 09:11:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716887464; cv=none; b=QvFUv3RrNQV54UjNOB6X6bR+UKr9gsR7TrJy07JPmIn4kmDRdEuFZdai/XBQGx585WwYZ5DhoU2zulhegRLfLP/9cStPr/lEyS7nay7WvOgcFlrIBveK4DX/bivynsrpIY1L8PPYVPZYMXWnCvauFZYVmr4SfKVbjEevzGKpAbM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716887464; c=relaxed/simple; bh=1RwQvCe3Yc/wpvVhbqyoP9WETRw6+GsL8em9Rc0ezjM=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=HeTwuqyonuZW48V8sd7RHfDtha6hVcqd3QxumwCi50Zw6a4ujauO/8TzjTjrsEZmzH/bW9OcmldofnbWDnw+ow95RBDj9dBnHoD5z2+fuA6iaFiWfNz+c2FFecIYe1ldUHOok4Z3X8bCqKWlj+OtOEoj+1Lq8Lr5xw3YtaNRJtw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VpRV85DVszwQ7Y for ; Tue, 28 May 2024 17:07:12 +0800 (CST) Received: from kwepemi500008.china.huawei.com (unknown [7.221.188.139]) by mail.maildlp.com (Postfix) with ESMTPS id B9E7A18006E for ; Tue, 28 May 2024 17:10:58 +0800 (CST) Received: from huawei.com (10.67.174.55) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 28 May 2024 17:10:58 +0800 From: Jinjie Ruan To: , CC: Subject: [PATCH] genirq/debugfs: Print irqdomain flags as human-readable strings Date: Tue, 28 May 2024 09:09:17 +0000 Message-ID: <20240528090917.3624463-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500008.china.huawei.com (7.221.188.139) Content-Type: text/plain; charset="utf-8" This patch improves the readability of irqdomain debugging information in debugfs by printing the flags field of domain files as human-readable strings instead of a raw bitmask, which aligned with the existing style used for irqchip flags in the irq debug files. Before: #cat :cpus:cpu@0:interrupt-controller name: :cpus:cpu@0:interrupt-controller size: 0 mapped: 2 flags: 0x00000003 After: #cat :cpus:cpu@0:interrupt-controller name: :cpus:cpu@0:interrupt-controller size: 0 mapped: 3 flags: 0x00000003 IRQ_DOMAIN_FLAG_HIERARCHY IRQ_DOMAIN_NAME_ALLOCATED Signed-off-by: Jinjie Ruan --- kernel/irq/debugfs.c | 17 ----------------- kernel/irq/internals.h | 19 +++++++++++++++++++ kernel/irq/irqdomain.c | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c index aae0402507ed..61a21a4c43ac 100644 --- a/kernel/irq/debugfs.c +++ b/kernel/irq/debugfs.c @@ -9,23 +9,6 @@ =20 static struct dentry *irq_dir; =20 -struct irq_bit_descr { - unsigned int mask; - char *name; -}; -#define BIT_MASK_DESCR(m) { .mask =3D m, .name =3D #m } - -static void irq_debug_show_bits(struct seq_file *m, int ind, unsigned int = state, - const struct irq_bit_descr *sd, int size) -{ - int i; - - for (i =3D 0; i < size; i++, sd++) { - if (state & sd->mask) - seq_printf(m, "%*s%s\n", ind + 12, "", sd->name); - } -} - #ifdef CONFIG_SMP static void irq_debug_show_masks(struct seq_file *m, struct irq_desc *desc) { diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index ed28059e9849..e2ea3f6917ac 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -501,6 +501,25 @@ static inline struct irq_data *irqd_get_parent_data(st= ruct irq_data *irqd) #ifdef CONFIG_GENERIC_IRQ_DEBUGFS #include =20 +struct irq_bit_descr { + unsigned int mask; + char *name; +}; + +#define BIT_MASK_DESCR(m) { .mask =3D m, .name =3D #m } + +static inline void irq_debug_show_bits(struct seq_file *m, int ind, + unsigned int state, + const struct irq_bit_descr *sd, int size) +{ + int i; + + for (i =3D 0; i < size; i++, sd++) { + if (state & sd->mask) + seq_printf(m, "%*s%s\n", ind + 12, "", sd->name); + } +} + void irq_add_debugfs_entry(unsigned int irq, struct irq_desc *desc); static inline void irq_remove_debugfs_entry(struct irq_desc *desc) { diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index c5832caf24cd..ba5c5cc90c3d 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1927,6 +1927,19 @@ static void irq_domain_free_one_irq(struct irq_domai= n *domain, unsigned int virq =20 static struct dentry *domain_dir; =20 +static const struct irq_bit_descr irqdomain_flags[] =3D { + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_HIERARCHY), + BIT_MASK_DESCR(IRQ_DOMAIN_NAME_ALLOCATED), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_IPI_PER_CPU), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_IPI_SINGLE), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_MSI), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_ISOLATED_MSI), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_NO_MAP), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_MSI_PARENT), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_MSI_DEVICE), + BIT_MASK_DESCR(IRQ_DOMAIN_FLAG_NONCORE), +}; + static void irq_domain_debug_show_one(struct seq_file *m, struct irq_domain *d, int in= d) { @@ -1934,6 +1947,8 @@ irq_domain_debug_show_one(struct seq_file *m, struct = irq_domain *d, int ind) seq_printf(m, "%*ssize: %u\n", ind + 1, "", d->revmap_size); seq_printf(m, "%*smapped: %u\n", ind + 1, "", d->mapcount); seq_printf(m, "%*sflags: 0x%08x\n", ind +1 , "", d->flags); + irq_debug_show_bits(m, ind, d->flags, irqdomain_flags, + ARRAY_SIZE(irqdomain_flags)); if (d->ops && d->ops->debug_show) d->ops->debug_show(m, d, NULL, ind + 1); #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY --=20 2.34.1