Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Wed, 2 Mar 2022 18:18:36 -0800
From:   Darren Hart <darren@os.amperecomputing.com>
To:     Vincent Guittot <vincent.guittot@linaro.org>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Linux Arm <linux-arm-kernel@lists.infradead.org>,
        Catalin Marinas <Catalin.Marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Barry Song <song.bao.hua@hisilicon.com>,
        Valentin Schneider <Valentin.Schneider@arm.com>,
        "D . Scott Phillips" <scott@os.amperecomputing.com>,
        Ilkka Koskinen <ilkka@os.amperecomputing.com>,
        stable@vger.kernel.org
Subject: Re: [PATCH 1/1] arm64: smp: Skip MC sched domain on SoCs with no LLC
Message-ID: <YiAlfGuRXWVnOmyF@fedora>
References: <cover.1646094455.git.darren@os.amperecomputing.com>
 <84e7cb911936f032318b6b376cf88009c90d93d5.1646094455.git.darren@os.amperecomputing.com>
 <CAKfTPtAQwJYy4UDAgF3Va_MJTDj+UpxuU3UqTWZ5gjwmcTf5wA@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKfTPtAQwJYy4UDAgF3Va_MJTDj+UpxuU3UqTWZ5gjwmcTf5wA@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MeUcsivSrpbu7cy0OLvIjIOf9VYsjYbJGJ4+2HMHoTv9/3kQ6z1czD2jzyGm?=
 =?us-ascii?Q?rU6BWs0Ss7SxjOtbkNvOUlFzGVhuOztNh5YGFHkEVuP5qwYiE5aW3CzJp1X9?=
 =?us-ascii?Q?QMcPQx5tVYq2+H0Rh78M0WWeN5fw4KTIbadRUReaxhkjwaC68nbWeoJUEsf5?=
 =?us-ascii?Q?o1ULeGHVk7BFe5uwRpLWAkFr7W1N+piBR5P7PHVi0ROJ4V/yj/PaBaaeJWp7?=
 =?us-ascii?Q?Bmeq6AdMkH4+ZVzK0vYLkuu+2iQggJd7auZXNcwY2DlS60UIFTTKHTMKPSgJ?=
 =?us-ascii?Q?GQoZZUHX8T7eG+D4IRG8q9+3fzWyu4eXhYQpIC30orzeNTsTudN5DtT8v42Y?=
 =?us-ascii?Q?5EOLvgthTkV/9sRw6G1V7ImRkhP6Qmt7kSRTF9l3gJShYpdvtUh75Xc6/zzY?=
 =?us-ascii?Q?HS2sH+seQVJMTC2Ko3dvkeMGl6CRhRDC39q+izvkDANGujT7DhsNeidrYAOi?=
 =?us-ascii?Q?bp34mHMv50/YMEF/9PHpoiyQwYI8cqaNu9QWwLY4CZ2f5z+DhYnFAfvs5FNc?=
 =?us-ascii?Q?Cr1I5Ac/PaiQGZV4tzGKxwDM9WnziM+0l25L2a0zoM3E9fkejAmmVFUAX9wq?=
 =?us-ascii?Q?W5xeDIdkN4ivd89ynq8pX1dIQxiesUyvGZxeiU2xhy+dEAJz76YcKSu3+gqE?=
 =?us-ascii?Q?DZsHk5duFA/HY8Oj+tpRlSBxZZxsirW165VSRdlOJ/pZ5Vq4Yq4Igb9zmN6a?=
 =?us-ascii?Q?WX61Ac2slAZjeJfzQFNJVm39gKQ1YSgLiiwNPUz6hGsvLmdl2KAMIsBWGIJb?=
 =?us-ascii?Q?wdYGT9wkFC76eZoG5IjzivA4PrUNie1WF933J3zplH6twf5rkc3Q1hs1Z4Gm?=
 =?us-ascii?Q?FqKWHLeXVV+nhlBTlY/x90wN50MaoL4Z7pGW/hSSTYnp3GSJctbWyw3AoCq4?=
 =?us-ascii?Q?3uSME5YJkN7AZFs/XzDTtaXEDknGbbUqPQFlpOsCf5tXq+LeEOjl6Th1GpOS?=
 =?us-ascii?Q?N4F/X8LBFXrVM7H3RfyIgYGjnlH2EuHmadelR10FIHWIzc0QsMGUxkOvGemx?=
 =?us-ascii?Q?CJtMfL4z+JvRhoEiZOymDKnqUuXn+sNxwdQkPDpMAEPdL3m0OX8qKsafxYvb?=
 =?us-ascii?Q?WhuDHuHbv/alvUrYgupXPuTKbyWWtxTbyPHI5GarSmZ/59De2gzhz6w1OEby?=
 =?us-ascii?Q?fLTT7U7Tbyl04AdLy1QG2CW9LXsRx9b4hAfXXQO6Rn4S6+LXZgVEl7G6ClyL?=
 =?us-ascii?Q?nOrb0E4wxFyFw8dsPE6J71ZdCwZ6PgMuPozNYBa71Xim9cSuY8FEQiDUYPGf?=
 =?us-ascii?Q?M7osIkWfauAzQA9481tqAbDzBqLmkDa/rtVA2LrYnJHgfLaHzhfdCvsHlWh+?=
 =?us-ascii?Q?a59LxOzH1EwUPdND5BtKPKPj2iLqj6mojkYO85vfbRcZZtJjKHIrNAfDTf/A?=
 =?us-ascii?Q?0lOjjUEOnNGOtZPpMa1KzC97uN3izOyzDfZ0dQJNm5O+NNpd9TtKnb3gwimk?=
 =?us-ascii?Q?0ylXEvrLQblTA6TvAWb/J6tyo5zuifbh+MBJ57EMrCqBDgfi5lGYJfJ5A45R?=
 =?us-ascii?Q?M25ylQA51JOzEH1NawnCWrt0zxq9VLi+WkSGi0M2nP+wR/BsKpm95ausvdaP?=
 =?us-ascii?Q?DpJtXFhMGCz5103eTqKejhN3ECzdOVJIBhoz9pMnd7GEoftE0NKQeaNO24/M?=
 =?us-ascii?Q?lAjQxvVmSV5bLxsoX5clG/l4pHe6Hg170Vj2K5XjLiAKVZUJc5fR9EcrLwTP?=
 =?us-ascii?Q?mtSL3bdkNvcgqFgFizkNw1xBZCwCK+L/2kDNXY/pi+vJLb3VJAQQlNfjqQlL?=
 =?us-ascii?Q?FI++0/HEfA=3D=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f080d145-63f0-4466-5642-08d9fcbc2183
X-MS-Exchange-CrossTenant-AuthSource: SA0PR01MB6329.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 02:18:40.2792
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BZErI/d/x++zCwFlrV6R6GyJc+q5yiKh8kCWpsWG9ojNFMCe+Mw44XLYumklsb048oaFPrgvVnwixwu2WKIEL8DIcmCb5fHbnyA9QbBkm3sWG4TMdASLQw81cdDemFJu
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR01MB7400
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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 Wed, Mar 02, 2022 at 10:32:06AM +0100, Vincent Guittot wrote:
> On Tue, 1 Mar 2022 at 01:35, Darren Hart <darren@os.amperecomputing.com> wrote:
> >
> > Ampere Altra defines CPU clusters in the ACPI PPTT. They share a Snoop
> > Control Unit, but have no shared CPU-side last level cache.
> >
> > cpu_coregroup_mask() will return a cpumask with weight 1, while
> > cpu_clustergroup_mask() will return a cpumask with weight 2.
> >
> > As a result, build_sched_domain() will BUG() once per CPU with:
> >
> > BUG: arch topology borken
> >      the CLS domain not a subset of the MC domain
> >
> > The MC level cpumask is then extended to that of the CLS child, and is
> > later removed entirely as redundant. This sched domain topology is an
> > improvement over previous topologies, or those built without
> > SCHED_CLUSTER, particularly for certain latency sensitive workloads.
> > With the current scheduler model and heuristics, this is a desirable
> > default topology for Ampere Altra and Altra Max system.
> >
> > Introduce an alternate sched domain topology for arm64 without the MC
> > level and test for llc_sibling weight 1 across all CPUs to enable it.
> >
> > Do this in arch/arm64/kernel/smp.c (as opposed to
> > arch/arm64/kernel/topology.c) as all the CPU sibling maps are now
> > populated and we avoid needing to extend the drivers/acpi/pptt.c API to
> > detect the cluster level being above the cpu llc level. This is
> > consistent with other architectures and provides a readily extensible
> > mechanism for other alternate topologies.
> >
> > The final sched domain topology for a 2 socket Ampere Altra system is
> > unchanged with or without CONFIG_SCHED_CLUSTER, and the BUG is avoided:
> >
> > For CPU0:
> >
> > CONFIG_SCHED_CLUSTER=y
> > CLS  [0-1]
> > DIE  [0-79]
> > NUMA [0-159]
> >
> > CONFIG_SCHED_CLUSTER is not set
> > DIE  [0-79]
> > NUMA [0-159]
> >
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Will Deacon <will@kernel.org>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Cc: Vincent Guittot <vincent.guittot@linaro.org>
> > Cc: Barry Song <song.bao.hua@hisilicon.com>
> > Cc: Valentin Schneider <valentin.schneider@arm.com>
> > Cc: D. Scott Phillips <scott@os.amperecomputing.com>
> > Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
> > Cc: <stable@vger.kernel.org> # 5.16.x
> > Signed-off-by: Darren Hart <darren@os.amperecomputing.com>
> > ---
> >  arch/arm64/kernel/smp.c | 28 ++++++++++++++++++++++++++++
> >  1 file changed, 28 insertions(+)
> >
> > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
> > index 27df5c1e6baa..3597e75645e1 100644
> > --- a/arch/arm64/kernel/smp.c
> > +++ b/arch/arm64/kernel/smp.c
> > @@ -433,6 +433,33 @@ static void __init hyp_mode_check(void)
> >         }
> >  }
> >
> > +static struct sched_domain_topology_level arm64_no_mc_topology[] = {
> > +#ifdef CONFIG_SCHED_SMT
> > +       { cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },
> > +#endif
> > +
> > +#ifdef CONFIG_SCHED_CLUSTER
> > +       { cpu_clustergroup_mask, cpu_cluster_flags, SD_INIT_NAME(CLS) },
> > +#endif
> > +
> > +       { cpu_cpu_mask, SD_INIT_NAME(DIE) },
> > +       { NULL, },
> > +};
> > +
> > +static void __init update_sched_domain_topology(void)
> > +{
> > +       int cpu;
> > +
> > +       for_each_possible_cpu(cpu) {
> > +               if (cpu_topology[cpu].llc_id != -1 &&
> 
> Have you tested it with a non-acpi system ? AFAICT, llc_id is only set
> by ACPI system and  llc_id == -1 for others like DT based system
> 
> > +                   cpumask_weight(&cpu_topology[cpu].llc_sibling) > 1)
> > +                       return;
> > +       }

Hi Vincent,

I did not have a non-acpi system to test, no. You're right of course,
llc_id is only set by ACPI systems on arm64. We could wrap this in a
CONFIG_ACPI ifdef (or IS_ENABLED), but I think this would be preferable:

+       for_each_possible_cpu(cpu) {
+               if (cpu_topology[cpu].llc_id == -1 ||
+                   cpumask_weight(&cpu_topology[cpu].llc_sibling) > 1)
+                       return;
+       }

Quickly tested on Altra successfully. Would appreciate anyone with non-acpi
arm64 systems who can test and verify this behaves as intended. I will ask
around tomorrow as well to see what I may have access to.

Thanks,

> > +
> > +       pr_info("No LLC siblings, using No MC sched domains topology\n");
> > +       set_sched_topology(arm64_no_mc_topology);
> > +}
> > +
> >  void __init smp_cpus_done(unsigned int max_cpus)
> >  {
> >         pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());
> > @@ -440,6 +467,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
> >         hyp_mode_check();
> >         apply_alternatives_all();
> >         mark_linear_text_alias_ro();
> > +       update_sched_domain_topology();
> >  }
> >
> >  void __init smp_prepare_boot_cpu(void)
> > --
> > 2.31.1
> >

-- 
Darren Hart
Ampere Computing / OS and Kernel