From patchwork Sat Dec 15 15:30:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 1013943 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43HBG32MwMz9s9h for ; Sun, 16 Dec 2018 02:31:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730405AbeLOPbD (ORCPT ); Sat, 15 Dec 2018 10:31:03 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33779 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730127AbeLOPbC (ORCPT ); Sat, 15 Dec 2018 10:31:02 -0500 Received: by mail-wr1-f65.google.com with SMTP id c14so8189154wrr.0 for ; Sat, 15 Dec 2018 07:31:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QsNRoNN5D0aLLveR10/vE8Qtg3P5qyBPeRA2teBv67c=; b=ZAPL4R5O38jraLU0yQLN+vV4/KIN1RvcH5VKLW4F0qWfzPfPbGXgfXGl4wMoomSrV8 9FhXwGkBmkPLulWvCwDKFSpzcr20PmRp+cfj7TSFi9PT5BAy0qAlDpOZ8FyHI9aXVRMw Mkzu0ljt7VpYcPvOb4okxW93aOKHtD1g3VI8Qg88pNI/uv2eSj1+VwMnkxDX2W4mAEIg GyH3B8YexFCZ4/XDEAaS8+LxgdcSAcu8rtbfP0HJw2qOaRvssjkjGV74UsRpe9bBLlh/ +M7T540+V0izSfXeWIBxnN9E7k4r0U6POnuRkOrRMPFR3jZ6vxwxCGfUU3kaM2vj5K6m jVhQ== X-Gm-Message-State: AA+aEWaR13piTYAR20TkIYJEsUl0t/5HAfd6pVDhlz+p4esdG1z+S9Ey vRFzSik28DAFOiODyaHOuy6y5T88 X-Google-Smtp-Source: AFSGD/Vq7GKlbGnmlUIl3sHwthi+aY4Gx/+iFyXQUXwR1H5llgzGAqm3zPyLXIHZxaRh4fvhstUMiQ== X-Received: by 2002:a5d:4d11:: with SMTP id z17mr5446040wrt.209.1544887860567; Sat, 15 Dec 2018 07:31:00 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:4441:b71:c640:c3f7]) by smtp.gmail.com with ESMTPSA id y145sm6138864wmd.30.2018.12.15.07.30.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Dec 2018 07:30:59 -0800 (PST) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Luca Boccassi , petr.vorel@gmail.com Subject: [PATCH iproute2 1/4] Makefile: have check target depend on all Date: Sat, 15 Dec 2018 15:30:48 +0000 Message-Id: <20181215153051.13166-1-bluca@debian.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Otherwise it will simply fail immediately from a just-cleaned workspace: $ make check -j1 cd testsuite && make && make alltests echo "Entering iproute2" && cd iproute2 && make configure && cd ..; Entering iproute2 make -C tools Makefile:3: ../../config.mk: No such file or directory make[2]: *** No rule to make target '../../config.mk'. Stop. Fixes: 8804a8c0d387 ("Makefile: Add check target") Cc: petr.vorel@gmail.com Signed-off-by: Luca Boccassi Reviewed-by: Petr Vorel Tested-by: Petr Vorel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b7488add..20c760e2 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ clobber: distclean: clobber -check: +check: all cd testsuite && $(MAKE) && $(MAKE) alltests cscope: From patchwork Sat Dec 15 15:30:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 1013944 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43HBG41gbtz9sB5 for ; Sun, 16 Dec 2018 02:31:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730425AbeLOPbE (ORCPT ); Sat, 15 Dec 2018 10:31:04 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54621 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730127AbeLOPbE (ORCPT ); Sat, 15 Dec 2018 10:31:04 -0500 Received: by mail-wm1-f65.google.com with SMTP id a62so8342208wmh.4 for ; Sat, 15 Dec 2018 07:31:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z7Wr4wnbUNKW5N2rg7uSRFGXr9/TUARp5iOEsLLfrGY=; b=D90ymNNZgrvtparpNg/Q6x0mEKFtk5L0pzkjlxP62xiw3uKRTpFYJ0smUbMzf6y9in SxvJ6pfjxNzklfAMScvDSuNc9nWnCyiptNloPohLBKqS2CnnXiixdxkiJxTnRK1KjlE3 jpOY4J6fqJ7xe06nKPL7AYKPpSrGe5glrvwf+szaGsLOJISH3SPTBQvKlHDeQMSSsGAr xMXxfhwslsld5HxGyropc3dyMmx1g/69NRBDDKNxDKwH263rD/OqypYy1oHrQucjoBSl eC2h8ocEfjQ+RCGitpZC+bQtscnaIKpxLikGrjx4q6cErE8fdCcr/Zo6eb0Fgn4sxK0k 7Vgg== X-Gm-Message-State: AA+aEWYxQA+s+KfjWBKfz3SCUuD/elxJKThwX4yBXQaFwLMTfg6x4n8l C9ckYTF+2XcFOtKRShCSwEpVFxwx X-Google-Smtp-Source: AFSGD/V5IaFFCBjx4Fmf7cQUT1yu6YcndeYqXZ1aF7HGXdgEz92xDkvyKxZvYDhuXCvKiTBhMYVK3Q== X-Received: by 2002:a1c:b1d5:: with SMTP id a204mr6929124wmf.32.1544887861941; Sat, 15 Dec 2018 07:31:01 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:4441:b71:c640:c3f7]) by smtp.gmail.com with ESMTPSA id l14sm9341429wrp.55.2018.12.15.07.31.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Dec 2018 07:31:01 -0800 (PST) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Luca Boccassi , petr.vorel@gmail.com Subject: [PATCH iproute2 2/4] testsuite: declare dependency between $(TESTS) and generate_nlmsg Date: Sat, 15 Dec 2018 15:30:49 +0000 Message-Id: <20181215153051.13166-2-bluca@debian.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181215153051.13166-1-bluca@debian.org> References: <20181215153051.13166-1-bluca@debian.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Parallel make from the top level directory fails since tests are at the same time as generate_nlmsg: $ make check -j4 ... cd testsuite && make && make alltests echo "Entering iproute2" && cd iproute2 && make configure && cd ..; Entering iproute2 make -C tools Removing results dir ... make[1]: ./tools/generate_nlmsg: Command not found make[1]: ./tools/generate_nlmsg: Command not found Makefile:64: recipe for target 'ip/netns/set_nsid_batch.t' failed make[1]: *** [ip/netns/set_nsid_batch.t] Error 127 make[1]: ./tools/generate_nlmsg: Command not found make[1]: *** Waiting for unfinished jobs.... Makefile:64: recipe for target 'ip/netns/set_nsid.t' failed make[1]: *** [ip/netns/set_nsid.t] Error 127 Makefile:64: recipe for target 'ip/link/show_dev_wo_vf_rate.t' failed make[1]: *** [ip/link/show_dev_wo_vf_rate.t] Error 127 CC generate_nlmsg Makefile:123: recipe for target 'check' failed make: *** [check] Error 2 Add an explicit dependency in testuite/Makefile's $(TESTS) rule so that the tool correctly gets compiled before any test runs. Fixes: 3537633dcf44 ("testsuite: Generate generate_nlmsg when needed") Cc: petr.vorel@gmail.com Signed-off-by: Luca Boccassi Reviewed-by: Petr Vorel Tested-by: Petr Vorel --- testsuite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/Makefile b/testsuite/Makefile index 46b243b0..9b0f1c15 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -53,7 +53,7 @@ clean: testclean distclean: clean echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..; -$(TESTS): testclean +$(TESTS): generate_nlmsg testclean ifeq (,$(IPVERS)) $(error Please run make first) endif From patchwork Sat Dec 15 15:30:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 1013945 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43HBG473qSz9s9h for ; Sun, 16 Dec 2018 02:31:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730444AbeLOPbH (ORCPT ); Sat, 15 Dec 2018 10:31:07 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:55296 "EHLO mail-wm1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730022AbeLOPbG (ORCPT ); Sat, 15 Dec 2018 10:31:06 -0500 Received: by mail-wm1-f54.google.com with SMTP id y139so8285305wmc.5 for ; Sat, 15 Dec 2018 07:31:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vQ9cG/NqZRV6/XFEpS43mltFdUjs7bpBeuhVpAhULwY=; b=Fq7zCBkHf/aBtCwTXuRahfMuEntrzvZAnQNduwuxxU8YdEnNQtwh6Q75L4bOzUDBtY Pk2t2Tdq/c8WEOuX6U9tIdnDPASMA/aMfurPmZ0K0p0KDAe2ymVq8uVYOAse8BpsJuVG KX0ywPplNHBTi207rYXFAYk3NP9viSDP8eb2/2mt7SExYyqwKg1EDlx28hQ11wpWqmcw AQZHwa19j98Dw4AW+d3hxHOGiPct0xHKsRoQIxUj9VxjBZIYrZFS7puNa1bZfoY2gdqO RaQJa7NxbRIGxgId6KxhtLjyVIFvx2k75tSYYU+ZzFwcIiXmWnI/wzk+cIO1rE/CCHhY /Fvg== X-Gm-Message-State: AA+aEWYsMCPFGBNVm6ljMtbx/mYR2+ck2VecUL9LOsVNAzFbJPvqsRmP eTVYlaw20nL23t2YQrxSPdH7rXOY X-Google-Smtp-Source: AFSGD/WFaUPtH4pWm61SZ4aReSIVR4cE3z8nwkbJkOpibr+86uISsppAdElteFkxzrhzFpgpTErEgg== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr6847849wmj.0.1544887863329; Sat, 15 Dec 2018 07:31:03 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:4441:b71:c640:c3f7]) by smtp.gmail.com with ESMTPSA id e142sm17242614wmf.46.2018.12.15.07.31.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Dec 2018 07:31:02 -0800 (PST) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Luca Boccassi Subject: [PATCH iproute2 3/4] tests: delete dummy interface after default route test Date: Sat, 15 Dec 2018 15:30:50 +0000 Message-Id: <20181215153051.13166-3-bluca@debian.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181215153051.13166-1-bluca@debian.org> References: <20181215153051.13166-1-bluca@debian.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Luca Boccassi Reviewed-by: Petr Vorel --- testsuite/tests/ip/route/add_default_route.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testsuite/tests/ip/route/add_default_route.t b/testsuite/tests/ip/route/add_default_route.t index 569ba1f8..c536e35f 100755 --- a/testsuite/tests/ip/route/add_default_route.t +++ b/testsuite/tests/ip/route/add_default_route.t @@ -31,3 +31,5 @@ ts_ip "$0" "Add another IPv6 route dst cafe:babe::/64" -6 route add cafe:babe::/ ts_ip "$0" "Show IPv6 default route" -6 route show default test_on "default via dead:beef::2 dev $DEV" test_lines_count 1 + +ts_ip "$0" "Del $NEW_DEV dummy interface" link del dev $DEV From patchwork Sat Dec 15 15:33:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 1013951 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43HBJv1BfWz9s9h for ; Sun, 16 Dec 2018 02:33:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730737AbeLOPde (ORCPT ); Sat, 15 Dec 2018 10:33:34 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52337 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730419AbeLOPdb (ORCPT ); Sat, 15 Dec 2018 10:33:31 -0500 Received: by mail-wm1-f67.google.com with SMTP id m1so8356013wml.2 for ; Sat, 15 Dec 2018 07:33:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uOVaZlwiAKZsnZvyI1s/d+S2ZOhY85yT6O7zcjIcuJc=; b=DZqzbZEW98RJMrbTGCGNp8Qp9nyCGzfRfb2a3EhsMxwuwSpLg/aGKOTL4OPNtTFGz9 YRuUi90bSv8riKPDfzMdEiDPSQ+o/RbTo84aN079uJFsAZl+X3PSy/XPL/ldZJYZtj3I sAMGwp+9uFzOFvyX1qeuwGkeA4HVi6ahQeniEjITqtP4NOz3i8iZ9zLCGUIXLpx5nrTI 0XtJjj+tsc0yHakOi9rec/9g9jCA947xTsGE0dZqlI7YwhGvLA/vICj/X5rt3DnFw3Zv zyPcf7KsK7c+Nigw+nfEQq42A8pch0IFKosp5OSSNcTsf3O7coqmlffW3WYP0VRzPsdR leRg== X-Gm-Message-State: AA+aEWaA984uy6R0kVR8yOeIZ0f40DpMCd9avbaTqz7d73xw82fypf16 frKgSPN9y8uApt59jqb2ZOY/d2nS X-Google-Smtp-Source: AFSGD/Vmn5yX03FU1Vt94YeLyBOw3+O5xHxk83heuzGcSqFsniQyTacwtjbYB57jbBTn94LViBN+bQ== X-Received: by 2002:a1c:1dc6:: with SMTP id d189mr6314644wmd.112.1544888008355; Sat, 15 Dec 2018 07:33:28 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:4441:b71:c640:c3f7]) by smtp.gmail.com with ESMTPSA id j202sm15655975wmf.15.2018.12.15.07.33.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Dec 2018 07:33:27 -0800 (PST) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Luca Boccassi Subject: [PATCH iproute2 4/4] testsuite: remove gre kmods if the test loads them Date: Sat, 15 Dec 2018 15:33:20 +0000 Message-Id: <20181215153320.14113-1-bluca@debian.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181215153051.13166-1-bluca@debian.org> References: <20181215153051.13166-1-bluca@debian.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The tunnel test leaves behind link devices created by the GRE kernel modules: $ ip -br link ... gre0@NONE DOWN 0.0.0.0 gretap0@NONE DOWN 00:00:00:00:00:00 erspan0@NONE DOWN 00:00:00:00:00:00 ip6tnl0@NONE DOWN :: ip6gre0@NONE DOWN 00:00:00:00: $ lsmod | grep gre ip6_gre 40960 0 ip6_tunnel 40960 1 ip6_gre ip_gre 32768 0 ip_tunnel 24576 1 ip_gre gre 16384 2 ip6_gre,ip_gre Check beforehand if the gre kernel module is loaded, and if not unload them all at the end of the test. This should avoid causing problems if a user is already using GRE for other purposes. Signed-off-by: Luca Boccassi Reviewed-by: Petr Vorel --- testsuite/tests/ip/tunnel/add_tunnel.t | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/testsuite/tests/ip/tunnel/add_tunnel.t b/testsuite/tests/ip/tunnel/add_tunnel.t index 3f5a9d3c..76f8b011 100755 --- a/testsuite/tests/ip/tunnel/add_tunnel.t +++ b/testsuite/tests/ip/tunnel/add_tunnel.t @@ -4,6 +4,15 @@ TUNNEL_NAME="tunnel_test_ip" +# note that checkbashism reports command -v, but dash supports it and it's posix compliant +if command -v lsmod >/dev/null 2>&1 && command -v rmmod >/dev/null 2>&1 +then + KMODS="ip6_gre ip6_tunnel ip_gre ip_tunnel gre" + COUNT_KMODS_BEFORE=$(lsmod | grep -c -e "^ip6_gre" -e "^ip6_tunnel" -e "^ip_gre" -e "^ip_tunnel" -e "^gre") +else + KMODS="" +fi + ts_log "[Testing add/del tunnels]" ts_ip "$0" "Add GRE tunnel over IPv4" tunnel add name $TUNNEL_NAME mode gre local 1.1.1.1 remote 2.2.2.2 @@ -12,3 +21,18 @@ ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode ip6gre local dead:beef::1 remote dead:beef::2 ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME + +if [ -n "$KMODS" ] +then + # unload kernel modules to remove dummy interfaces only if they were not in use beforehand + COUNT_KMODS_AFTER=$(lsmod | grep -c -e "^ip6_gre" -e "^ip6_tunnel" -e "^ip_gre" -e "^ip_tunnel" -e "^gre") + if [ "$COUNT_KMODS_BEFORE" -eq 0 ] && [ "$COUNT_KMODS_AFTER" -gt 0 ] + then + for mod in $KMODS + do + sudo rmmod "$mod" + done + else + ts_log "[gre kernel module was loaded before test, not removing]" + fi +fi