selftests/resctrl: Move resctrl FS mount/umount to higher level
A few places currently lack umounting resctrl FS on error paths: - cmt_resctrl_val() has multiple error paths with direct return. - cat_perf_miss_val() has multiple error paths with direct return. In addition, validate_resctrl_feature_request() is called by run_mbm_test() and run_mba_test(). Neither MBA nor MBM test tries to umount resctrl FS. Each and every test does require resctrl FS to be present already for feature check. Thus, it makes sense to just mount it on higher level in resctrl_tests.c and properly pair it with umount. Move resctrl FS (re)mount/unmount into each test function in resctrl_tests.c. Make feature validation to simply check that resctrl FS is mounted. As there's the final umount in main() before this change, the selftest should not leave resctrl FS behind after the tests even if one of the forementioned paths is taken (thus, no fixes tag). Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Tested-by: Babu Moger <babu.moger@amd.com> Tested-by: Shaopeng Tan (Fujitsu) <tan.shaopeng@fujitsu.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
committed by
Shuah Khan
parent
ede1300848
commit
caddc0fbe4
@@ -617,7 +617,8 @@ char *fgrep(FILE *inf, const char *str)
|
||||
* validate_resctrl_feature_request - Check if requested feature is valid.
|
||||
* @resctrl_val: Requested feature
|
||||
*
|
||||
* Return: True if the feature is supported, else false
|
||||
* Return: True if the feature is supported, else false. False is also
|
||||
* returned if resctrl FS is not mounted.
|
||||
*/
|
||||
bool validate_resctrl_feature_request(const char *resctrl_val)
|
||||
{
|
||||
@@ -625,11 +626,13 @@ bool validate_resctrl_feature_request(const char *resctrl_val)
|
||||
bool found = false;
|
||||
char *res;
|
||||
FILE *inf;
|
||||
int ret;
|
||||
|
||||
if (!resctrl_val)
|
||||
return false;
|
||||
|
||||
if (remount_resctrlfs(false))
|
||||
ret = find_resctrl_mount(NULL);
|
||||
if (ret)
|
||||
return false;
|
||||
|
||||
if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) {
|
||||
|
||||
Reference in New Issue
Block a user