2012-06-14 07:50:35

by Alexander Gordeev

Subject: [PATCH 5/6] x86/apic/es7000+summit: Always make valid apicid from a cpumask

In case of invalid parameters cpu_mask_to_apicid_and() might return
apicid value of 0 (on Summit) or a uninitialized value (on ES7000),
although it is supposed to return apicid of cpu-0 at least. Fix the
operation to always return a valid apicid.

Signed-off-by: Alexander Gordeev <[email protected]>
---
arch/x86/kernel/apic/es7000_32.c | 2 ++
arch/x86/kernel/apic/summit_32.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 0c1347d..9882093 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -545,6 +545,8 @@ es7000_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
apicid = new_apicid;
round++;
}
+ if (!round)
+ return -EINVAL;
*dest_id = apicid;
return 0;
}
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index e6cc182..b6e6185 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -282,6 +282,8 @@ summit_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
apicid |= new_apicid;
round++;
}
+ if (!round)
+ return -EINVAL;
*dest_id = apicid;
return 0;
}
--
1.7.7.6


--
Regards,
Alexander Gordeev
[email protected]

2012-06-14 14:49:25

by Alexander Gordeev

Subject: [tip:x86/apic] x86/apic/es7000+summit: Always make valid apicid from a cpumask

Commit-ID: 214e270b5f5f6a85400a817d5305c797b2b7467a
Gitweb: http://git.kernel.org/tip/214e270b5f5f6a85400a817d5305c797b2b7467a
Author: Alexander Gordeev <[email protected]>
AuthorDate: Thu, 14 Jun 2012 09:50:27 +0200
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 14 Jun 2012 12:53:15 +0200

x86/apic/es7000+summit: Always make valid apicid from a cpumask

In case of invalid parameters cpu_mask_to_apicid_and() might
return apicid value of 0 (on Summit) or a uninitialized value
(on ES7000), although it is supposed to return apicid of cpu-0
at least. Fix the operation to always return a valid apicid.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Suresh Siddha <[email protected]>
Cc: Yinghai Lu <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/apic/es7000_32.c | 2 ++
arch/x86/kernel/apic/summit_32.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 0c1347d..9882093 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -545,6 +545,8 @@ es7000_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
apicid = new_apicid;
round++;
}
+ if (!round)
+ return -EINVAL;
*dest_id = apicid;
return 0;
}
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index e6cc182..b6e6185 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -282,6 +282,8 @@ summit_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
apicid |= new_apicid;
round++;
}
+ if (!round)
+ return -EINVAL;
*dest_id = apicid;
return 0;
}