rm unused controllers/io-throttle tests
RFC PATCH 1/1 rm unused controllers/io-throttle tests
These files do not appear in any runtest file nor are they called from anywhere else.
---
.../kernel/controllers/io-throttle/.gitignore | 1 - .../kernel/controllers/io-throttle/Makefile | 32 -- .../kernel/controllers/io-throttle/README | 56 ---- .../io-throttle/io_throttle_testplan.txt | 36 --- .../kernel/controllers/io-throttle/iobw.c | 281 ------------------ .../controllers/io-throttle/myfunctions-io.sh | 61 ---- .../io-throttle/run_io_throttle_test.sh | 123 -------- 7 files changed, 590 deletions(-) delete mode 100644 testcases/kernel/controllers/io-throttle/.gitignore delete mode 100644 testcases/kernel/controllers/io-throttle/Makefile delete mode 100644 testcases/kernel/controllers/io-throttle/README delete mode 100644 testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt delete mode 100644 testcases/kernel/controllers/io-throttle/iobw.c delete mode 100755 testcases/kernel/controllers/io-throttle/myfunctions-io.sh delete mode 100755 testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
testcases/kernel/controllers/io-throttle/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -/iobw
testcases/kernel/controllers/io-throttle/Makefile deleted +0 -32
@@ -1,32 +0,0 @@ -# -# kernel/controllers/io-throttle testcase suite Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc - -INSTALL_TARGETS := run_io_throttle_test.sh myfunctions-io.sh - -LDLIBS += -lm -lcontrollers - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/controllers/io-throttle/README deleted +0 -56
56 lines not on this page · raw message
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0 -36
@@ -1,36 +0,0 @@ -The I/O bandwidth controller testplan includes a complete set of testcases to -verify the effectiveness of the block device I/O throttling capabilities for -cgroups. - -I/O bandwidth limitations are imposed by the testcase script and verified doing -I/O activity on a limited block device. Tests are supposed to be passed if the -I/O rates of all the different workloads always respect the I/O limitations. - -TESTCASE DESCRIPTION: -==================== -First of all we evaluate the physical I/O bandwidth (physical-io-bw) of the -block device where the current working directory resides. - -Based on the physical I/O bandwidth three cgroups are created: cgroup-1, -cgroup-2, cgroup-3. Cgroups use respectively the following I/O bandwidth -limitations: -- cgroup-1: physical-io-bw / 2 -- cgroup-2: physical-io-bw / 4 -- cgroup-3: physical-io-bw / 8 - -Each test is considered passed only if the I/O limitations above are respected. - -Currently the following different scenarios are tested: -- 1 single stream per cgroup using leaky-bucket I/O throttling -- 1 single stream per cgroup using token-bucket I/O throttling -- 2 parallel streams per cgroup using leaky-bucket I/O throttling -- 2 parallel streams per cgroup using token-bucket I/O throttling -- 4 parallel streams per cgroup using leaky-bucket I/O throttling -- 4 parallel streams per cgroup using token-bucket I/O throttling - -For any other information please refer to -Documentation/controllers/io-throttle.txt in kernel documentation. - -Questions? ----------- -Send email to: [email protected]
testcases/kernel/controllers/io-throttle/iobw.c deleted +0 -281
281 lines not on this page · raw message
testcases/kernel/controllers/io-throttle/myfunctions-io.sh deleted +0 -61
61 lines not on this page · raw message
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0 -123
123 lines not on this page · raw message
Signature · 1 line
2.31.1
RFC PATCH 1/1 rm unused controllers/io-throttle tests
Hi Richie,
[Cc automated-testing ML ]
Quoted 2 lines
These files do not appear in any runtest file nor are they called from anywhere else.
A bit of googling Documentation/controllers/io-throttle.txt mentioned in README was sent to kernel ML in 2008 [1] for 2.6.26-rc6, from this time our memory tests originated [2]. But it looks like it never got merged (<linux/blk-io-throttle.h> mentioned in patch "i/o bandwidth controller infrastructure" [3] didn't get into git).
myfunctions-io.sh uses /dev/blockioctl, which IMHO never got into mainline.
IMHO it should have never even got in. Thanks for asking for delete.
Kind regards,
Petr
[1] https://lists.linuxfoundation.org/pipermail/containers/2008-June/011372.html
[2] https://lists.linuxfoundation.org/pipermail/containers/2008-June/011384.html
[3] https://lists.linuxfoundation.org/pipermail/containers/2008-June/011373.html
Quoted 651 lines
Signed-off-by Richard Palethorpe <[email protected]>---
.../kernel/controllers/io-throttle/.gitignore | 1 - .../kernel/controllers/io-throttle/Makefile | 32 -- .../kernel/controllers/io-throttle/README | 56 ---- .../io-throttle/io_throttle_testplan.txt | 36 --- .../kernel/controllers/io-throttle/iobw.c | 281 ------------------ .../controllers/io-throttle/myfunctions-io.sh | 61 ---- .../io-throttle/run_io_throttle_test.sh | 123 -------- 7 files changed, 590 deletions(-) delete mode 100644 testcases/kernel/controllers/io-throttle/.gitignore delete mode 100644 testcases/kernel/controllers/io-throttle/Makefile delete mode 100644 testcases/kernel/controllers/io-throttle/README delete mode 100644 testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt delete mode 100644 testcases/kernel/controllers/io-throttle/iobw.c delete mode 100755 testcases/kernel/controllers/io-throttle/myfunctions-io.sh delete mode 100755 testcases/kernel/controllers/io-throttle/run_io_throttle_test.shtestcases/kernel/controllers/io-throttle/.gitignore deleted +0
-1@@ -1 +0,0 @@ -/iobwtestcases/kernel/controllers/io-throttle/Makefile deleted +0
-32@@ -1,32 +0,0 @@ -# -# kernel/controllers/io-throttle testcase suite Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc - -INSTALL_TARGETS := run_io_throttle_test.sh myfunctions-io.sh - -LDLIBS += -lm -lcontrollers - -include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/controllers/io-throttle/README deleted +0
-56@@ -1,56 +0,0 @@ -TEST SUITE: - -The directory io-throttle contains the tests related to block device I/O -bandwdith controller. - -More testcases are expected to be added in future. - -TESTS AIM: - -The aim of the tests is to check the block device I/O throttling functionality -for cgroups. - -FILES DESCRIPTION: - -iobw.c ---------------- -Simple benchmark to generate parallel streams of direct I/O (O_DIRECT). This -benchmark fork()s one task per stream. Each task creates a separate file in the -current working directory, fills it with data using O_DIRECT writes and re-read -the whole file always in O_DIRECT mode. Different timestamps are used to -evaluate per-task I/O rate and total I/O rate (seen by the parent). - -myfunctions.sh ----------- -This file contains the functions which are common for the io-throttle tests. -For ex. the setup and cleanup functions which do the setup for running the -test and do the cleanup once the test finishes. The setup() function creates -/dev/blockioctl directory and mounts cgroup filesystem on it with memory -controller. It then creates a number(n) of groups in /dev/blockioctl. The -cleanup function does a complete cleanup of the system. - -Most of the error scenarios have been taken care of for a sane cleanup of the -system. However if cleanup fails in any case, just manually execute the -commands written in cleanup function in myfunctions.sh. -One of the most common causes of failed cleanup is that you have done cd into -any of the groups in controller dir tree. - -run_io_throttle_test.sh ------------------- -This script creates different scenarios for I/O bandwidth controller testing -and fires (n) tasks in different groups to write and read different I/O streams -etc. It waits for the return status from tasks and reports test pass/fail -accordingly. - -Makefile --------- -The usual makefile for this directory - -PASS/FAIL CRITERION: -================== -The test cases are intelligent enough in deciding the pass or failure of a -test. - -README: --------- -This file.testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-36@@ -1,36 +0,0 @@ -The I/O bandwidth controller testplan includes a complete set of testcases to -verify the effectiveness of the block device I/O throttling capabilities for -cgroups. - -I/O bandwidth limitations are imposed by the testcase script and verified doing -I/O activity on a limited block device. Tests are supposed to be passed if the -I/O rates of all the different workloads always respect the I/O limitations. - -TESTCASE DESCRIPTION: -==================== -First of all we evaluate the physical I/O bandwidth (physical-io-bw) of the -block device where the current working directory resides. - -Based on the physical I/O bandwidth three cgroups are created: cgroup-1, -cgroup-2, cgroup-3. Cgroups use respectively the following I/O bandwidth -limitations: -- cgroup-1: physical-io-bw / 2 -- cgroup-2: physical-io-bw / 4 -- cgroup-3: physical-io-bw / 8 - -Each test is considered passed only if the I/O limitations above are respected. - -Currently the following different scenarios are tested: -- 1 single stream per cgroup using leaky-bucket I/O throttling -- 1 single stream per cgroup using token-bucket I/O throttling -- 2 parallel streams per cgroup using leaky-bucket I/O throttling -- 2 parallel streams per cgroup using token-bucket I/O throttling -- 4 parallel streams per cgroup using leaky-bucket I/O throttling -- 4 parallel streams per cgroup using token-bucket I/O throttling - -For any other information please refer to -Documentation/controllers/io-throttle.txt in kernel documentation. - -Questions? ----------- -Send email to: [email protected]testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-281@@ -1,281 +0,0 @@ -/* -* iobw.c - simple I/O bandwidth benchmark -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -* -* Copyright (C) 2008 Andrea Righi <[email protected]> -*/ - -#define _GNU_SOURCE -#define __USE_GNU - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <fcntl.h> -#include <signal.h> -#include <string.h> -#include <unistd.h> -#include <limits.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <sys/wait.h> - -#ifndef PAGE_SIZE -#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) -#endif - -#define align (x,a) __align_mask(x,(typeof(x))(a)-1) -#define __align_mask (x,mask) (((x)+(mask))&~(mask)) -#define kb (x) ((x) >> 10) - -const char usage[] ="Usage: iobw [-direct] threads chunk_size data_size\n" ; -const char child_fmt[] ="(%s) task %3d: time %4lu.%03lu bw %7lu KiB/s (%s)\n" ; -const char parent_fmt[] = -"(%s) parent %d: time %4lu.%03lu bw %7lu KiB/s (%s)\n" ; - -static int directio =0 ; -static size_t data_size =0 ; -static size_t chunk_size =0 ; - -typedef enum { -OP_WRITE , -OP_READ , -NUM_IOPS , -}iops_t ; - -static const char *iops[] = { -"WRITE" , -"READ " , -"TOTAL" , -}; - -static int threads; -pid_t *children; - -char *mygroup; - -static void print_results (int id,iops_t op,size_t bytes,struct timeval *diff) -{ -fprintf (stdout, id ? child_fmt : parent_fmt, - mygroup, id, diff->tv_sec, diff->tv_usec /1000 , - (bytes / (diff->tv_sec *1000000L + diff->tv_usec)) - *1000000L /1024 , iops[op]); -} - -static void thread (int id) -{ -struct timeval start, stop, diff; -int fd, i, ret; -size_t n; -void *buf; -int flags =O_CREAT |O_RDWR |O_LARGEFILE ; -char filename[32 ]; - - ret =posix_memalign (&buf,PAGE_SIZE , chunk_size); -if (ret <0 ) { -fprintf (stderr, -"ERROR: task %d couldn't allocate %zu bytes (%s)\n" , - id, chunk_size,strerror (errno)); -exit (1 ); - } -memset (buf,0xaa , chunk_size); - -snprintf (filename,sizeof (filename),"%s-%d-iobw.tmp" , mygroup, id); -if (directio) - flags |=O_DIRECT ; - fd =open (filename, flags,0600 ); -if (fd <0 ) { -fprintf (stderr,"ERROR: task %d couldn't open %s (%s)\n" , - id, filename,strerror (errno)); -free (buf); -exit (1 ); - } - -/* Write */ -lseek (fd,0 ,SEEK_SET ); - n =0 ; -gettimeofday (&start,NULL ); -while (n < data_size) { - i =write (fd, buf, chunk_size); -if (i <0 ) { -fprintf (stderr,"ERROR: task %d writing to %s (%s)\n" , - id, filename,strerror (errno)); - ret =1 ; - goto out; - } - n += i; - } -gettimeofday (&stop,NULL ); -timersub (&stop, &start, &diff); -print_results (id +1 ,OP_WRITE , data_size, &diff); - -/* Read */ -lseek (fd,0 ,SEEK_SET ); - n =0 ; -gettimeofday (&start,NULL ); -while (n < data_size) { - i =read (fd, buf, chunk_size); -if (i <0 ) { -fprintf (stderr,"ERROR: task %d reading to %s (%s)\n" , - id, filename,strerror (errno)); - ret =1 ; - goto out; - } - n += i; - } -gettimeofday (&stop,NULL ); -timersub (&stop, &start, &diff); -print_results (id +1 ,OP_READ , data_size, &diff); -out: -close (fd); -unlink (filename); -free (buf); -exit (ret); -} - -static void spawn (int id) -{ -pid_t pid; - - pid =fork (); -switch (pid) { -case -1 : -fprintf (stderr,"ERROR: couldn't fork thread %d\n" , id); -exit (1 ); -case 0 : -thread (id); -default : - children[id] = pid; - } -} - -void signal_handler (int sig) -{ -char filename[32 ]; -int i; - -for (i =0 ; i < threads; i++) -if (children[i]) -kill (children[i],SIGKILL ); - -for (i =0 ; i < threads; i++) { -struct stat mystat; - -snprintf (filename,sizeof (filename),"%s-%d-iobw.tmp" , - mygroup, i); -if (stat (filename, &mystat) <0 ) -continue ; -unlink (filename); - } - -fprintf (stdout,"received signal %d, exiting\n" , sig); -exit (0 ); -} - -unsigned long long memparse (char *ptr,char **retptr) -{ -unsigned long long ret =strtoull (ptr, retptr,0 ); - -switch (**retptr) { -case 'G' : -case 'g' : - ret <<=10 ; -case 'M' : -case 'm' : - ret <<=10 ; -case 'K' : -case 'k' : - ret <<=10 ; - (*retptr)++; -default : -break ; - } -return ret; -} - -int main (int argc,char *argv[]) -{ -struct timeval start, stop, diff; -char *end; -int i; - -if (argv[1 ] &&strcmp (argv[1 ],"-direct" ) ==0 ) { - directio =1 ; - argc--; - argv++; - } -if (argc !=4 ) { -fprintf (stderr, usage); -exit (1 ); - } -if ((threads =atoi (argv[1 ])) ==0 ) { -fprintf (stderr, usage); -exit (1 ); - } - chunk_size =align (memparse (argv[2 ], &end),PAGE_SIZE ); -if (*end) { -fprintf (stderr, usage); -exit (1 ); - } - data_size =align (memparse (argv[3 ], &end),PAGE_SIZE ); -if (*end) { -fprintf (stderr, usage); -exit (1 ); - } - -/* retrieve group name */ - mygroup =getenv ("MYGROUP" ); -if (!mygroup) { -fprintf (stderr, -"ERROR: undefined environment variable MYGROUP\n" ); -exit (1 ); - } - - children =malloc (sizeof (pid_t) * threads); -if (!children) { -fprintf (stderr,"ERROR: not enough memory\n" ); -exit (1 ); - } - -/* handle user interrupt */ -signal (SIGINT , signal_handler); -/* handle kill from shell */ -signal (SIGTERM , signal_handler); - -fprintf (stdout,"chunk_size %zuKiB, data_size %zuKiB\n" , -kb (chunk_size),kb (data_size)); -fflush (stdout); - -gettimeofday (&start,NULL ); -for (i =0 ; i < threads; i++) -spawn (i); -for (i =0 ; i < threads; i++) { -int status; -wait (&status); -if (!WIFEXITED (status)) -exit (1 ); - } -gettimeofday (&stop,NULL ); - -timersub (&stop, &start, &diff); -print_results (0 ,NUM_IOPS , data_size * threads *NUM_IOPS , &diff); -fflush (stdout); -free (children); - -exit (0 ); -}testcases/kernel/controllers/io-throttle/myfunctions-io.sh deleted +0
-61@@ -1,61 +0,0 @@ -#!/bin/sh -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 021110-1307, USA. -# -# Copyright (C) 2008 Andrea Righi <[email protected]> -# -# usage . myfunctions.sh - -setup() -{ - # create testcase cgroups - if [ -e /dev/blockioctl ]; then - echo "WARN: /dev/blockioctl already exist! overwriting." - cleanup - fi - mkdir /dev/blockioctl - mount -t cgroup -o blockio cgroup /dev/blockioctl - if [ $? -ne 0 ]; then - echo "ERROR: could not mount cgroup filesystem " \ - " on /dev/blockioctl. Exiting test." - cleanup - exit 1 - fi - for i in `seq 1 3`; do - if [ -e /dev/blockioctl/cgroup-$i ]; then - rmdir /dev/blockioctl/cgroup-$i - echo "WARN: earlier cgroup-$i found and removed" - fi - mkdir /dev/blockioctl/cgroup-$i - if [ $? -ne 0 ]; then - echo "ERROR: could not create cgroup-$i" \ - "Check your permissions. Exiting test." - cleanup - exit 1 - fi - done -} - -cleanup() -{ - echo "Cleanup called" - for i in `seq 1 3`; do - rmdir /dev/blockioctl/cgroup-$i - rm -f /tmp/cgroup-$i.out - done - umount /dev/blockioctl - rmdir /dev/blockioctl -}testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-123@@ -1,123 +0,0 @@ -#!/bin/bash -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 021110-1307, USA. -# -# Copyright (C) 2008 Andrea Righi <[email protected]> -# -# Usage: ./run_io_throttle_test.sh -# Description: test block device I/O bandwidth controller functionalities - -. ./myfunctions-io.sh - -trap cleanup SIGINT - -BUFSIZE=16m -DATASIZE=64m - -setup - -# get the device name of the entire mounted block device -dev=`df -P . | sed '1d' | cut -d' ' -f1 | sed 's/[p]*[0-9]*$//'` - -# evaluate device bandwidth -export MYGROUP= -phys_bw=`./iobw -direct 1 $BUFSIZE $DATASIZE | grep TOTAL | awk '{print $7}'` -if [ $? -ne 0 ]; then - echo "ERROR: could not evaluate i/o bandwidth of $dev. Exiting test." - cleanup - exit 1 -fi -echo ">> physical i/o bandwidth limit is: $phys_bw KiB/s" -# show cgroup i/o bandwidth limits -for i in `seq 1 3`; do - MYGROUP=cgroup-$i - echo "($MYGROUP) max i/o bw: " \ - "$(($phys_bw / `echo 2^$i | bc`)) KiB/s + O_DIRECT" -done - -for tasks in 1 2 4; do -for strategy in 0 1; do - # set bw limiting rules - if [ -f /dev/blockioctl/blockio.bandwidth ]; then - io_throttle_file=blockio.bandwidth - elif [ -f /dev/blockioctl/blockio.bandwidth-max ]; then - io_throttle_file=blockio.bandwidth-max - else - echo "ERROR: unknown kernel ABI. Exiting test." - cleanup - exit 1 - fi - for i in `seq 1 3`; do - limit=$(($phys_bw * 1024 / `echo 2^$i | bc`)) - IOBW[$i]=$(($limit / 1024)) - /bin/echo $dev:$limit:$strategy:$limit > \ - /dev/blockioctl/cgroup-$i/${io_throttle_file} - if [ $? -ne 0 ]; then - echo "ERROR: could not set i/o bandwidth limit for cgroup-$i. Exiting test." - cleanup - exit 1 - fi - done - - # run benchmark - if [ $tasks -eq 1 ]; then - stream="stream" - else - stream="streams" - fi - echo -n ">> testing $tasks parallel $stream per cgroup " - if [ $strategy -eq 0 ]; then - echo "(leaky-bucket i/o throttling)" - else - echo "(token-bucket i/o throttling)" - fi - for i in `seq 1 3`; do - MYGROUP=cgroup-$i - /bin/echo $$ > /dev/blockioctl/$MYGROUP/tasks - if [ $? -ne 0 ]; then - echo "ERROR: could not set i/o bandwidth limit for cgroup-$i. Exiting test." - cleanup - exit 1 - fi - # exec i/o benchmark - ./iobw -direct $tasks $BUFSIZE $DATASIZE > /tmp/$MYGROUP.out & - PID[$i]=$! - done - /bin/echo $$ > /dev/blockioctl/tasks - - # wait for children completion - for i in `seq 1 3`; do - MYGROUP=cgroup-$i - wait ${PID[$i]} - ret=$? - if [ $ret -ne 0 ]; then - echo "ERROR: error code $ret during test $tasks.$strategy.$i. Exiting test." - cleanup - exit 1 - fi - iorate=`grep parent /tmp/${MYGROUP}.out | awk '{print $7}'` - diff=$((${IOBW[$i]} - $iorate)) - echo "($MYGROUP) i/o-bw ${IOBW[$i]} KiB/s, i/o-rate $iorate KiB/s, err $diff KiB/s" - if [ ${IOBW[$i]} -ge $iorate ]; then - echo "TPASS Block device I/O bandwidth controller: test $tasks.$strategy.$i PASSED"; - else - echo "TFAIL Block device I/O bandwidth controller: test $tasks.$strategy.$i FAILED"; - fi - done -done -done - -cleanup
RFC PATCH 1/1 rm unused controllers/io-throttle tests
Quoted 6 lines · Petr Vorel
Hi Richie,
[Cc automated-testing ML ]
Quoted 2 lines
These files do not appear in any runtest file nor are they called from anywhere else.
Quoted 9 lines
A bit of googling
Documentation/controllers/io-throttle.txtmentioned in README
was sent to kernel ML in 2008 [1] for 2.6.26-rc6, from this time our memory tests originated [2]. But it looks like it never got merged (<linux/blk-io-throttle.h> mentioned in patch "i/o bandwidth controller infrastructure" [3] didn't get into git).
myfunctions-io.shuses/dev/blockioctl, which IMHO never got into mainline.
Thanks to provide the details info.
Quoted 726 lines
IMHO it should have never even got in. Thanks for asking for delete.
Acked-by Petr Vorel <[email protected]>Kind regards,
Petr[1]
https://lists.linuxfoundation.org/pipermail/containers/2008-June/011372.html
[2]
https://lists.linuxfoundation.org/pipermail/containers/2008-June/011384.html
[3]
https://lists.linuxfoundation.org/pipermail/containers/2008-June/011373.htmlQuoted 15 lines
Signed-off-by Richard Palethorpe <[email protected]>---
.../kernel/controllers/io-throttle/.gitignore | 1 - .../kernel/controllers/io-throttle/Makefile | 32 -- .../kernel/controllers/io-throttle/README | 56 ---- .../io-throttle/io_throttle_testplan.txt | 36 --- .../kernel/controllers/io-throttle/iobw.c | 281 ------------------ .../controllers/io-throttle/myfunctions-io.sh | 61 ---- .../io-throttle/run_io_throttle_test.sh | 123 -------- 7 files changed, 590 deletions(-) delete mode 100644 testcases/kernel/controllers/io-throttle/.gitignore delete mode 100644 testcases/kernel/controllers/io-throttle/Makefile delete mode 100644 testcases/kernel/controllers/io-throttle/README delete mode 100644
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txtQuoted 2 lines
delete mode 100644 testcases/kernel/controllers/io-throttle/iobw.c delete mode 100755
testcases/kernel/controllers/io-throttle/myfunctions-io.shQuoted 1 line
delete mode 100755
testcases/kernel/controllers/io-throttle/run_io_throttle_test.shReview
Quoted 1 line
(quoted diff) +0
-0b/testcases/kernel/controllers/io-throttle/.gitignore
Review
Quoted 7 lines
deleted file mode 100644
index 6836f7b74..000000000testcases/kernel/controllers/io-throttle/.gitignore deleted +0
-1@@ -1 +0,0 @@ -/iobw(quoted diff) +0
-0b/testcases/kernel/controllers/io-throttle/Makefile
testcases/kernel/controllers/io-throttle/Makefile line 6
Quoted 11 lines
deleted file mode 100644
index ceeba7362..000000000testcases/kernel/controllers/io-throttle/Makefile deleted +0
-6@@ -1,32 +0,0 @@ -# -# kernel/controllers/io-throttle testcase suite Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/ormodify
testcases/kernel/controllers/io-throttle/Makefile line 7
Quoted 1 line
testcases/kernel/controllers/io-throttle/Makefile deleted +0
-1-# it under the terms of the GNU General Public License as publishedby
testcases/kernel/controllers/io-throttle/Makefile
Quoted 9 lines
testcases/kernel/controllers/io-throttle/Makefile deleted +0
-9-# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public Licensealong
testcases/kernel/controllers/io-throttle/Makefile line 17
Quoted 1 line
testcases/kernel/controllers/io-throttle/Makefile deleted +0
-1-# with this program; if not, write to the Free Software Foundation,Inc.,
testcases/kernel/controllers/io-throttle/Makefile
Quoted 11 lines
testcases/kernel/controllers/io-throttle/Makefile deleted +0
-11-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc - -INSTALL_TARGETS := run_io_throttle_test.sh
myfunctions-io.shReview
Quoted 5 lines
testcases/kernel/controllers/io-throttle/Makefile deleted +0
-4- -LDLIBS += -lm -lcontrollers - -include $(top_srcdir)/include/mk/generic_leaf_target.mk(quoted diff) +0
-0b/testcases/kernel/controllers/io-throttle/README
Quoted 5 lines
deleted file mode 100644
index e5980fb6c..000000000testcases/kernel/controllers/io-throttle/README line 10
Quoted 10 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-10@@ -1,56 +0,0 @@ -TEST SUITE: - -The directory io-throttle contains the tests related to block device I/O -bandwdith controller. - -More testcases are expected to be added in future. - -TESTS AIM: - -The aim of the tests is to check the block device I/O throttlingfunctionality
testcases/kernel/controllers/io-throttle/README
Quoted 7 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-7-for cgroups. - -FILES DESCRIPTION: - -iobw.c ---------------- -Simple benchmark to generate parallel streams of direct I/O (O_DIRECT).This
testcases/kernel/controllers/io-throttle/README line 18
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-benchmark fork()s one task per stream. Each task creates a separatefile in the
testcases/kernel/controllers/io-throttle/README line 19
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-current working directory, fills it with data using O_DIRECT writes andre-read
testcases/kernel/controllers/io-throttle/README
Quoted 6 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-6-the whole file always in O_DIRECT mode. Different timestamps are used to -evaluate per-task I/O rate and total I/O rate (seen by the parent). - -myfunctions.sh ----------- -This file contains the functions which are common for the io-throttletests.
testcases/kernel/controllers/io-throttle/README line 26
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-For ex. the setup and cleanup functions which do the setup for runningthe
testcases/kernel/controllers/io-throttle/README line 27
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-test and do the cleanup once the test finishes. The setup() functioncreates
testcases/kernel/controllers/io-throttle/README line 29
Quoted 2 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-2-/dev/blockioctl directory and mounts cgroup filesystem on it with memory -controller. It then creates a number(n) of groups in /dev/blockioctl.The
testcases/kernel/controllers/io-throttle/README
Quoted 3 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-3-cleanup function does a complete cleanup of the system. - -Most of the error scenarios have been taken care of for a sane cleanupof the
testcases/kernel/controllers/io-throttle/README
Quoted 3 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-3-system. However if cleanup fails in any case, just manually execute the -commands written in cleanup function in myfunctions.sh. -One of the most common causes of failed cleanup is that you have donecd into
testcases/kernel/controllers/io-throttle/README
Quoted 5 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-5-any of the groups in controller dir tree. - -run_io_throttle_test.sh ------------------- -This script creates different scenarios for I/O bandwidth controllertesting
testcases/kernel/controllers/io-throttle/README line 41
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-and fires (n) tasks in different groups to write and read different I/Ostreams
testcases/kernel/controllers/io-throttle/README line 42
Quoted 1 line
testcases/kernel/controllers/io-throttle/README deleted +0
-1-etc. It waits for the return status from tasks and reports testpass/fail
testcases/kernel/controllers/io-throttle/README
Quoted 9 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-9-accordingly. - -Makefile --------- -The usual makefile for this directory - -PASS/FAIL CRITERION: -================== -The test cases are intelligent enough in deciding the pass or failureof a
Quoted 6 lines
testcases/kernel/controllers/io-throttle/README deleted +0
-5-test. - -README: --------- -This file.diff --git
a/testcases/kernel/controllers/io-throttle/io_throttle_testplan.txtb/testcases/kernel/controllers/io-throttle/io_throttle_testplan.txttestcases/kernel/controllers/io-throttle/io_throttle_testplan.txt line 1
Quoted 6 lines
deleted file mode 100644
index fa5b85b42..000000000testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-1@@ -1,36 +0,0 @@ -The I/O bandwidth controller testplan includes a complete set oftestcases to
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt line 2
Quoted 1 line
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-1-verify the effectiveness of the block device I/O throttlingcapabilities for
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt
Quoted 3 lines
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-3-cgroups. - -I/O bandwidth limitations are imposed by the testcase script andverified doing
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt line 6
Quoted 1 line
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-1-I/O activity on a limited block device. Tests are supposed to be passedif the
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt line 7
Quoted 1 line
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-1-I/O rates of all the different workloads always respect the I/Olimitations.
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt
Quoted 4 lines
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-4- -TESTCASE DESCRIPTION: -==================== -First of all we evaluate the physical I/O bandwidth (physical-io-bw) ofthe
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt
Quoted 10 lines
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-10-block device where the current working directory resides. - -Based on the physical I/O bandwidth three cgroups are created: cgroup-1, -cgroup-2, cgroup-3. Cgroups use respectively the following I/O bandwidth -limitations: -- cgroup-1: physical-io-bw / 2 -- cgroup-2: physical-io-bw / 4 -- cgroup-3: physical-io-bw / 8 - -Each test is considered passed only if the I/O limitations above arerespected.
Review
Quoted 16 lines
testcases/kernel/controllers/io-throttle/io_throttle_testplan.txt deleted +0
-15- -Currently the following different scenarios are tested: -- 1 single stream per cgroup using leaky-bucket I/O throttling -- 1 single stream per cgroup using token-bucket I/O throttling -- 2 parallel streams per cgroup using leaky-bucket I/O throttling -- 2 parallel streams per cgroup using token-bucket I/O throttling -- 4 parallel streams per cgroup using leaky-bucket I/O throttling -- 4 parallel streams per cgroup using token-bucket I/O throttling - -For any other information please refer to -Documentation/controllers/io-throttle.txt in kernel documentation. - -Questions? ----------- -Send email to: [email protected](quoted diff) +0
-0
b/testcases/kernel/controllers/io-throttle/iobw.cQuoted 41 lines
deleted file mode 100644
index e4d9c9bb6..000000000testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-36@@ -1,281 +0,0 @@ -/* -* iobw.c - simple I/O bandwidth benchmark -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -* -* Copyright (C) 2008 Andrea Righi <[email protected]> -*/ - -#define _GNU_SOURCE -#define __USE_GNU - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <fcntl.h> -#include <signal.h> -#include <string.h> -#include <unistd.h> -#include <limits.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <sys/wait.h> testcases/kernel/controllers/io-throttle/iobw.c line 46
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10- -#ifndef PAGE_SIZE -#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) -#endif - -#define align (x,a) __align_mask(x,(typeof(x))(a)-1) -#define __align_mask (x,mask) (((x)+(mask))&~(mask)) -#define kb (x) ((x) >> 10) - -const char usage[] = "Usage: iobw [-direct] threads chunk_sizedata_size\n";
testcases/kernel/controllers/io-throttle/iobw.c line 47
Quoted 1 line
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-1-const char child_fmt[] = "(%s) task %3d: time %4lu.%03lu bw %7lu KiB/s(%s)\n";
Quoted 15 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-15-const char parent_fmt[] = -"(%s) parent %d: time %4lu.%03lu bw %7lu KiB/s (%s)\n" ; - -static int directio =0 ; -static size_t data_size =0 ; -static size_t chunk_size =0 ; - -typedef enum { -OP_WRITE , -OP_READ , -NUM_IOPS , -}iops_t ; - -static const char *iops[] = { -"WRITE" ,testcases/kernel/controllers/io-throttle/iobw.c
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10-"READ " , - "TOTAL", -}; - -static int threads; -pid_t *children; - -char *mygroup; - -static void print_results(int id, iops_t op, size_t bytes, structtimeval *diff)
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10-{ -fprintf (stdout, id ? child_fmt : parent_fmt, - mygroup, id, diff->tv_sec, diff->tv_usec /1000 , - (bytes / (diff->tv_sec *1000000L + diff->tv_usec)) - *1000000L /1024 , iops[op]); -} - -static void thread (int id) -{ -struct timeval start, stop, diff;testcases/kernel/controllers/io-throttle/iobw.c
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10-int fd, i, ret; -size_t n; -void *buf; -int flags =O_CREAT |O_RDWR |O_LARGEFILE ; -char filename[32 ]; - - ret =posix_memalign (&buf,PAGE_SIZE , chunk_size); -if (ret <0 ) { - fprintf(stderr, - "ERROR: task %d couldn't allocate %zu bytes(%s)\n",
testcases/kernel/controllers/io-throttle/iobw.c
Quoted 6 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-6- id, chunk_size, strerror(errno)); -exit (1 ); - } -memset (buf,0xaa , chunk_size); - - snprintf(filename, sizeof(filename), "%s-%d-iobw.tmp", mygroup,id);
Quoted 8 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-8-if (directio) - flags |=O_DIRECT ; - fd =open (filename, flags,0600 ); -if (fd <0 ) { -fprintf (stderr,"ERROR: task %d couldn't open %s (%s)\n" , - id, filename,strerror (errno)); -free (buf); -exit (1 );testcases/kernel/controllers/io-throttle/iobw.c
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10- } - -/* Write */ -lseek (fd,0 ,SEEK_SET ); - n =0 ; -gettimeofday (&start,NULL ); -while (n < data_size) { - i =write (fd, buf, chunk_size); -if (i <0 ) { - fprintf(stderr, "ERROR: task %d writing to %s(%s)\n",
Quoted 8 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-8- id, filename, strerror(errno)); - ret =1 ; - goto out; - } - n += i; - } -gettimeofday (&stop,NULL ); -timersub (&stop, &start, &diff);testcases/kernel/controllers/io-throttle/iobw.c
Quoted 10 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-10-print_results (id +1 ,OP_WRITE , data_size, &diff); - -/* Read */ -lseek (fd,0 ,SEEK_SET ); - n =0 ; -gettimeofday (&start,NULL ); -while (n < data_size) { - i =read (fd, buf, chunk_size); -if (i <0 ) { - fprintf(stderr, "ERROR: task %d reading to %s(%s)\n",
Review
Quoted 148 lines
testcases/kernel/controllers/io-throttle/iobw.c deleted +0
-147- id, filename, strerror(errno)); - ret =1 ; - goto out; - } - n += i; - } -gettimeofday (&stop,NULL ); -timersub (&stop, &start, &diff); -print_results (id +1 ,OP_READ , data_size, &diff); -out: -close (fd); -unlink (filename); -free (buf); -exit (ret); -} - -static void spawn (int id) -{ -pid_t pid; - - pid =fork (); -switch (pid) { -case -1 : -fprintf (stderr,"ERROR: couldn't fork thread %d\n" , id); -exit (1 ); -case 0 : -thread (id); -default : - children[id] = pid; - } -} - -void signal_handler (int sig) -{ -char filename[32 ]; -int i; - -for (i =0 ; i < threads; i++) -if (children[i]) -kill (children[i],SIGKILL ); - -for (i =0 ; i < threads; i++) { -struct stat mystat; - -snprintf (filename,sizeof (filename),"%s-%d-iobw.tmp" , - mygroup, i); -if (stat (filename, &mystat) <0 ) -continue ; -unlink (filename); - } - -fprintf (stdout,"received signal %d, exiting\n" , sig); -exit (0 ); -} - -unsigned long long memparse (char *ptr,char **retptr) -{ -unsigned long long ret =strtoull (ptr, retptr,0 ); - -switch (**retptr) { -case 'G' : -case 'g' : - ret <<=10 ; -case 'M' : -case 'm' : - ret <<=10 ; -case 'K' : -case 'k' : - ret <<=10 ; - (*retptr)++; -default : -break ; - } -return ret; -} - -int main (int argc,char *argv[]) -{ -struct timeval start, stop, diff; -char *end; -int i; - -if (argv[1 ] &&strcmp (argv[1 ],"-direct" ) ==0 ) { - directio =1 ; - argc--; - argv++; - } -if (argc !=4 ) { -fprintf (stderr, usage); -exit (1 ); - } -if ((threads =atoi (argv[1 ])) ==0 ) { -fprintf (stderr, usage); -exit (1 ); - } - chunk_size =align (memparse (argv[2 ], &end),PAGE_SIZE ); -if (*end) { -fprintf (stderr, usage); -exit (1 ); - } - data_size =align (memparse (argv[3 ], &end),PAGE_SIZE ); -if (*end) { -fprintf (stderr, usage); -exit (1 ); - } - -/* retrieve group name */ - mygroup =getenv ("MYGROUP" ); -if (!mygroup) { -fprintf (stderr, -"ERROR: undefined environment variable MYGROUP\n" ); -exit (1 ); - } - - children =malloc (sizeof (pid_t) * threads); -if (!children) { -fprintf (stderr,"ERROR: not enough memory\n" ); -exit (1 ); - } - -/* handle user interrupt */ -signal (SIGINT , signal_handler); -/* handle kill from shell */ -signal (SIGTERM , signal_handler); - -fprintf (stdout,"chunk_size %zuKiB, data_size %zuKiB\n" , -kb (chunk_size),kb (data_size)); -fflush (stdout); - -gettimeofday (&start,NULL ); -for (i =0 ; i < threads; i++) -spawn (i); -for (i =0 ; i < threads; i++) { -int status; -wait (&status); -if (!WIFEXITED (status)) -exit (1 ); - } -gettimeofday (&stop,NULL ); - -timersub (&stop, &start, &diff); -print_results (0 ,NUM_IOPS , data_size * threads *NUM_IOPS , &diff); -fflush (stdout); -free (children); - -exit (0 ); -}(quoted diff) +0
-0
b/testcases/kernel/controllers/io-throttle/myfunctions-io.shQuoted 66 lines
deleted file mode 100755
index bf4bb2b9a..000000000testcases/kernel/controllers/io-throttle/myfunctions-io.sh deleted +0
-61@@ -1,61 +0,0 @@ -#!/bin/sh -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 021110-1307, USA. -# -# Copyright (C) 2008 Andrea Righi <[email protected]> -# -# usage . myfunctions.sh - -setup() -{ - # create testcase cgroups - if [ -e /dev/blockioctl ]; then - echo "WARN: /dev/blockioctl already exist! overwriting." - cleanup - fi - mkdir /dev/blockioctl - mount -t cgroup -o blockio cgroup /dev/blockioctl - if [ $? -ne 0 ]; then - echo "ERROR: could not mount cgroup filesystem " \ - " on /dev/blockioctl. Exiting test." - cleanup - exit 1 - fi - for i in `seq 1 3`; do - if [ -e /dev/blockioctl/cgroup-$i ]; then - rmdir /dev/blockioctl/cgroup-$i - echo "WARN: earlier cgroup-$i found and removed" - fi - mkdir /dev/blockioctl/cgroup-$i - if [ $? -ne 0 ]; then - echo "ERROR: could not create cgroup-$i" \ - "Check your permissions. Exiting test." - cleanup - exit 1 - fi - done -} - -cleanup() -{ - echo "Cleanup called" - for i in `seq 1 3`; do - rmdir /dev/blockioctl/cgroup-$i - rm -f /tmp/cgroup-$i.out - done - umount /dev/blockioctl - rmdir /dev/blockioctl -}Quoted 1 line
diff --git
a/testcases/kernel/controllers/io-throttle/run_io_throttle_test.shb/testcases/kernel/controllers/io-throttle/run_io_throttle_test.shQuoted 16 lines
deleted file mode 100755
index c855fd052..000000000testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-11@@ -1,123 +0,0 @@ -#!/bin/bash -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details.testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh line 21
Quoted 10 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-10-# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 021110-1307, USA. -# -# Copyright (C) 2008 Andrea Righi <[email protected]> -# -# Usage: ./run_io_throttle_test.sh -# Description: test block device I/O bandwidth controllerfunctionalities
Quoted 6 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-6- -. ./myfunctions-io.sh - -trap cleanup SIGINT - -BUFSIZE=16mtestcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 10 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-10-DATASIZE=64m - -setup - -# get the device name of the entire mounted block device -dev=`df -P . | sed '1d' | cut -d' ' -f1 | sed 's/[p]*[0-9]*$//'` - -# evaluate device bandwidth -export MYGROUP= -phys_bw=`./iobw -direct 1 $BUFSIZE $DATASIZE | grep TOTAL | awk '{print$7}'`
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh line 39
Quoted 2 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-2-if [ $? -ne 0 ]; then - echo "ERROR: could not evaluate i/o bandwidth of $dev. Exitingtest."
Quoted 20 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-20- cleanup - exit 1 -fi -echo ">> physical i/o bandwidth limit is: $phys_bw KiB/s" -# show cgroup i/o bandwidth limits -for i in `seq 1 3`; do - MYGROUP=cgroup-$i - echo "($MYGROUP) max i/o bw: " \ - "$(($phys_bw / `echo 2^$i | bc`)) KiB/s + O_DIRECT" -done - -for tasks in 1 2 4; do -for strategy in 0 1; do - # set bw limiting rules - if [ -f /dev/blockioctl/blockio.bandwidth ]; then - io_throttle_file=blockio.bandwidth - elif [ -f /dev/blockioctl/blockio.bandwidth-max ]; then - io_throttle_file=blockio.bandwidth-max - else - echo "ERROR: unknown kernel ABI. Exiting test."testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 10 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-10- cleanup - exit 1 - fi - for i in `seq 1 3`; do - limit=$(($phys_bw * 1024 / `echo 2^$i | bc`)) - IOBW[$i]=$(($limit / 1024)) - /bin/echo $dev:$limit:$strategy:$limit > \ - /dev/blockioctl/cgroup-$i/${io_throttle_file} - if [ $? -ne 0 ]; then - echo "ERROR: could not set i/o bandwidth limit forcgroup-$i. Exiting test."
Quoted 12 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-12- cleanup - exit 1 - fi - done - - # run benchmark - if [ $tasks -eq 1 ]; then - stream="stream" - else - stream="streams" - fi - echo -n ">> testing $tasks parallel $stream per cgroup "testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 10 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-10- if [ $strategy -eq 0 ]; then - echo "(leaky-bucket i/o throttling)" - else - echo "(token-bucket i/o throttling)" - fi - for i in `seq 1 3`; do - MYGROUP=cgroup-$i - /bin/echo $$ > /dev/blockioctl/$MYGROUP/tasks - if [ $? -ne 0 ]; then - echo "ERROR: could not set i/o bandwidth limit forcgroup-$i. Exiting test."
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 5 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-5- cleanup - exit 1 - fi - # exec i/o benchmark - ./iobw -direct $tasks $BUFSIZE $DATASIZE >
/tmp/$MYGROUP.out&testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 11 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-11- PID[$i]=$! - done - /bin/echo $$ > /dev/blockioctl/tasks - - # wait for children completion - for i in `seq 1 3`; do - MYGROUP=cgroup-$i - wait ${PID[$i]} - ret=$? - if [ $ret -ne 0 ]; then - echo "ERROR: error code $ret during test$tasks.$strategy.$i. Exiting test."
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh
Quoted 6 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-6- cleanup - exit 1 - fi - iorate=`grep parent /tmp/${MYGROUP}.out | awk '{print $7}'` - diff=$((${IOBW[$i]} - $iorate)) - echo "($MYGROUP) i/o-bw ${IOBW[$i]} KiB/s, i/o-rate$iorate KiB/s, err $diff KiB/s"
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh line 115
Quoted 2 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-2- if [ ${IOBW[$i]} -ge $iorate ]; then - echo "TPASS Block device I/O bandwidthcontroller: test $tasks.$strategy.$i PASSED";
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh line 117
Quoted 2 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-2- else - echo "TFAIL Block device I/O bandwidthcontroller: test $tasks.$strategy.$i FAILED";
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh line 108
Quoted 6 lines
testcases/kernel/controllers/io-throttle/run_io_throttle_test.sh deleted +0
-6- fi - done -done -done - -cleanup--
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210625/55daa073/attachment-0001.htm>
RFC PATCH 1/1 rm unused controllers/io-throttle tests
Hi Richie,
thanks a lot, merged!
Kind regards,
Petr
RFC PATCH 1/1 rm unused controllers/io-throttle tests
In reply to Petr VorelHi!
Quoted 1 line
Acked-by Petr Vorel <[email protected]>
Things that never got into mainline shouldn't be in the repo at all...
Signature · 2 lines
Cyril Hrubis [email protected]