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:   Thu, 29 Jun 2023 21:27:10 +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: <ZJ2Grrn7sq9Jdxf6@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>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <87r0px40o5.ffs@tglx>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?u9TlL+pLK21hn23CMzeRTHT18fKdefVtZ3/T3Prd1g727N5EOxfiDyvTixaE?=
 =?us-ascii?Q?oGb6FMQUnzbito+wXKGBPX0tVfXEOd8ZqSAk2hySqlj982JVAsdfKXYn0veg?=
 =?us-ascii?Q?wHVdi2x/QRZ92DcJ5aYcoDdB1uvTw8LCzUlMSz+pOAlFCy9DMpt8VhpTtQnH?=
 =?us-ascii?Q?SaoVrjf+XBmT8EomZ2Fvbx/pjY6Wiolw5vgQTl5UId3QsEHaN3fs3GzdWkq5?=
 =?us-ascii?Q?nUlcNbN/FlM4mPvBb3p7fMYjhW06KXOwq5bC1gZ6e+viGJxaLRufxNO+mpAZ?=
 =?us-ascii?Q?agLmwQh7RnsMIJ7IlRHdu6o+XPO22NOdBg929Ktt7Gwz3Nc1jY0fzQjsmDcq?=
 =?us-ascii?Q?mwFTBX1BbN5s2huLC6S2ixsou2MulZSyqTMcfn2o7RbEd3DrRwVoIpqah1wh?=
 =?us-ascii?Q?5GoZ/K0RAshr3THJsOQLiNhB2xdtx+6+MkA/Jh+jzQKfgyAAzy165fzhZsFu?=
 =?us-ascii?Q?6u1DjsQ80hd+Nw6vIikxmJwnEyrkMazsTh+6tK97JzkPl9FNAOl+BaxYupgd?=
 =?us-ascii?Q?pX1pCGxoP+h2iKxBshA2kTytV3YjYjlZDtai9RltNzb1nV+/F6I0uJKdPRmz?=
 =?us-ascii?Q?ZIhIc5vzfzfmYW3JQhlGSe7ozw80qVhtqGj7YVDxWpbZ3t7iMgXAcm7oLwb1?=
 =?us-ascii?Q?YUu72APEanq5l5mykoP6YzQBvNJ8Zn1/peToYI3out4fULiRQh8XmAkfsAnY?=
 =?us-ascii?Q?pPNPihqXgWH3aHtiIJdwG3giaZKrrW/pSu6xUE87bMzSH1ci4hyRNpJEd32z?=
 =?us-ascii?Q?vMryzrSaMPorD6UIVdjbQRZjTyBCI34z0ITocc24ARR2ZBFZcVsUpFVdwuTv?=
 =?us-ascii?Q?L27dJBliKiJYvFnAUfgUDiu2/K22dL/zLp2wA+eJ/8Pen3exJZInmjn6NM44?=
 =?us-ascii?Q?OMXH8Bq+8AEU9y53BvFxrr9pNzH1gg4NFteg4gyxxOFmF5LvumWzSlEgiSsa?=
 =?us-ascii?Q?QN4VxLETvZ1LoGi2fei0xPzROUzWNhGQVhq7eO9+KxdKmOvOmUK0rT26ZnYg?=
 =?us-ascii?Q?kw5H5r/642dEiobGnNI/76sWzoPUJLJsOM/u99aELTTLDxiGoPjuIMR2oF4P?=
 =?us-ascii?Q?ZjbYKFuxEPMBniBHT+TvhkboW0Gi35rxn6DTNqFbmZug7KdgRAqI7qPZFOfA?=
 =?us-ascii?Q?8J7sTk4gDAeo4EiPRf5ahW8EJG66OYnLfdOE/WNLMmLSyEZnKCMlrJmFg8H0?=
 =?us-ascii?Q?Yebm9VDjysgKX83pDob6i7fCU7gqYd/iXjCQ9HfqZ1xVw+wCnZMrrm+aWJJG?=
 =?us-ascii?Q?yzRVvTFmp0zfEubHljZYgcTCVzr+B6piroXJb9nHgTRTwEfpXiJalp20/hlY?=
 =?us-ascii?Q?vPeIubyR33CX7NatdDUCJxvOmAZyVZkR/1KmG4FW/qPiawJGrofZC16imKH0?=
 =?us-ascii?Q?TesyoSanQ2iuiLrBDU06HM6ts0tE17LXKj3uEBSXn5J2FNQUT0h8ozw/yi65?=
 =?us-ascii?Q?xPz0Hqw0WLM8hK/tR5MCc4IOLkuwwAwXSTUwNN1PM2Rvx2q1EQoKqnTsP1dH?=
 =?us-ascii?Q?uy+Y4f4Xn9DsfRK/Ncd/o4xANkMowgWSAi8//FG+zJMMGRYkKrIHvl62zVLa?=
 =?us-ascii?Q?KeFqDOH6CR52KMgBhsr0pn0++fPGtqokDkjOebXM?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7ac00203-6aec-4b55-58c3-08db78a5ad37
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 13:35:17.5806
 (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: Zrvh3Z6in33uBlhDYOKIXJSidB9S2ecgSgMOe2AGIiDW36nVF2tK8EsEwHmC2MA5uiSI3QXfzJSeBq/Jrm3Erg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5494
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        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 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>

Thanks,
Feng