From patchwork Thu Jun 14 12:01:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 929387 X-Patchwork-Delegate: bpf@iogearbox.net 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fICrag2y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4162K14pSVz9s19 for ; Thu, 14 Jun 2018 22:01:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936058AbeFNMBX (ORCPT ); Thu, 14 Jun 2018 08:01:23 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:44543 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935648AbeFNMBW (ORCPT ); Thu, 14 Jun 2018 08:01:22 -0400 Received: by mail-pg0-f44.google.com with SMTP id p21-v6so2821189pgd.11 for ; Thu, 14 Jun 2018 05:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=epqjTNXPghhGrhLHGlxOCswhS0RXSd96FMT3l1j75eY=; b=fICrag2yvc8GLj0SLgRge4KqaaxViIHtEmTjF3fV4x+JsXQIF8P2tIFlfmPcDCG0G+ JOOf099TIwqeN4z/6tfvgxKpPEU/1UlSaCMYGhgKvvCq6EXW7uZEGSDgQgPhcMbWx5XQ 215QUpcsrMK5TXpl/M7YNbsWP2nIOOx+AbHFIPph8ydqDv1kozpSNQ8E4OafZAFdpmKZ Xb4oVXNM39BJi4Vmw4oJUkteeAbvUM+U3rauLGm6NVZb7jqcAO14Yqz4gDOevj7Ja7CI 0KVDAO3FdVLTvDfj+GAZ4Gnz3JN7ci3NzXKPGHYxTMjGM5JFu32aNks8bjPRIeKGcXak B0LA== 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; bh=epqjTNXPghhGrhLHGlxOCswhS0RXSd96FMT3l1j75eY=; b=WcNi1I1MqUBn26dcqtoMxTCKMtjv2vxohlRSqIZ8WZ/n1+V2WpzRTUvA/HsgKgIOHW p+Qo5/qZcvTm5uRDJ+Ar0n12rIhYjvjPTR9U+RtPAYo1q/MAubhMj1bTdfpFdhbGZ//C Vs7y74m8awPuwOKs1sVoN+uw74Ivp3k0LeTswZkUTDoZeRkWiHSw6Q3DNFM/16KYfX5g MG0W4xRRWQLDZFKgSDaQd7+675K9WlKgVdOo5zB/P24Z8Ylv7Xd9XVhF16fq8d7GZ2M1 qdZE3cVNFN9fE3qv54mfS+0lQPDSzgNRJXk+6QhkzVosdxizhrta9GbPg8dwuIzedO4z HZuA== X-Gm-Message-State: APt69E2V2GirQgIVUtW4+TNOCVW78rkjxOyf7hS10PB1vxGcEaKdPsQC Heg2b+ttBHokdT0bCwgA3bERcu6N X-Google-Smtp-Source: ADUXVKJYve4R53sMrKZ/7vJ1YfqSA0ThoXMUwCsLVcr55s5af1Fp+gHtYXM7OC36mYpHAmN+wwBR2Q== X-Received: by 2002:a63:7459:: with SMTP id e25-v6mr2028507pgn.186.1528977681542; Thu, 14 Jun 2018 05:01:21 -0700 (PDT) Received: from ovs.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id r2-v6sm10039762pfa.49.2018.06.14.05.01.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jun 2018 05:01:20 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: anders.roxell@linaro.org Subject: [PATCH bpf-net] selftests/bpf: delete xfrm tunnel when test exits. Date: Thu, 14 Jun 2018 05:01:06 -0700 Message-Id: <1528977666-26477-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make the printting of bpf xfrm tunnel better and cleanup xfrm state and policy when xfrm test finishes. Signed-off-by: William Tu --- tools/testing/selftests/bpf/test_tunnel.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/test_tunnel.sh b/tools/testing/selftests/bpf/test_tunnel.sh index aeb2901f21f4..7b1946b340be 100755 --- a/tools/testing/selftests/bpf/test_tunnel.sh +++ b/tools/testing/selftests/bpf/test_tunnel.sh @@ -608,28 +608,26 @@ setup_xfrm_tunnel() test_xfrm_tunnel() { config_device - #tcpdump -nei veth1 ip & - output=$(mktemp) - cat /sys/kernel/debug/tracing/trace_pipe | tee $output & - setup_xfrm_tunnel + > /sys/kernel/debug/tracing/trace + setup_xfrm_tunnel tc qdisc add dev veth1 clsact tc filter add dev veth1 proto ip ingress bpf da obj test_tunnel_kern.o \ sec xfrm_get_state ip netns exec at_ns0 ping $PING_ARG 10.1.1.200 sleep 1 - grep "reqid 1" $output + grep "reqid 1" /sys/kernel/debug/tracing/trace check_err $? - grep "spi 0x1" $output + grep "spi 0x1" /sys/kernel/debug/tracing/trace check_err $? - grep "remote ip 0xac100164" $output + grep "remote ip 0xac100164" /sys/kernel/debug/tracing/trace check_err $? cleanup if [ $ret -ne 0 ]; then - echo -e ${RED}"FAIL: xfrm tunnel"${NC} - return 1 - fi - echo -e ${GREEN}"PASS: xfrm tunnel"${NC} + echo -e ${RED}"FAIL: xfrm tunnel"${NC} + return 1 + fi + echo -e ${GREEN}"PASS: xfrm tunnel"${NC} } attach_bpf() @@ -657,6 +655,10 @@ cleanup() ip link del ip6geneve11 2> /dev/null ip link del erspan11 2> /dev/null ip link del ip6erspan11 2> /dev/null + ip xfrm policy delete dir out src 10.1.1.200/32 dst 10.1.1.100/32 2> /dev/null + ip xfrm policy delete dir in src 10.1.1.100/32 dst 10.1.1.200/32 2> /dev/null + ip xfrm state delete src 172.16.1.100 dst 172.16.1.200 proto esp spi 0x1 2> /dev/null + ip xfrm state delete src 172.16.1.200 dst 172.16.1.100 proto esp spi 0x2 2> /dev/null } cleanup_exit()