From: Reinette Chatre <reinette.chatre@intel.com>
To: James Morse <james.morse@arm.com>, <x86@kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
H Peter Anvin <hpa@zytor.com>, Babu Moger <Babu.Moger@amd.com>,
<shameerali.kolothum.thodi@huawei.com>,
Jamie Iles <jamie@nuviainc.com>,
"D Scott Phillips OS" <scott@os.amperecomputing.com>,
<lcherian@marvell.com>, <bobo.shaobowang@huawei.com>,
<tan.shaopeng@fujitsu.com>
Subject: Re: [PATCH v2 15/23] x86/recstrl: Add per-rmid arch private storage for overflow and chunks
Date: Fri, 15 Oct 2021 15:29:20 -0700 [thread overview]
Message-ID: <65451ca3-3770-b679-6569-a2d3b90f4b44@intel.com> (raw)
In-Reply-To: <20211001160302.31189-16-james.morse@arm.com>
Hi James,
On 10/1/2021 9:02 AM, James Morse wrote:
> resctrl_arch_rmid_read() is intended as the function that an
> architecture agnostic resctrl filesystem driver can use to
> read a value in bytes from a counter. Currently the function returns
resctrl_arch_rmid_read() does not exist at this point and is also not
introduced in this patch.
> the mbm values in chunks directly from hardware. For bandwidth
Could you please replace mbm with MBM throughout the series?
> counters the resctrl filesystem uses this to calculate the number of
> bytes ever seen.
>
> MPAM's scaling of counters can be changed at runtime, reducing the
> resolution but increasing the range. When this is changed the prev_msr
> values need to be converted by the architecture code.
>
> Add an array for per-rmid private storage. The prev_msr and chunks
> values will move here to allow resctrl_arch_rmid_read() to always
> return the number of bytes read by this counter without assistance
> from the filesystem. The values are moved in later patches when
> the overflow and correction calls are moved into
> resctrl_arch_rmid_read().
>
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
> arch/x86/kernel/cpu/resctrl/core.c | 34 ++++++++++++++++++++++++++
> arch/x86/kernel/cpu/resctrl/internal.h | 13 ++++++++++
> 2 files changed, 47 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
> index 583fb41db06d..f527489a607a 100644
> --- a/arch/x86/kernel/cpu/resctrl/core.c
> +++ b/arch/x86/kernel/cpu/resctrl/core.c
> @@ -413,6 +413,8 @@ void setup_default_ctrlval(struct rdt_resource *r, u32 *dc)
>
> void domain_free(struct rdt_hw_domain *hw_dom)
> {
> + kfree(hw_dom->arch_mbm_total);
> + kfree(hw_dom->arch_mbm_local);
> kfree(hw_dom->ctrl_val);
> kfree(hw_dom);
> }
> @@ -438,6 +440,33 @@ static int domain_setup_ctrlval(struct rdt_resource *r, struct rdt_domain *d)
> return 0;
> }
>
> +/**
> + * arch_domain_mbm_alloc() - Allocate arch private storage for the mbm counters
mbm -> MBM in comments also please .
> + * @num_rmid: The size of the mbm counter array
> + * @hw_dom: The domain that owns the allocated the arrays
the allocated the -> the allocated
> + *
> + * On error, call domain_free()
When following kerneldoc please use "Return:" to indicate the return
section. It will help to run scripts/kernel-doc on these changes to make
sure no new kernel-doc issues are introduced.
> + */
> +static int arch_domain_mbm_alloc(u32 num_rmid, struct rdt_hw_domain *hw_dom)
> +{
> + size_t tsize;
> +
> + if (is_mbm_total_enabled()) {
> + tsize = sizeof(*hw_dom->arch_mbm_total);
> + hw_dom->arch_mbm_total = kcalloc(num_rmid, tsize, GFP_KERNEL);
> + if (!hw_dom->arch_mbm_total)
> + return -ENOMEM;
> + }
> + if (is_mbm_local_enabled()) {
> + tsize = sizeof(*hw_dom->arch_mbm_local);
> + hw_dom->arch_mbm_local = kcalloc(num_rmid, tsize, GFP_KERNEL);
> + if (!hw_dom->arch_mbm_local)
> + return -ENOMEM;
> + }
> +
Proper cleanup on error should be done in this function. Please do not
use domain_free() as cleanup for what can be done in this function. I
see domain_free() as the higher level error control ... like when a
wrapper function calls arch_domain_mbm_alloc() and then something else
fails after that ... then domain_free() would be that higher level error
handling.
> + return 0;
> +}
> +
> /*
> * domain_add_cpu - Add a cpu to a resource's domain list.
> *
> @@ -487,6 +516,11 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r)
> return;
> }
>
> + if (r->mon_capable && arch_domain_mbm_alloc(r->num_rmid, hw_dom)) {
> + domain_free(hw_dom);
> + return;
> + }
> +
> list_add_tail(&d->list, add_pos);
>
> err = resctrl_online_domain(r, d);
> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index 0a5721e1cc07..aaae900a8ef3 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -303,17 +303,30 @@ struct mbm_state {
> bool delta_comp;
> };
>
> +/**
> + * struct arch_mbm_state - values used to compute resctrl_arch_rmid_read()s
> + * return value.
> + * @prev_msr Value of IA32_QM_CTR for this RMID last time we read it
Missing a ":"?
Please do not use "we".
This is a description of a struct ... can the doc elaborate on what
"this RMID" means?
> + */
> +struct arch_mbm_state {
> + u64 prev_msr;
> +};
> +
> /**
> * struct rdt_hw_domain - Arch private attributes of a set of CPUs that share
> * a resource
> * @d_resctrl: Properties exposed to the resctrl file system
> * @ctrl_val: array of cache or mem ctrl values (indexed by CLOSID)
> + * @arch_mbm_total: arch private state for MBM total bandwidth
> + * @arch_mbm_local: arch private state for MBM local bandwidth
> *
> * Members of this structure are accessed via helpers that provide abstraction.
> */
> struct rdt_hw_domain {
> struct rdt_domain d_resctrl;
> u32 *ctrl_val;
> + struct arch_mbm_state *arch_mbm_total;
> + struct arch_mbm_state *arch_mbm_local;
> };
>
> static inline struct rdt_hw_domain *resctrl_to_arch_dom(struct rdt_domain *r)
>
Reinette
next prev parent reply other threads:[~2021-10-15 22:29 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 16:02 [PATCH v2 00/23] x86/resctrl: Make resctrl_arch_rmid_read() return values in bytes James Morse
2021-10-01 16:02 ` [PATCH v2 01/23] x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails James Morse
2021-10-01 16:02 ` [PATCH v2 02/23] x86/resctrl: Fix kfree() of the wrong type in domain_add_cpu() James Morse
2021-10-01 16:02 ` [PATCH v2 03/23] x86/resctrl: Kill off alloc_enabled James Morse
2021-10-15 22:19 ` Reinette Chatre
2021-10-01 16:02 ` [PATCH v2 04/23] x86/resctrl: Merge mon_capable and mon_enabled James Morse
2021-10-19 23:18 ` Babu Moger
2021-10-22 18:30 ` James Morse
2021-10-01 16:02 ` [PATCH v2 05/23] x86/resctrl: Add domain online callback for resctrl work James Morse
2021-10-15 22:19 ` Reinette Chatre
2021-10-22 18:30 ` James Morse
2021-10-19 23:19 ` Babu Moger
2021-10-22 18:30 ` James Morse
2021-10-01 16:02 ` [PATCH v2 06/23] x86/resctrl: Group struct rdt_hw_domain cleanup James Morse
2021-10-01 16:02 ` [PATCH v2 07/23] x86/resctrl: Add domain offline callback for resctrl work James Morse
2021-10-19 23:19 ` Babu Moger
2021-10-22 18:30 ` James Morse
2021-10-01 16:02 ` [PATCH v2 08/23] x86/resctrl: Create mba_sc configuration in the rdt_domain James Morse
2021-10-15 22:26 ` Reinette Chatre
2021-10-22 18:30 ` James Morse
2021-10-01 16:02 ` [PATCH v2 09/23] x86/resctrl: Switch over to the resctrl mbps_val list James Morse
2021-10-15 22:26 ` Reinette Chatre
2021-10-27 16:49 ` James Morse
2021-10-01 16:02 ` [PATCH v2 10/23] x86/resctrl: Remove architecture copy of mbps_val James Morse
2021-10-15 22:27 ` Reinette Chatre
2021-10-27 16:49 ` James Morse
2021-10-01 16:02 ` [PATCH v2 11/23] x86/resctrl: Remove set_mba_sc()s control array re-initialisation James Morse
2021-10-01 16:02 ` [PATCH v2 12/23] x86/resctrl: Abstract and use supports_mba_mbps() James Morse
2021-10-07 6:13 ` tan.shaopeng
2021-10-27 16:50 ` James Morse
2021-10-15 22:28 ` Reinette Chatre
2021-10-01 16:02 ` [PATCH v2 13/23] x86/resctrl: Allow update_mba_bw() to update controls directly James Morse
2021-10-15 22:28 ` Reinette Chatre
2021-10-27 16:49 ` James Morse
2021-10-01 16:02 ` [PATCH v2 14/23] x86/resctrl: Calculate bandwidth from the previous __mon_event_count() chunks James Morse
2021-10-15 22:28 ` Reinette Chatre
2021-10-27 16:50 ` James Morse
2021-10-27 20:41 ` Reinette Chatre
2021-10-29 15:50 ` James Morse
2021-10-29 22:22 ` Reinette Chatre
2021-10-01 16:02 ` [PATCH v2 15/23] x86/recstrl: Add per-rmid arch private storage for overflow and chunks James Morse
2021-10-15 22:29 ` Reinette Chatre [this message]
2021-10-01 16:02 ` [PATCH v2 16/23] x86/recstrl: Allow per-rmid arch private storage to be reset James Morse
2021-10-07 6:16 ` tan.shaopeng
2021-10-01 16:02 ` [PATCH v2 17/23] x86/resctrl: Abstract __rmid_read() James Morse
2021-10-15 22:29 ` Reinette Chatre
2021-10-19 23:20 ` Babu Moger
2021-10-20 18:15 ` Reinette Chatre
2021-10-20 19:22 ` Babu Moger
2021-10-20 20:28 ` Reinette Chatre
2021-10-27 16:50 ` James Morse
2021-10-27 18:59 ` Babu Moger
2021-10-01 16:02 ` [PATCH v2 18/23] x86/resctrl: Pass the required parameters into resctrl_arch_rmid_read() James Morse
2021-10-15 22:30 ` Reinette Chatre
2021-10-01 16:02 ` [PATCH v2 19/23] x86/resctrl: Move mbm_overflow_count() " James Morse
2021-10-01 16:02 ` [PATCH v2 20/23] x86/resctrl: Move get_corrected_mbm_count() " James Morse
2021-10-01 16:03 ` [PATCH v2 21/23] x86/resctrl: Rename and change the units of resctrl_cqm_threshold James Morse
2021-10-01 16:03 ` [PATCH v2 22/23] x86/resctrl: Add resctrl_rmid_realloc_limit to abstract x86's boot_cpu_data James Morse
2021-10-01 16:03 ` [PATCH v2 23/23] x86/resctrl: Make resctrl_arch_rmid_read() return values in bytes James Morse
2021-10-13 2:09 ` [PATCH v2 00/23] " tan.shaopeng
2021-10-19 23:17 ` Babu Moger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65451ca3-3770-b679-6569-a2d3b90f4b44@intel.com \
--to=reinette.chatre@intel.com \
--cc=Babu.Moger@amd.com \
--cc=bobo.shaobowang@huawei.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=jamie@nuviainc.com \
--cc=lcherian@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=scott@os.amperecomputing.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).