[tip:x86/urgent] x86/apic: Fix a warning message in logical CPU IDs allocation

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Dou Liyang <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:x86/urgent] x86/apic: Fix a warning message in logical CPU IDs allocation
Date	Wed, 01 Mar 2017 10:20:01 +0100
Message-ID	<tg8Ap-Y7-1@gated-at.bofh.it> (permalink)
References	<tfIZj-68-5@gated-at.bofh.it>
X-Original-To	linux-tip-commits@vger.kernel.org
Reply-To	torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, douly.fnst@cn.fujitsu.com, peterz@infradead.org
Git-Commit-ID	bb3f0a52630c84807fca9bdd76ac2f5dcec82689
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, douly.fnst@cn.fujitsu.com, tglx@linutronix.de, hpa@zytor.com
X-Original-Date	Wed, 1 Mar 2017 01:14:12 -0800
X-Original-Message-ID	<tip-bb3f0a52630c84807fca9bdd76ac2f5dcec82689@git.kernel.org>
X-Original-References	<1488261052-25753-1-git-send-email-douly.fnst@cn.fujitsu.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1590116

Show key headers only | View raw

Commit-ID:  bb3f0a52630c84807fca9bdd76ac2f5dcec82689
Gitweb:     http://git.kernel.org/tip/bb3f0a52630c84807fca9bdd76ac2f5dcec82689
Author:     Dou Liyang <douly.fnst@cn.fujitsu.com>
AuthorDate: Tue, 28 Feb 2017 13:50:52 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 1 Mar 2017 10:09:08 +0100

x86/apic: Fix a warning message in logical CPU IDs allocation

The current warning message in allocate_logical_cpuid() is somewhat confusing:

  Only 1 processors supported.Processor 2/0x2 and the rest are ignored.

As it might imply that there's only one CPU in the system - while what we ran
into here is a kernel limitation.

Fix the warning message to clarify all that:

  APIC: NR_CPUS/possible_cpus limit of 2 reached. Processor 2/0x2 and the rest are ignored.

( Also update the error return from -1 to -EINVAL, which is the more
  canonical return value. )

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: nicstange@gmail.com
Cc: wanpeng.li@hotmail.com
Link: http://lkml.kernel.org/r/1488261052-25753-1-git-send-email-douly.fnst@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/apic/apic.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 4261b32..11088b8 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2062,10 +2062,10 @@ static int allocate_logical_cpuid(int apicid)
 
 	/* Allocate a new cpuid. */
 	if (nr_logical_cpuids >= nr_cpu_ids) {
-		WARN_ONCE(1, "Only %d processors supported."
+		WARN_ONCE(1, "APIC: NR_CPUS/possible_cpus limit of %i reached. "
 			     "Processor %d/0x%x and the rest are ignored.\n",
-			     nr_cpu_ids - 1, nr_logical_cpuids, apicid);
-		return -1;
+			     nr_cpu_ids, nr_logical_cpuids, apicid);
+		return -EINVAL;
 	}
 
 	cpuid_to_apicid[nr_logical_cpuids] = apicid;

Thread

[PATCH] x86/acpi: Fix a warning message in logical CPU IDs allocation Dou Liyang <douly.fnst@cn.fujitsu.com> - 2017-02-28 07:00 +0100
  [tip:x86/urgent] x86/apic: Fix a warning message in logical CPU IDs  allocation tip-bot for Dou Liyang <tipbot@zytor.com> - 2017-03-01 10:20 +0100
  Re: [PATCH] x86/acpi: Fix a warning message in logical CPU IDs  allocation Ingo Molnar <mingo@kernel.org> - 2017-03-01 10:30 +0100
    Re: [PATCH] x86/acpi: Fix a warning message in logical CPU IDs  allocation Dou Liyang <douly.fnst@cn.fujitsu.com> - 2017-03-01 11:20 +0100

csiph-web