linux.git/tools/testing/selftests/resctrl/resctrl.h, branch v6.6.131

selftests/resctrl: Refactor fill_buf functions

2024-12-09T09:31:57+00:00

[ Upstream commit 24be05591fb7a2a3edd639092c045298dd57aeea ]

There are unnecessary nested calls in fill_buf.c:
  - run_fill_buf() calls fill_cache()
  - alloc_buffer() calls malloc_and_init_memory()

Simplify the code flow and remove those unnecessary call levels by
moving the called code inside the calling function and remove the
duplicated error print.

Resolve the difference in run_fill_buf() and fill_cache() parameter
name into 'buf_size' which is more descriptive than 'span'. Also, while
moving the allocation related code, rename 'p' into 'buf' to be
consistent in naming the variables.

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Signed-off-by: Shuah Khan 
Stable-dep-of: caf02626b2bf ("selftests/resctrl: Fix memory overflow due to unhandled wraparound")
Signed-off-by: Sasha Levin

selftests/resctrl: Convert perror() to ksft_perror() or ksft_print_msg()

2024-08-03T06:53:43+00:00

[ Upstream commit cc8ff7f5c85c076297b18fb9f6d45ec5569d3d44 ]

The resctrl selftest code contains a number of perror() calls. Some of
them come with hash character and some don't. The kselftest framework
provides ksft_perror() that is compatible with test output formatting
so it should be used instead of adding custom hash signs.

Some perror() calls are too far away from anything that sets error.
For those call sites, ksft_print_msg() must be used instead.

Convert perror() to ksft_perror() or ksft_print_msg().

Other related changes:
- Remove hash signs
- Remove trailing stops & newlines from ksft_perror()
- Add terminating newlines for converted ksft_print_msg()
- Use consistent capitalization
- Small fixes/tweaks to typos & grammar of the messages
- Extract error printing out of PARENT_EXIT() to be able to
  differentiate

Signed-off-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Signed-off-by: Shuah Khan 
Stable-dep-of: c44000b6535d ("selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops")
Signed-off-by: Sasha Levin

selftests/resctrl: Move run_benchmark() to a more fitting file

2024-08-03T06:53:43+00:00

[ Upstream commit 508934b5d15ab79fd5895cc2a6063bc9d95f6a55 ]

resctrlfs.c contains mostly functions that interact in some way with
resctrl FS entries while functions inside resctrl_val.c deal with
measurements and benchmarking.

run_benchmark() is located in resctrlfs.c even though it's purpose
is not interacting with the resctrl FS but to execute cache checking
logic.

Move run_benchmark() to resctrl_val.c just before resctrl_val() that
makes use of run_benchmark(). Make run_benchmark() static since it's
not used between multiple files anymore.

Remove return comment from kernel-doc since the function is type void.

Signed-off-by: Maciej Wieczor-Retman 
Reviewed-by: Ilpo Järvinen 
Reviewed-by: Reinette Chatre 
Signed-off-by: Shuah Khan 
Stable-dep-of: c44000b6535d ("selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops")
Signed-off-by: Sasha Levin

selftests/resctrl: Make benchmark command const and build it with pointers

2023-11-28T17:20:08+00:00

[ Upstream commit e33cb5702a9f287d829b0e9e6abe57f6a4aba6d2 ]

Benchmark command is used in multiple tests so it should not be
mutated by the tests but CMT test alters span argument. Due to the
order of tests (CMT test runs last), mutating the span argument in CMT
test does not trigger any real problems currently.

Mark benchmark_cmd strings as const and setup the benchmark command
using pointers. Because the benchmark command becomes const, the input
arguments can be used directly. Besides being simpler, using the input
arguments directly also removes the internal size restriction.

CMT test has to create a copy of the benchmark command before altering
the benchmark command.

Signed-off-by: Ilpo Järvinen 
Tested-by: Shaopeng Tan 
Reviewed-by: Shaopeng Tan 
Reviewed-by: Reinette Chatre 
Reviewed-by: "Wieczor-Retman, Maciej" 
Signed-off-by: Shuah Khan 
Stable-dep-of: 3aff51464455 ("selftests/resctrl: Extend signal handler coverage to unmount on receiving signal")
Signed-off-by: Sasha Levin

selftests/resctrl: Simplify span lifetime

2023-11-28T17:20:08+00:00

[ Upstream commit b1a901e078c4ee4a6fe13021c4577ef5f3155251 ]

struct resctrl_val_param contains span member. resctrl_val(), however,
never uses it because the value of span is embedded into the default
benchmark command and parsed from it by run_benchmark().

Remove span from resctrl_val_param. Provide DEFAULT_SPAN for the code
that needs it. CMT and CAT tests communicate span that is different
from the DEFAULT_SPAN between their internal functions which is
converted into passing it directly as a parameter.

Signed-off-by: Ilpo Järvinen 
Tested-by: Shaopeng Tan 
Reviewed-by: Reinette Chatre 
Reviewed-by: Shaopeng Tan 
Reviewed-by: "Wieczor-Retman, Maciej" 
Signed-off-by: Shuah Khan 
Stable-dep-of: 3aff51464455 ("selftests/resctrl: Extend signal handler coverage to unmount on receiving signal")
Signed-off-by: Sasha Levin

selftests/resctrl: Remove bw_report and bm_type from main()

2023-11-28T17:20:08+00:00

[ Upstream commit 47e36f16c7846bf3627ff68525e02555c53dc99e ]

bw_report is always set to "reads" and bm_type is set to "fill_buf" but
is never used.

Set bw_report directly to "reads" in MBA/MBM test and remove bm_type.

Signed-off-by: Ilpo Järvinen 
Tested-by: Shaopeng Tan 
Reviewed-by: Reinette Chatre 
Reviewed-by: Shaopeng Tan 
Reviewed-by: "Wieczor-Retman, Maciej" 
Signed-off-by: Shuah Khan 
Stable-dep-of: 3aff51464455 ("selftests/resctrl: Extend signal handler coverage to unmount on receiving signal")
Signed-off-by: Sasha Levin

selftests/resctrl: Refactor feature check to use resource and feature name

2023-11-28T17:20:04+00:00

commit d56e5da0e0f557a206bace16bbbdad00a5800e34 upstream.

Feature check in validate_resctrl_feature_request() takes in the test
name string and maps that to what to check per test.

Pass resource and feature names to validate_resctrl_feature_request()
directly rather than deriving them from the test name inside the
function which makes the feature check easier to extend for new test
cases.

Use !! in the return statement to make the boolean conversion more
obvious even if it is not strictly necessary from correctness point of
view (to avoid it looking like the function is returning a freed
pointer).

Signed-off-by: Ilpo Järvinen 
Tested-by: Shaopeng Tan 
Reviewed-by: Reinette Chatre 
Reviewed-by: Shaopeng Tan 
Cc:  # selftests/resctrl: Remove duplicate feature check from CMT test
Cc:  # selftests/resctrl: Move _GNU_SOURCE define into Makefile
Signed-off-by: Shuah Khan 
Signed-off-by: Greg Kroah-Hartman

selftests/resctrl: Move _GNU_SOURCE define into Makefile

2023-11-28T17:20:04+00:00

commit 3a1e4a91aa454a1c589a9824d54179fdbfccde45 upstream.

_GNU_SOURCE is defined in resctrl.h. Defining _GNU_SOURCE has a large
impact on what gets defined when including headers either before or
after it. This can result in compile failures if .c file decides to
include a standard header file before resctrl.h.

It is safer to define _GNU_SOURCE in Makefile so it is always defined
regardless of in which order includes are done.

Signed-off-by: Ilpo Järvinen 
Tested-by: Shaopeng Tan 
Reviewed-by: Reinette Chatre 
Reviewed-by: Shaopeng Tan 
Cc: 
Signed-off-by: Shuah Khan 
Signed-off-by: Greg Kroah-Hartman

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