Skip to contentSkip to conversation

xen/dt: Remove loop in dt_read_number()

PATCH Superseded Alejandro Vallejo 3 participants 4 messages Jun 17, 2025

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen/dt: Remove loop in dt_read_number()

The DT spec declares only two number types for a property: u32 and u64, as per Table 2.3 in Section 2.2.4. Remove unbounded loop and replace with a switch statement. Default to a size of 1 cell in the nonsensical size case, with a warning printed on the Xen console.

---
Based on this suggestion by Daniel:

    https://lore.kernel.org/xen-devel/[email protected]/

I'd be happier panicking there, seeing how DTs are by their very nature trusted blobs. But I suspect defaulting to something will find less resistance in review. I don't care much either way.

---
 xen/include/xen/device_tree.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
xen/include/xen/device_tree.h +12 -3
index 75017e4266..2daef8659e 100644
@@ -261,10 +261,19 @@ void intc_dt_preinit(void);
 /* Helper to read a big number; size is in cells (not bytes) */
 static inline u64 dt_read_number(const __be32 *cell, int size)
 {
-    u64 r = 0;
+    u64 r = be32_to_cpu(*cell);
+
+    switch ( size )
+    {
+    case 1:
+        break;
+    case 2:
+        r = (r << 32) | be32_to_cpu(cell[1]);
+    default:
+        // Nonsensical size. default to 1.
+        printk(XENLOG_WARNING "dt_read_number(%d) bad size", size);
+    };
 
-    while ( size-- )
-        r = (r << 32) | be32_to_cpu(*(cell++));
     return r;
 }
 

base-commit: 14c57887f36937c1deb9eeca852c3a7595d2d0b8

Signature · 1 line
2.43.0
#1 lore raw
Quoted 16 lines · Alejandro Vallejo
xen/include/xen/device_tree.h +7 -1
index 75017e4266..2daef8659e 100644
@@ -261,10 +261,19 @@ void intc_dt_preinit(void);
 /* Helper to read a big number; size is in cells (not bytes) */
 static inline u64 dt_read_number(const __be32 *cell, int size)
 {
-    u64 r = 0;
+    u64 r = be32_to_cpu(*cell);
+
+    switch ( size )
+    {
+    case 1:
+        break;
+    case 2:

xen/include/xen/device_tree.h void intc_dt_preinit(void); · line 278

Quoted 10 lines
xen/include/xen/device_tree.h +5 -2
+        r = (r << 32) | be32_to_cpu(cell[1]);
+    default:
+        // Nonsensical size. default to 1.
+        printk(XENLOG_WARNING "dt_read_number(%d) bad size", size);
+    };
 
-    while ( size-- )
-        r = (r << 32) | be32_to_cpu(*(cell++));
     return r;
 }

What testing has this had?

~Andrew

#2 lore raw
In reply to Alejandro Vallejo
Quoted 26 lines · Alejandro Vallejo

The DT spec declares only two number types for a property: u32 and u64, as per Table 2.3 in Section 2.2.4. Remove unbounded loop and replace with a switch statement. Default to a size of 1 cell in the nonsensical size case, with a warning printed on the Xen console.

---
Based on this suggestion by Daniel:

    https://lore.kernel.org/xen-devel/[email protected]/

I'd be happier panicking there, seeing how DTs are by their very nature trusted blobs. But I suspect defaulting to something will find less resistance in review. I don't care much either way.

---
 xen/include/xen/device_tree.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
xen/include/xen/device_tree.h +0 -0
index 75017e4266..2daef8659e 100644
@@ -261,10 +261,19 @@ void intc_dt_preinit(void);
 /* Helper to read a big number; size is in cells (not bytes) */
 static inline u64 dt_read_number(const __be32 *cell, int size)

xen/include/xen/device_tree.h void intc_dt_preinit(void); · line 271

Quoted 10 lines
xen/include/xen/device_tree.h +8 -1
 {
-    u64 r = 0;
+    u64 r = be32_to_cpu(*cell);
+
+    switch ( size )
+    {
+    case 1:
+        break;
+    case 2:
+        r = (r << 32) | be32_to_cpu(cell[1]);

Bah, missing break. And with a printk rather than a panic CI stayed green when it shouldn't have been.

xen/include/xen/device_tree.h void intc_dt_preinit(void); · line 274

Quoted 3 lines
xen/include/xen/device_tree.h +3 -0
+    default:
+        // Nonsensical size. default to 1.
+        printk(XENLOG_WARNING "dt_read_number(%d) bad size", size);

I'll add an ASSERT_UNREACHABLE() here for good measure.

Quoted 9 lines
xen/include/xen/device_tree.h +1 -2
+    };
 
-    while ( size-- )
-        r = (r << 32) | be32_to_cpu(*(cell++));
     return r;
 }
 

base-commit: 14c57887f36937c1deb9eeca852c3a7595d2d0b8

#3 lore raw
In reply to Alejandro Vallejo

Hi Alejandro,

Quoted 29 lines · Alejandro Vallejo

The DT spec declares only two number types for a property: u32 and u64, as per Table 2.3 in Section 2.2.4. Remove unbounded loop and replace with a switch statement. Default to a size of 1 cell in the nonsensical size case, with a warning printed on the Xen console.

---
Based on this suggestion by Daniel:

     https://lore.kernel.org/xen-devel/[email protected]/

I'd be happier panicking there, seeing how DTs are by their very nature trusted blobs. But I suspect defaulting to something will find less resistance in review. I don't care much either way.

---
  xen/include/xen/device_tree.h | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
xen/include/xen/device_tree.h +1 -1
index 75017e4266..2daef8659e 100644
@@ -261,10 +261,19 @@ void intc_dt_preinit(void);
  /* Helper to read a big number; size is in cells (not bytes) */
  static inline u64 dt_read_number(const __be32 *cell, int size)
  {
-    u64 r = 0;
+    u64 r = be32_to_cpu(*cell);

xen/include/xen/device_tree.h void intc_dt_preinit(void); · line 274

Quoted 10 lines
xen/include/xen/device_tree.h +10 -0
+
+    switch ( size )
+    {
+    case 1:
+        break;
+    case 2:
+        r = (r << 32) | be32_to_cpu(cell[1]);
+    default:
+        // Nonsensical size. default to 1.
+        printk(XENLOG_WARNING "dt_read_number(%d) bad size", size);

Aside what Andrew wrote. I would consider to use at least ASSERT_UNREACHABLE() for debug build. I am not sure what's the best approach for release build. But this likely want to a XENLOG_ERR.

Cheers,

Signature · 1 line
Julien Grall