Skip to contentSkip to conversation

irqchip/gic-v3: fix OF_BAD_ADDR error handling

PATCH Applied Arnd Bergmann 4 participants 6 messages Mar 23, 2021 – Apr 7, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irqchip/gic-v3: fix OF_BAD_ADDR error handling

From: Arnd Bergmann <[email protected]>

When building with extra warnings enabled, clang points out a mistake in the error handling:

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

                if (mbi_phys_base == OF_BAD_ADDR) {

Truncate the constant to the same type as the variable it gets compared to, to shut make the check work and void the warning.

Fixes 505287525c24 ("irqchip/gic-v3: Add support for Message Based Interrupts as an MSI controller")
---
 drivers/irqchip/irq-gic-v3-mbi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-mbi.c +1 -1
index 563a9b366294..e81e89a81cb5 100644
@@ -303,7 +303,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
 	reg = of_get_property(np, "mbi-alias", NULL);
 	if (reg) {
 		mbi_phys_base = of_translate_address(np, reg);
-		if (mbi_phys_base == OF_BAD_ADDR) {
+		if (mbi_phys_base == (phys_addr_t)OF_BAD_ADDR) {
 			ret = -ENXIO;
 			goto err_free_mbi;
 		}
Signature · 1 line
2.29.2
#1 lore raw
Quoted 7 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When building with extra warnings enabled, clang points out a mistake in the error handling:

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

Looks like based on CONFIG_PHYS_ADDR_T_64BIT, phys_addr_t can be u64 or u32, but of_translate_address always returns a u64. This is fine for the current value of OF_BAD_ADDR, but I think there's a risk of losing the top 32b of the return value of of_translate_address() here?

Quoted 27 lines
                if (mbi_phys_base == OF_BAD_ADDR) {

Truncate the constant to the same type as the variable it gets compared to, to shut make the check work and void the warning.

Fixes 505287525c24 ("irqchip/gic-v3: Add support for Message Based Interrupts as an MSI controller")
---
 drivers/irqchip/irq-gic-v3-mbi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-mbi.c +1 -2
index 563a9b366294..e81e89a81cb5 100644
@@ -303,7 +303,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
        reg = of_get_property(np, "mbi-alias", NULL);
        if (reg) {
                mbi_phys_base = of_translate_address(np, reg);
-               if (mbi_phys_base == OF_BAD_ADDR) {
+               if (mbi_phys_base == (phys_addr_t)OF_BAD_ADDR) {
                        ret = -ENXIO;
                        goto err_free_mbi;
                }
--

2.29.2

Signature · 2 lines
Thanks,
~Nick Desaulniers
maintainer
#2 lore raw
Quoted 8 lines · Nick Desaulniers
Quoted 6 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When building with extra warnings enabled, clang points out a mistake in the error handling:

Quoted 6 lines
Quoted 1 line

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

Looks like based on CONFIG_PHYS_ADDR_T_64BIT, phys_addr_t can be u64 or u32, but of_translate_address always returns a u64. This is fine for the current value of OF_BAD_ADDR, but I think there's a risk of losing the top 32b of the return value of of_translate_address() here?

If the DT describes a 64bit physical address, and that the (32bit) kernel isn't built to grok these addresses, then I'd say that the kernel cannot run on this HW, and that we don't need to worry much about this case.

In general, CONFIG_PHYS_ADDR_T_64BIT must be selected by the arch code if anything above 32bit can be described in the PA space.

Thanks,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
#3 lore raw
Quoted 18 lines · Marc Zyngier
Quoted 8 lines · Nick Desaulniers
Quoted 6 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When building with extra warnings enabled, clang points out a mistake in the error handling:

Quoted 6 lines
Quoted 1 line

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

Looks like based on CONFIG_PHYS_ADDR_T_64BIT, phys_addr_t can be u64 or u32, but of_translate_address always returns a u64. This is fine for the current value of OF_BAD_ADDR, but I think there's a risk of losing the top 32b of the return value of of_translate_address() here?

Quoted 7 lines

If the DT describes a 64bit physical address, and that the (32bit) kernel isn't built to grok these addresses, then I'd say that the kernel cannot run on this HW, and that we don't need to worry much about this case.

In general, CONFIG_PHYS_ADDR_T_64BIT must be selected by the arch code if anything above 32bit can be described in the PA space.

Right, this generally works fine, the OF_BAD_ADDR is just a little hard to get right. Fortunately there are very few comparisons to OF_BAD_ADDR in other drivers, so I don't think we have to do anything about it. I looked through every other user of this and found no problems there, either they use 64-bit temporaries, or they correctly cast the results.

Arnd

maintainer Applied
#4 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

When building with extra warnings enabled, clang points out a mistake in the error handling:

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

                if (mbi_phys_base == OF_BAD_ADDR) {

Truncate the constant to the same type as the variable it gets compared to, to shut make the check work and void the warning.

Applied to irq/irqchip-next, thanks!

[1/1] irqchip/gic-v3: fix OF_BAD_ADDR error handling

      commit: 8e13d96670a4c050d4883e6743a9e9858e5cfe10

Cheers,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
#5 lore raw

[irqchip: irq/irqchip-next] irqchip/gic-v3: Fix OF_BAD_ADDR error handling

In reply to Arnd Bergmann
The following commit has been merged into the irq/irqchip-next branch of irqchip:

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     8e13d96670a4c050d4883e6743a9e9858e5cfe10
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/8e13d96670a4c050d4883e6743a9e9858e5cfe10
Author:        Arnd Bergmann <[email protected]>
AuthorDate:    Tue, 23 Mar 2021 14:18:35 +01:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Wed, 07 Apr 2021 13:25:52 +01:00

irqchip/gic-v3: Fix OF_BAD_ADDR error handling

When building with extra warnings enabled, clang points out a mistake in the error handling:

drivers/irqchip/irq-gic-v3-mbi.c:306:21: error: result of comparison of constant 18446744073709551615 with expression of type 'phys_addr_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]

                if (mbi_phys_base == OF_BAD_ADDR) {

Truncate the constant to the same type as the variable it gets compared to, to shut make the check work and void the warning.

Fixes 505287525c24 ("irqchip/gic-v3: Add support for Message Based Interrupts as an MSI controller")
---
 drivers/irqchip/irq-gic-v3-mbi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-mbi.c +1 -1
index 563a9b3..e81e89a 100644
@@ -303,7 +303,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
 	reg = of_get_property(np, "mbi-alias", NULL);
 	if (reg) {
 		mbi_phys_base = of_translate_address(np, reg);
-		if (mbi_phys_base == OF_BAD_ADDR) {
+		if (mbi_phys_base == (phys_addr_t)OF_BAD_ADDR) {
 			ret = -ENXIO;
 			goto err_free_mbi;
 		}