From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753102AbbESQ4k (ORCPT ); Tue, 19 May 2015 12:56:40 -0400 Received: from mail.skyhub.de ([78.46.96.112]:52661 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752842AbbESQ4g (ORCPT ); Tue, 19 May 2015 12:56:36 -0400 Date: Tue, 19 May 2015 18:56:27 +0200 From: Borislav Petkov To: Prarit Bhargava Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Andy Lutomirski , Denys Vlasenko , Dave Hansen , Igor Mammedov , Fenghua Yu , Brian Gerst Subject: Re: [PATCH] x86, cpuinfo x86_model_id whitespace cleanup Message-ID: <20150519165627.GK4641@pd.tnic> References: <1432050210-32036-1-git-send-email-prarit@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1432050210-32036-1-git-send-email-prarit@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 19, 2015 at 11:43:30AM -0400, Prarit Bhargava wrote: > When comparing 'model name' fields in /proc/cpuinfo it was noticed that > a simple test comparing the model name fields was failing. After some > quick investigation it was noticed that the model name fields were actually > different -- processor 0's model name field had trailing white space removed, > while the other processors did not. > > Another way of seeing this behaviour is to convert spaces into underscores > in the output of /proc/cpuinfo, > > [thetango@prarit ~]# grep "^model name" /proc/cpuinfo | uniq -c | sed 's/\ /_/g' > ______1_model_name :_AMD_Opteron(TM)_Processor_6272 > _____63_model_name :_AMD_Opteron(TM)_Processor_6272_________________ > > which shows two different model name fields even though they should be the > same. > > This occurs because the kernel calls strim() on cpu 0's x86_model_id field > to output a pretty message to the console in print_cpu_info(), and as a > result truncates the whitespace at the end of the x86_model_id field. > > The x86_model_id field should be the same for the same processors. This > patch uses string functions to remove both leading and trailing whitespace > in the x86_model_id field. As a result the print_cpu_info() output looks > like > > smpboot: CPU0: AMD Opteron(TM) Processor 6272 (fam: 15, model: 01, stepping: 02) > > and the x86_model_id field is correct on all processors on AMD platforms > > [thetango@prarit ~]# grep "^model name" /proc/cpuinfo | uniq -c | sed 's/\ /_/g' > _____64_model_name :_AMD_Opteron(TM)_Processor_6272 > > and the functionality is correct on an Intel box: > > [thetango@prarit2]# grep "^model name" /proc/cpuinfo | uniq -c | sed 's/\ /_/g' > ____144_model_name :_Intel(R)_Xeon(R)_CPU_E7-8890_v3_@_2.50GHz > > Signed-off-by: Prarit Bhargava > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: x86@kernel.org > Cc: Andy Lutomirski > Cc: Borislav Petkov > Cc: Denys Vlasenko > Cc: Dave Hansen > Cc: Igor Mammedov > Cc: Fenghua Yu > Cc: Brian Gerst > --- > arch/x86/kernel/cpu/common.c | 17 ++++------------- > 1 file changed, 4 insertions(+), 13 deletions(-) Applied, thanks. -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --