Commit be6b294d authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller

selftests: concurrency: add test to verify parallel add/delete

Implement test that runs 5 instances of tc add filter in parallel with 5
instances of tc del filter from same tp instance. Each instance uses its
own filter handle and key range.

Extend tdc_multibatch.py with additional options required to implement the
test: common prefix for all generated batch files, first value of filter
handle range, MAC address prefix modifier. These are necessary to allow
creating batch files with unique keys and handle ranges with multiple
invocation of tdc_multibatch.py helper script.
Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a788b302
...@@ -121,5 +121,31 @@ ...@@ -121,5 +121,31 @@
"$TC qdisc del dev $DEV2 ingress", "$TC qdisc del dev $DEV2 ingress",
"/bin/rm -rf $BATCH_DIR" "/bin/rm -rf $BATCH_DIR"
] ]
},
{
"id": "ab62",
"name": "Add and delete from same tp with 10 tc instances",
"category": [
"filter",
"flower",
"concurrency"
],
"setup": [
"/bin/mkdir $BATCH_DIR",
"$TC qdisc add dev $DEV2 ingress",
"./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 5 add",
"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b",
"./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 add",
"./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
],
"cmdUnderTest": "find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b",
"expExitCode": "0",
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
"matchCount": "500000",
"teardown": [
"$TC qdisc del dev $DEV2 ingress",
"/bin/rm -rf $BATCH_DIR"
]
} }
] ]
...@@ -21,25 +21,45 @@ parser.add_argument( ...@@ -21,25 +21,45 @@ parser.add_argument(
"operation", "operation",
choices=['add', 'del', 'replace'], choices=['add', 'del', 'replace'],
help="operation to perform on filters") help="operation to perform on filters")
parser.add_argument(
"-x",
"--file_prefix",
default="",
help="prefix for generated batch file names")
parser.add_argument( parser.add_argument(
"-d", "-d",
"--duplicate_handles", "--duplicate_handles",
action="store_true", action="store_true",
help="duplicate filter handle range in all files") help="duplicate filter handle range in all files")
parser.add_argument(
"-a",
"--handle_start",
type=int,
default=1,
help="start handle range from (default: 1)")
parser.add_argument(
"-m",
"--mac_prefix",
type=int,
default=0,
choices=range(0, 256),
help="add this value to third byte of source MAC address of flower filter"
"(default: 0)")
args = parser.parse_args() args = parser.parse_args()
device = args.device device = args.device
dir = args.dir dir = args.dir
file_prefix = args.operation + "_" file_prefix = args.file_prefix + args.operation + "_"
num_filters = args.num_filters num_filters = args.num_filters
num_files = args.num_files num_files = args.num_files
operation = args.operation operation = args.operation
duplicate_handles = args.duplicate_handles duplicate_handles = args.duplicate_handles
handle = 1 handle = args.handle_start
mac_prefix = args.mac_prefix
for i in range(num_files): for i in range(num_files):
file = dir + '/' + file_prefix + str(i) file = dir + '/' + file_prefix + str(i)
os.system("./tdc_batch.py -n {} -a {} -e {} -m {} {} {}".format( os.system("./tdc_batch.py -n {} -a {} -e {} -m {} {} {}".format(
num_filters, handle, operation, i, device, file)) num_filters, handle, operation, i + mac_prefix, device, file))
if not duplicate_handles: if not duplicate_handles:
handle += num_filters handle += num_filters
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment