From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752204AbcCUDq3 (ORCPT ); Sun, 20 Mar 2016 23:46:29 -0400 Received: from mail-bl2on0076.outbound.protection.outlook.com ([65.55.169.76]:42976 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751749AbcCUDqW (ORCPT ); Sun, 20 Mar 2016 23:46:22 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O4DEH0-08-FDX-02 X-M-MSG: Date: Mon, 21 Mar 2016 11:46:19 +0800 From: Huang Rui To: Borislav Petkov , Sherry Hurwitz CC: Peter Zijlstra , , , , , , Gang Long , Subject: Re: [PATCH 2/3] x86/topology: Fix AMD core count Message-ID: <20160321034618.GB26269@hr-amur2> References: <20160318150345.146716865@infradead.org> <20160318150538.551407299@infradead.org> <20160318164101.GG7817@pd.tnic> <20160321030744.GA26269@hr-amur2> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20160321030744.GA26269@hr-amur2> User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(24454002)(189002)(199003)(164054003)(92566002)(105586002)(106466001)(77096005)(93886004)(101416001)(81166005)(15975445007)(87936001)(83506001)(33656002)(2950100001)(2906002)(5008740100001)(19580395003)(19580405001)(47776003)(76176999)(586003)(189998001)(54356999)(50986999)(4001350100001)(4326007)(23726003)(97756001)(1076002)(1096002)(1220700001)(11100500001)(86362001)(46406003)(33716001)(50466002)(5001770100001)(107986001)(473944003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR1201MB1086;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;MX:1;A:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: 52c12612-0eb7-4038-fce0-08d3513b5bc8 X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;2:oNg7Rnct1QPh/sz3SyoExSgcyXfBuGJLi8zNlWsz2qwhUmX/PVnhBO5gKv2bHEvNDbmd3fABwDk4Z0mX3QXregtTCKNxntMr+cSQ8y9sspNtkGd/lSQ3SScvCEGF//k8aYGmqDLBqkmDEQ3c56uKRp18iy4AAAVdC9y1aUHAnoOZW5m/MjmtVVE4tDGRsehQ;3:rS3lFeOTUxPABvS3khIvMH3NV8Xz586LQoZDdrnxn8XtkibTUeNZRyne270aKvbaKX5GuTWRjYjRxfRun0V8s/I7gPRSuKqA37H+KIHnDeJwymI0C5AaW9ZK4NlTWiBIpFHzGjx0r64W5dOjNMHSLTCMJGPtbjI/vjn6Rm7McyL2sLDfw7yLrBlUObc6N0qxrFAx9415ozMfFo6HrcC+z7JKGZtTycFYskeCfsbL/qo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR1201MB1086; X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;25:cJKZdPYJas2N0zHJlyGIMGV6sKh3iDR9w1Iq35J3WrYWQ5YGYWi82MaMBaSvwj2VPYcSCWMROa+t6nYHerQN4kyu8ent42x5V6bCEQ1wsvQ5evkvcmn1bRenURZ/4JYlpaVsEwoi+Pibm1P9slDLu6FpggZM694tEjYIhj9TzOSvemL/CobKx76NDK2HULxZ/ABqGToIBM9ZAIag9Ddbs0m6Eouo/HaOasbWEWKlXbaIiPaswxT+cu4ob3yd45MryoMHub5opb4EYGx2HowRP3mIZBECtAOyy1DUNtetPu4iB8lMtu+jlEjVZz5vt2TXMj6VOg9zRiZC4v+/Rt30Vc6bmpF91+Y4Nh69mJw2ge8fVokMj4KUqp3jdLV/Sz3pf/PU4dT3qJXiMozIKTxOAJKgdnu8b2gP/fLLbPBXWdR/hPl2pb/CYqA8bWqaJ+Yba6s+7VAeUoYNgImhuXwIbtgYgKDVqzpHlDXjwOuhjZuUWpnJm+h7ASapsZy2iyRKv1HVcyKvuogsIMmZ3Ym9/C5WJ9Vb5pLwVcTPUl3HdBzIETUVmvwDAG5RDMfCINUO6lYQCtEbGO/D7I4NKQPpaOLVpSjCaoMMW9T/wP1rIhGEkyydfBdQlxgrXsrMN9TJkDvOtCjWsA/ROelNPHTIHQ== X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;20:oyoS1PUW3apQAvz5c5Z7fOCMo4ia/DP2hfGCz+/61ngLRpFG+6JH8oejUnrcODmqwJM1tliUPaGxctMOJp8Hi7u3Odgci/09ijdQCJJh6BNrSXGecaFvPB7CN2xvPLXtFz9uy3KJNR6UU4Bs9Od4ufDrEKEitf2qB0ylgflx4iSNsVKqIWBqSsx355Y4HSiuvJWL0GQGhqLBuWt8HKUHAs9QmG725phru0ac5r1XzP8e635vmLtUTTM5GsPLU7WOIPR6dwUkI0tzBt6xnK6D4DCH15mqmaEVMO6RNCJ4nngp5eYjo3AOgkKl+HvW0Jc1yUp9eAP0VTcnSUw4FxI0CMJamld78xtF8T6AzVA0kvTW6BsRpJzLAGQY5a85tuUAESNdIC4RntlOqm3hnG181x+t6ED8yWgg1QeKP2QnVyAHkVdLuJPE8YFtGGoEbr26QibBxUsG0PT0MlzmHe372fdI6UxFP0cTeIOtVzghOBFwCuKwCmWyqNrIjXe2UxPj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13024025)(13017025)(13015025)(5005006)(13023025)(13018025)(8121501046)(10201501046)(3002001);SRVR:DM3PR1201MB1086;BCL:0;PCL:0;RULEID:;SRVR:DM3PR1201MB1086; X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;4:E84hYFDHZzucuoNSnUF3nvoBww3L4ia06XzX4YEJo6+EdnV3NGMOkrJYKjm2ZMq4qJTKcLwEpYuABV6Z0KIhCNSl4EPVReiQzzTkI5SbLGQm1wlr2RhPn526dTIrCQ1yefMcxWkpmOv2pwHIzaF6slM/RPa9oLfEKas0Laa1xyS/h2zhmAe0muFe6fOx/VidVnMMrMbGVslkHfuUIpEj3w8zsaG4Kjq3AD8dyl84fr7BnojdI/59Q+x5dzDUMwPufCINbjoBrYpJYvvLtg6SKnstQIanjMWt6gPWHt+FFBu8zAYCGx7Ypcu4bQrJhT+6bj4RfC8YLZ+3DEz288OV17UjNb2vnjU+TRvjM25xZfgkObxQgi/h04fxAscumYghlIcTcQwwnpx40N2wIwmbxUGkuIR81Uks8sZ/KWxbxdPNs9xi0H0auSaMwQFChK7L95G8pnx/67/EoC1VTUCH/g== X-Forefront-PRVS: 0888B1D284 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR1201MB1086;23:CiyMPtlc3k1y4SgBrS8ooCVXBfgHw2IdvtbmgYc?= =?us-ascii?Q?RJKz3tjETSn5CCjo9YIMajI2FVfaepLPA601fs1XTm1bNV6TY3X3fTvgPi8z?= =?us-ascii?Q?JFqL/h8ELDLytqdldc9sfEXka0Jb40o1N3uVEMd/TrRHKdYu8RtXRO6F6GAb?= =?us-ascii?Q?2dqhK+lvsRs4AH67rbbDHjWnIv3YBWc5RskOwg+xyxq5iNa4DQkSV5DE4lg3?= =?us-ascii?Q?4nX2vowFYez1K5h2dcZlCW9mbLt8p25ICdJo2ajPiaKf1f05jLGrl/IZz/rZ?= =?us-ascii?Q?eb7uHNB9qKxGh0RAkIh2Ki2oXh4UYgBI9KqyVs+GljSjeUMSU+KvTVMiNhpL?= =?us-ascii?Q?njGixnTLvU9YVDB1dSj5IP43JEhp7AcWtc6Tu32DlQJnQ16m/GGaKsfhLVhr?= =?us-ascii?Q?GffUtLQB50yQiCclTp+sXuJj+mliQoAeRZcIVh6BGcb3Tiov1EQJqKrvjibE?= =?us-ascii?Q?7YCkt/gB2Z55kuGAfWLKh0eJ+KZZh75FAKYjiDFeeYn28f8J4g9UrsTuXypJ?= =?us-ascii?Q?vBU5dvO1w5Drb5vxyyVq6TFJEQZqXZw6vzDiz/N3orwONgt+Ej8vEYihWeFN?= =?us-ascii?Q?+bl31JnkIzNC726BUTmCKKUXrqmC1uSm3gVaN/zUkb66d3i7gBeaQBDnywPk?= =?us-ascii?Q?LT8dZkQxN79jfyMGlLnLGnJNyHPXLYTRaMfu5EdqgjAl7Xb6JKtTpES+38wI?= =?us-ascii?Q?Vl/2q645PeR0mwczXZ9uF0PBF+6Eqhtc/C87+j3h6CVYk5TAkA8qc0APFhkU?= =?us-ascii?Q?tUqOgD9i/fht4apQiRPYl6QuRUsU/HBlMl3sP1e+i5tXGo9ByvKYehkmDuQ+?= =?us-ascii?Q?ZUhNRjzwvZ7tq6vX8CXlpEcNs7YyRYJS0xeqG3WlpDPflWl64POD8sZFwXnv?= =?us-ascii?Q?oxGPrT823uerDNq+D/cTipBQHztfa1xdGx4V58zqtZ/B0xdWhOmC3knmWfd/?= =?us-ascii?Q?f4yZhWcSVWIqN60a6GN1x3nCajdx3x77Fl5k4XXnHg8ABACQapfYaCwli8FP?= =?us-ascii?Q?K/q/3ADwMEfMzjYtBVRcJiu4O2CYwxEl/PfeJ8cnBe/lERMNjCIjgAKrh6u3?= =?us-ascii?Q?aoNKH3nzhi5n6LrFHkm+CvZsatV0MFdjzcd0a7EHOUB3+u+xWG9dDOttOTPm?= =?us-ascii?Q?MffVaXfkvt7hBfsWBnXVfiN/lDX23vgsT?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;5:UFHbwgeOuY938uvIpSe5xCXgmMwB3R9f/MNZa+7aOqNVK0qA8ZIcj0eY6nfrjVX+7uVmRfL4HABwonHwXpgOBd3YO1TKM3apIyN6xjbaNwGSYgB/VLqiz2Dt7YR+JbYT5+9I9LZp90gCHlv2dI8j/w==;24:3Z+e3MTfj9zNGEGjsKajGT7wfgQMGCoC3F9PGU9MFkReI9GLgP3NY7aAphP3cjR9/rkHpTupVpsQ0zwaDhnR+fKxMsoiwnS5/torRk6Jtu4=;20:QpsDBQ7keEHXepJnk3TXTyc8U6ivVXCTcQQefHGcySSlXqs9a6Rasuc8ehxHWwJAreoGSt1x6q8tG5Jo9FlWZIEx6gNUvpV22zRcCx0XGUyzsGM8agS/refy5tmRoyOMQE2Up6dMKnfDzsk6rS+/ChIwVpGDoh6nQ+jsr3djB/TkqIQuvNw3PiI4J2WvvYc+nS4hJvpF2bM42vG4jrYJTnnhlWb8JDGKdXYsTBHhJODHX7jFpgNxgUumOvuy/zpx SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2016 03:46:16.5284 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR1201MB1086 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 21, 2016 at 11:07:44AM +0800, Huang Rui wrote: > On Fri, Mar 18, 2016 at 05:41:01PM +0100, Borislav Petkov wrote: > > On Fri, Mar 18, 2016 at 04:03:47PM +0100, Peter Zijlstra wrote: > > > It turns out AMD gets x86_max_cores wrong when there are compute > > > units. > > > > > > The issue is that Linux assumes: > > > > > > nr_logical_cpus = nr_cores * nr_siblings > > > > > > But AMD reports its CU unit as 2 cores, but then sets num_smp_siblings > > > to 2 as well. > > > > > > Cc: Ingo Molnar > > > Cc: Borislav Petkov > > > Cc: Thomas Gleixner > > > Cc: Andreas Herrmann > > > Reported-by: Xiong Zhou > > > Fixes: 1f12e32f4cd5 ("x86/topology: Create logical package id") > > > Signed-off-by: Peter Zijlstra (Intel) > > > Link: http://lkml.kernel.org/r/20160317095220.GO6344@twins.programming.kicks-ass.net > > > --- > > > arch/x86/kernel/cpu/amd.c | 8 ++++---- > > > arch/x86/kernel/smpboot.c | 11 ++++++----- > > > 2 files changed, 10 insertions(+), 9 deletions(-) > > > > > > --- a/arch/x86/kernel/cpu/amd.c > > > +++ b/arch/x86/kernel/cpu/amd.c > > > @@ -313,9 +313,9 @@ static void amd_get_topology(struct cpui > > > node_id = ecx & 7; > > > > > > /* get compute unit information */ > > > - smp_num_siblings = ((ebx >> 8) & 3) + 1; > > > + cores_per_cu = smp_num_siblings = ((ebx >> 8) & 3) + 1; > > > + c->x86_max_cores /= smp_num_siblings; > > > c->compute_unit_id = ebx & 0xff; > > > - cores_per_cu += ((ebx >> 8) & 3); > > > } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { > > > u64 value; > > > > > > @@ -331,8 +331,8 @@ static void amd_get_topology(struct cpui > > > u32 cus_per_node; > > > > > > set_cpu_cap(c, X86_FEATURE_AMD_DCM); > > > - cores_per_node = c->x86_max_cores / nodes_per_socket; > > > - cus_per_node = cores_per_node / cores_per_cu; > > > + cus_per_node = c->x86_max_cores / nodes_per_socket; > > > + cores_per_node = cus_per_node * cores_per_cu; > > > > > > /* store NodeID, use llc_shared_map to store sibling info */ > > > per_cpu(cpu_llc_id, cpu) = node_id; > > > > Looks ok to me, however it probably would be prudent if AMD tested it on > > a bunch of machines just to make sure we don't break anything else. I'm > > thinking F15h and F16h, something big... > > > > Rui, can you find some time to run this one please? > > > > Look at before/after info in /proc/cpuinfo, topology in sysfs and dmesg > > before and after might be useful too. > > > > OK, we will find some fam15h, fam16h platforms to verify it. Please > wait for my feedback. > > But I am confused with c->x86_max_cores /= smp_num_siblings, what is > the real meaning of c->x86_max_cores here for AMD, the whole compute > unit numbers per socket? > > + Sherry, for her awareness. > I quickly applied this patch on tip/master with on a fam15h machine. The issue is still existed, only one core can be detected. processor : 0 vendor_id : AuthenticAMD cpu family : 21 model : 2 model name : AMD Opteron(tm) Processor 6386 SE stepping : 0 microcode : 0x6000822 cpu MHz : 2792.882 cache size : 2048 KB fpu : yes fpu_exception : yes cpuid level : 13 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf eagerfpu pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 popcnt aes xsave avx f16c lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs xop skinit wdt lwp fma4 tce nodeid_msr tbm topoext perfctr_core perfctr_nb cpb hw_pstate vmmcall bmi1 arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold bugs : fxsave_leak sysret_ss_attrs bogomips : 5585.76 TLB size : 1536 4K pages clflush size : 64 cache_alignment : 64 address sizes : 48 bits physical, 48 bits virtual power management: ts ttp tm 100mhzsteps hwpstate cpb eff_freq_ro Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 1 On-line CPU(s) list: 0 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 1 Vendor ID: AuthenticAMD CPU family: 21 Model: 2 Stepping: 0 CPU MHz: 2792.882 BogoMIPS: 5585.76 Virtualization: AMD-V L1d cache: 16K L1i cache: 64K L2 cache: 2048K L3 cache: 6144K Thanks, Rui