From: James Morse <james.morse@arm.com>
To: Peter Newman <peternewman@google.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@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,
D Scott Phillips OS <scott@os.amperecomputing.com>,
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 <quic_jiles@quicinc.com>,
Xin Hao <xhao@linux.alibaba.com>
Subject: Re: [PATCH v2 09/18] x86/resctrl: Allow resctrl_arch_rmid_read() to sleep
Date: Mon, 6 Mar 2023 11:33:21 +0000 [thread overview]
Message-ID: <314321ca-2911-efa5-c7f8-23134363054c@arm.com> (raw)
In-Reply-To: <CALPaoCisUdTzSP6E+9VVa4okjvcCjs6p7MhyLYpzxVGs7+8nNA@mail.gmail.com>
Hi Peter,
On 23/01/2023 13:54, Peter Newman wrote:
> On Fri, Jan 13, 2023 at 6:56 PM James Morse <james.morse@arm.com> wrote:
>> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
>> index d309b830aeb2..d6ae4b713801 100644
>> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
>> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
>> @@ -206,17 +206,19 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
>> return chunks >> shift;
>> }
>>
>> -int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
>> - u32 closid, u32 rmid, enum resctrl_event_id eventid,
>> - u64 *val)
>> +struct __rmid_read_arg
>> {
>> - struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
>> - struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
>> - struct arch_mbm_state *am;
>> - u64 msr_val, chunks;
>> + u32 rmid;
>> + enum resctrl_event_id eventid;
>>
>> - if (!cpumask_test_cpu(smp_processor_id(), &d->cpu_mask))
>> - return -EINVAL;
>> + u64 msr_val;
>> +};
>> +
>> +static void __rmid_read(void *arg)
>> +{
>> + enum resctrl_event_id eventid = ((struct __rmid_read_arg *)arg)->eventid;
>> + u32 rmid = ((struct __rmid_read_arg *)arg)->rmid;
>> + u64 msr_val;
>>
>> /*
>> * As per the SDM, when IA32_QM_EVTSEL.EvtID (bits 7:0) is configured
>> @@ -229,6 +231,28 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
>> wrmsr(MSR_IA32_QM_EVTSEL, eventid, rmid);
>> rdmsrl(MSR_IA32_QM_CTR, msr_val);
>>
>> + ((struct __rmid_read_arg *)arg)->msr_val = msr_val;
>> +}
>> +
>> +int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
>> + u32 closid, u32 rmid, enum resctrl_event_id eventid,
>> + u64 *val)
>> +{
>> + struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
>> + struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
>> + struct __rmid_read_arg arg;
>> + struct arch_mbm_state *am;
>> + u64 msr_val, chunks;
>> + int err;
>> +
>> + arg.rmid = rmid;
>> + arg.eventid = eventid;
>> +
>> + err = smp_call_function_any(&d->cpu_mask, __rmid_read, &arg, true);
>> + if (err)
>> + return err;
>> +
>> + msr_val = arg.msr_val;
>
> These changes are conflicting now after v6.2-rc4 due to my recent
> changes in resctrl_arch_rmid_read(), which include my own
> reintroduction of __rmid_read():
>
> https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=2a81160d29d65b5876ab3f824fda99ae0219f05e
>
> Fortunately it looks like our respective versions of __rmid_read()
> aren't too much different from the original, but __rmid_read() does
> have a new call site in resctrl_arch_reset_rmid() to record initial
> event counts.
Yup, this is the normal headache when rebasing over other changes.
Thanks for fixing that thing - I thought the 'first' behaviour in the filesystem code
covered it, but clearly it doesn't.
Thanks,
James
next prev parent reply other threads:[~2023-03-06 11:33 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 17:54 [PATCH v2 00/18] x86/resctrl: monitored closid+rmid together, separate arch/fs locking James Morse
2023-01-13 17:54 ` [PATCH v2 01/18] x86/resctrl: Track the closid with the rmid James Morse
2023-01-13 17:54 ` [PATCH v2 02/18] x86/resctrl: Access per-rmid structures by index James Morse
2023-01-17 18:28 ` Yu, Fenghua
2023-03-03 18:33 ` James Morse
2023-01-17 18:29 ` Yu, Fenghua
2023-02-02 23:44 ` Reinette Chatre
2023-03-03 18:33 ` James Morse
2023-01-13 17:54 ` [PATCH v2 03/18] x86/resctrl: Create helper for RMID allocation and mondata dir creation James Morse
2023-01-13 17:54 ` [PATCH v2 04/18] x86/resctrl: Move rmid allocation out of mkdir_rdt_prepare() James Morse
2023-01-17 18:28 ` Yu, Fenghua
2023-02-02 23:45 ` Reinette Chatre
2023-03-03 18:33 ` James Morse
2023-01-13 17:54 ` [PATCH v2 05/18] x86/resctrl: Allow RMID allocation to be scoped by CLOSID James Morse
2023-01-17 18:53 ` Yu, Fenghua
2023-03-03 18:34 ` James Morse
2023-02-02 23:45 ` Reinette Chatre
2023-03-03 18:34 ` James Morse
2023-03-10 19:57 ` Reinette Chatre
2023-01-13 17:54 ` [PATCH v2 06/18] x86/resctrl: Allow the allocator to check if a CLOSID can allocate clean RMID James Morse
2023-01-17 18:29 ` Yu, Fenghua
2023-03-03 18:35 ` James Morse
2023-02-02 23:46 ` Reinette Chatre
2023-03-03 18:36 ` James Morse
2023-03-10 19:59 ` Reinette Chatre
2023-03-20 17:12 ` James Morse
2023-01-13 17:54 ` [PATCH v2 07/18] x86/resctrl: Move CLOSID/RMID matching and setting to use helpers James Morse
2023-01-17 19:10 ` Yu, Fenghua
2023-03-03 18:37 ` James Morse
2023-02-02 23:47 ` Reinette Chatre
2023-03-06 11:32 ` James Morse
2023-03-08 10:30 ` Peter Newman
2023-03-10 20:00 ` Reinette Chatre
2023-01-13 17:54 ` [PATCH v2 08/18] x86/resctrl: Queue mon_event_read() instead of sending an IPI James Morse
2023-01-17 18:29 ` Yu, Fenghua
2023-03-06 11:32 ` James Morse
2023-03-10 20:00 ` Reinette Chatre
2023-02-02 23:47 ` Reinette Chatre
2023-03-06 11:33 ` James Morse
2023-03-08 16:09 ` James Morse
2023-03-10 20:06 ` Reinette Chatre
2023-03-20 17:12 ` James Morse
2023-01-13 17:54 ` [PATCH v2 09/18] x86/resctrl: Allow resctrl_arch_rmid_read() to sleep James Morse
2023-01-23 13:54 ` Peter Newman
2023-03-06 11:33 ` James Morse [this message]
2023-01-23 15:33 ` Peter Newman
2023-03-06 11:33 ` James Morse
2023-03-06 13:14 ` Peter Newman
2023-03-08 17:45 ` James Morse
2023-03-09 13:41 ` Peter Newman
2023-03-09 17:35 ` James Morse
2023-03-10 9:28 ` Peter Newman
2023-03-20 17:12 ` James Morse
2023-03-22 13:21 ` Peter Newman
2023-01-13 17:54 ` [PATCH v2 10/18] x86/resctrl: Allow arch to allocate memory needed in resctrl_arch_rmid_read() James Morse
2023-01-13 17:54 ` [PATCH v2 11/18] x86/resctrl: Make resctrl_mounted checks explicit James Morse
2023-01-13 17:54 ` [PATCH v2 12/18] x86/resctrl: Move alloc/mon static keys into helpers James Morse
2023-01-13 17:54 ` [PATCH v2 13/18] x86/resctrl: Make rdt_enable_key the arch's decision to switch James Morse
2023-02-02 23:48 ` Reinette Chatre
2023-01-13 17:54 ` [PATCH v2 14/18] x86/resctrl: Add helpers for system wide mon/alloc capable James Morse
2023-01-25 7:16 ` Shaopeng Tan (Fujitsu)
2023-03-06 11:34 ` James Morse
2023-01-13 17:54 ` [PATCH v2 15/18] x86/resctrl: Add cpu online callback for resctrl work James Morse
2023-01-13 17:54 ` [PATCH v2 16/18] x86/resctrl: Allow overflow/limbo handlers to be scheduled on any-but cpu James Morse
2023-02-02 23:49 ` Reinette Chatre
2023-03-06 11:34 ` James Morse
2023-01-13 17:54 ` [PATCH v2 17/18] x86/resctrl: Add cpu offline callback for resctrl work James Morse
2023-01-13 17:54 ` [PATCH v2 18/18] x86/resctrl: Separate arch and fs resctrl locks James Morse
2023-02-02 23:50 ` Reinette Chatre
2023-03-06 11:34 ` James Morse
2023-03-11 0:22 ` Reinette Chatre
2023-03-20 17:12 ` James Morse
2023-01-25 7:19 ` [PATCH v2 00/18] x86/resctrl: monitored closid+rmid together, separate arch/fs locking Shaopeng Tan (Fujitsu)
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=314321ca-2911-efa5-c7f8-23134363054c@arm.com \
--to=james.morse@arm.com \
--cc=Babu.Moger@amd.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=bobo.shaobowang@huawei.com \
--cc=bp@alien8.de \
--cc=carl@os.amperecomputing.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=lcherian@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peternewman@google.com \
--cc=quic_jiles@quicinc.com \
--cc=reinette.chatre@intel.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 \
--cc=xhao@linux.alibaba.com \
--cc=xingxin.hx@openanolis.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).