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:   Tue, 18 Oct 2022 09:07:46 +0800
From:   Feng Tang <feng.tang@intel.com>
To:     Dave Hansen <dave.hansen@intel.com>
CC:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H . Peter Anvin" <hpa@zytor.com>,
        "Peter Zijlstra" <peterz@infradead.org>, <x86@kernel.org>,
        <linux-kernel@vger.kernel.org>, <rui.zhang@intel.com>,
        <tim.c.chen@intel.com>, <liaoyu15@huawei.com>
Subject: Re: [RFC PATCH] x86/tsc: use topology_max_packages() in tsc watchdog
 check
Message-ID: <Y038Ym8e0K7Cz3WR@feng-clx>
References: <20221017132942.1646934-1-feng.tang@intel.com>
 <ff269ad9-2811-e427-3bb9-5b4c978e80bf@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <ff269ad9-2811-e427-3bb9-5b4c978e80bf@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qrNIy7/w2hrjkRQD8RElZFfn3DeakJ6o41u/VXnVQ43xkLca04IlSx3keLl2?=
 =?us-ascii?Q?gEHP7FqoZ51A+aEy2kYC1xnpIY4EnNg8fWSI0Pcup8DhIKoBX9AazxlMeNNu?=
 =?us-ascii?Q?3svnKxbRrUiQUrTPdFYl24XwqMWKbc/5zGSnZCtlTrBB7ZqwW9+OWc0/5UoV?=
 =?us-ascii?Q?VQt32pfnxj/E4yyGRwQAAjI2gcgcSbraDSGTeNVaUsbOT2ZAtO4wXEgugiQH?=
 =?us-ascii?Q?cIpfArko43u2n8bxYx9n50uAne7AYkYYqTWkHynJcYZHTz4fm8kT0mwFtkvf?=
 =?us-ascii?Q?/F4OgkU2j59BK/436/SJwiOhbI1h6+f599yZBwpbe2DtCrz1LzCd99JOhW5H?=
 =?us-ascii?Q?rLTK2N5b7Fb+UzmAmKLK1OTweVAg7fk/aikc3JWMktV41ycxivKvbDP3MXv4?=
 =?us-ascii?Q?/kqZAcv8vam2ctXmAfRarq+5RIpuaR8QJ8mt4CMGAhI4HonQxQVJHh9F9wvv?=
 =?us-ascii?Q?b4SYIJAPdBauiyZ6/YUXivcFf3xm+7Z0dt8fG07YUZ1Ly2G78/Tomf703Lys?=
 =?us-ascii?Q?PnSRZjdkUjnlgLbu7M8rcJylYwj9ihpHGKkSLPqYYuc1Vbc8apmxzzIMZnL9?=
 =?us-ascii?Q?cwt39UyIHW6hyeRaY7mcaAzuQMSLfcIo9JOxKuwG1dB3SaZL6QiiXr4jjDDe?=
 =?us-ascii?Q?079Ywao4/x3CDTgl/TLfF12mLNrI5uW0qDs2YLal0lyTwLX80ETasQk1F4px?=
 =?us-ascii?Q?emungPHuQJujYF7qtABRrcvMPklnwR7TNcgBsXsWnPY00hKzNPOKLh4mIDOv?=
 =?us-ascii?Q?0oEp/kHwEhUyxpJBfE8QG8qYQhjphAcsLgMAMFfTLpXdGeSoX5fVuL1kpVWv?=
 =?us-ascii?Q?xACvBPlzcKcJfou8RO1F0/RDYzPQ5oo3QL4Lw2Kd9geV9KtbXVGAW3bExXNY?=
 =?us-ascii?Q?5MkMXb3OBs9gt0NSkk40rOvSgzrsEYyzf11UCywXTvk7ahSdO1ga+6S7jjE1?=
 =?us-ascii?Q?5yXASYTZ4bZO2c1/HVKooKyj1fYEt+mnj7duGYnj/QoP1RAvyIIrxTuI3CR+?=
 =?us-ascii?Q?zDIYBvxJEVJ4DrPDUvMR/ePD/UN0IsVL8Kyvk4JvnG9TnRsHZzNaSyZvO8VW?=
 =?us-ascii?Q?6Kd4HY1lhRwWIqTqcW1Xcziy0MCja2i8wkUzoFxVp7HbJxEPSzpg2BM5TnUA?=
 =?us-ascii?Q?z5irWpb7lh2sPMqfezDnuLM6WmJZD20KpmV6+N63+zSwsS4jimjNVUOFYyNy?=
 =?us-ascii?Q?hK6ADMumzZGf0khw7EKY5GckAeH7rM4z7TR1sgOHWui1vY7ozDuUUxEzKqKk?=
 =?us-ascii?Q?SEs++Q2mG4JuKjn2nbZe3SSKOG/o+o4wR45fnsmHkhkNeu9JLiLh6TTaLnhv?=
 =?us-ascii?Q?vO5jLPrIHq2anm9LIjcGMFF7fcHbO/vcH/AI+dB5aPpH562QLd51fERuaGW+?=
 =?us-ascii?Q?3937dd2/gT/AS/VV6MjrO7osHidSiiiQ3iyzg8FOwiQ4sly6lPOA3m0d1DJK?=
 =?us-ascii?Q?Y335HskqnkAmq+pgyQ/6CBRSL4IR1QoxpbM8oMKcZRKrAEl3v5GUWKiV0N+r?=
 =?us-ascii?Q?VvU7wG6/e9+hEnFu+mN5MfUohpyIEfNlTpgoQxBqwcMfiwMpvcO5LHzB/82d?=
 =?us-ascii?Q?pcGcfeduPw71JnFBUOi6PhdJSdDIPrlKimLY5FDZ?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c672aa3e-afbe-4e15-b91f-08dab0a53450
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 01:08:02.1237
 (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: MPuDTb5dVebN3GBun4LMhtZVSaCwpWxGSyln9M903L5OGQktEwSrKvXozJls4tBdQfuijUeJ5OSrgH6mpvz6nw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5561
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.7 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_NONE,SPF_NONE 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 Mon, Oct 17, 2022 at 04:15:24PM -0700, Dave Hansen wrote:
> On 10/17/22 06:29, Feng Tang wrote:
> > +	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC) &&
> > +	    boot_cpu_has(X86_FEATURE_NONSTOP_TSC) &&
> > +	    boot_cpu_has(X86_FEATURE_TSC_ADJUST) &&
> > +	    topology_max_packages() <= 2)
> > +		clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY;
> 
> I couldn't help but notice the comment in here:
> 
> > void __init calculate_max_logical_packages(void)
> > {
> >         int ncpus;
> > 
> >         /*
> >          * Today neither Intel nor AMD support heterogeneous systems so
> >          * extrapolate the boot cpu's data to all packages.
> >          */
> >         ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();
> >         __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus);
> >         pr_info("Max logical packages: %u\n", __max_logical_packages);
> > }
> 
> Could you double check for me that the Alder Lake combination Core/Atom
> CPUs don't count as "heterogeneous systems" in this case?

Thanks for the great catch! This API seems to be obsolete and shouldn't
be used, even if the number happens to equal to 'logical_packages'  

I found a Alder Lake platform which has 6 P-cores and 8 E-cores (Thanks
Rui for sharing it), the log shows "smpboot: Max logical packages: 1",
and 'cat /proc/cpuinfo | grep "physical id"' shows all its CPU's package
ID is '0'

When writing the RFC patch, I followed the smp_init() discussed by Peter
and Rui, where 'logical_packages' is the appropriate number, which is
updated in topology_update_package_map() after each CPU gets initialized.

Possible fix for this could be:
* export 'logical_packages' for tsc use
* update calculate_max_logical_packages() to return 'logical_packages'

Thoughts?

Thanks,
Feng