Skip to contentSkip to conversation

x86/pci: use unsigned int in check_reserved_t

PATCH In review Sami Tolvanen 2 participants 4 messages Nov 14, 2020

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

PATCH v2 1/2 x86/pci: use unsigned int in check_reserved_t

Use unsigned int instead of raw unsigned in check_reserved_t to follow the kernel's style guidelines.

---
 arch/x86/pci/mmconfig-shared.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/mmconfig-shared.c +2 -2
index 6fa42e9c4e6f..37f31dd7005a 100644
@@ -425,7 +425,7 @@ static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl,
 	return AE_OK;
 }
 
-static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
+static bool is_acpi_reserved(u64 start, u64 end, unsigned int not_used)
 {
 	struct resource mcfg_res;
 
@@ -442,7 +442,7 @@ static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
 	return mcfg_res.flags;
 }
 
-typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned type);
+typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned int type);
 
 static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
 				     struct pci_mmcfg_region *cfg,

base-commit: 9e6a39eae450b81c8b2c8cbbfbdf8218e9b40c81

Signature · 1 line
2.29.2.299.gdc1121823c-goog
#1 lore raw

PATCH v2 2/2 x86/e820: fix the function type for e820__mapped_all

e820__mapped_all is passed as a callback to is_mmconf_reserved, which expects a function of type:

typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned int type);

This trips indirect call checking with Clang's Control-Flow Integrity (CFI). Change the last argument from enum e820_type to unsigned to fix the type mismatch.

---
 arch/x86/include/asm/e820/api.h | 2 +-
 arch/x86/kernel/e820.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/e820/api.h +1 -1
index e8f58ddd06d9..a122ca2784b2 100644
@@ -12,7 +12,7 @@ extern unsigned long pci_mem_start;
 
 extern bool e820__mapped_raw_any(u64 start, u64 end, enum e820_type type);
 extern bool e820__mapped_any(u64 start, u64 end, enum e820_type type);
-extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type);
+extern bool e820__mapped_all(u64 start, u64 end, unsigned int type);
 
 extern void e820__range_add   (u64 start, u64 size, enum e820_type type);
 extern u64  e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
arch/x86/kernel/e820.c +1 -1
index 22aad412f965..24b82ff53513 100644
@@ -145,7 +145,7 @@ static struct e820_entry *__e820__mapped_all(u64 start, u64 end,
 /*
  * This function checks if the entire range <start,end> is mapped with type.
  */
-bool __init e820__mapped_all(u64 start, u64 end, enum e820_type type)
+bool __init e820__mapped_all(u64 start, u64 end, unsigned int type)
 {
 	return __e820__mapped_all(start, end, type);
 }
Signature · 1 line
2.29.2.299.gdc1121823c-goog
Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] x86/e820: fix the function type for e820__mapped_all

Quoted 11 lines · Sami Tolvanen

e820__mapped_all is passed as a callback to is_mmconf_reserved, which expects a function of type:

typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned int type);

This trips indirect call checking with Clang's Control-Flow Integrity (CFI). Change the last argument from enum e820_type to unsigned to fix the type mismatch.

Thanks.

Quoted 32 lines
---
 arch/x86/include/asm/e820/api.h | 2 +-
 arch/x86/kernel/e820.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/e820/api.h +1 -1
index e8f58ddd06d9..a122ca2784b2 100644
@@ -12,7 +12,7 @@ extern unsigned long pci_mem_start;
 
 extern bool e820__mapped_raw_any(u64 start, u64 end, enum e820_type type);
 extern bool e820__mapped_any(u64 start, u64 end, enum e820_type type);
-extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type);
+extern bool e820__mapped_all(u64 start, u64 end, unsigned int type);
 
 extern void e820__range_add   (u64 start, u64 size, enum e820_type type);
 extern u64  e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
arch/x86/kernel/e820.c +1 -1
index 22aad412f965..24b82ff53513 100644
@@ -145,7 +145,7 @@ static struct e820_entry *__e820__mapped_all(u64 start, u64 end,
 /*
  * This function checks if the entire range <start,end> is mapped with type.
  */
-bool __init e820__mapped_all(u64 start, u64 end, enum e820_type type)
+bool __init e820__mapped_all(u64 start, u64 end, unsigned int type)
 {
 	return __e820__mapped_all(start, end, type);
 }
Signature · 1 line
~Randy
Acked-by on v2 1/2
#3 lore raw
In reply to Sami Tolvanen
Quoted 4 lines · Sami Tolvanen

Use unsigned int instead of raw unsigned in check_reserved_t to follow the kernel's style guidelines.

Thanks.

Quoted 29 lines
---
 arch/x86/pci/mmconfig-shared.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/mmconfig-shared.c +2 -2
index 6fa42e9c4e6f..37f31dd7005a 100644
@@ -425,7 +425,7 @@ static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl,
 	return AE_OK;
 }
 
-static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
+static bool is_acpi_reserved(u64 start, u64 end, unsigned int not_used)
 {
 	struct resource mcfg_res;
 
@@ -442,7 +442,7 @@ static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
 	return mcfg_res.flags;
 }
 
-typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned type);
+typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned int type);
 
 static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
 				     struct pci_mmcfg_region *cfg,

base-commit: 9e6a39eae450b81c8b2c8cbbfbdf8218e9b40c81

Signature · 1 line
~Randy