Hi Ilpo,
On 2024-01-25 at 13:46:51 +0200, Ilpo Järvinen wrote:
>On Thu, 25 Jan 2024, Maciej Wieczor-Retman wrote:
>
>> validate_resctrl_feature_request() is used to test both if a resource is
>> present in the info directory, and if a passed monitoring feature is
>> present in the mon_features file.
>>
>> Refactor validate_resctrl_feature_request() into two smaller functions
>> that each accomplish one check to give feature checking more
>> granularity:
>> - Resource directory presence in the /sys/fs/resctrl/info directory.
>> - Feature name presence in the /sys/fs/resctrl/info/L3_MON/mon_features
>> file.
>>
>> Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@xxxxxxxxx>
>> ---
>> Changelog v3:
>> - Move new function to a separate patch. (Reinette)
>> - Rewrite resctrl_mon_feature_exists() only for L3_MON.
>>
>> Changelog v2:
>> - Add this patch.
>>
>> tools/testing/selftests/resctrl/cmt_test.c | 4 +--
>> tools/testing/selftests/resctrl/mba_test.c | 4 +--
>> tools/testing/selftests/resctrl/mbm_test.c | 6 ++--
>> tools/testing/selftests/resctrl/resctrl.h | 3 +-
>> tools/testing/selftests/resctrl/resctrlfs.c | 33 +++++++++++++--------
>> 5 files changed, 30 insertions(+), 20 deletions(-)
>>
>> diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c
>> index dd5ca343c469..428de9df81c8 100644
>> --- a/tools/testing/selftests/resctrl/cmt_test.c
>> +++ b/tools/testing/selftests/resctrl/cmt_test.c
>> @@ -169,8 +169,8 @@ static int cmt_run_test(const struct resctrl_test *test, const struct user_param
>>
>> static bool cmt_feature_check(const struct resctrl_test *test)
>> {
>> - return test_resource_feature_check(test) &&
>> - validate_resctrl_feature_request("L3_MON", "llc_occupancy");
>> + return resctrl_mon_feature_exists("llc_occupancy") &&
>> + resctrl_resource_exists("L3");
>> }
>>
>> struct resctrl_test cmt_test = {
>> diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/selftests/resctrl/mba_test.c
>> index da256d2dbe5c..e22285b80e37 100644
>> --- a/tools/testing/selftests/resctrl/mba_test.c
>> +++ b/tools/testing/selftests/resctrl/mba_test.c
>> @@ -170,8 +170,8 @@ static int mba_run_test(const struct resctrl_test *test, const struct user_param
>>
>> static bool mba_feature_check(const struct resctrl_test *test)
>> {
>> - return test_resource_feature_check(test) &&
>> - validate_resctrl_feature_request("L3_MON", "mbm_local_bytes");
>> + return resctrl_resource_exists(test->resource) &&
>
>I don't understand what's the advantage of converting away from
>test_resource_feature_check() in CMT and MBA case?
>
>> + resctrl_mon_feature_exists("mbm_local_bytes");
>> }
>
>> @@ -756,7 +765,7 @@ bool validate_resctrl_feature_request(const char *resource, const char *feature)
>>
>> bool test_resource_feature_check(const struct resctrl_test *test)
>> {
>> - return validate_resctrl_feature_request(test->resource, NULL);
>> + return resctrl_resource_exists(test->resource);
>
>...The replacement in MBA open coded test_resource_feature_check() 100%
>and CMT even replaces the test->resource with the string matching to
>what's in test->resource?
>
You're right, I got carried away with refactoring a bit. I'll keep
test_resource_feature_check() for CMT and MBM. Thanks!
>
>--
> i.
>
--
Kind regards
Maciej Wieczór-Retman
