]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/apic: Sanitize APIC ID range validation
authorThomas Gleixner <tglx@linutronix.de>
Tue, 8 Aug 2023 22:04:12 +0000 (15:04 -0700)
committerDave Hansen <dave.hansen@linux.intel.com>
Wed, 9 Aug 2023 18:58:32 +0000 (11:58 -0700)
Now that everything has apic::max_apic_id set and the eventual update for
the x2APIC case is in place, switch the apic_id_valid() helper to use
apic::max_apic_id and remove the apic::apic_id_valid() callback.

[ dhansen: Fix subject typo ]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
12 files changed:
arch/x86/include/asm/apic.h
arch/x86/kernel/apic/apic_common.c
arch/x86/kernel/apic/apic_flat_64.c
arch/x86/kernel/apic/apic_noop.c
arch/x86/kernel/apic/apic_numachip.c
arch/x86/kernel/apic/bigsmp_32.c
arch/x86/kernel/apic/local.h
arch/x86/kernel/apic/probe_32.c
arch/x86/kernel/apic/x2apic_cluster.c
arch/x86/kernel/apic/x2apic_phys.c
arch/x86/kernel/apic/x2apic_uv_x.c
arch/x86/xen/apic.c

index 2e79c13d3c65e9fbc17d6d0201efe136dbad4772..ccf4e3665d08c289453194f47d55326cfa94c394 100644 (file)
@@ -284,7 +284,6 @@ struct apic {
        /* Probe, setup and smpboot functions */
        int     (*probe)(void);
        int     (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
-       int     (*apic_id_valid)(u32 apicid);
        bool    (*apic_id_registered)(void);
 
        bool    (*check_apicid_used)(physid_mask_t *map, int apicid);
@@ -378,7 +377,7 @@ static inline u32 safe_apic_wait_icr_idle(void)
 
 static inline bool apic_id_valid(u32 apic_id)
 {
-       return apic->apic_id_valid(apic_id);
+       return apic_id <= apic->max_apic_id;
 }
 
 extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));
index bbb5d5a6c82057f5e845f1b32432ca403a444738..7bc5d9bf59cd191a7b85c24eb3db7e8c6ee08f53 100644 (file)
@@ -37,11 +37,6 @@ int default_cpu_present_to_apicid(int mps_cpu)
 }
 EXPORT_SYMBOL_GPL(default_cpu_present_to_apicid);
 
-int default_apic_id_valid(u32 apicid)
-{
-       return (apicid < 255);
-}
-
 bool default_apic_id_registered(void)
 {
        return physid_isset(read_apic_id(), phys_cpu_present_map);
index b5e85bb021a168aef4d6c4d3700e286793e862ac..1e268a0251f88adcc116cc832969e5808af20d79 100644 (file)
@@ -80,7 +80,6 @@ static struct apic apic_flat __ro_after_init = {
        .name                           = "flat",
        .probe                          = flat_probe,
        .acpi_madt_oem_check            = flat_acpi_madt_oem_check,
-       .apic_id_valid                  = default_apic_id_valid,
        .apic_id_registered             = default_apic_id_registered,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
@@ -158,7 +157,6 @@ static struct apic apic_physflat __ro_after_init = {
        .name                           = "physical flat",
        .probe                          = physflat_probe,
        .acpi_madt_oem_check            = physflat_acpi_madt_oem_check,
-       .apic_id_valid                  = default_apic_id_valid,
        .apic_id_registered             = default_apic_id_registered,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
index d49c10d31318b94992e0af9f9ff064633b8a38bd..bd6a95ce75de054f85d1b6c3b8cda3c189b8b643 100644 (file)
@@ -67,8 +67,6 @@ struct apic apic_noop __ro_after_init = {
        .probe                          = noop_probe,
        .acpi_madt_oem_check            = NULL,
 
-       .apic_id_valid                  = default_apic_id_valid,
-
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = true,
 
index 43cbc24dbdfdd624a49d17af923e828ac99bcaea..39ebe1a3458b851985af05bf3a53fcbcba43d3e8 100644 (file)
@@ -56,12 +56,6 @@ static u32 numachip2_set_apic_id(unsigned int id)
        return id << 24;
 }
 
-static int numachip_apic_id_valid(u32 apicid)
-{
-       /* Trust what bootloader passes in MADT */
-       return 1;
-}
-
 static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
 {
        return initial_apic_id >> index_msb;
@@ -227,7 +221,6 @@ static const struct apic apic_numachip1 __refconst = {
        .name                           = "NumaConnect system",
        .probe                          = numachip1_probe,
        .acpi_madt_oem_check            = numachip1_acpi_madt_oem_check,
-       .apic_id_valid                  = numachip_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = false,
@@ -267,7 +260,6 @@ static const struct apic apic_numachip2 __refconst = {
        .name                           = "NumaConnect2 system",
        .probe                          = numachip2_probe,
        .acpi_madt_oem_check            = numachip2_acpi_madt_oem_check,
-       .apic_id_valid                  = numachip_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = false,
index 5f7a94b97e17055fee9207c1c9e9cdd32aa2197f..ffcd114c96b9e77addc7c10d98df3d9212c40326 100644 (file)
@@ -79,7 +79,6 @@ static struct apic apic_bigsmp __ro_after_init = {
 
        .name                           = "bigsmp",
        .probe                          = probe_bigsmp,
-       .apic_id_valid                  = default_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = false,
index e576b3a4d29c2851495e5999b32783e35253af0c..ec219c659c7ddf496b782388c5df9ba5506812e0 100644 (file)
@@ -14,7 +14,6 @@
 #include <asm/apic.h>
 
 /* X2APIC */
-int x2apic_apic_id_valid(u32 apicid);
 void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest);
 unsigned int x2apic_get_apic_id(unsigned long id);
 u32 x2apic_set_apic_id(unsigned int id);
index 7c4b5f716bb63f707714a322165a70d0c5d0f6da..d9f52f2f3e161a8f151175c2035e6fb18be9b755 100644 (file)
@@ -33,7 +33,6 @@ static struct apic apic_default __ro_after_init = {
 
        .name                           = "default",
        .probe                          = probe_default,
-       .apic_id_valid                  = default_apic_id_valid,
        .apic_id_registered             = default_apic_id_registered,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
index a164764cb166bd35e39cc74b93db09422b993232..12b9c310f3f561938ec6c7e59a7f38be8229d2c2 100644 (file)
@@ -226,7 +226,6 @@ static struct apic apic_x2apic_cluster __ro_after_init = {
        .name                           = "cluster x2apic",
        .probe                          = x2apic_cluster_probe,
        .acpi_madt_oem_check            = x2apic_acpi_madt_oem_check,
-       .apic_id_valid                  = x2apic_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = true,
index 3aabfd336f1e32fc2492fc140f887b46f90d8109..fcb96b9652ba18f5a60739ece7ab422a316a682f 100644 (file)
@@ -124,12 +124,6 @@ static int x2apic_phys_probe(void)
        return apic == &apic_x2apic_phys;
 }
 
-/* Common x2apic functions, also used by x2apic_cluster */
-int x2apic_apic_id_valid(u32 apicid)
-{
-       return apicid <= x2apic_max_apicid;
-}
-
 unsigned int x2apic_get_apic_id(unsigned long id)
 {
        return id;
@@ -150,7 +144,6 @@ static struct apic apic_x2apic_phys __ro_after_init = {
        .name                           = "physical x2apic",
        .probe                          = x2apic_phys_probe,
        .acpi_madt_oem_check            = x2apic_acpi_madt_oem_check,
-       .apic_id_valid                  = x2apic_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = false,
index 7d4eaa889e6444a0938e47a4f108dcfeb193184e..26891ac881f9559a1fdcb398c4b988335dead16a 100644 (file)
@@ -780,11 +780,6 @@ static void uv_send_IPI_all(int vector)
        uv_send_IPI_mask(cpu_online_mask, vector);
 }
 
-static int uv_apic_id_valid(u32 apicid)
-{
-       return 1;
-}
-
 static u32 set_apic_id(unsigned int id)
 {
        return id;
@@ -810,7 +805,6 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
        .name                           = "UV large system",
        .probe                          = uv_probe,
        .acpi_madt_oem_check            = uv_acpi_madt_oem_check,
-       .apic_id_valid                  = uv_apic_id_valid,
 
        .delivery_mode                  = APIC_DELIVERY_MODE_FIXED,
        .dest_mode_logical              = false,
index 572814b29c6d079f28d13e23db1e8044b2ca45bd..661eecfdc4ba95e42e4efc0a27a358b5c38be36e 100644 (file)
@@ -105,11 +105,6 @@ static int xen_madt_oem_check(char *oem_id, char *oem_table_id)
        return xen_pv_domain();
 }
 
-static int xen_id_always_valid(u32 apicid)
-{
-       return 1;
-}
-
 static int xen_phys_pkg_id(int initial_apic_id, int index_msb)
 {
        return initial_apic_id >> index_msb;
@@ -127,7 +122,6 @@ static struct apic xen_pv_apic = {
        .name                           = "Xen PV",
        .probe                          = xen_apic_probe_pv,
        .acpi_madt_oem_check            = xen_madt_oem_check,
-       .apic_id_valid                  = xen_id_always_valid,
 
        /* .delivery_mode and .dest_mode_logical not used by XENPV */