linux-kernel - Re: [PATCH V1 2/5] irqchip/loongson-eiointc: Fix incorrect use of acpi_get_vec

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <c0ad9408-26a0-2b39-586c-a65cb08d4b76@loongson.cn>
Date:   Mon, 27 Mar 2023 12:00:32 +0800
From:   Jianmin Lv <lvjianmin@...ngson.cn>
To:     loongson-kernel@...ts.loongnix.cn
Cc:     Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org,
        loongarch@...ts.linux.dev,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Jiaxun Yang <jiaxun.yang@...goat.com>,
        Huacai Chen <chenhuacai@...ngson.cn>
Subject: Re: [PATCH V1 2/5] irqchip/loongson-eiointc: Fix incorrect use of
 acpi_get_vec_parent



On 2023/3/24 下午11:34, Marc Zyngier wrote:
> On Fri, 24 Mar 2023 06:08:51 +0000,
> Jianmin Lv <lvjianmin@...ngson.cn> wrote:
>>
>> In eiointc_acpi_init(), a *eiointc* node is passed into
>> acpi_get_vec_parent() instead of a required *NUMA* node (on some chip
>> like 3C5000L, a *NUMA* node means a *eiointc* node, but on some chip
>> like 3C5000, a *NUMA* node contains 4 *eiointc* nodes), and node in
>> struct acpi_vector_group is essentially a *NUMA* node, which will
>> lead to no parent matched for passed *eiointc* node. so the patch
>> adjusts code to use *NUMA* node for parameter node of
>> acpi_set_vec_parent/acpi_get_vec_parent.
>>
>> Change-Id: Iddd8423f9694cadc1ce28ee290c2e98ca17dfccc
>> Signed-off-by: Jianmin Lv <lvjianmin@...ngson.cn>
>> ---
>>   drivers/irqchip/irq-loongson-eiointc.c | 17 +++++++++++------
>>   1 file changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c
>> index 62a632d73991..b165c27a3609 100644
>> --- a/drivers/irqchip/irq-loongson-eiointc.c
>> +++ b/drivers/irqchip/irq-loongson-eiointc.c
>> @@ -280,9 +280,6 @@ static void acpi_set_vec_parent(int node, struct irq_domain *parent, struct acpi
>>   {
>>   	int i;
>>   
>> -	if (cpu_has_flatmode)
>> -		node = cpu_to_node(node * CORES_PER_EIO_NODE);
>> -
>>   	for (i = 0; i < MAX_IO_PICS; i++) {
>>   		if (node == vec_group[i].node) {
>>   			vec_group[i].parent = parent;
>> @@ -349,8 +346,13 @@ static int __init pch_pic_parse_madt(union acpi_subtable_headers *header,
>>   static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
>>   					const unsigned long end)
>>   {
>> +	struct irq_domain *parent;
>>   	struct acpi_madt_msi_pic *pchmsi_entry = (struct acpi_madt_msi_pic *)header;
>> -	struct irq_domain *parent = acpi_get_vec_parent(eiointc_priv[nr_pics - 1]->node, msi_group);
>> +	int node = eiointc_priv[nr_pics - 1]->node;
>> +
>> +	if (cpu_has_flatmode)
>> +		node = cpu_to_node(node * CORES_PER_EIO_NODE);
> 
> This is a bit unreadable. I'd rather see:
> 
> 	int node;
> 
> 	if (cpu_has_flatmode)
> 		node = ....;
> 	else
> 		node = ....;
> 
> which makes it easy to detect the use of an uninitialised 'node'
> rather than using the wrong default variable.
> 
>> +	parent = acpi_get_vec_parent(node, msi_group);
>>   
>>   	if (parent)
>>   		return pch_msi_acpi_init(parent, pchmsi_entry);
>> @@ -379,6 +381,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
>>   	int i, ret, parent_irq;
>>   	unsigned long node_map;
>>   	struct eiointc_priv *priv;
>> +	int node = acpi_eiointc->node;
>>   
>>   	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
>>   	if (!priv)
>> @@ -421,8 +424,10 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
>>   				  "irqchip/loongarch/intc:starting",
>>   				  eiointc_router_init, NULL);
>>   
>> -	acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, pch_group);
>> -	acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, msi_group);
>> +	if (cpu_has_flatmode)
>> +		node = cpu_to_node(node * CORES_PER_EIO_NODE);
>> +	acpi_set_vec_parent(node, priv->eiointc_domain, pch_group);
>> +	acpi_set_vec_parent(node, priv->eiointc_domain, msi_group);
>>   	ret = acpi_cascade_irqdomain_init();
>>   
>>   	return ret;
> 
> Same thing here.
> 

Ok, I'll change them  in next version.

Thanks!

> 	M.
>