linux.git/tools/testing/selftests/resctrl, branch v6.6-rc2

selftests/resctrl: Remove test type checks from cat_val()

2023-07-25T14:54:11+00:00

cat_val() is only used during CAT test but it checks for test type.

Remove test type checks and the unused else branch from cat_val().

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Pass the real number of tests to show_cache_info()

2023-07-25T14:54:05+00:00

Results include warm-up test which is discarded before passing the sum
to show_cache_info(). show_cache_info() handles this by subtracting one
from the number of tests in divisor. It is a trappy construct to have
sum and number of tests parameters to disagree like this.

A more logical place for subtracting the skipped tests is where the sum
is calculated so move it there. Pass the correct number of tests to
show_cache_info() so it can be used directly as the divisor for
calculating the average.

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Move CAT/CMT test global vars to function they are used in

2023-07-25T14:53:59+00:00

CAT and CMT tests have count_of_bits, long_mask, cbm_mask, and
cache_size global variables that can be moved into the sole using
function.

Make the global variables local variables of the relevant function to
scope them better.

While at it, move cache_size initialization into the declaration line.

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Don't use variable argument list for ->setup()

2023-07-25T14:53:53+00:00

struct resctrl_val_param has ->setup() function that accepts variable
argument list. All test cases use only 1 argument as input and it's
the struct resctrl_val_param pointer.

Instead of variable argument list, directly pass struct
resctrl_val_param pointer as the only parameter to ->setup().

Co-developed-by: Fenghua Yu 
Signed-off-by: Fenghua Yu 
Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Don't pass test name to fill_buf

2023-07-25T14:53:48+00:00

Test name is passed to fill_buf functions so that they can loop around
buffer only once. This is required for CAT test case.

To loop around buffer only once, caller doesn't need to let fill_buf
know which test case it is. Instead, pass a boolean argument 'once'
which makes fill_buf more generic.

As run_benchmark() no longer needs to pass the test name to
run_fill_buf(), a few test running functions can be simplified to not
write the test name into the default benchmark_cmd. The has_ben
argument can also be removed now from those test running functions.

Co-developed-by: Fenghua Yu 
Signed-off-by: Fenghua Yu 
Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Improve parameter consistency in fill_buf

2023-07-25T14:53:42+00:00

fill_buf's arguments can be improved in multiple ways:

  - Multiple functions in fill_buf have start_ptr as one of their
    argument which is a bit long and the extra "start" is pretty
    obvious when it comes to pointers.

  - Some of the functions take end_ptr and others size_t to indicate
    the end of the buffer.

  - Some arguments meaning buffer size are called just 's'

  - mem_flush() takes void * but immediately converts it to char *

Cleanup the parameters to make things simpler and more consistent:

  - Rename start_ptr to simply buf as it's shorter.

  - Replace end_ptr and s parameters with buf_size and only calculate
    end_ptr in the functions that truly use it.

  - Make mem_flush() parameters to follow the same convention as the
    other functions in fill_buf.

  - convert mem_flush() char * to unsigned char *.

While at it, fix also a typo in a comment.

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Remove unnecessary startptr global from fill_buf

2023-07-25T14:53:36+00:00

fill_buf stores buffer pointer into global variable startptr that is
only used in fill_cache().

Remove startptr as global variable, the local variable in fill_cache()
is enough to keep the pointer.

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf()

2023-07-25T14:53:29+00:00

run_fill_buf()'s malloc_and_init_memory parameter is always 1. There's
also duplicated memory init code for malloc_and_init_memory == 0 case
in fill_buf() which is unused.

Remove the malloc_and_init_memory parameter and the duplicated mem init
code.

While at it, fix also a typo in run_fill_buf() prototype's argument.

Co-developed-by: Fenghua Yu 
Signed-off-by: Fenghua Yu 
Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Remove duplicated preparation for span arg

2023-07-25T14:53:23+00:00

When no benchmark_cmd is given, benchmark_cmd[1] is set to span in
main(). There's no need to do it again in run_mba_test().

Remove the duplicated preparation for span argument into
benchmark_cmd[1] from run_mba_test(). After this, the has_ben and span
arguments to run_mba_test() can be removed.

Co-developed-by: Fenghua Yu 
Signed-off-by: Fenghua Yu 
Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan

selftests/resctrl: Express span internally in bytes

2023-07-25T14:53:18+00:00

MBA and MBM tests to use megabytes to represent span. CMT test uses
bytes. The difference requires run_benchmark() to size the buffer
differently based on the test name, which in turn requires passing the
test name into run_benchmark().

Convert MBA and MBM tests to use span internally in bytes like CMT test
to remove the internal inconsistency between the tests. Remove the test
dependent buffer sizing from run_benchmark().

This change eliminates one of the reasons why the test name has to be
passed around but there are still other users too so the test name
passing cannot yet be removed.

Co-developed-by: Fenghua Yu 
Signed-off-by: Fenghua Yu 
Signed-off-by: Ilpo Järvinen 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan (Fujitsu) 
Signed-off-by: Shuah Khan