Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 17 Jul 2023 21:38:30 +0800
From:   Feng Tang <feng.tang@intel.com>
To:     Thomas Gleixner <tglx@linutronix.de>
CC:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "H . Peter Anvin" <hpa@zytor.com>,
        David Woodhouse <dwmw@amazon.co.uk>,
        "Paul E . McKenney" <paulmck@kernel.org>, <x86@kernel.org>,
        <linux-kernel@vger.kernel.org>, <rui.zhang@intel.com>,
        <tim.c.chen@intel.com>
Subject: Re: [Patch v2 2/2] x86/tsc: use logical_packages as a better
 estimation of socket numbers
Message-ID: <ZLVEVoZTbYi3LbjK@feng-clx>
References: <20230613052523.1106821-1-feng.tang@intel.com>
 <20230613052523.1106821-2-feng.tang@intel.com>
 <20230615092021.GE1683497@hirez.programming.kicks-ass.net>
 <ZIwMstkB7CG3pDYu@feng-clx>
 <87h6qz7et0.ffs@tglx>
 <87edm36qqb.ffs@tglx>
 <ZJW0gi5oQQbxf8Df@feng-clx>
 <ZJhUiO+bdBoLU5WF@feng-clx>
 <87r0px40o5.ffs@tglx>
 <ZJ2Grrn7sq9Jdxf6@feng-clx>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <ZJ2Grrn7sq9Jdxf6@feng-clx>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EVYkz9xjHscUNxaEa+lmAcGWVIuLE5cCF9IelAxOpU1itxIqZLFudbk2e3SF?=
 =?us-ascii?Q?XinPsT37S2YhEytDjXJcKRibGXndkCSnW7ZcxqpHmr3uIlKbG8AXIG3Avz96?=
 =?us-ascii?Q?2af6tfmjCkTZBJvUUTYSIvg98SWtaAujk+VEFa2RdjKIgZtIUqI+SX8/OGEc?=
 =?us-ascii?Q?Pgg2qcALGKbvs/TS/wavSimzxcEiLoLf4lOPFFeeD9XHSiTR1xUIugljV1PT?=
 =?us-ascii?Q?qU6xhOGGNdhZpGhaNFJg1xTDGqQfNXUToCv/KZsU92abs/Qq7oEwrhMvGED5?=
 =?us-ascii?Q?3zv/fM9WuJGXCRuq/XGXZwUTah+cr6ZiNkMYShfOYc8hSOenzM6qCSKBs2jL?=
 =?us-ascii?Q?lq5eqYOJiv5R3udoJQGrZOGv14bvbpQ87XcN5txv8e5h/7sUb0KttyFKw76l?=
 =?us-ascii?Q?p/ctPCMM72Q3jzjKnHVjNPk6X0mQtBMXmD8rFxMjeY1D2YSL9HIYmtqIcU+P?=
 =?us-ascii?Q?SqKkXTsSr9atRvyy0HMWuPKWqi4/Zhkaef33EBpi6ULu5lt+wjLgVXboJiNj?=
 =?us-ascii?Q?uYlWVMRiCG/jgE0s6w9ac8CCEJjfgnWkJX2B3M65muSiNIdES4SNmKyjNp62?=
 =?us-ascii?Q?4vWIF0IuXR63ROGEO27dNJSnXEN4bYrXLAu+2pEHPr56mIXZIWMgJa+TQWOY?=
 =?us-ascii?Q?A2nVVAVhMth5qd06moPAjfNL1VA/COlojcy/sp9XgIhnwVFmo2njLcCdNgsm?=
 =?us-ascii?Q?n//bchxGvU7sAyMAal5200dzrUU+xoFhZf8yEJgG6qNSlpB6ueC9QaBLCfk9?=
 =?us-ascii?Q?CliHVwnMiMVGVC2cK6KlC017Dt2XIQYGVPleGgNILxguEbBkLQl/jYSZv5SW?=
 =?us-ascii?Q?gHXfjB9HmWrFJmzXVUQtfipiD6ihwBATyCVSg+RII2SpzJBVsMp/KuWYAUeO?=
 =?us-ascii?Q?+AmK9AeC0gwt4PeQcdK9uo/BEZc7JHrQ3hNSd7b76K2Ek0fSl1R1IOiQqhwF?=
 =?us-ascii?Q?P3dUwZOaY2dZTQz8knJP/zKFKvcsFdTR/CNk5jc3Vrc1I/pojsNsMdYnnpLE?=
 =?us-ascii?Q?pAtO0/Y23Th9AHtCs/YTZQ1VooX8mG8m+PwROvypjMxm3+1PeAno2hjcBJAm?=
 =?us-ascii?Q?eh3EiG4WtqkN7UFZnyZMOnSS+RIEuCRL/3Jxhdkr2WS3uKXzpx/dj3rSPHtZ?=
 =?us-ascii?Q?8pA4hkRQMsWmVlUF6aH+M5gy8TsmUWFJsFAXlIIf+YfiJFwAK/IZlalI9Epi?=
 =?us-ascii?Q?OQ4WQVl+qz8WxQz+e1nlS4KPXMN00UehZYoey7ILwmopsSCuH11IVuSCVprl?=
 =?us-ascii?Q?nfXfYSC0uCMwcHmbGMlE2UAcM8nxtOp9dnVIjJh/H32k5UqxquaO7OPLb68K?=
 =?us-ascii?Q?nwic+TQS01T9LBbwMYz21SMN6cJmuc2EULLZgn7g5nAeaRwc150zC0htHHsO?=
 =?us-ascii?Q?WPd1J0h6M4TOUsMlGiTCYrZ381s+1KYhkqSso2LvjefKxwusoD6xRjaXZ9Oc?=
 =?us-ascii?Q?nAwLNHGpoKYLQYF9SRvM6WyypBKmL7thQvKqg1X16PjAwIRnkmyDcj2EMWHq?=
 =?us-ascii?Q?J8hBVf0PqLZ5zokwF3KF/YZdaRAbr1zttGylf0i8NLasfW3YfD6rCR2MMSB2?=
 =?us-ascii?Q?xSctclpjaY/1WabMbv2VdO3P2AYsFlGag/ZIMb0a?=
X-MS-Exchange-CrossTenant-Network-Message-Id: fb734537-e46b-4e5f-a62f-08db86cc373b
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2023 13:46:26.4464
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0PsDCMNQ/TGDqI3VQM6g2mZuOc9wS9AVVAh5T32mQ4akOwttHGt5AAwyq4HzcJGg051nsuAuTtzGL69k1I37Kw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7097
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jun 29, 2023 at 09:27:10PM +0800, Feng Tang wrote:
> On Tue, Jun 27, 2023 at 01:14:34PM +0200, Thomas Gleixner wrote:
> > On Sun, Jun 25 2023 at 22:51, Feng Tang wrote:
> > > From debug, the reason of the hung/stall is detect_extended_topology_early()
> > > is called by cpu hotplug after boot, where there is "maxcpus=XXX" setting,
> > > (#echo 1 > /sys/devices/system/cpu/cpuX/online).
> > >
> > > It could be fixed with below patch:
> > > ----------------------------------------------------------------
> > > diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
> > > index 828c1f7edac1..1ff73c8c4972 100644
> > > --- a/arch/x86/kernel/cpu/topology.c
> > > +++ b/arch/x86/kernel/cpu/topology.c
> > > @@ -29,7 +29,7 @@ unsigned int __max_die_per_package __read_mostly = 1;
> > >  EXPORT_SYMBOL(__max_die_per_package);
> > >  
> > >  #ifdef CONFIG_SMP
> > > -unsigned int apic_to_pkg_shift __ro_after_init;
> > > +unsigned int apic_to_pkg_shift;
> > 
> > Bah, yes. I missed the early_init() call from init_intel(). I hate that
> > code with a passion.
>    
> I tested the patch on a 2S Icelake with Sub-NUMA-Cluster enabled, which
> shows 4 NUMA nodes, and this patch gave the right package number: 2
> 
> On a hybrid system Alderlake with 8 P-core and 8 E-core,
> '__max_logical_packages' is 1.
> 
> I also tried 'acpi=off' parameter. On a 2S Cascade Lake box, it only
> brought up one CPU due to no MP table, while on another single socket
> 18C/36T Cascade Lake box which has MP table, it brought up 18 CPUs.
> The '__max_logical_packages' is 1 for both of them.
> 
> The patch covers most of cases we have listed, so feel free to add:
> 
> Tested-by: Feng Tang <feng.tang@intel.com>

Hi Thomas,

I plan to put these together and resend. Can I use your Signed-off-by
for your code?  

Thanks,
Feng