Skip to contentSkip to conversation

ACPICA: Use uintptr_t and offsetof() in Linux kernel builds

PATCH In review Rafael J. Wysocki 3 participants 3 messages Jan 11, 2022 – Jan 25, 2022

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

PATCH 1/1 ACPICA: Use uintptr_t and offsetof() in Linux kernel builds

From: Rafael J. Wysocki <[email protected]>

To avoid "performing pointer subtraction with a null pointer has undefined behavior" compiler warnings, use uintptr_t and offsetof() that are always available during Linux kernel builds to define acpi_uintptr_t and the ACPI_TO_INTEGER() and ACPI_OFFSET() macros.

Based on earlier proposal from Arnd Bergmann.

---
 include/acpi/actypes.h          |    4 ++++
 include/acpi/platform/aclinux.h |    5 +++++
 2 files changed, 9 insertions(+)
include/acpi/platform/aclinux.h +5 -0
Index: linux-pm/include/acpi/platform/aclinux.h
===================================================================
@@ -114,6 +114,11 @@
 #define acpi_raw_spinlock                   raw_spinlock_t *
 #define acpi_cpu_flags                      unsigned long
 
+#define acpi_uintptr_t                      uintptr_t
+
+#define ACPI_TO_INTEGER(p)                  ((uintptr_t)(p))
+#define ACPI_OFFSET(d, f)                   offsetof(d, f)
+
 /* Use native linux version of acpi_os_allocate_zeroed */
 
 #define USE_NATIVE_ALLOCATE_ZEROED
include/acpi/actypes.h +4 -0
Index: linux-pm/include/acpi/actypes.h
===================================================================
@@ -507,8 +507,12 @@ typedef u64 acpi_integer;
 /* Pointer/Integer type conversions */
 
 #define ACPI_TO_POINTER(i)              ACPI_CAST_PTR (void, (acpi_size) (i))
+#ifndef ACPI_TO_INTEGER
 #define ACPI_TO_INTEGER(p)              ACPI_PTR_DIFF (p, (void *) 0)
+#endif
+#ifndef ACPI_OFFSET
 #define ACPI_OFFSET(d, f)               ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0)
+#endif
 #define ACPI_PTR_TO_PHYSADDR(i)         ACPI_TO_INTEGER(i)
 
 /* Optimizations for 4-character (32-bit) acpi_name manipulation */
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

To avoid "performing pointer subtraction with a null pointer has undefined behavior" compiler warnings, use uintptr_t and offsetof() that are always available during Linux kernel builds to define acpi_uintptr_t and the ACPI_TO_INTEGER() and ACPI_OFFSET() macros.

Quoted 4 lines

Based on earlier proposal from Arnd Bergmann.

Thanks for the follow-up. I can't easily test this at the moment, but it looks correct to
me. I had a different approach that I had planned to eventually submit, but yours
looks better anyway, so let's go with this.

#2 lore raw
Quoted 15 lines · Arnd Bergmann
Quoted 8 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

To avoid "performing pointer subtraction with a null pointer has undefined behavior" compiler warnings, use uintptr_t and offsetof() that are always available during Linux kernel builds to define acpi_uintptr_t and the ACPI_TO_INTEGER() and ACPI_OFFSET() macros.

Quoted 4 lines

Based on earlier proposal from Arnd Bergmann.

Quoted 7 lines

Thanks for the follow-up. I can't easily test this at the moment, but it looks correct to
me. I had a different approach that I had planned to eventually submit, but yours
looks better anyway, so let's go with this.

Thank you, I've applied this patch as 5.18 material.

A pull request for the analogous change in the upstream code base has been submitted and Bob is going to take it AFAICS.