From patchwork Wed Sep 9 18:25:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1360926 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bmr7R4HRHz9sTM for ; Thu, 10 Sep 2020 04:26:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbgIIS0K (ORCPT ); Wed, 9 Sep 2020 14:26:10 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:5249 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbgIIS0G (ORCPT ); Wed, 9 Sep 2020 14:26:06 -0400 IronPort-SDR: zA9XNXEXspEXpvQAk0e0EupO3hw14WwrAkNg2p18c00um0kWtImOjXUXDKjIKJ6dn+mKrW/8ik f3jPcfGEfL8I/U+QWJSotKeaqR/5cjXRhHyBqr1Whyek7Pdk8Ppbw7/VAiGlQTB5TypClQZvpL sZrb7XFOu1kQeXlm+Qj5eLnJxAcAOtxzli+ga8bvvwyBgDSC2mZZj4vec7h1xvtgMwgTImibVl QF6Nma1Gnsf8D2Ssnh/+7o8B9licIZ535M83fniN+HXuoGLLQfn2h1Rz32rjv0RT6V5KjLACWr pt4= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:eDLf1BBpoPA3EDn6N3DJUyQJP3N1i/DPJgcQr6AfoPdwSP36oc+wAkXT6L1XgUPTWs2DsrQY0rSQ6v29EjxRqb+681k6OKRWUBEEjchE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i764jEdAAjwOhRoLerpBIHSk9631+ev8JHPfglEnjWwba5zIRmssAnctskbjYRhJ6s11xDEvmZGd+NKyG1yOFmdhQz85sC+/J5i9yRfpfcs/NNeXKv5Yqo1U6VWACwpPG4p6sLrswLDTRaU6XsHTmoWiBtIDBPb4xz8Q5z8rzH1tut52CmdIM32UbU5Uims4qt3VBPljjoMOjgk+2/Vl8NwlrpWrhK/qRJizYDaY4abO/VxcK7GYd8XRnBMUtpLWiBdHo+xaZYEAeobPeZfqonwv1sAogGlCgmtHuzvzCJDiH/s3aIkzusuDxvG3A08ENINrX/Zq9v1O70JXuC716TI1jbDbvNQ2Tjj9IjEaAsuru+VUL92bMHexlUhGRnfgVWMtYzqISmV1uIVvmaV7OdtUeKhhm8npg1vrDWhxtohhpXUio4Jy13K+ip3zZs7KNCmVUN2YdypHYVfuS2GOYV4TccvTWFotiokzrALv4OwcisSyJk/wxPTduaLf5WL7x79TuqdPDZ1iXJ/dL6ihhu/91WrxPfmWcmuyllKqzJIktzLtn8QyRPe8tOHSv5h/ke53jaPyhzT5vlEIU8qkarbLIYswro3lpUPq0vDGi/2mELtjK+KbEkk/u+o5Pj9bbXiu5CcMIp0hRv/MqQogsC/AOI4PRYSX2WD/emwyafv8VD6TblUlPE6j6jUvZDAKcgGp6O1GwpV3Zwi6xa7ATemytMYnXwfIVJLYh2IlIbpNkrVIPD7Dfa/hUqjkCtxy//dILLtGo/NIWTbkLf9YbZ97FZRyBIpwt9E45JUDaoMIPTtVU/tutzYDxs5MxCqzOb9Etl90ZkeWW2XCK+DLKzSqUOI5v4oI+SUZ48aoivyK/w76PHylnI5n0ESfbWn3ZsWbHC4AuppI1+DbXrrmNcBHn8AvhAiQ+zylF2CTTlTam68X6My/Tw7E56mDZ3HRo+zhryNxjq0EYNObGBcFl+MCWvod5mDW/oUbiKdPNNhkjIFVbilV48uywuuuBbnxLV5MOrb5CkYuIn91Nh6+eLTjws+9T9qAMSH1WGCUWV0knkPRz8s06B1uVZ9xUub0ahkn/xYEsRe6O9OUgcgK5Hc0/J1BMr3Wg/aeNeGVkqmQtunATE1UtI+3cUOb1x6G9W4gRDJxzCqDKMNl7yXGJw09brR337vKMZh1nnJyrchgkI4QstAK2KmnLRz9wvNCI7TlUWWiaKqeb4b3C7X+2eJ1XCOs11AUA5sTaXFWmgSZkXMotvi6EPPVKSuCbcnMwtH18GCNrFGZcb3ggYOePC2IN3UZ2WZnWqsCxeM2r6WKo3wdCFV3yzRDEUPuwYe4XiHMRQzHGGmuW2aRDJxPUnzeUfh969ypSCVVEgxmi+DZUxo0fKb4BMZiOadQPBbirwNsikJsDZlGluhmdjbXYnT7zF9dblRNItuqGxM0njU4lRw X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AdEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGQGYFpCwEBAQEBAQEBASMRAQIEAQGES4IUJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmAYJXKbUihBCEdYFCgTYCAQEBAQGIJ4UZgUE/hF+EJIYQBJonnEOCb4MNhF1+kTsPIaBWklGhaoF6TSAYgyQJRxkNnGhCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2AdEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGQGYFpCwEBAQEBAQEBASMRAQIEAQGES4IUJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmAYJXKbUihBCEdYFCgTYCAQEBAQGIJ4UZgUE/hF+EJIYQBJonnEOCb4MNhF1+kTsPIaBWklGhaoF6TSAYgyQJRxkNnGhCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 09 Sep 2020 20:26:01 +0200 From: Fabian Frederick To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Fabian Frederick Subject: [PATCH 1/3 nf] selftests: netfilter: add cpu counter check Date: Wed, 9 Sep 2020 20:25:36 +0200 Message-Id: <20200909182536.23730-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org run task on first CPU with netfilter counters reset and check cpu meta after another ping Signed-off-by: Fabian Frederick Acked-by: Florian Westphal --- tools/testing/selftests/netfilter/nft_meta.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/testing/selftests/netfilter/nft_meta.sh b/tools/testing/selftests/netfilter/nft_meta.sh index d250b84dd5bc3..17b2d6eaa2044 100755 --- a/tools/testing/selftests/netfilter/nft_meta.sh +++ b/tools/testing/selftests/netfilter/nft_meta.sh @@ -33,6 +33,7 @@ table inet filter { counter infproto4count {} counter il4protocounter {} counter imarkcounter {} + counter icpu0counter {} counter oifcount {} counter oifnamecount {} @@ -54,6 +55,7 @@ table inet filter { meta nfproto ipv4 counter name "infproto4count" meta l4proto icmp counter name "il4protocounter" meta mark 42 counter name "imarkcounter" + meta cpu 0 counter name "icpu0counter" } chain output { @@ -119,6 +121,18 @@ check_one_counter omarkcounter "1" true if [ $ret -eq 0 ];then echo "OK: nftables meta iif/oif counters at expected values" +else + exit $ret +fi + +#First CPU execution and counter +taskset -p 01 $$ > /dev/null +ip netns exec "$ns0" nft reset counters > /dev/null +ip netns exec "$ns0" ping -q -c 1 127.0.0.1 > /dev/null +check_one_counter icpu0counter "2" true + +if [ $ret -eq 0 ];then + echo "OK: nftables meta cpu counter at expected values" fi exit $ret From patchwork Wed Sep 9 18:26:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1360929 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bmr893wg0z9sTH for ; Thu, 10 Sep 2020 04:26:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728405AbgIIS0m (ORCPT ); Wed, 9 Sep 2020 14:26:42 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:5273 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbgIIS0c (ORCPT ); Wed, 9 Sep 2020 14:26:32 -0400 IronPort-SDR: bD8uNhFGVHwEVPYlwW5V5w67iMWVYwJpup2/wKODiZDjkJl4W0UA0clZ2xOG5QUebakvN+0kVg pAHcfR1bvr4gvRFOh+S5nE50W5IKd1PSD6xCcwORVr0mPm0c7dRc/TW4+8CAj9CvJ5gSGXlV5k 4FaEoD94Kb38IuHnrxv7DrhLcYw8A7G2P9zLhIgqSoYxDdSXUZfnjzfy906E1yaLU5sH/THK/F K/JzVEwplBFApBINpeijljEch+QjLiFVVgHxqs/IRk3jPCx7QwdAnV8t07xUDK6WWc/HAxuJSb GKk= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:DmRruhcXQ/3uiqyw0Dyk0imOlGMj4u6mDksu8pMizoh2WeGdxc27YheN2/xhgRfzUJnB7Loc0qyK6v6mADFdqsbQ+Fk5M7V0HycfjssXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aFRrwLxd6KfroEYDOkcu3y/qy+5rOaAlUmTaxe7x/IAi3oAnLq8UbgYtvJqkyxxbNv3BFZ/lYyWR0KFyJgh3y/N2w/Jlt8yRRv/Iu6ctNWrjkcqo7ULJVEi0oP3g668P3uxbDSxCP5mYHXWUNjhVIGQnF4wrkUZr3ryD3q/By2CiePc3xULA0RTGv5LplRRP0lCsKMSMy/WfKgcJyka1bugqsqRxhzYDJbo+bN/1wcazSc94BWWZMXdxcWzBbD4+gc4cCCfcKM+ZCr4n6olsDtRuwChO3C+Pu0DBIgGL9060g0+s/DA7JwhYgH9MSv3TXsd74M6kSXvquw6nG1jjDdPBW2Df76IfWbhAtu+qDUqxpfMfX1EIgGB/LgE+Kpoz5IzOayP4Ns26D4uRuVu+ij24ppgBxrzSxyMoiipTEip4IxlzY9Ch3z4k7KMC2RUNlfNOpEJlduj+VOYdqTM0sTGVltiY6xLEYvZO2ejUBxpc/xxPHb/GLbpKE7g/gWeqPOzt0mXNodbKlixqv8EWtzPD3WNOu31ZQtCVFl8HBtnUK1xPO9MeKUuB9/kK92TaX0ADT9/1ELVg0laXFL54hxaY9lp4UsUvfBCD2nEX2jKiNdkU44OSo7+Pnban8qZ+YKoB0jQT+Pb4vmsy5Geg4Mw4OUHaH+emk0LDv4Ff1TKhJg/EoiKXVrZHXKMQBqqKkAgJZyoMj5Ay+Dzei3tQYh34HLFdddRKJlYfmIF/OLevjDfe8g1Wslilkx+zcMrL6HJrBNmLDn6v5fbZh905czxI+zchF6J1PDrEBJ+n+Wknvu9zEAB85Mgi0w/r5B9VnzI8eXniPAqCBOqPIrVCI/v4vI/WLZIINuzbyMeUq5/rwgnAlglIde7em3YcZaHC5GvRmP1uWYWD2jtcGC2cKsRI0TPb2h12aTT5Te3GyUroy5jA1E4+mFpvDRpqpgLOf2ie3BIBZaX5eAFCWDXjob5mEW+sLaC+KJM9ujCAEVbagS48lyRGhqhX6x6N6IeXK5C0Xq5bj2cNr5+3cix4y7yZ4D8eD3GGXSWF7gGcISyUx3KBlrkx30k2D3rRgg/xECdxT4OtEXRs9NZ7G0eN6F879VRjEftqSTlapXMmmAT8wTtI1398BfVx9F8+ljhDZ0CqgG6UVmKCTBJwo7qLc2GD8J8BjxHbayaYukUcmT9BRNW2pmKF/7RLfB43XnEWDkaala6Ac0DTK9GeZwmqEpFtYXxJoUaXZQXAfYVPbrdrj6UzZQb+jEq8nMghByM6ENKRKdsflgk5YS6SrBNOLe2u7n2CYAxuUyLKIcIfwPWIH02GVC0EIlw0Y1XCLKQY/AjusuSTZFjMqXVzwS1jw6+1zrjW3Qxwa1QaPOmNo3bu8/FY7n/GQRukS1bFM7CkooTtcB1Ws2d/KTdCN8VkyNJ5AaM8wtQ8UnVnSsBZwa8St X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CmQgCXHVlf/xCltltfGgEBAQEBPAEBAQECAgEBAQECAQEBAQMBAQEBHIFKgRyBfFVfjTqSUZICCwEBAQEBAQEBASMRAQIEAQGES4IUJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmAYJXKbUihBCEdYFCgTgBiCuFGYFBP4RfhASGMAS2aoJvgw2EXX6ROw8hoFYtkiShaoF6TSAYO4JpCUcZDY4oGo4mQjA3AgYKAQEDCVcBPQGKbIJGAQE X-IPAS-Result: A2CmQgCXHVlf/xCltltfGgEBAQEBPAEBAQECAgEBAQECAQEBAQMBAQEBHIFKgRyBfFVfjTqSUZICCwEBAQEBAQEBASMRAQIEAQGES4IUJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmAYJXKbUihBCEdYFCgTgBiCuFGYFBP4RfhASGMAS2aoJvgw2EXX6ROw8hoFYtkiShaoF6TSAYO4JpCUcZDY4oGo4mQjA3AgYKAQEDCVcBPQGKbIJGAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 09 Sep 2020 20:26:30 +0200 From: Fabian Frederick To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Fabian Frederick Subject: [PATCH 2/3 nf] selftests: netfilter: fix nft_meta.sh error reporting Date: Wed, 9 Sep 2020 20:26:13 +0200 Message-Id: <20200909182613.23784-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When some test directly done with check_one_counter() fails, counter variable is undefined. This patch calls ip with cname which avoids errors like: FAIL: oskuidcounter, want "packets 2", got Error: syntax error, unexpected newline, expecting string list counter inet filter ^ Error is now correctly rendered: FAIL: oskuidcounter, want "packets 2", got table inet filter { counter oskuidcounter { packets 1 bytes 84 } } Signed-off-by: Fabian Frederick --- tools/testing/selftests/netfilter/nft_meta.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/netfilter/nft_meta.sh b/tools/testing/selftests/netfilter/nft_meta.sh index 17b2d6eaa2044..1f5b46542c14c 100755 --- a/tools/testing/selftests/netfilter/nft_meta.sh +++ b/tools/testing/selftests/netfilter/nft_meta.sh @@ -90,7 +90,7 @@ check_one_counter() if [ $? -ne 0 ];then echo "FAIL: $cname, want \"$want\", got" ret=1 - ip netns exec "$ns0" nft list counter inet filter $counter + ip netns exec "$ns0" nft list counter inet filter $cname fi } From patchwork Wed Sep 9 18:26:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1360931 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bmr8F6yK0z9sTH for ; Thu, 10 Sep 2020 04:26:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729953AbgIIS0v (ORCPT ); Wed, 9 Sep 2020 14:26:51 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:5273 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729525AbgIIS0o (ORCPT ); Wed, 9 Sep 2020 14:26:44 -0400 IronPort-SDR: pNX6ncdP65mDe1+h142elqQ5LUq0gy5gtBLRwL9zTsIHJwzLSrJgbGrLD0LA18UefqzTjMEMAQ 2UwwWg87erL19RWH2XZUyxL6AEnit+lISd0MnlokClJzSPyP6VjYQrrsAX0exVhAJ56NLg6dSP 30Ta4D2VfWvUzChbFtR0419icVua4PzeDPGDrCO6a0NUOc31vPfCp/aKdu3WSfQzf63YjXXw0g yzXMlMAeZzB/pa13tSygbcGqAe9Ya0xXbp31ueY5ZuszsA/ZtQYHPDNLqY0FYE6VQ8VrCttS2c FxE= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:a5HhahRaTOHR35jRawbZFyIxhNpsv+yvbD5Q0YIujvd0So/mwa67ZRKEt8tkgFKBZ4jH8fUM07OQ7/m+HzVdvN3R4TgrS99lb1c9k8IYnggtUoauKHbQC7rUVRE8B9lIT1R//nu2YgB/Ecf6YEDO8DXptWZBUhrwOhBoKevrB4Xck9q41/yo+53Ufg5EmCexbal9IRmrrAjdrNQajItiJ6o+yRbEpmZDdvhLy29vOV+dhQv36N2q/J5k/SRQuvYh+NBFXK7nYak2TqFWASo/PWwt68LlqRfMTQ2U5nsBSWoWiQZHAxLE7B7hQJj8tDbxu/dn1ymbOc32Sq00WSin4qx2RhLklDsLOjgk+2zRl8d+jr9UoAi5qhJ/3YDafY+bOvl5cKzSct0XXnZNU8VLWiBdGI6wc5cDAuwcNuhYtYn9oF4OoAO+Cwa2H+zvyyVHhnnr1qM6yeQuDxzJ0xI6H9IPrHvUr8j+OaAcUe+v16bIwy7Ob+hV2Tb97ojHbAwhreuXUr1uaMfcz1QkGAzZgFuKs4PlIy+V2foXs2id9+duW+GihmonpQxwojWj2MkhhInUi44J11zI6SR0zok6K9ClRkN2f8OpHZtSuiyEOIV6Xs0sTW5stSg6yrMKp5q2cS4Xw5ok3x7Sc/iKf5WS7h7+V+udPy10iG9kdb+/nRq+7Emtx+vhXceuyllKtDBKktzUu3AI0Bzc99aIR+Nm/kekxTaPzwfT6vxYIUwslarUNZohwrkom5oXtkTMAjX5mEH2jK+RbUUk5vKk6+DgYrr6vJCcM5J7igb7Mqs0m8y/B/w0MgkIX2eF5eSxzLnu8VDjTLlXjfA6jLPVvI3bKMkbvKK1Hg5Y3p4m6xmlDjem1NoYnWMALFJAYB+HgZLmNErAIP3jFve/gFStkDF1yPDaJLHuGYvCImDZkLj9ZbZ991JcyA0rwNBH/Z1bEbUBIPXoV0/3qtPYEhE5Mw2ww+b7Ftp9zJkSWWWVAq+WKKnSq0OH5vozI+mQY48YoDX9JOI46P7qk3A2hUQQfa+30psLZnC4H/BmI1mHbnr2mNsBFn0KvgUmRuzwlFKCSSJTZ2q1X68k6DE6BpmrDZzfRoC3hLyOwiG7EodLaW9YElqMC2vnd52YW/cQbyKfOslhnSIYVbivSo8h0Q2uuxHgy7Z+M+Xb5DMYuozn1NVu+e3Tmg899SZuA8SezW6NVWd0kX0MRzMs26B/u0N9wE+Z0adkm/xYCcBT5/RRXwgmMp7c1fJ1C8zsVQ3be9eEU1CmTcu6ATE/T9Ixx8MObFhnG9m4iRDDxSWqCacPl7OXHJw07r7c33/pKsZ71XnGyLQugEc4QsZUK22mibBw9xLJC47KjUqZjaCqeroY3CLX82eD12WOtllCUAFsSaXFQWwfZkzOoNT3/EzNVLGuBK88MgtCyc+CLLVFasHzgVpdWviwcOjZNnq4kWO3LRCF2r2NaJbnYSMaxiqZQEsNnwQe9l6AOBQwByO9rniYCyZhURrhfGv37fN6pXX9QkJn4RuNahhP3rC08xhdq+aRR/4J37kH8HMvoj96NE2+ztTbF5yKqlwyL+1nfdoh7QIfhirivAtnM8n4Ig== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AZEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGSAgsBAQEBAQEBAQEjEQECBAEBhEuCFCU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig1IBIyOBPxKDJgGCVym1IoQQhHWBQoE2AgEBAQEBiCeFGYFBP4ERg06KNAS2aoJvgw2EXX6ROw8hoFaSUaFqgXpNIBg7gmkJRxkNjlaOEkIwNwIGCgEBAwlXAT0BjTIBAQ X-IPAS-Result: A2AZEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGSAgsBAQEBAQEBAQEjEQECBAEBhEuCFCU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig1IBIyOBPxKDJgGCVym1IoQQhHWBQoE2AgEBAQEBiCeFGYFBP4ERg06KNAS2aoJvgw2EXX6ROw8hoFaSUaFqgXpNIBg7gmkJRxkNjlaOEkIwNwIGCgEBAwlXAT0BjTIBAQ Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 09 Sep 2020 20:26:41 +0200 From: Fabian Frederick To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Fabian Frederick Subject: [PATCH 3/3 nf] selftests: netfilter: remove unused cnt and simplify command testing Date: Wed, 9 Sep 2020 20:26:24 +0200 Message-Id: <20200909182624.23834-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org cnt was not used in nft_meta.sh This patch also fixes 2 shellcheck SC2181 warnings: "check exit code directly with e.g. 'if mycmd;', not indirectly with $?." Signed-off-by: Fabian Frederick --- tools/testing/selftests/netfilter/nft_meta.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/netfilter/nft_meta.sh b/tools/testing/selftests/netfilter/nft_meta.sh index 1f5b46542c14c..18a1abca32629 100755 --- a/tools/testing/selftests/netfilter/nft_meta.sh +++ b/tools/testing/selftests/netfilter/nft_meta.sh @@ -7,8 +7,7 @@ ksft_skip=4 sfx=$(mktemp -u "XXXXXXXX") ns0="ns0-$sfx" -nft --version > /dev/null 2>&1 -if [ $? -ne 0 ];then +if ! nft --version > /dev/null 2>&1; then echo "SKIP: Could not run test without nft tool" exit $ksft_skip fi @@ -86,8 +85,7 @@ check_one_counter() local want="packets $2" local verbose="$3" - cnt=$(ip netns exec "$ns0" nft list counter inet filter $cname | grep -q "$want") - if [ $? -ne 0 ];then + if ! ip netns exec "$ns0" nft list counter inet filter $cname | grep -q "$want"; then echo "FAIL: $cname, want \"$want\", got" ret=1 ip netns exec "$ns0" nft list counter inet filter $cname