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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1141CC74A5B for ; Tue, 21 Mar 2023 15:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231630AbjCUPMt (ORCPT ); Tue, 21 Mar 2023 11:12:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231612AbjCUPMj (ORCPT ); Tue, 21 Mar 2023 11:12:39 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97C9B4ECE5 for ; Tue, 21 Mar 2023 08:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679411556; x=1710947556; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=x9a3YOj4a+R+7xggcFJXpjB82SQTOk9c6QKb7Ibe/Fk=; b=cY7jLu3M7702IEHS45h/FHliK+vY3S/jSyl1bUoaegV4kzCn1uhUuS2N sYI9B1GIjHFIf7tAlP6MEhgGix+qVrX1ZZxThq+MKpmnxO0FECIiMJcPP 2lxLaCvUxNEEHEHUK8w/JuAB92ZGlqMdJ1dRtFXJLis8AuBpTtILpE4A3 hgd1plHHOi0FGBVAbOhEOcCh+0QNV6bNdHHIOfENzveJNTRLcWZp3cS2c eZXDRsq594ETi4GajeCYMfB3ROzNExxb9DSHInkZXJMQu5WDKC7CE75Iy fo7CwmtTVaofPkxpwIe3K0Bcn2t0fLO5lkoAu19dIxECJ0ZXIWVMVJnjz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="425245678" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="425245678" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 08:12:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="927445689" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="927445689" Received: from jluqueti-mobl.ger.corp.intel.com ([10.252.63.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 08:12:29 -0700 Date: Tue, 21 Mar 2023 17:12:27 +0200 (EET) From: =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= To: James Morse cc: x86@kernel.org, LKML , Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com Subject: Re: [PATCH v3 17/19] x86/resctrl: Allow overflow/limbo handlers to be scheduled on any-but cpu In-Reply-To: <20230320172620.18254-18-james.morse@arm.com> Message-ID: <118d53a6-e292-50a0-dc8f-32c573379ed7@linux.intel.com> References: <20230320172620.18254-1-james.morse@arm.com> <20230320172620.18254-18-james.morse@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 20 Mar 2023, James Morse wrote: > When a CPU is taken offline resctrl may need to move the overflow or > limbo handlers to run on a different CPU. > > Once the offline callbacks have been split, cqm_setup_limbo_handler() > will be called while the CPU that is going offline is still present > in the cpu_mask. > > Pass the CPU to exclude to cqm_setup_limbo_handler() and > mbm_setup_overflow_handler(). These functions can use a variant of > cpumask_any_but() when selecting the CPU. -1 is used to indicate no CPUs > need excluding. > > Tested-by: Shaopeng Tan > Signed-off-by: James Morse > --- > Changes since v2: > * Rephrased a comment to avoid a two letter bad-word. (we) > * Avoid assigning mbm_work_cpu if the domain is going to be free()d > * Added cpumask_any_housekeeping_but(), I dislike the name > --- > arch/x86/kernel/cpu/resctrl/core.c | 8 +++-- > arch/x86/kernel/cpu/resctrl/internal.h | 37 ++++++++++++++++++++-- > arch/x86/kernel/cpu/resctrl/monitor.c | 43 +++++++++++++++++++++----- > arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 ++-- > include/linux/resctrl.h | 3 ++ > 5 files changed, 83 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c > index 8e25ea49372e..aafe4b74587c 100644 > --- a/arch/x86/kernel/cpu/resctrl/core.c > +++ b/arch/x86/kernel/cpu/resctrl/core.c > @@ -582,12 +582,16 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r) > if (r == &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl) { > if (is_mbm_enabled() && cpu == d->mbm_work_cpu) { > cancel_delayed_work(&d->mbm_over); > - mbm_setup_overflow_handler(d, 0); > + /* > + * exclude_cpu=-1 as this CPU has already been removed > + * by cpumask_clear_cpu()d > + */ > + mbm_setup_overflow_handler(d, 0, RESCTRL_PICK_ANY_CPU); > } > if (is_llc_occupancy_enabled() && cpu == d->cqm_work_cpu && > has_busy_rmid(r, d)) { > cancel_delayed_work(&d->cqm_limbo); > - cqm_setup_limbo_handler(d, 0); > + cqm_setup_limbo_handler(d, 0, RESCTRL_PICK_ANY_CPU); > } > } > } > diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h > index 3eb5b307b809..47838ba6876e 100644 > --- a/arch/x86/kernel/cpu/resctrl/internal.h > +++ b/arch/x86/kernel/cpu/resctrl/internal.h > @@ -78,6 +78,37 @@ static inline unsigned int cpumask_any_housekeeping(const struct cpumask *mask) > return cpu; > } > > +/** > + * cpumask_any_housekeeping_but() - Chose any cpu in @mask, preferring those > + * that aren't marked nohz_full, excluding > + * the provided CPU > + * @mask: The mask to pick a CPU from. > + * @exclude_cpu:The CPU to avoid picking. > + * > + * Returns a CPU from @mask, but not @but. If there are houskeeping CPUs that > + * don't use nohz_full, these are preferred. > + * Returns >= nr_cpu_ids if no CPUs are available. > + */ > +static inline unsigned int > +cpumask_any_housekeeping_but(const struct cpumask *mask, int exclude_cpu) > +{ > + int cpu, hk_cpu; > + > + cpu = cpumask_any_but(mask, exclude_cpu); > + if (tick_nohz_full_cpu(cpu)) { > + hk_cpu = cpumask_nth_andnot(0, mask, tick_nohz_full_mask); > + if (hk_cpu == exclude_cpu) { > + hk_cpu = cpumask_nth_andnot(1, mask, > + tick_nohz_full_mask); I'm left to wonder if it's okay to alter tick_nohz_full_mask in resctrl code?? -- i.