From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: fenghua.yu@intel.com, reinette.chatre@intel.com,
babu.moger@amd.com, x86@kernel.org
Subject: [PATCH v2] x86/resctrl: Fix zero cbm for AMD in cbm_validate
Date: Mon, 16 May 2022 17:12:34 -0700 [thread overview]
Message-ID: <20220517001234.3137157-1-eranian@google.com> (raw)
AMD supports cbm with no bits set as reflected in rdt_init_res_defs_amd() by:
r->cache.arch_has_empty_bitmaps = true;
However given the unified code in cbm_validate(), checking for:
val == 0 && !arch_has_empty_bitmaps
is not enough because you also have in cbm_validate():
if ((zero_bit - first_bit) < r->cache.min_cbm_bits)
Default value for if r->cache.min_cbm_bits = 1
Leading to:
$ cd /sys/fs/resctrl
$ mkdir foo
$ cd foo
$ echo L3:0=0 > schemata
-bash: echo: write error: Invalid argument
Patch initializes fixes the logic in cbm_validate() to take into account
arch_has_empty_bitmaps when true and cbm value is 0.
Fixes: 316e7f901f5a ("x86/resctrl: Add struct rdt_cache::arch_has_{sparse, empty}_bitmaps")
Signed-off-by: Stephane Eranian <eranian@google.com>
---
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index 87666275eed9..f376ed8bff8f 100644
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -107,6 +107,10 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r)
first_bit = find_first_bit(&val, cbm_len);
zero_bit = find_next_zero_bit(&val, cbm_len, first_bit);
+ /* no need to check bits if arch supports no bits set */
+ if (r->cache.arch_has_empty_bitmaps && val == 0)
+ goto done;
+
/* Are non-contiguous bitmaps allowed? */
if (!r->cache.arch_has_sparse_bitmaps &&
(find_next_bit(&val, cbm_len, zero_bit) < cbm_len)) {
@@ -119,7 +123,7 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r)
r->cache.min_cbm_bits);
return false;
}
-
+done:
*data = val;
return true;
}
--
2.36.0.550.gb090851708-goog
next reply other threads:[~2022-05-17 0:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 0:12 Stephane Eranian [this message]
2022-05-17 16:33 ` [PATCH v2] x86/resctrl: Fix zero cbm for AMD in cbm_validate Fenghua Yu
2022-05-17 16:49 ` Reinette Chatre
2022-05-17 17:27 ` Fenghua Yu
2022-05-17 18:10 ` Reinette Chatre
2022-05-18 16:34 ` Fenghua Yu
2022-05-25 13:10 ` Stephane Eranian
2022-07-25 19:47 ` Babu Moger
2022-08-01 14:58 ` Moger, Babu
2022-08-01 15:19 ` Stephane Eranian
2022-10-18 18:33 ` [tip: x86/urgent] x86/resctrl: Fix min_cbm_bits for AMD tip-bot2 for 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=20220517001234.3137157-1-eranian@google.com \
--to=eranian@google.com \
--cc=babu.moger@amd.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--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).