From patchwork Wed Nov 29 22:24:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Tammela X-Patchwork-Id: 13473597 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="e3Wfw5lx" Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7D94198B for ; Wed, 29 Nov 2023 14:24:49 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d01c45ffebso3140825ad.1 for ; Wed, 29 Nov 2023 14:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1701296689; x=1701901489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nkjwf60hOQWmCO9wJUuBcwdkxaN20yzfTfsYdyEt6b4=; b=e3Wfw5lx9+Z9mcTqPC5ur7+2t/bdm86ClSLUqmv+rk8LfKhOhwEuXIEDWF3bOKv4al whUn1CL7QXRq0j1D4cehIZgvLWZcC60Z89YOB1W5pb2C1Nv99rNHuhAKjD2b48TT+Vsq 5qRojGKwmk4HnimwS1hMK8+vkW6oR1xaJ67S07dAw0sG8HPSdPy0t3H4z4LKUa1l3Zo4 nw/O6lDOLtrZgx/WH/ogv1Syr6o6CcZFx2IAXughjfXwPnXt5RnXkKeojgdQS780jsK9 DcOolm3f23uG1ARO26NqSMr6Afof+mk717R8elQDLl8+uMmOdQsXXAAHaVwbtinHJsfQ +pwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701296689; x=1701901489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nkjwf60hOQWmCO9wJUuBcwdkxaN20yzfTfsYdyEt6b4=; b=Y+m6N1ybMTwTqXwAXig1wqTqWd4PzsDXqBdWfWHo+MKunwIsUicSDYlVrccADKUX2C Hz8WHEeYhTe9f6nvV605gNJuwJoaJN9sxestYkKHoaHoHGGZVOIoENiW/tfw22l23YYf JUtuvpJo0AJOsb+y2wKW35gQC2t10NPYJtzPj/yLClgh6Lu7rKaMJkXJMqQact5eqku/ nuj9oTLGdLM9rxfKRIjtDoeTgV9eoeaXjiuxEzKECrfSHNv4HnwNXZXTigaD3581ZeQ+ xvWk3ljgMD/yM5hu7+/L0xKrgCV93fE2j4al0a+sawciN0zjgHusbFHQa4qhJqGg1BbJ w0vA== X-Gm-Message-State: AOJu0Yz/6ni5K62PORqKBZdYOdBtq0G7+3vm2eocH1wgNseIM3A0C2fb 09rY3U1RxtM/Bg7in2pegfgancdXKGuGw2U4w5w= X-Google-Smtp-Source: AGHT+IGpZNbjdUjvjMHf2+Bo0Y2uskqFlYzxCP56cmcZoiUvM/fR6Dh5tXuBNfRJ7dEB7q25WMWekA== X-Received: by 2002:a17:902:e54b:b0:1ce:6589:d1c0 with SMTP id n11-20020a170902e54b00b001ce6589d1c0mr25126311plf.46.1701296689128; Wed, 29 Nov 2023 14:24:49 -0800 (PST) Received: from rogue-one.tail33bf8.ts.net ([201.17.86.134]) by smtp.gmail.com with ESMTPSA id l8-20020a170902f68800b001cfb971edf2sm8663697plg.13.2023.11.29.14.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:24:48 -0800 (PST) From: Pedro Tammela To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, linux-kselftest@vger.kernel.org, Pedro Tammela Subject: [PATCH net-next 1/4] selftests: tc-testing: remove spurious nsPlugin usage Date: Wed, 29 Nov 2023 19:24:21 -0300 Message-Id: <20231129222424.910148-2-pctammela@mojatatu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129222424.910148-1-pctammela@mojatatu.com> References: <20231129222424.910148-1-pctammela@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Tests using DEV2 should not be run in a dedicated net namespace, and in parallel, as this device cannot be shared. Signed-off-by: Pedro Tammela --- .../selftests/tc-testing/tc-tests/filters/tests.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json b/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json index 361235ad574b..4598f1d330fe 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json +++ b/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json @@ -48,9 +48,6 @@ "filter", "flower" ], - "plugins": { - "requires": "nsPlugin" - }, "setup": [ "$TC qdisc add dev $DEV2 ingress", "./tdc_batch.py $DEV2 $BATCH_FILE --share_action -n 1000000" @@ -72,9 +69,6 @@ "filter", "flower" ], - "plugins": { - "requires": "nsPlugin" - }, "setup": [ "$TC qdisc add dev $DEV2 ingress", "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop" From patchwork Wed Nov 29 22:24:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Tammela X-Patchwork-Id: 13473598 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="HTTWBMfc" Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1054E1998 for ; Wed, 29 Nov 2023 14:24:53 -0800 (PST) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1cf8e569c35so2990595ad.0 for ; Wed, 29 Nov 2023 14:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1701296692; x=1701901492; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gNtH+1gH2lQm382ulpsqNWzj+X2PY2b5el3VSQomhZc=; b=HTTWBMfc/OUinqxGqWkjD6Se5fRaj4PP6fdUBm7V75lmhsaikMpNUsmBBGku7h+b6R p6Jt1j1ubn7Gitu/7V0eXn0q9yXQlFOTZMsm5zlzt7NTgW7E2Mt6YdMkLCcooZtP2T19 G73JTqZswUiT0bn+Zt8lQncc39U9hVUnvHvt9q8nn3qSrPUQTuSvhCfCQpQQHm85y18L PzCIbRUOF76eQEL3d5ZYBbvPa9Jj8Uxx1uYtfZCIy7LYkHoBTxil0L+0IJdItcmSYab7 EH2RdNoj9Lp4geu7aHpo8a2kbupxV9X9H8y1qoK7xgJvTxGURXAzLm7/BV1HEOAyQwTT CwGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701296692; x=1701901492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gNtH+1gH2lQm382ulpsqNWzj+X2PY2b5el3VSQomhZc=; b=RvpG67lYA1/gJU7KAkkiJhhNrEWx8K36y8Z6qU6A/E8qHym0TlsS5yQXBUePcqMMlD jP/Lge/igHkKJ6OfQyYJnBTwrMIGIeJk5IVSbcSorpymmRo/884ireJbmd9sJcH6XL1t SusEANljkp+poXl11muK31r3kBIVMCFWtgP0jyC8FwY7QHx+13XLFc+ldrq3SvK6ReD/ QhZ944ZZh0aROrIpRYgqG0WNq0nWsCgiPvxI3Wy54FxsbDZj7NTQ9Bic5QNMicNf/G5L EVj4Yo21qi+x0C8PaQKxg1hpA96CalTpgfaK1cPCw9iY1cDvBOuUt1CDJB5YKvNLsfFt beMQ== X-Gm-Message-State: AOJu0Yy2qu4WPgTqHjDfHIWw68YS1r6tm3c6gchnE3XsgJ7m4mC9sbx4 B2woNfUCAbeK3oKKh17+4KkWjC482tnWfA6t7cY= X-Google-Smtp-Source: AGHT+IGNDlKoqxcERG5pvxOUvytNKG9IcyHtmVrHI/OJz23zoAESqtSMxMD2v3XzETpmZeTUNhas3w== X-Received: by 2002:a17:902:f68e:b0:1cf:9bd1:aaea with SMTP id l14-20020a170902f68e00b001cf9bd1aaeamr24256867plg.11.1701296692249; Wed, 29 Nov 2023 14:24:52 -0800 (PST) Received: from rogue-one.tail33bf8.ts.net ([201.17.86.134]) by smtp.gmail.com with ESMTPSA id l8-20020a170902f68800b001cfb971edf2sm8663697plg.13.2023.11.29.14.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:24:51 -0800 (PST) From: Pedro Tammela To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, linux-kselftest@vger.kernel.org, Pedro Tammela Subject: [PATCH net-next 2/4] selftests: tc-testing: remove spurious './' from Makefile Date: Wed, 29 Nov 2023 19:24:22 -0300 Message-Id: <20231129222424.910148-3-pctammela@mojatatu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129222424.910148-1-pctammela@mojatatu.com> References: <20231129222424.910148-1-pctammela@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Patchwork CI didn't like the extra './', so remove it. Signed-off-by: Pedro Tammela --- tools/testing/selftests/tc-testing/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/tc-testing/Makefile b/tools/testing/selftests/tc-testing/Makefile index e8b3dde4fa16..9153e3428a77 100644 --- a/tools/testing/selftests/tc-testing/Makefile +++ b/tools/testing/selftests/tc-testing/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_PROGS += ./tdc.sh +TEST_PROGS += tdc.sh TEST_FILES := action-ebpf tdc*.py Tdc*.py plugins plugin-lib tc-tests scripts include ../lib.mk From patchwork Wed Nov 29 22:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Tammela X-Patchwork-Id: 13473599 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="by6h9GTu" Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1D0A1703 for ; Wed, 29 Nov 2023 14:24:55 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1cfafe3d46bso3271815ad.0 for ; Wed, 29 Nov 2023 14:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1701296695; x=1701901495; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=boH2XvYQnpBpBXH5Z+yQzRXQ5rbOkFbvurC2g24QJlY=; b=by6h9GTuIXHQdcm+9KtaMeVBv/jQBcwbEEH2zt0r1lF5RxjOZEQPMJIt09kUSawI+t Gbzy5PcOuzxIwDSlAQv8gxk9P/kjp5yZIKo2d2RPmBiiqdYsIa2R2BoL/AwRNTQWWvZS iQUmUAfczGjhNJQnNdUAHBsUZqcbL4J34VLTYbqnZkSDIkb2dF1BpvbIF80n9Kb/vrSD HAlj7DrQXudNSjP2I6qAm819VK6VwaNiKfmsJXU4aELgTu1kfpQTIHJJghROmCw6/NdV L/j0VeWoXpLlOcKqaJIHtT7CvNTJUZWUHtTZcAspKxS1EJtoOjhf+GzUWpc8myogTJf0 zfsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701296695; x=1701901495; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=boH2XvYQnpBpBXH5Z+yQzRXQ5rbOkFbvurC2g24QJlY=; b=gsabTUyWChKNMHd5/OMwELjj9l93ItlOYiH1GIPY3po3nU/WzKhA+67urTg9doUCVC VIIEuKg3044QhKqsnYMhty0jMbrp2GGhC/04RoNGVOM3NBdxQSySzi/GECxPr1g2ocpq SuJKSpFNBHHVy1p48H/88ZbNpyQEMcxM3BjK6jiW2Z6hwd/hSGmLpfnWTHX2BkFJ/yMO C3w0qFh4VcgoV+di5JYBAwIzmFcA8wHfZqWs24eJCifOy3AIuDg8j5yY3LXL8LVUxkAv wc/qOHHhPX9jWvYFaKBN5iuxV4T67Mp9Su4JHobpHgaVxgNFwEICHySd7zB1Uo/Qx78V +ddQ== X-Gm-Message-State: AOJu0YwW9QJO8KAG5h2FJinwPxRlCfl0tz00XEaj4+DfXvI/irFaO8zP lmWOXvfR33lTneqC2eQisyp49TU/CS+4WTgmCoI= X-Google-Smtp-Source: AGHT+IFvmJExB91/kXCn45gNOep8CJWPXl3id5s9b9Htkc5jp3hI1N5aGUPK/r8ayf6P5+GL9QpEAA== X-Received: by 2002:a17:902:da8b:b0:1cf:f506:c98e with SMTP id j11-20020a170902da8b00b001cff506c98emr8020601plx.16.1701296695300; Wed, 29 Nov 2023 14:24:55 -0800 (PST) Received: from rogue-one.tail33bf8.ts.net ([201.17.86.134]) by smtp.gmail.com with ESMTPSA id l8-20020a170902f68800b001cfb971edf2sm8663697plg.13.2023.11.29.14.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:24:55 -0800 (PST) From: Pedro Tammela To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, linux-kselftest@vger.kernel.org, Pedro Tammela Subject: [PATCH net-next 3/4] selftests: tc-testing: rename concurrency.json to flower.json Date: Wed, 29 Nov 2023 19:24:23 -0300 Message-Id: <20231129222424.910148-4-pctammela@mojatatu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129222424.910148-1-pctammela@mojatatu.com> References: <20231129222424.910148-1-pctammela@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org All tests in this file pertain to flower, so name it appropriately Signed-off-by: Pedro Tammela --- .../tc-testing/tc-tests/filters/{concurrency.json => flower.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/testing/selftests/tc-testing/tc-tests/filters/{concurrency.json => flower.json} (100%) diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json b/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json similarity index 100% rename from tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json rename to tools/testing/selftests/tc-testing/tc-tests/filters/flower.json From patchwork Wed Nov 29 22:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Tammela X-Patchwork-Id: 13473600 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="HSQqGDYE" Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16C3A10FE for ; Wed, 29 Nov 2023 14:24:59 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1cfbda041f3so2931675ad.2 for ; Wed, 29 Nov 2023 14:24:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1701296698; x=1701901498; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lSrFE3+h5zzVB7jBNvTgKunTZNHyuNKQBqWYc0dL+X4=; b=HSQqGDYEULa1paiNf2hCFxWTLagfz4k3QH+i6mwSLGzPZGJF2sIVIHyYKn4jXpEb3O FviEjsfnwomLLEqGn7JyJbQcCMBRSjYTjROmdsmGVAap4ZMOKntG94gHcsJQEnesZNpy VfqQ+g1SFWxxfDTOTmtX2kY5T6dDK3655xpGE+mOVog8SVR8iJjPbNr9/y+yLd3d0O8X MDYuy144D3g4r/fAeIF0yyES2XO2T9AVH5VSRbshqlAiMhnxxo2jalMSXM6guDYuVs7f uzO/z0w45dNKEOLmj/YMLaaCa6L2TUE7lJ0U9AtWcw1a8k9itoKdXA9hyY7TW1Vo3dug 8m9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701296698; x=1701901498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lSrFE3+h5zzVB7jBNvTgKunTZNHyuNKQBqWYc0dL+X4=; b=oUtyfoHhZxCIzAGnPcwJJ+WL1BAvI3A9THdAHQlxXsZzxYvEOmdUebepQVjhl87a+I 2OEl8Z1R8G4r5bMM+Z/B0axsLj0lxyDGtXXyclk3WR169S8CWBt75Rrxosw/0uXrukMq BaHt+5JkzGcOKdEx+TT5IRcZ2LE95x+zCnR8RYTVIQj9eFg5SncZIAf3baJaR35Pb5xv 8cLDwxAKzSMiDoOzobzB1LUI6Q4lyjWiLCYmNwtrmzQUXKrGotpjCf3XXXygQgWRWeZn 6jIbl4NktlFKtgw6jZ9tLLYSO7OKTrlX+iNR3600ymJZZ6BjtMztVmnRf80kg2ZPYfAo G2BQ== X-Gm-Message-State: AOJu0YzwE/m27irS0qqPNVMO4yXiUfX49DRQ871Fk2jNRVgTKdPII2S9 Mg8FRGJsWXhT8lSp2DqKibWH8yfa4M8Qjdo9Qa4= X-Google-Smtp-Source: AGHT+IEuNs0fHPUjPJKyExFAA0yrf9VZeLwMC4OQW+7VA/d78k8KKe9c3WBTzbDAZeF+H5JHp8ikHw== X-Received: by 2002:a17:902:8309:b0:1d0:68a:4a45 with SMTP id bd9-20020a170902830900b001d0068a4a45mr5183683plb.35.1701296698402; Wed, 29 Nov 2023 14:24:58 -0800 (PST) Received: from rogue-one.tail33bf8.ts.net ([201.17.86.134]) by smtp.gmail.com with ESMTPSA id l8-20020a170902f68800b001cfb971edf2sm8663697plg.13.2023.11.29.14.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:24:58 -0800 (PST) From: Pedro Tammela To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, linux-kselftest@vger.kernel.org, Pedro Tammela Subject: [PATCH net-next 4/4] selftests: tc-testing: remove filters/tests.json Date: Wed, 29 Nov 2023 19:24:24 -0300 Message-Id: <20231129222424.910148-5-pctammela@mojatatu.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129222424.910148-1-pctammela@mojatatu.com> References: <20231129222424.910148-1-pctammela@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Remove this generic file and move the tests to their appropriate files Signed-off-by: Pedro Tammela --- .../tc-testing/tc-tests/filters/flower.json | 98 ++++++++++++++ .../tc-testing/tc-tests/filters/matchall.json | 23 ++++ .../tc-testing/tc-tests/filters/tests.json | 123 ------------------ 3 files changed, 121 insertions(+), 123 deletions(-) delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/tests.json diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json b/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json index c2a433a4737e..6b08c0642069 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json +++ b/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json @@ -173,5 +173,103 @@ "$TC qdisc del dev $DEV2 ingress", "/bin/rm -rf $BATCH_DIR" ] + }, + { + "id": "2ff3", + "name": "Add flower with max handle and then dump it", + "category": [ + "filter", + "flower" + ], + "setup": [ + "$TC qdisc add dev $DEV2 ingress" + ], + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress handle 0xffffffff flower action ok", + "expExitCode": "0", + "verifyCmd": "$TC filter show dev $DEV2 ingress", + "matchPattern": "filter protocol ip pref 1 flower.*handle 0xffffffff", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DEV2 ingress" + ] + }, + { + "id": "d052", + "name": "Add 1M filters with the same action", + "category": [ + "filter", + "flower" + ], + "setup": [ + "$TC qdisc add dev $DEV2 ingress", + "./tdc_batch.py $DEV2 $BATCH_FILE --share_action -n 1000000" + ], + "cmdUnderTest": "$TC -b $BATCH_FILE", + "expExitCode": "0", + "verifyCmd": "$TC actions list action gact", + "matchPattern": "action order 0: gact action drop.*index 1 ref 1000000 bind 1000000", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DEV2 ingress", + "/bin/rm $BATCH_FILE" + ] + }, + { + "id": "4cbd", + "name": "Try to add filter with duplicate key", + "category": [ + "filter", + "flower" + ], + "setup": [ + "$TC qdisc add dev $DEV2 ingress", + "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop" + ], + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop", + "expExitCode": "2", + "verifyCmd": "$TC -s filter show dev $DEV2 ingress", + "matchPattern": "filter protocol ip pref 1 flower chain 0 handle", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DEV2 ingress" + ] + }, + { + "id": "7c65", + "name": "Add flower filter and then terse dump it", + "category": [ + "filter", + "flower" + ], + "setup": [ + "$TC qdisc add dev $DEV2 ingress" + ], + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress flower dst_mac e4:11:22:11:4a:51 action drop", + "expExitCode": "0", + "verifyCmd": "$TC -br filter show dev $DEV2 ingress", + "matchPattern": "filter protocol ip pref 1 flower.*handle", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DEV2 ingress" + ] + }, + { + "id": "d45e", + "name": "Add flower filter and verify that terse dump doesn't output filter key", + "category": [ + "filter", + "flower" + ], + "setup": [ + "$TC qdisc add dev $DEV2 ingress" + ], + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress flower dst_mac e4:11:22:11:4a:51 action drop", + "expExitCode": "0", + "verifyCmd": "$TC -br filter show dev $DEV2 ingress", + "matchPattern": " dst_mac e4:11:22:11:4a:51", + "matchCount": "0", + "teardown": [ + "$TC qdisc del dev $DEV2 ingress" + ] } ] diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json b/tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json index afa1b9b0c856..f8d28c415bc3 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json +++ b/tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json @@ -480,5 +480,28 @@ "$TC qdisc del dev $DUMMY ingress", "$TC actions del action police index 199" ] + }, + { + "id": "2638", + "name": "Add matchall and try to get it", + "category": [ + "filter", + "matchall" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$TC qdisc add dev $DEV1 clsact", + "$TC filter add dev $DEV1 protocol all pref 1 ingress handle 0x1234 matchall action ok" + ], + "cmdUnderTest": "$TC filter get dev $DEV1 protocol all pref 1 ingress handle 0x1234 matchall", + "expExitCode": "0", + "verifyCmd": "$TC filter show dev $DEV1 ingress", + "matchPattern": "filter protocol all pref 1 matchall chain 0 handle 0x1234", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DEV1 clsact" + ] } ] diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json b/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json deleted file mode 100644 index 4598f1d330fe..000000000000 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json +++ /dev/null @@ -1,123 +0,0 @@ -[ - { - "id": "2638", - "name": "Add matchall and try to get it", - "category": [ - "filter", - "matchall" - ], - "plugins": { - "requires": "nsPlugin" - }, - "setup": [ - "$TC qdisc add dev $DEV1 clsact", - "$TC filter add dev $DEV1 protocol all pref 1 ingress handle 0x1234 matchall action ok" - ], - "cmdUnderTest": "$TC filter get dev $DEV1 protocol all pref 1 ingress handle 0x1234 matchall", - "expExitCode": "0", - "verifyCmd": "$TC filter show dev $DEV1 ingress", - "matchPattern": "filter protocol all pref 1 matchall chain 0 handle 0x1234", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DEV1 clsact" - ] - }, - { - "id": "2ff3", - "name": "Add flower with max handle and then dump it", - "category": [ - "filter", - "flower" - ], - "setup": [ - "$TC qdisc add dev $DEV2 ingress" - ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress handle 0xffffffff flower action ok", - "expExitCode": "0", - "verifyCmd": "$TC filter show dev $DEV2 ingress", - "matchPattern": "filter protocol ip pref 1 flower.*handle 0xffffffff", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DEV2 ingress" - ] - }, - { - "id": "d052", - "name": "Add 1M filters with the same action", - "category": [ - "filter", - "flower" - ], - "setup": [ - "$TC qdisc add dev $DEV2 ingress", - "./tdc_batch.py $DEV2 $BATCH_FILE --share_action -n 1000000" - ], - "cmdUnderTest": "$TC -b $BATCH_FILE", - "expExitCode": "0", - "verifyCmd": "$TC actions list action gact", - "matchPattern": "action order 0: gact action drop.*index 1 ref 1000000 bind 1000000", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DEV2 ingress", - "/bin/rm $BATCH_FILE" - ] - }, - { - "id": "4cbd", - "name": "Try to add filter with duplicate key", - "category": [ - "filter", - "flower" - ], - "setup": [ - "$TC qdisc add dev $DEV2 ingress", - "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop" - ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop", - "expExitCode": "2", - "verifyCmd": "$TC -s filter show dev $DEV2 ingress", - "matchPattern": "filter protocol ip pref 1 flower chain 0 handle", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DEV2 ingress" - ] - }, - { - "id": "7c65", - "name": "Add flower filter and then terse dump it", - "category": [ - "filter", - "flower" - ], - "setup": [ - "$TC qdisc add dev $DEV2 ingress" - ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress flower dst_mac e4:11:22:11:4a:51 action drop", - "expExitCode": "0", - "verifyCmd": "$TC -br filter show dev $DEV2 ingress", - "matchPattern": "filter protocol ip pref 1 flower.*handle", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DEV2 ingress" - ] - }, - { - "id": "d45e", - "name": "Add flower filter and verify that terse dump doesn't output filter key", - "category": [ - "filter", - "flower" - ], - "setup": [ - "$TC qdisc add dev $DEV2 ingress" - ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress flower dst_mac e4:11:22:11:4a:51 action drop", - "expExitCode": "0", - "verifyCmd": "$TC -br filter show dev $DEV2 ingress", - "matchPattern": " dst_mac e4:11:22:11:4a:51", - "matchCount": "0", - "teardown": [ - "$TC qdisc del dev $DEV2 ingress" - ] - } -]