lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 108/800] selftests/resctrl: Fix incorrect parsing of option "-t"
    Date
    From: Xiaochen Shen <xiaochen.shen@intel.com>

    commit 1421ec684a43379b2aa3cfda20b03d38282dc990 upstream.

    Resctrl test suite accepts command line argument "-t" to specify the
    unit tests to run in the test list (e.g., -t mbm,mba,cmt,cat) as
    documented in the help.

    When calling strtok() to parse the option, the incorrect delimiters
    argument ":\t" is used. As a result, passing "-t mbm,mba,cmt,cat" throws
    an invalid option error.

    Fix this by using delimiters argument "," instead of ":\t" for parsing
    of unit tests list. At the same time, remove the unnecessary "spaces"
    between the unit tests in help documentation to prevent confusion.

    Fixes: 790bf585b0ee ("selftests/resctrl: Add Cache Allocation Technology (CAT) selftest")
    Fixes: 78941183d1b1 ("selftests/resctrl: Add Cache QoS Monitoring (CQM) selftest")
    Fixes: ecdbb911f22d ("selftests/resctrl: Add MBM test")
    Fixes: 034c7678dd2c ("selftests/resctrl: Add README for resctrl tests")
    Cc: stable@vger.kernel.org
    Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>
    Reviewed-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/testing/selftests/resctrl/README | 2 +-
    tools/testing/selftests/resctrl/resctrl_tests.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/tools/testing/selftests/resctrl/README
    +++ b/tools/testing/selftests/resctrl/README
    @@ -47,7 +47,7 @@ Parameter '-h' shows usage information.

    usage: resctrl_tests [-h] [-b "benchmark_cmd [options]"] [-t test list] [-n no_of_bits]
    -b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CMT default benchmark is builtin fill_buf
    - -t test list: run tests specified in the test list, e.g. -t mbm, mba, cmt, cat
    + -t test list: run tests specified in the test list, e.g. -t mbm,mba,cmt,cat
    -n no_of_bits: run cache tests using specified no of bits in cache bit mask
    -p cpu_no: specify CPU number to run the test. 1 is default
    -h: help
    --- a/tools/testing/selftests/resctrl/resctrl_tests.c
    +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
    @@ -40,7 +40,7 @@ static void cmd_help(void)
    printf("\t-b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CMT\n");
    printf("\t default benchmark is builtin fill_buf\n");
    printf("\t-t test list: run tests specified in the test list, ");
    - printf("e.g. -t mbm, mba, cmt, cat\n");
    + printf("e.g. -t mbm,mba,cmt,cat\n");
    printf("\t-n no_of_bits: run cache tests using specified no of bits in cache bit mask\n");
    printf("\t-p cpu_no: specify CPU number to run the test. 1 is default\n");
    printf("\t-h: help\n");
    @@ -173,7 +173,7 @@ int main(int argc, char **argv)

    return -1;
    }
    - token = strtok(NULL, ":\t");
    + token = strtok(NULL, ",");
    }
    break;
    case 'p':

    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:4.059 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site