From: Borislav Petkov <bp@alien8.de>
To: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: linux-tip-commits@vger.kernel.org,
Xiaochen Shen <xiaochen.shen@intel.com>,
Borislav Petkov <bp@suse.de>, Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [tip: x86/cache] x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled
Date: Wed, 9 Dec 2020 23:23:28 +0100 [thread overview]
Message-ID: <20201209222328.GA20710@zn.tnic> (raw)
In-Reply-To: <160754081861.3364.12382697409765236626.tip-bot2@tip-bot2>
On Wed, Dec 09, 2020 at 07:06:58PM -0000, tip-bot2 for Xiaochen Shen wrote:
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
> index 622073f..93a33b7 100644
> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
> @@ -320,7 +320,6 @@ static int __mon_event_count(u32 rmid, struct rmid_read *rr)
> }
>
> chunks = mbm_overflow_count(m->prev_msr, tval, rr->r->mbm_width);
> - m->chunks += chunks;
> m->prev_msr = tval;
>
> rr->val += get_corrected_mbm_count(rmid, m->chunks);
Hmm, zapping this one. First, there's an unused variable warning:
https://lkml.kernel.org/r/202012100516.H7sTNehL-lkp@intel.com
and you should remove the chunks assignment too.
And then it didn't apply cleanly:
$ test-apply.sh /tmp/xiaochen.01
checking file arch/x86/kernel/cpu/resctrl/monitor.c
Hunk #1 FAILED at 279.
Hunk #2 succeeded at 514 (offset 64 lines).
1 out of 2 hunks FAILED
I wiggled it in but it ended up removing the wrong chunks inc line -
not the one in mbm_bw_count() but in __mon_event_count() - which I just
realized.
So please redo this patch against:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=x86/cache
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2020-12-09 22:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 6:27 [PATCH] " Xiaochen Shen
2020-12-09 19:06 ` [tip: x86/cache] " tip-bot2 for Xiaochen Shen
2020-12-09 22:23 ` Borislav Petkov [this message]
2020-12-09 22:27 ` Borislav Petkov
2020-12-10 4:45 ` Xiaochen Shen
2020-12-10 10:26 ` Borislav Petkov
2020-12-10 16:40 ` Xiaochen Shen
2020-12-10 16:50 ` Borislav Petkov
2020-12-10 5:49 ` [tip: x86/cache v2] " Xiaochen Shen
2020-12-10 16:57 ` [tip: x86/urgent] " tip-bot2 for Xiaochen Shen
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=20201209222328.GA20710@zn.tnic \
--to=bp@alien8.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=xiaochen.shen@intel.com \
/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
all inboxes | Powered by JetHome®