From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A43B2C433EF for ; Thu, 7 Oct 2021 10:39:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F7A960F02 for ; Thu, 7 Oct 2021 10:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240945AbhJGKkw (ORCPT ); Thu, 7 Oct 2021 06:40:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240955AbhJGKkV (ORCPT ); Thu, 7 Oct 2021 06:40:21 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06C3AC061762; Thu, 7 Oct 2021 03:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Z0HFg8la3obAWV2GGdEJBj4YtmyT7c3u08WRq35X0fo=; b=iRFJNOzhmcmh/dAkVO9P881YVq 86hGzZgtuBXX8iNGtm5OzclBT6NslnMwl9H3R5sb5/Lwe0supJf8CaF0mM4FDLrf/Eg6yrxbgMHZ3 Py44t3TottmnEdhwKDGGH1VzQn6tLcpASoiodCpI860AsXYGFay7QeKxB6OY4KsALjQP1PQtxaJYu mmvrdvMoltaAxf0eo3YBMycRPBw7X3HhivxTMwtOYPtk48PjrD6hloR4Zg4iP3uu5hT+p+8JchnPb NDhOItF9JFmq9KpBgibmgNtWkzCV2eLmJaRQb8h7hBuEGH/zPR3yjcrC92pwx/adGzsH3tixw0GLr MUYR9FGg==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=worktop.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYQkI-001l03-C6; Thu, 07 Oct 2021 10:35:43 +0000 Received: by worktop.programming.kicks-ass.net (Postfix, from userid 1000) id 508D29811BB; Thu, 7 Oct 2021 12:35:26 +0200 (CEST) Date: Thu, 7 Oct 2021 12:35:26 +0200 From: Peter Zijlstra To: Barry Song <21cnbao@gmail.com> Cc: Valentin Schneider , Dietmar Eggemann , LKML , Ingo Molnar , Vincent Guittot , Aubrey Li , Borislav Petkov , Daniel Bristot de Oliveira , Ben Segall , Catalin Marinas , Greg Kroah-Hartman , Guodong Xu , "H. Peter Anvin" , Jonathan Cameron , Juri Lelli , "Cc: Len Brown" , ACPI Devel Maling List , LAK , Linuxarm , Mark Rutland , Mel Gorman , msys.mizuma@gmail.com, "Zengtao (B)" , "Rafael J. Wysocki" , Steven Rostedt , Barry Song , Sudeep Holla , Thomas Gleixner , "Rafael J. Wysocki" , Tim Chen , Will Deacon , x86 , yangyicong , Tian Tao Subject: Re: [PATCH RESEND 1/3] topology: Represent clusters of CPUs within a die Message-ID: <20211007103526.GS174703@worktop.programming.kicks-ass.net> References: <20210924085104.44806-1-21cnbao@gmail.com> <20210924085104.44806-2-21cnbao@gmail.com> <87o883l9c8.mognet@arm.com> <20211006121858.GI174703@worktop.programming.kicks-ass.net> <20211006135550.GJ174703@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 07, 2021 at 11:30:36PM +1300, Barry Song wrote: > On Thu, Oct 7, 2021 at 2:55 AM Peter Zijlstra wrote: > > > > On Thu, Oct 07, 2021 at 01:50:43AM +1300, Barry Song wrote: > > > On Thu, Oct 7, 2021 at 1:20 AM Peter Zijlstra wrote: > > > > > > > > On Wed, Oct 06, 2021 at 11:50:35PM +1300, Barry Song wrote: > > > > > > > > > > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > > > > > > index 7cb31d959f33..fc0836f460fb 100644 > > > > > > --- a/drivers/base/arch_topology.c > > > > > > +++ b/drivers/base/arch_topology.c > > > > > > @@ -622,7 +622,8 @@ void update_siblings_masks(unsigned int cpuid) > > > > > > if (cpuid_topo->package_id != cpu_topo->package_id) > > > > > > continue; > > > > > > > > > > > > - if (cpuid_topo->cluster_id == cpu_topo->cluster_id) { > > > > > > + if (cpuid_topo->cluster_id == cpu_topo->cluster_id && > > > > > > + cpuid_topo->cluster_id != -1) { > > > > > > cpumask_set_cpu(cpu, &cpuid_topo->cluster_sibling); > > > > > > cpumask_set_cpu(cpuid, &cpu_topo->cluster_sibling); > > > > > > } > > > > > > > > > > > > > > > > Hi Peter, > > > > > Would you like to change this line in your tree? > > > > > > > > Can you please double check: > > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git/log/?h=sched/next > > > > > > yes. It is correct for patch 1/3, thanks! > > oops, there is a typo there: > + if (cpuid_topo->cluster_id == cpu_topo->cluster_id && > + cpuid_topo->clister_id != -1) { > > clister should be cluster. Yeah, my bad, typing so hard... :-) Already fixed.