From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EAF721D596 for ; Thu, 8 May 2025 08:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692376; cv=none; b=GIQc+aQcwDxB0gZMBUzy5Fx25ZR7Pd4LJu6HClug/i3pHrUuws8375w01IsW8Rqmal2FEtj44b9JuTSvdDu9g4Sf0lvyBVZBzfsBuA6HopUHR0nIkuHETwMzG1kL3vSFT8MA4CErP62PSLvjAQwq38OAIaPUyCk+Lg8Ne6Px9Ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692376; c=relaxed/simple; bh=hQhbhaO8Zx7OtDKFPagfIJ00HDVkDQ+YZmYffxnythM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R8gUkUSeqF/5WE2OHHKF3L2yzvO2PUfJXoMqAV/m6MtOOYM3NzhkVt4uPiCvORfLLwEyq2iVXDdv4RaAACAF25IWdj9fxXnZt2Bb7zGC9XbgEKF0D5y/jlDIm1Bpr/qs7IDUIDjI+vsxHnV0rzVi+uQ/NpVkIYE3ShW/qgY+l9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bJQAh4v0; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bJQAh4v0" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-736ab1c43c4so786101b3a.1 for ; Thu, 08 May 2025 01:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692374; x=1747297174; darn=lists.linux.dev; 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=CRGCVJPfcsr/8TB6R+WZ33LOVsNeuFhXBOzLDfmrdJU=; b=bJQAh4v0pO4YJ606fFrx7WQqxOEehlKLWAbkORje6qfjWkftyq5UmOI3bojU1lu6zZ mjyWvkp9V70fUfS5/+vA9Ng1/2nNXhW4YHmkmqf6nmmDZTBvlccNzEJDJWkTuPnXyPtD z1BpJVCBIN22VhlOYm+vPwf8f+rBDIGhrApOW1zb5f4ADNoTROaR/izKdiMkNW6IEgXr BkGKgqnRhU7EFsfNU6+kBEzB6pBculrdxogVjKnjY0wpKEelkoZfzlmDAFabjEV0tqkp cxK7b+PTpwzL1zgLScsbo73QKxZ9Nr5RDtwOHDm3hQcr80xXmuJdYAdO2r95h6tO+ghn GJAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692374; x=1747297174; 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=CRGCVJPfcsr/8TB6R+WZ33LOVsNeuFhXBOzLDfmrdJU=; b=WfY//fCZvzn4PQ6/yzJ/Q6xW2Lp+YbqWXzg525xYZYBu/MaIXi/1KAXdflEgpTMhfU z3MIk5Gf3xVc8yodR/DndFbodlMti6jdS4a0nEoIChlKmXFIwMB8XcnPBHpo81Vsm4Qp mbxLAt7Fj4xNgRhNM3z9yqgB8wrJ76v8wsiAFIyrCLH6Grj70K0HMNRWA80i1XURyody zGC1SNKDaNZUWdqNd4H+Q/MKVDjTMeqxpOxl+BQlOu1h6iCUcsLDV+J8K//XG2Rg1Wgb Xb3AMNlp0ZRfU6w/DChp9g4OAbnauslC3OynX61t6UugNIjM5Qxghh6vaaW+fmfFlZ8x Lkiw== X-Forwarded-Encrypted: i=1; AJvYcCVfmzoPllMzEckD99Ur9vJx1poqz0PJPGW9SpneQWrg4hP1C4dKdflhGgDGFYJ46KMrlCLk4g==@lists.linux.dev X-Gm-Message-State: AOJu0YxWzkjwjPrvgPXDRTZY5Vpu00GMjFy+GYEgkkRDxrDGAr968U4z lABQLnHrZFHKUqsut32Cw0C6yn1LemVXvvSarzdgp1dYMtRd2esz X-Gm-Gg: ASbGncsW8aAy4P5aDFEao0x+A5M0todSq3/ojtqIRzDn5bqhbhGsFZ6jY44LBEdXCd4 UDTKqGtdcxihc0g4pFw+kI4Y1mmIKZxyOelGP44veqdoF4kS84YJtPJCp1L47ZpZMIXcUBTRd2P J17Ig9aL6KwMFEhxq/rE3mC0ttvKkEltrg8I4Vxn4X7afwwGk8mChibqqoycJGAPbzDOKrNdRYm gZb/t8/L+dmL+Yt/1+HErVGm2kIY5xkorHxUFMKOaIzR8DCdGa4Lp3iECY9namSFNPkmZClWCcc UkrBfFklwVaTch8/hWHsB40kyXS6T4Z1wzsvZOPUF0uIPdCasxFVsu1t6rH3 X-Google-Smtp-Source: AGHT+IGROvk3mF2EKqBAktUKZTpWeSfkmo/9ElGFt+56fmbYp3o8/RWNmiaSxns3kTtet6H1mg65xQ== X-Received: by 2002:a05:6a20:d524:b0:1f5:8678:183d with SMTP id adf61e73a8af0-2148b81ef71mr9347845637.14.1746692373712; Thu, 08 May 2025 01:19:33 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:19:33 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu Subject: [PATCHv2 net-next 1/6] selftests: net: disable rp_filter after namespace initialization Date: Thu, 8 May 2025 08:19:05 +0000 Message-ID: <20250508081910.84216-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some distributions enable rp_filter globally by default. To ensure consiste= nt behavior across environments, we explicitly disable it in several test case= s. This patch moves the rp_filter disabling logic to immediately after the network namespace is initialized. With this change, individual test cases with creating namespace via setup_ns no longer need to disable rp_filter again. This helps avoid redundancy and ensures test consistency. Signed-off-by: Hangbin Liu Reviewed-by: Simon Horman --- tools/testing/selftests/net/lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index 7e1e56318625..7962da06f816 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -217,6 +217,8 @@ setup_ns() return $ksft_skip fi ip -n "${!ns_name}" link set lo up + ip netns exec "${!ns_name}" sysctl -wq net.ipv4.conf.all.rp_filter=3D0 + ip netns exec "${!ns_name}" sysctl -wq net.ipv4.conf.default.rp_filter= =3D0 ns_list+=3D("${!ns_name}") done NS_LIST+=3D("${ns_list[@]}") --=20 2.46.0 From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC8BC221D85 for ; Thu, 8 May 2025 08:19:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692383; cv=none; b=jgzclmw8hvgMvC4OHN9X5AXOQFS2ItWbMx50nL7Ww94aF0nOtXqJGLENthORvbcUYealnDKo9hp4ASJE8RoIVok9Vk5rG4faRbGJDlpwhE/5pWlKU+63JSSwHDDak+ynaOWV2m7aPnn/6Q1CEdVPEv1ttAW3qW5FUEu7ZppxffA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692383; c=relaxed/simple; bh=NDqRijYzjhs0y/BEUOAKtrmFA7xwhtMvr8QfCvPf9aE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ivIRYBGDVK9Ji03U+nCobfa7Fo9DM4gnqKUB9iDENQa3Rb7y8jnMOAzH4Omv3RgYn4+CAaQRPBlk8+YcUHoAZhJKX/vO7ZDvUZ+2fOx3MH49REAWMzcQo4eXK8Zf3tEMvjcUGC+lzn0WXX/GLdG5DbUQ0pQKzO6PVqjaDXdErVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e1OU/1GY; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e1OU/1GY" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-736c3e7b390so724170b3a.2 for ; Thu, 08 May 2025 01:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692381; x=1747297181; darn=lists.linux.dev; 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=wtfXnYitCXVUTGCdTcTCxeQzg7Q4AmshUJnCjDRlr08=; b=e1OU/1GYnnbR0JLzf1pp4eLdLLRlMQXovyPDD4vURXxl8Kwf/rThdjexPjG+p3Lncy SRFMeSZ8JaZp89M3jO+blJmMPKHXOKCvE7AZn94FzJg5vWSrUWL22Db0LTQWYMu6u949 B7SgwKOxdX/j13qkjPobWXTzC06XIAd2uTFKH7zl+Q31KWd37RKyyAxQQi1rILqmDSjo FHbTVfLDvSiP+eY1gEPDgeVoyqFO4zOeUciFVPoTsB+CsBH40a7ZB5GN9Uhnwl1CATXs JnPxkHO+6h8bHGCDQhkwfVK+ZY4HVuFaO/vfsh3FI8QIdKuDtx/lpL/AmOlcKNiqLvy/ FcIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692381; x=1747297181; 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=wtfXnYitCXVUTGCdTcTCxeQzg7Q4AmshUJnCjDRlr08=; b=xFonbNI928TDOYJCAlkbDZIVrbfuIBluV74VGBjHvKlS6K6zXkaytadKk8oke/446d o5+/eTD+fnG2CcIbpzuxQNHJPMKVkKABtqoieHmXnfmos+fR5/W5+gzYWrmFgIp7XuiT b4akvnX4nHuqWfLalHq97q449sEEoaO3YEZceWhHCYcbPlVTCkS12Rnvxr2ipWLaWMLf OFCRpEO9zPGiaboi1RCz3b+RVp1elPstEFvdMZ3sMNb4oCkBYI/eZdJHvi/PVJdte02S S0IWoFDdv9ouwwZxqiVmuXIU6a9vgW9vPF6dhHbR3ynJ2JIAWI+aRSEiie4JsY3gPfcj 7V5w== X-Forwarded-Encrypted: i=1; AJvYcCX61CyiRDAumcxWdSE/EqVW71WuqFUT/UZQlK/sX+ut0DYNSVSEglFSIsayFLiy1cJ0RJ6WFA==@lists.linux.dev X-Gm-Message-State: AOJu0YzZ86lERrCJ8m4DDFPFk2iUDXX8/ZDalIKO5w0PkG54tWlS0Unk VkXouZQqeuGKKiiR/S+9/fiorQYjTJnZ14KzrBpYfMR3KU2zzu0m X-Gm-Gg: ASbGncszEUyoXF7cIWX+9LQPWuznKlX5K1DsTHQ1W8q1rioyT0zLEOjXBz8PB84Bt5k r1QrvhV1NLJL0rvRN/JjFt/9K6H8p92XuyAhvxFuGwQVXFjqfF28aM2EFKbUAI+nEQ1NH+3M5UM WclU3kQ285NulXyTttSfAZhLW7gkXDYNURvIYkKZRW6OcWi8RYISCKv2zif6ylV7hF+OItvyupV Cxa7lJupYly9DPeYv51jQRzinwr/AYrOBawsbQPd0eEv+Y3+n9DVYZJIMeYwBgmxQK0sXEJJ+4E 2wWopSWUGP4Uh79rO/iyWJnoDRB8RBUzjfSZTEONJt0uW50BN+vDmqYcFSyY X-Google-Smtp-Source: AGHT+IG7pwQ/ZmLNv85y0ipwxtsXxWTqjT9C0wws4LQDnBve2+4o0xCMNV6ghhEGty2Mj/8lwIMs5w== X-Received: by 2002:a05:6a00:ad07:b0:730:75b1:7219 with SMTP id d2e1a72fcca58-740a99cb1ebmr3589916b3a.12.1746692381066; Thu, 08 May 2025 01:19:41 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:19:40 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu Subject: [PATCHv2 net-next 2/6] selftests: net: remove redundant rp_filter configuration Date: Thu, 8 May 2025 08:19:06 +0000 Message-ID: <20250508081910.84216-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The following tests use setup_ns to create a network namespace, which will disables rp_filter immediately after namespace creation. Therefore, it is no longer necessary to disable rp_filter again within these individual tests. Signed-off-by: Hangbin Liu Reviewed-by: Simon Horman --- tools/testing/selftests/net/fib_rule_tests.sh | 3 --- tools/testing/selftests/net/fib_tests.sh | 3 --- tools/testing/selftests/net/icmp_redirect.sh | 2 -- 3 files changed, 8 deletions(-) diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/= selftests/net/fib_rule_tests.sh index c7cea556b416..5fbdd2a0b537 100755 --- a/tools/testing/selftests/net/fib_rule_tests.sh +++ b/tools/testing/selftests/net/fib_rule_tests.sh @@ -516,10 +516,7 @@ fib_rule4_test() fib_rule4_test_match_n_redirect "$match" "$match" "$getnomatch" \ "oif redirect to table" "oif no redirect to table" =20 - # Enable forwarding and disable rp_filter as all the addresses are in - # the same subnet and egress device =3D=3D ingress device. ip netns exec $testns sysctl -qw net.ipv4.ip_forward=3D1 - ip netns exec $testns sysctl -qw net.ipv4.conf.$DEV.rp_filter=3D0 match=3D"from $SRC_IP iif $DEV" getnomatch=3D"from $SRC_IP iif lo" fib_rule4_test_match_n_redirect "$match" "$match" "$getnomatch" \ diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selft= ests/net/fib_tests.sh index c58dc4ac2810..a94b73a53f72 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -2560,9 +2560,6 @@ ipv4_mpath_list_test() run_cmd "ip -n $ns2 route add 203.0.113.0/24 nexthop via 172.16.201.2 nexthop via 172.16.202.2" run_cmd "ip netns exec $ns2 sysctl -qw net.ipv4.fib_multipath_hash_policy= =3D1" - run_cmd "ip netns exec $ns2 sysctl -qw net.ipv4.conf.veth2.rp_filter=3D0" - run_cmd "ip netns exec $ns2 sysctl -qw net.ipv4.conf.all.rp_filter=3D0" - run_cmd "ip netns exec $ns2 sysctl -qw net.ipv4.conf.default.rp_filter=3D= 0" set +e =20 local dmac=3D$(ip -n $ns2 -j link show dev veth2 | jq -r '.[]["address"]') diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/s= elftests/net/icmp_redirect.sh index d6f0e449c029..b13c89a99ecb 100755 --- a/tools/testing/selftests/net/icmp_redirect.sh +++ b/tools/testing/selftests/net/icmp_redirect.sh @@ -178,8 +178,6 @@ setup() else ip netns exec $ns sysctl -q -w net.ipv4.ip_forward=3D1 ip netns exec $ns sysctl -q -w net.ipv4.conf.all.send_redirects=3D1 - ip netns exec $ns sysctl -q -w net.ipv4.conf.default.rp_filter=3D0 - ip netns exec $ns sysctl -q -w net.ipv4.conf.all.rp_filter=3D0 =20 ip netns exec $ns sysctl -q -w net.ipv6.conf.all.forwarding=3D1 ip netns exec $ns sysctl -q -w net.ipv6.route.mtu_expires=3D10 --=20 2.46.0 From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECA9E2288CB for ; Thu, 8 May 2025 08:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692390; cv=none; b=QCf+LYTmRvHY+bClJS5vpg4oxFoQSiAAEC22FqfDICzPkje46J1EwZUh4vkn8Aqk8A+BpkrqgkreH6G04AqM+Az7VhjU/5oDEHl7b1gM0uH3T2m4p8LG+gDFYLwy3/9FnC851JT2FgEVG6NV2EuHeNASAFzhkm8YwSUaUkSdldo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692390; c=relaxed/simple; bh=fYBZ3e80lB7pnNPogmHpxRb6JLRnBdbF4Ja5yF5QpuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uIchmgnvWzOOGnQkYf0Ji4N/HQJSxdcyWQxDAT5ew4wR6e7qXUv7Bfn06NPbQCajFMHGw1fCHlzejrjnIjyAZY5MGjO2vq9tY9dmywBPZtjtbBwkfCAdpEaJNBqJ6Npjz5Y6yIi+oISMLyPm4Yhz2BWL9jcn7jK8fK/j1fqJSL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P5r02qAT; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P5r02qAT" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-740b3a18e26so229217b3a.2 for ; Thu, 08 May 2025 01:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692388; x=1747297188; darn=lists.linux.dev; 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=OYrEDWYc5BP3GcwX3PUi68NFmiVIngMEPgSuDqL8ai8=; b=P5r02qATFTmcCdhAuLgc8MtkiN8/B35jf7QDrU3M/HBk6/aZCJ26bzocvp4UKIb1df qdg3eK14iOJAevM1TFdLVjlIUOf2au8Uw2O4g4hypg957ngvWJZf8aZbnB7VlgEgyH87 K+M+MxXPHXaeFnQYwc73HWPYqhUr9eRsp/pMD3gW0cZOwV3cA7NJzoi28GdaEC7gHNw7 H7ulyRLTIFWQLEqawtOrAfT8Md5MxoUPCD9RXs1D435me8Mg5PjMdA7YLsPRMNdlKxjj UL+IVQJ0RuW7O1ajb/+W9iez+rKR5jEr0NZ7y8dznzxLZ4mVB7D6k05v1icoCLgNRpj/ K96g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692388; x=1747297188; 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=OYrEDWYc5BP3GcwX3PUi68NFmiVIngMEPgSuDqL8ai8=; b=fB8ZaW2rJ6EiZvwt8ZVB+M538bkNUWl0ceUrdxnPT9q0AbbWJazvW4oT5fKqv4/tfm AXv0/V6jA4Y0tTd7/G8r2sp+tGm4+Nfi2yf6AziRr6KHI/EbeMnX9X+piTfYesYfQ0Dt o35ydN/rqGmAjIgnyUik5+DG9cJGUi7v3LnKJmQL12fYSXUOIPGIb19J1azu6LLvBOM5 LpXgqI/rc0B1lJ5cU9dmshH0FVmrusL17jetPHZ9fTepiZXFlwhrJx3zxSbQc+84CVsA nD789RWwBFhKI7XGSkW0/RriW6+RrLbbIHqaiedG5V1S7HKkOX1PZt28e8KdZYi+fbBK hMPA== X-Forwarded-Encrypted: i=1; AJvYcCUW7Pg2FHUO9kSE6u/0JNmkqM0000FFYKex47FU9Gks1z6VHb6cO2GBIZ4osZB35JBVV3b9Ng==@lists.linux.dev X-Gm-Message-State: AOJu0YzcjIph2ps97FEgSENNH9BG5/7dWjThctzFYulxLF3EvGzcSOS4 6OdGKYu1d59BZzFbjjoRFHY5xDGU/gd87xH3Ecd3u04B2D+uu8MC X-Gm-Gg: ASbGncsSuO6zznZnP/6cj8PVdGo7uJqmElN8nlJAkjzEXb7flPpT/IhwFOJjMQUNdvw 1Axgcjg/hhvT6wdQ3g2QGpcpQuvFb6eRrGUZkwRGyr9KVq63X7W6QKZcFNrpLOQnItJkk5MV2h7 OFP9hiM6waVGxop5hbePGiuMxXBPJ7cFivJidS5CGO9Vcx5k6/mgkSyZAiVhXNY40Tq9PUIiGK3 381anpXceUXHSPOhMFnhkoSRNOr4MHjjKOt9EqLPNsXLUgqOulUSGXT/LOek00Lx6P7NveNc9/i scQg/ZtzKRCwsIgzemisPBwriv/ZR/7Nl0pK4FJgad/1C3/zNdQYrz8Kz36N X-Google-Smtp-Source: AGHT+IHd7oaveLaD1WpCZJtWDo3JJSOim6lGQAp0CwnAyt1bRUpsQR18gKlfMWUpXmh87Fxwt7cV4A== X-Received: by 2002:a05:6a20:cf90:b0:1f5:619a:8f75 with SMTP id adf61e73a8af0-2159af284d6mr3334817637.2.1746692388068; Thu, 08 May 2025 01:19:48 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:19:47 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu Subject: [PATCHv2 net-next 3/6] selftests: net: use setup_ns for bareudp testing Date: Thu, 8 May 2025 08:19:07 +0000 Message-ID: <20250508081910.84216-4-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Switch bareudp testing to use setup_ns, which sets up rp_filter by default. This allows us to remove the manual rp_filter configuration from the script. Additionally, since setup_ns handles namespace naming and cleanup, we no longer need a separate cleanup function. We also move the trap setup earlier in the script, before the test setup begins. Signed-off-by: Hangbin Liu Reviewed-by: Simon Horman --- tools/testing/selftests/net/bareudp.sh | 49 ++++---------------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/net/bareudp.sh b/tools/testing/selftes= ts/net/bareudp.sh index f366cadbc5e8..4046131e7888 100755 --- a/tools/testing/selftests/net/bareudp.sh +++ b/tools/testing/selftests/net/bareudp.sh @@ -106,26 +106,16 @@ # | | # +-----------------------------------------------------------------------+ =20 +. ./lib.sh + ERR=3D4 # Return 4 by default, which is the SKIP code for kselftest PING6=3D"ping" PAUSE_ON_FAIL=3D"no" =20 -readonly NS0=3D$(mktemp -u ns0-XXXXXXXX) -readonly NS1=3D$(mktemp -u ns1-XXXXXXXX) -readonly NS2=3D$(mktemp -u ns2-XXXXXXXX) -readonly NS3=3D$(mktemp -u ns3-XXXXXXXX) - # Exit the script after having removed the network namespaces it created -# -# Parameters: -# -# * The list of network namespaces to delete before exiting. -# exit_cleanup() { - for ns in "$@"; do - ip netns delete "${ns}" 2>/dev/null || true - done + cleanup_all_ns =20 if [ "${ERR}" -eq 4 ]; then echo "Error: Setting up the testing environment failed." >&2 @@ -140,17 +130,7 @@ exit_cleanup() # namespaces created by this script are deleted. create_namespaces() { - ip netns add "${NS0}" || exit_cleanup - ip netns add "${NS1}" || exit_cleanup "${NS0}" - ip netns add "${NS2}" || exit_cleanup "${NS0}" "${NS1}" - ip netns add "${NS3}" || exit_cleanup "${NS0}" "${NS1}" "${NS2}" -} - -# The trap function handler -# -exit_cleanup_all() -{ - exit_cleanup "${NS0}" "${NS1}" "${NS2}" "${NS3}" + setup_ns NS0 NS1 NS2 NS3 || exit_cleanup } =20 # Configure a network interface using a host route @@ -188,10 +168,6 @@ iface_config() # setup_underlay() { - for ns in "${NS0}" "${NS1}" "${NS2}" "${NS3}"; do - ip -netns "${ns}" link set dev lo up - done; - ip link add name veth01 netns "${NS0}" type veth peer name veth10 netns "= ${NS1}" ip link add name veth12 netns "${NS1}" type veth peer name veth21 netns "= ${NS2}" ip link add name veth23 netns "${NS2}" type veth peer name veth32 netns "= ${NS3}" @@ -234,14 +210,6 @@ setup_overlay_ipv4() ip netns exec "${NS2}" sysctl -qw net.ipv4.ip_forward=3D1 ip -netns "${NS1}" route add 192.0.2.100/32 via 192.0.2.10 ip -netns "${NS2}" route add 192.0.2.103/32 via 192.0.2.33 - - # The intermediate namespaces don't have routes for the reverse path, - # as it will be handled by tc. So we need to ensure that rp_filter is - # not going to block the traffic. - ip netns exec "${NS1}" sysctl -qw net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${NS2}" sysctl -qw net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${NS1}" sysctl -qw net.ipv4.conf.default.rp_filter=3D0 - ip netns exec "${NS2}" sysctl -qw net.ipv4.conf.default.rp_filter=3D0 } =20 setup_overlay_ipv6() @@ -521,13 +489,10 @@ done =20 check_features =20 -# Create namespaces before setting up the exit trap. -# Otherwise, exit_cleanup_all() could delete namespaces that were not crea= ted -# by this script. -create_namespaces - set -e -trap exit_cleanup_all EXIT +trap exit_cleanup EXIT + +create_namespaces =20 setup_underlay setup_overlay_ipv4 --=20 2.46.0 From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60160224AF9 for ; Thu, 8 May 2025 08:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692398; cv=none; b=WW3DlUlx44/eEYNYn8dU57VvGlxNblxRJ2VC2CZ2nnQGB2c2KeQsCn6mKFfQp71mMqJG4BXJ1CAki2FCMZNGHWHJLJyl0aXWeq+X76f/5KAo7kiItSra1AM1MI/UzOEow4YLeSQoX4xD4Sat39RmnABAZDNTEOJtY5Jddq3L/BI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692398; c=relaxed/simple; bh=UHi4pSssyxHwV8SAOnrVsdmL9ZKzjQmlV3VoaEBVGsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XdXtDa0JHyh82SUNR2uJQtQPnINpTGwBM9SKQ4kTx71mJYC/wEgziadqbNAD/X6Y0DvDjBDHl2aWgYrKzowKXC5YGonTO8gZMpk0+iTSbyQMvY3B8Ao8KZW3Ax9WjDprz4Asczu4aL0ypNfTYy7ZKXeHOBSyinrONMtMzcCZRdE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gzmpa2Xp; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gzmpa2Xp" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-739525d4e12so712795b3a.3 for ; Thu, 08 May 2025 01:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692396; x=1747297196; darn=lists.linux.dev; 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=YoPedsvjH0YCpVS881iJsXXPZ3MfgM8U/YaVLnUVz00=; b=gzmpa2Xp/o7Sliu6x0OxRzJVyK0VcJH929aavNDZdmJLSkXI69/Ac1CirZlTtgsfAv V932vDsM6bglJB6K8fy6wbCcbFTf4NtQXVXkmrhaIyLjz7sK6Z7IfZcPj/ivQ0Q9oDDn l3VpiIyWMQdn2Okf8JVpn2MKWTW8Z8RNRLThhQEQkwpCaFYLkDG+Ht0ZiGZEoKKakJN9 5jrBd7if/gwuYxzg8Oqj/oCMxpJ2J5ODzIWFzzDpJItDkHEsmie7vdTNEJp1cimL3Vk/ i2+MX82Dl5a/uDHAzbR0Oc+/bUGwAeW7AFoPiXd1g6uJdxt5AWCC26Po3FzqBiqOGx3P X5SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692396; x=1747297196; 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=YoPedsvjH0YCpVS881iJsXXPZ3MfgM8U/YaVLnUVz00=; b=MD0xPAsXKP1NzeFSavCVwQXGg1BTRTa770gWFf+QXWMFmR8U6v4JzJI6UPS9RyPYZO GIlHK6JAD1PW1bnvG77QBpNwDRdjan1T+5yowi71vZmGJBsUWaPwOZM4KNjyNfMpIvyz kNBweMZExJ4if1O0q4PqU7sNNY7y4QjfNeoKJ+mMelGsgVuQ3se9S5nesUozmX4qXp9P YlNFZO+hZRxHcaDsuikJYaJ+qwOZT2e0OB543XpywODZ3g9Jl6x5YV8jF3rB1cI+bWyb 8tI2F1yZ9R52pozSxwVTo5LtGkZngeAWPZ0j1d++tJUYpbn2z5Z0siuQCMQlL6USeoul P8MQ== X-Forwarded-Encrypted: i=1; AJvYcCWtC4e92e1Pf0gbZotXC20y7K1O5zrrgnHJftBV4IYZwdxGqkFib5IMP06u09fBgvh9HGVeeg==@lists.linux.dev X-Gm-Message-State: AOJu0Yx5zwJ749ocS9Z2objUqOGAkRt3sYLbZLaoYX75P29u5VnHP3Eq g1xECnw7Lc1dLkIbtNM/Ff0s9KmY6bHMTEdhZ9L11b3+l9Fwe/p4 X-Gm-Gg: ASbGncvibAyK/QGNtquRrBzDgQQwdSC/rR8lpHJ6YP+VawRFMO3CfMYFy0RHlcjNgbK Qul2c2JjXYti/U9OT16yJjqJUIIYxfGivkTx5x5cezsVF1KfxGK4SSt6WPUxgoaeWYiDJNlP5P5 e4eRuCF4clNp1HKgWWq5MZqTNPd0SHE1D4JKbT6/ft6gf5G6bm3iyUlI7nexyl/yp8w0TF/XAV8 JR5jq9HTWfk0MdLdsdfqG2cw8q0IJ49xxhbojW6pZmlKDIdLGAaGL5Xr+AY8AzkKaYaeWZCP4Z5 KT6xtdJiDUyzXu/TaLpDpbDbHO6stw8w0A6DL62xR1qAC2OGhPbI9Yhq0CwbO/x0ehxMlio= X-Google-Smtp-Source: AGHT+IFlVtEhEHpT31WDk+FkzPbeFv8fb2OPmmMWdNSgPe5la+Ehsx1YtDTmSdp3Q0sP+8wJXwYcvQ== X-Received: by 2002:a05:6a20:cf8a:b0:1f5:6d00:ba05 with SMTP id adf61e73a8af0-2148d42ccb3mr10097555637.38.1746692395603; Thu, 08 May 2025 01:19:55 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:19:55 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu Subject: [PATCHv2 net-next 4/6] selftests: net: use setup_ns for SRv6 tests and remove rp_filter configuration Date: Thu, 8 May 2025 08:19:08 +0000 Message-ID: <20250508081910.84216-5-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some SRv6 tests manually set up network namespaces and disable rp_filter. Since the setup_ns library function already handles rp_filter configuration, convert these SRv6 tests to use setup_ns and remove the redundant rp_filter settings. Signed-off-by: Hangbin Liu Acked-by: Andrea Mayer --- .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 5 -- .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 5 -- .../net/srv6_end_next_csid_l3vpn_test.sh | 77 ++++------------- .../net/srv6_end_x_next_csid_l3vpn_test.sh | 83 +++++-------------- .../net/srv6_hencap_red_l3vpn_test.sh | 74 ++++------------- .../net/srv6_hl2encap_red_l2vpn_test.sh | 83 +++++-------------- 6 files changed, 76 insertions(+), 251 deletions(-) diff --git a/tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh b/tool= s/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh index 02d617040793..a5e959a080bb 100755 --- a/tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh +++ b/tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh @@ -285,11 +285,6 @@ setup_hs() ip netns exec ${hsname} sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec ${hsname} sysctl -wq net.ipv6.conf.default.accept_dad=3D0 =20 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.default.rp_filter=3D0 - ip -netns ${hsname} link add veth0 type veth peer name ${rtveth} ip -netns ${hsname} link set ${rtveth} netns ${rtname} ip -netns ${hsname} addr add ${IPv6_HS_NETWORK}::${hid}/64 dev veth0 nodad diff --git a/tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh b/tools= /testing/selftests/net/srv6_end_dt4_l3vpn_test.sh index 79fb81e63c59..a649dba3cb77 100755 --- a/tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh +++ b/tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh @@ -250,11 +250,6 @@ setup_hs() eval local rtname=3D\${rt_${rid}} local rtveth=3Dveth-t${tid} =20 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.default.rp_filter=3D0 - ip -netns ${hsname} link add veth0 type veth peer name ${rtveth} ip -netns ${hsname} link set ${rtveth} netns ${rtname} ip -netns ${hsname} addr add ${IPv4_HS_NETWORK}.${hid}/24 dev veth0 diff --git a/tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh b= /tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh index 87e414cc417c..ba730655a7bf 100755 --- a/tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh +++ b/tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh @@ -245,10 +245,8 @@ # that adopted in the use cases already examined (of course, it is necessa= ry to # consider the different SIDs/C-SIDs). =20 -# Kselftest framework requirement - SKIP code is 4. -readonly ksft_skip=3D4 +source lib.sh =20 -readonly RDMSUFF=3D"$(mktemp -u XXXXXXXX)" readonly DUMMY_DEVNAME=3D"dum0" readonly VRF_TID=3D100 readonly VRF_DEVNAME=3D"vrf-${VRF_TID}" @@ -376,32 +374,18 @@ test_command_or_ksft_skip() fi } =20 -get_nodename() -{ - local name=3D"$1" - - echo "${name}-${RDMSUFF}" -} - get_rtname() { local rtid=3D"$1" =20 - get_nodename "rt-${rtid}" + echo "rt_${rtid}" } =20 get_hsname() { local hsid=3D"$1" =20 - get_nodename "hs-${hsid}" -} - -__create_namespace() -{ - local name=3D"$1" - - ip netns add "${name}" + echo "hs_${hsid}" } =20 create_router() @@ -410,8 +394,7 @@ create_router() local nsname =20 nsname=3D"$(get_rtname "${rtid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 create_host() @@ -420,28 +403,12 @@ create_host() local nsname =20 nsname=3D"$(get_hsname "${hsid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 cleanup() { - local nsname - local i - - # destroy routers - for i in ${ROUTERS}; do - nsname=3D"$(get_rtname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - - # destroy hosts - for i in ${HOSTS}; do - nsname=3D"$(get_hsname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done + cleanup_all_ns =20 # check whether the setup phase was completed successfully or not. In # case of an error during the setup phase of the testing environment, @@ -462,10 +429,10 @@ add_link_rt_pairs() local nsname local neigh_nsname =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do - neigh_nsname=3D"$(get_rtname "${neigh}")" + eval neigh_nsname=3D\${$(get_rtname "${neigh}")} =20 ip link add "veth-rt-${rt}-${neigh}" netns "${nsname}" \ type veth peer name "veth-rt-${neigh}-${rt}" \ @@ -497,7 +464,7 @@ setup_rt_networking() local devname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -518,9 +485,6 @@ setup_rt_networking() ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.forwarding=3D1 - - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.default.rp_filter=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv4.ip_forward=3D1 } =20 @@ -596,7 +560,7 @@ setup_rt_local_sids() local lcnode_func_prefix local lcblock_prefix =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -668,8 +632,8 @@ __setup_l3vpn() local rtsrc_nsname local rtdst_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${src}")" - rtdst_nsname=3D"$(get_rtname "${dst}")" + eval rtsrc_nsname=3D\${$(get_rtname "${src}")} + eval rtdst_nsname=3D\${$(get_rtname "${dst}")} =20 container=3D"${LCBLOCK_ADDR}" =20 @@ -744,8 +708,8 @@ setup_hs() local hsname local rtname =20 - hsname=3D"$(get_hsname "${hs}")" - rtname=3D"$(get_rtname "${rt}")" + eval hsname=3D\${$(get_hsname "${hs}")} + eval rtname=3D\${$(get_rtname "${rt}")} =20 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 @@ -791,11 +755,6 @@ setup_hs() ip netns exec "${rtname}" \ sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".proxy_arp=3D1 =20 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec "${rtname}" \ - sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".rp_filter=3D0 - ip netns exec "${rtname}" sh -c "echo 1 > /proc/sys/net/vrf/strict_mode" } =20 @@ -880,7 +839,7 @@ check_rt_connectivity() local prefix local rtsrc_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${rtsrc}")" + eval rtsrc_nsname=3D\${$(get_rtname "${rtsrc}")} =20 prefix=3D"$(get_network_prefix "${rtsrc}" "${rtdst}")" =20 @@ -903,7 +862,7 @@ check_hs_ipv6_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv6_HS_NETWORK}::${hsdst}" >/dev/null 2>&1 @@ -915,7 +874,7 @@ check_hs_ipv4_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv4_HS_NETWORK}.${hsdst}" >/dev/null 2>&1 @@ -1025,7 +984,7 @@ rt_x_nextcsid_end_behavior_test() local nsname local ret =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 __nextcsid_end_behavior_test "${nsname}" "add" "${blen}" "${flen}" ret=3D"$?" diff --git a/tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh= b/tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh index c79cb8ede17f..4b86040c58c6 100755 --- a/tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh +++ b/tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh @@ -287,10 +287,8 @@ # packet using the SRv6 End.DT46 behavior (associated with the SID fcff:1:= :d46) # and sends it to the host hs-1. =20 -# Kselftest framework requirement - SKIP code is 4. -readonly ksft_skip=3D4 +source lib.sh =20 -readonly RDMSUFF=3D"$(mktemp -u XXXXXXXX)" readonly DUMMY_DEVNAME=3D"dum0" readonly VRF_TID=3D100 readonly VRF_DEVNAME=3D"vrf-${VRF_TID}" @@ -418,32 +416,18 @@ test_command_or_ksft_skip() fi } =20 -get_nodename() -{ - local name=3D"$1" - - echo "${name}-${RDMSUFF}" -} - get_rtname() { local rtid=3D"$1" =20 - get_nodename "rt-${rtid}" + echo "rt_${rtid}" } =20 get_hsname() { local hsid=3D"$1" =20 - get_nodename "hs-${hsid}" -} - -__create_namespace() -{ - local name=3D"$1" - - ip netns add "${name}" + echo "hs_${hsid}" } =20 create_router() @@ -452,15 +436,12 @@ create_router() local nsname =20 nsname=3D"$(get_rtname "${rtid}")" + setup_ns "${nsname}" =20 - __create_namespace "${nsname}" - + eval nsname=3D\${$(get_rtname "${rtid}")} ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.forwarding=3D1 - - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.default.rp_filter=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv4.ip_forward=3D1 } =20 @@ -470,29 +451,12 @@ create_host() local nsname =20 nsname=3D"$(get_hsname "${hsid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 cleanup() { - local nsname - local i - - # destroy routers - for i in ${ROUTERS}; do - nsname=3D"$(get_rtname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - - # destroy hosts - for i in ${HOSTS}; do - nsname=3D"$(get_hsname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - + cleanup_all_ns # check whether the setup phase was completed successfully or not. In # case of an error during the setup phase of the testing environment, # the selftest is considered as "skipped". @@ -512,10 +476,10 @@ add_link_rt_pairs() local nsname local neigh_nsname =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do - neigh_nsname=3D"$(get_rtname "${neigh}")" + eval neigh_nsname=3D\${$(get_rtname "${neigh}")} =20 ip link add "veth-rt-${rt}-${neigh}" netns "${nsname}" \ type veth peer name "veth-rt-${neigh}-${rt}" \ @@ -547,7 +511,7 @@ setup_rt_networking() local devname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -631,7 +595,7 @@ set_end_x_nextcsid() local rt=3D"$1" local adj=3D"$2" =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} net_prefix=3D"$(get_network_prefix "${rt}" "${adj}")" lcnode_func_prefix=3D"$(build_lcnode_func_prefix "${rt}")" =20 @@ -650,7 +614,7 @@ set_underlay_sids_reachability() local rt=3D"$1" local rt_neighs=3D"$2" =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -685,7 +649,7 @@ setup_rt_local_sids() local lcnode_func_prefix local lcblock_prefix =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 set_underlay_sids_reachability "${rt}" "${rt_neighs}" =20 @@ -728,8 +692,8 @@ __setup_l3vpn() local rtsrc_nsname local rtdst_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${src}")" - rtdst_nsname=3D"$(get_rtname "${dst}")" + eval rtsrc_nsname=3D\${$(get_rtname "${src}")} + eval rtdst_nsname=3D\${$(get_rtname "${dst}")} =20 container=3D"${LCBLOCK_ADDR}" =20 @@ -804,8 +768,8 @@ setup_hs() local hsname local rtname =20 - hsname=3D"$(get_hsname "${hs}")" - rtname=3D"$(get_rtname "${rt}")" + eval hsname=3D\${$(get_hsname "${hs}")} + eval rtname=3D\${$(get_rtname "${rt}")} =20 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 @@ -851,11 +815,6 @@ setup_hs() ip netns exec "${rtname}" \ sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".proxy_arp=3D1 =20 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec "${rtname}" \ - sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".rp_filter=3D0 - ip netns exec "${rtname}" sh -c "echo 1 > /proc/sys/net/vrf/strict_mode" } =20 @@ -947,7 +906,7 @@ check_rt_connectivity() local prefix local rtsrc_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${rtsrc}")" + eval rtsrc_nsname=3D\${$(get_rtname "${rtsrc}")} =20 prefix=3D"$(get_network_prefix "${rtsrc}" "${rtdst}")" =20 @@ -970,7 +929,7 @@ check_hs_ipv6_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv6_HS_NETWORK}::${hsdst}" >/dev/null 2>&1 @@ -982,7 +941,7 @@ check_hs_ipv4_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv4_HS_NETWORK}.${hsdst}" >/dev/null 2>&1 @@ -1093,7 +1052,7 @@ rt_x_nextcsid_end_x_behavior_test() local nsname local ret =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 __nextcsid_end_x_behavior_test "${nsname}" "add" "${blen}" "${flen}" ret=3D"$?" diff --git a/tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh b/to= ols/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh index 28a775654b92..3efce1718c5f 100755 --- a/tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh +++ b/tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh @@ -166,10 +166,8 @@ # hs-4->hs-3 |IPv6 DA=3Dfcff:1::e|SRH SIDs=3Dfcff:3::d46|IPv6|...| (i.d) # =20 -# Kselftest framework requirement - SKIP code is 4. -readonly ksft_skip=3D4 +source lib.sh =20 -readonly RDMSUFF=3D"$(mktemp -u XXXXXXXX)" readonly VRF_TID=3D100 readonly VRF_DEVNAME=3D"vrf-${VRF_TID}" readonly RT2HS_DEVNAME=3D"veth-t${VRF_TID}" @@ -248,32 +246,18 @@ test_command_or_ksft_skip() fi } =20 -get_nodename() -{ - local name=3D"$1" - - echo "${name}-${RDMSUFF}" -} - get_rtname() { local rtid=3D"$1" =20 - get_nodename "rt-${rtid}" + echo "rt_${rtid}" } =20 get_hsname() { local hsid=3D"$1" =20 - get_nodename "hs-${hsid}" -} - -__create_namespace() -{ - local name=3D"$1" - - ip netns add "${name}" + echo "hs_${hsid}" } =20 create_router() @@ -282,8 +266,7 @@ create_router() local nsname =20 nsname=3D"$(get_rtname "${rtid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 create_host() @@ -292,29 +275,12 @@ create_host() local nsname =20 nsname=3D"$(get_hsname "${hsid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 cleanup() { - local nsname - local i - - # destroy routers - for i in ${ROUTERS}; do - nsname=3D"$(get_rtname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - - # destroy hosts - for i in ${HOSTS}; do - nsname=3D"$(get_hsname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - + cleanup_all_ns # check whether the setup phase was completed successfully or not. In # case of an error during the setup phase of the testing environment, # the selftest is considered as "skipped". @@ -334,10 +300,10 @@ add_link_rt_pairs() local nsname local neigh_nsname =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do - neigh_nsname=3D"$(get_rtname "${neigh}")" + eval neigh_nsname=3D\${$(get_rtname "${neigh}")} =20 ip link add "veth-rt-${rt}-${neigh}" netns "${nsname}" \ type veth peer name "veth-rt-${neigh}-${rt}" \ @@ -369,7 +335,7 @@ setup_rt_networking() local devname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -387,9 +353,6 @@ setup_rt_networking() ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.forwarding=3D1 - - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.default.rp_filter=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv4.ip_forward=3D1 } =20 @@ -403,7 +366,7 @@ setup_rt_local_sids() local nsname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -469,7 +432,7 @@ __setup_rt_policy() local policy=3D'' local n =20 - nsname=3D"$(get_rtname "${encap_rt}")" + eval nsname=3D\${$(get_rtname "${encap_rt}")} =20 for n in ${end_rts}; do policy=3D"${policy}${VPN_LOCATOR_SERVICE}:${n}::${END_FUNC}," @@ -516,8 +479,8 @@ setup_hs() local hsname local rtname =20 - hsname=3D"$(get_hsname "${hs}")" - rtname=3D"$(get_rtname "${rt}")" + eval hsname=3D\${$(get_hsname "${hs}")} + eval rtname=3D\${$(get_rtname "${rt}")} =20 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 @@ -555,11 +518,6 @@ setup_hs() ip netns exec "${rtname}" \ sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".proxy_arp=3D1 =20 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec "${rtname}" \ - sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".rp_filter=3D0 - ip netns exec "${rtname}" sh -c "echo 1 > /proc/sys/net/vrf/strict_mode" } =20 @@ -656,7 +614,7 @@ check_rt_connectivity() local prefix local rtsrc_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${rtsrc}")" + eval rtsrc_nsname=3D\${$(get_rtname "${rtsrc}")} =20 prefix=3D"$(get_network_prefix "${rtsrc}" "${rtdst}")" =20 @@ -679,7 +637,7 @@ check_hs_ipv6_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv6_HS_NETWORK}::${hsdst}" >/dev/null 2>&1 @@ -691,7 +649,7 @@ check_hs_ipv4_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv4_HS_NETWORK}.${hsdst}" >/dev/null 2>&1 diff --git a/tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh b/= tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh index cb4177d41b21..cabc70538ffe 100755 --- a/tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh +++ b/tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh @@ -116,10 +116,8 @@ # hs-2->hs-1 |IPv6 DA=3Dfcff:4::e|SRH SIDs=3Dfcff:3::e,fcff:1::d2|eth|...= | (i.b) # =20 -# Kselftest framework requirement - SKIP code is 4. -readonly ksft_skip=3D4 +source lib.sh =20 -readonly RDMSUFF=3D"$(mktemp -u XXXXXXXX)" readonly DUMMY_DEVNAME=3D"dum0" readonly RT2HS_DEVNAME=3D"veth-hs" readonly HS_VETH_NAME=3D"veth0" @@ -199,32 +197,18 @@ test_command_or_ksft_skip() fi } =20 -get_nodename() -{ - local name=3D"$1" - - echo "${name}-${RDMSUFF}" -} - get_rtname() { local rtid=3D"$1" =20 - get_nodename "rt-${rtid}" + echo "rt_${rtid}" } =20 get_hsname() { local hsid=3D"$1" =20 - get_nodename "hs-${hsid}" -} - -__create_namespace() -{ - local name=3D"$1" - - ip netns add "${name}" + echo "hs_${hsid}" } =20 create_router() @@ -233,8 +217,7 @@ create_router() local nsname =20 nsname=3D"$(get_rtname "${rtid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 create_host() @@ -243,28 +226,12 @@ create_host() local nsname =20 nsname=3D"$(get_hsname "${hsid}")" - - __create_namespace "${nsname}" + setup_ns "${nsname}" } =20 cleanup() { - local nsname - local i - - # destroy routers - for i in ${ROUTERS}; do - nsname=3D"$(get_rtname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done - - # destroy hosts - for i in ${HOSTS}; do - nsname=3D"$(get_hsname "${i}")" - - ip netns del "${nsname}" &>/dev/null || true - done + cleanup_all_ns =20 # check whether the setup phase was completed successfully or not. In # case of an error during the setup phase of the testing environment, @@ -285,10 +252,10 @@ add_link_rt_pairs() local nsname local neigh_nsname =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do - neigh_nsname=3D"$(get_rtname "${neigh}")" + eval neigh_nsname=3D\${$(get_rtname "${neigh}")} =20 ip link add "veth-rt-${rt}-${neigh}" netns "${nsname}" \ type veth peer name "veth-rt-${neigh}-${rt}" \ @@ -320,7 +287,7 @@ setup_rt_networking() local devname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -341,9 +308,6 @@ setup_rt_networking() ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv6.conf.all.forwarding=3D1 - - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${nsname}" sysctl -wq net.ipv4.conf.default.rp_filter=3D0 ip netns exec "${nsname}" sysctl -wq net.ipv4.ip_forward=3D1 } =20 @@ -357,7 +321,7 @@ setup_rt_local_sids() local nsname local neigh =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 for neigh in ${rt_neighs}; do devname=3D"veth-rt-${rt}-${neigh}" @@ -407,7 +371,7 @@ __setup_rt_policy() local policy=3D'' local n =20 - nsname=3D"$(get_rtname "${encap_rt}")" + eval nsname=3D\${$(get_rtname "${encap_rt}")} =20 for n in ${end_rts}; do policy=3D"${policy}${VPN_LOCATOR_SERVICE}:${n}::${END_FUNC}," @@ -446,7 +410,7 @@ setup_decap() local rt=3D"$1" local nsname =20 - nsname=3D"$(get_rtname "${rt}")" + eval nsname=3D\${$(get_rtname "${rt}")} =20 # Local End.DX2 behavior ip -netns "${nsname}" -6 route \ @@ -463,8 +427,8 @@ setup_hs() local hsname local rtname =20 - hsname=3D"$(get_hsname "${hs}")" - rtname=3D"$(get_rtname "${rt}")" + eval hsname=3D\${$(get_hsname "${hs}")} + eval rtname=3D\${$(get_rtname "${rt}")} =20 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.all.accept_dad=3D0 ip netns exec "${hsname}" sysctl -wq net.ipv6.conf.default.accept_dad=3D0 @@ -486,11 +450,6 @@ setup_hs() add "${IPv4_HS_NETWORK}.254/24" dev "${RT2HS_DEVNAME}" =20 ip -netns "${rtname}" link set "${RT2HS_DEVNAME}" up - - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec "${rtname}" \ - sysctl -wq net.ipv4.conf."${RT2HS_DEVNAME}".rp_filter=3D0 } =20 # set an auto-generated mac address @@ -508,7 +467,7 @@ set_mac_address() local ifname=3D"$4" local nsname =20 - nsname=3D$(get_nodename "${nodename}") + eval nsname=3D\${${nodename}} =20 ip -netns "${nsname}" link set dev "${ifname}" down =20 @@ -532,7 +491,7 @@ set_host_l2peer() local hssrc_name local ipaddr =20 - hssrc_name=3D"$(get_hsname "${hssrc}")" + eval hssrc_name=3D\${$(get_hsname "${hssrc}")} =20 if [ "${proto}" -eq 6 ]; then ipaddr=3D"${ipprefix}::${hsdst}" @@ -562,7 +521,7 @@ setup_l2vpn() local rtdst=3D"${hsdst}" =20 # set fixed mac for source node and the neigh MAC address - set_mac_address "hs-${hssrc}" "${hssrc}" "${hssrc}" "${HS_VETH_NAME}" + set_mac_address "hs_${hssrc}" "${hssrc}" "${hssrc}" "${HS_VETH_NAME}" set_host_l2peer "${hssrc}" "${hsdst}" "${IPv6_HS_NETWORK}" 6 set_host_l2peer "${hssrc}" "${hsdst}" "${IPv4_HS_NETWORK}" 4 =20 @@ -570,7 +529,7 @@ setup_l2vpn() # to the mac address of the remote peer (L2 VPN destination host). # Otherwise, traffic coming from the source host is dropped at the # ingress router. - set_mac_address "rt-${rtsrc}" "${hsdst}" 254 "${RT2HS_DEVNAME}" + set_mac_address "rt_${rtsrc}" "${hsdst}" 254 "${RT2HS_DEVNAME}" =20 # set the SRv6 Policies at the ingress router setup_rt_policy_ipv6 "${hsdst}" "${rtsrc}" "${end_rts}" "${rtdst}" \ @@ -647,7 +606,7 @@ check_rt_connectivity() local prefix local rtsrc_nsname =20 - rtsrc_nsname=3D"$(get_rtname "${rtsrc}")" + eval rtsrc_nsname=3D\${$(get_rtname "${rtsrc}")} =20 prefix=3D"$(get_network_prefix "${rtsrc}" "${rtdst}")" =20 @@ -670,7 +629,7 @@ check_hs_ipv6_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv6_HS_NETWORK}::${hsdst}" >/dev/null 2>&1 @@ -682,7 +641,7 @@ check_hs_ipv4_connectivity() local hsdst=3D"$2" local hssrc_nsname =20 - hssrc_nsname=3D"$(get_hsname "${hssrc}")" + eval hssrc_nsname=3D\${$(get_hsname "${hssrc}")} =20 ip netns exec "${hssrc_nsname}" ping -c 1 -W "${PING_TIMEOUT_SEC}" \ "${IPv4_HS_NETWORK}.${hsdst}" >/dev/null 2>&1 --=20 2.46.0 From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E582621ADD1 for ; Thu, 8 May 2025 08:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692405; cv=none; b=gb1kMMLOOgTg/GLwHsDc+mg+5x450uXZzErwB9bE7kyzOYFYXZfTqMyb7MAss7JxMo3QxCUByMLa2bgzxvarvRO745RIIgf6BvtkwUDUiDx7e6UBbyX78g+QoSqf9uy2ZVFVn4PylFMC6pGbn0VgTY7rchP4MKnG3vOQv/hyaTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692405; c=relaxed/simple; bh=ETlGTGZHi9yyVZwTgQhE71uDuRQAwdt3Q5McNadhQ6I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pa/FfQXmwZahM+Q2VSv85wAslwGg0wedwIC+pj3ArG2dsJkX/qIMsjDC19Jxxg9LNEvfG254tghMek3vx2RL9SCID8FpXosdr79ivEqZAmFQkjfSPm+yXaziKULU65gDClur5xgstEHgtipY7ySSrHNr+PtpQ6VBJt6hvFAxqYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L1TxaDln; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L1TxaDln" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-736b0c68092so661678b3a.0 for ; Thu, 08 May 2025 01:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692403; x=1747297203; darn=lists.linux.dev; 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=E06alhez4ALhFESu7WKcH3IlmMsagNxhNEJVtOJuRfc=; b=L1TxaDlnd9SYO02FovBH3lweqErwtTWrkXg5lYhtazhzsvx8jWQZYdPuqTpGom9AiK Gr/iaM3uGdWL6dXPaDkjqrwkPTdeRTAYqTBurAUwtym9Ub2PBIhyurRoXL4inhEbhldX U/wNXRTv8FcY88eLE0mFgHNFrGhGENngnK734B37hMzhnx8SF/7o/sDMRvDtdU5BfCJq S/zffqmanRyBg+kh5piScbS0kQaYq8xhlIcv/+m4lqH2bV2PotzjlFgGEYs6NhLrkpGr eHb76AyPqQhsc21Q+/6ix1PaQ9TSwUKy4+mPLxoFgIUw1MesobVr8cfOr8wmpsKhkK5+ zFLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692403; x=1747297203; 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=E06alhez4ALhFESu7WKcH3IlmMsagNxhNEJVtOJuRfc=; b=io6AYfd2MwsPJVwPWYwB0CqCqmf2U+XJxe4HI5bO09jQ9h4Sow7KSdMQnPzs3TkMaf JaMlsMpICFC5S6if2+RStu0wk945cVeCNQZpjvcJOtynYwGtjbsee1ZmNTyRHb6oV+6O bSx+g/XkQ9zldqGJ1Waw98cajYTWmG/Zqqrs7HqUlFn90+Gte9Qr+NOkEIhDHYfXogQH rwLlYQpscDRwWdVDdsNUyEGBCLeokXvF0GCw9w/OjbZsi7uVSXrW/DpDyqkAzXZzU+rF Bnd5DEauwN5+NTXb/obQrdjwpRILsavdRusJGdcD5m8y8DAULmWF9B27mwKuMB4e7qMj dChQ== X-Forwarded-Encrypted: i=1; AJvYcCUlLco8Ff428/p/D/szMMotQiuPRkiLnoaMGhm581csgqNsK0w2i6pXGl7YQQ5RqRUgj5XODw==@lists.linux.dev X-Gm-Message-State: AOJu0YxMg0XpPlpwzBO84pFB5mrdVjbzuq0mu3FfdPc977HOF6WKRsCc 7m3Jqve6xztGC6/SMM0tO2rjhVehO/lDM0iPKbV23Gypcbuh54tZ X-Gm-Gg: ASbGncvUmPl87PNY3WsVMCRN76TLscNyq06PCmRMfzneGQpd0puVhmTBH/PdBVo4C0m PE5sATPWxgZSRZh/OJdsAuvuaWQcROggAQgEUVHialOQx47NS4SOQ6wq9tldeozY/bNLfj+7f7E xdGE9NNGmpH3DmqfZmv3Dujij+D3i+pEsmHx0wb7eA+kvbt485rWF83E/qBK0GnF3C6JPxw9TX6 hm7x6Bt938ZIxtNA0CPw8tej9DyVpmIHFSLunsRgl79TTDbzqx/eaUoYV87JKwWlPZXUutuUZDW 8AlbxpxoXvNjrpk2PZBxFIhuqfCYwRGPHdf/u/lSedpdaWrvp7wwQ1j5rMGO X-Google-Smtp-Source: AGHT+IEeiqwCWO6vGjah9C04bfTFRzhZ6KvgVsDlBsuERnKsxYZfsx3JJkDvtmIGO6gF3ieAb5Rkpw== X-Received: by 2002:a05:6a20:3d8e:b0:1f5:8678:1820 with SMTP id adf61e73a8af0-2148b81ec77mr10235054637.12.1746692403062; Thu, 08 May 2025 01:20:03 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:20:02 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu , Florian Westphal Subject: [PATCHv2 net-next 5/6] selftests: netfilter: remove rp_filter configuration Date: Thu, 8 May 2025 08:19:09 +0000 Message-ID: <20250508081910.84216-6-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the rp_filter configuration in netfilter lib, as setup_ns already sets it appropriately by default Acked-by: Florian Westphal Signed-off-by: Hangbin Liu --- .../selftests/net/netfilter/br_netfilter.sh | 3 --- .../selftests/net/netfilter/bridge_brouter.sh | 2 -- .../selftests/net/netfilter/conntrack_vrf.sh | 3 --- tools/testing/selftests/net/netfilter/ipvs.sh | 6 ------ .../testing/selftests/net/netfilter/nft_fib.sh | 2 -- .../selftests/net/netfilter/nft_nat_zones.sh | 2 -- tools/testing/selftests/net/netfilter/rpath.sh | 18 +++++------------- 7 files changed, 5 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/net/netfilter/br_netfilter.sh b/tools/= testing/selftests/net/netfilter/br_netfilter.sh index 1559ba275105..011de8763094 100755 --- a/tools/testing/selftests/net/netfilter/br_netfilter.sh +++ b/tools/testing/selftests/net/netfilter/br_netfilter.sh @@ -60,9 +60,6 @@ bcast_ping() done } =20 -ip netns exec "$ns0" sysctl -q net.ipv4.conf.all.rp_filter=3D0 -ip netns exec "$ns0" sysctl -q net.ipv4.conf.default.rp_filter=3D0 - if ! ip link add veth1 netns "$ns0" type veth peer name eth0 netns "$ns1";= then echo "SKIP: Can't create veth device" exit $ksft_skip diff --git a/tools/testing/selftests/net/netfilter/bridge_brouter.sh b/tool= s/testing/selftests/net/netfilter/bridge_brouter.sh index 2549b6590693..ea76f2bc2f59 100755 --- a/tools/testing/selftests/net/netfilter/bridge_brouter.sh +++ b/tools/testing/selftests/net/netfilter/bridge_brouter.sh @@ -22,8 +22,6 @@ trap cleanup EXIT =20 setup_ns nsbr ns1 ns2 =20 -ip netns exec "$nsbr" sysctl -q net.ipv4.conf.default.rp_filter=3D0 -ip netns exec "$nsbr" sysctl -q net.ipv4.conf.all.rp_filter=3D0 if ! ip link add veth0 netns "$nsbr" type veth peer name eth0 netns "$ns1"= ; then echo "SKIP: Can't create veth device" exit $ksft_skip diff --git a/tools/testing/selftests/net/netfilter/conntrack_vrf.sh b/tools= /testing/selftests/net/netfilter/conntrack_vrf.sh index e95ecb37c2b1..025b58f2ae91 100755 --- a/tools/testing/selftests/net/netfilter/conntrack_vrf.sh +++ b/tools/testing/selftests/net/netfilter/conntrack_vrf.sh @@ -52,9 +52,6 @@ trap cleanup EXIT =20 setup_ns ns0 ns1 =20 -ip netns exec "$ns0" sysctl -q -w net.ipv4.conf.default.rp_filter=3D0 -ip netns exec "$ns0" sysctl -q -w net.ipv4.conf.all.rp_filter=3D0 -ip netns exec "$ns0" sysctl -q -w net.ipv4.conf.all.rp_filter=3D0 ip netns exec "$ns0" sysctl -q -w net.ipv4.conf.all.forwarding=3D1 =20 if ! ip link add veth0 netns "$ns0" type veth peer name veth0 netns "$ns1"= > /dev/null 2>&1; then diff --git a/tools/testing/selftests/net/netfilter/ipvs.sh b/tools/testing/= selftests/net/netfilter/ipvs.sh index d3edb16cd4b3..6af2ea3ad6b8 100755 --- a/tools/testing/selftests/net/netfilter/ipvs.sh +++ b/tools/testing/selftests/net/netfilter/ipvs.sh @@ -129,9 +129,6 @@ test_dr() { # avoid incorrect arp response ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.arp_ignore=3D1 ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.arp_announce=3D2 - # avoid reverse route lookup - ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.veth21.rp_filter=3D0 ip netns exec "${ns2}" ip addr add "${vip_v4}/32" dev lo:1 =20 test_service @@ -167,9 +164,6 @@ test_tun() { ip netns exec "${ns2}" ip link set tunl0 up ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.arp_ignore=3D1 ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.arp_announce=3D2 - ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.tunl0.rp_filter=3D0 - ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.veth21.rp_filter=3D0 ip netns exec "${ns2}" ip addr add "${vip_v4}/32" dev lo:1 =20 test_service diff --git a/tools/testing/selftests/net/netfilter/nft_fib.sh b/tools/testi= ng/selftests/net/netfilter/nft_fib.sh index ea47dd246a08..82780b39277c 100755 --- a/tools/testing/selftests/net/netfilter/nft_fib.sh +++ b/tools/testing/selftests/net/netfilter/nft_fib.sh @@ -167,8 +167,6 @@ test_ping() { ip netns exec "$nsrouter" sysctl net.ipv6.conf.all.forwarding=3D1 > /dev/n= ull ip netns exec "$nsrouter" sysctl net.ipv4.conf.veth0.forwarding=3D1 > /dev= /null ip netns exec "$nsrouter" sysctl net.ipv4.conf.veth1.forwarding=3D1 > /dev= /null -ip netns exec "$nsrouter" sysctl net.ipv4.conf.all.rp_filter=3D0 > /dev/nu= ll -ip netns exec "$nsrouter" sysctl net.ipv4.conf.veth0.rp_filter=3D0 > /dev/= null =20 test_ping 10.0.2.1 dead:2::1 || exit 1 check_drops || exit 1 diff --git a/tools/testing/selftests/net/netfilter/nft_nat_zones.sh b/tools= /testing/selftests/net/netfilter/nft_nat_zones.sh index 3b81d88bdde3..9f200f80253a 100755 --- a/tools/testing/selftests/net/netfilter/nft_nat_zones.sh +++ b/tools/testing/selftests/net/netfilter/nft_nat_zones.sh @@ -88,7 +88,6 @@ for i in $(seq 1 "$maxclients");do echo netns exec "$cl" sysctl -q net.ipv4.tcp_syn_retries=3D2 echo netns exec "$gw" ip link set "veth$i" up echo netns exec "$gw" sysctl -q net.ipv4.conf.veth"$i".arp_ignore=3D2 - echo netns exec "$gw" sysctl -q net.ipv4.conf.veth"$i".rp_filter=3D0 =20 # clients have same IP addresses. echo netns exec "$cl" ip addr add 10.1.0.3/24 dev eth0 @@ -178,7 +177,6 @@ fi =20 ip netns exec "$gw" sysctl -q net.ipv4.conf.all.forwarding=3D1 > /dev/null ip netns exec "$gw" sysctl -q net.ipv6.conf.all.forwarding=3D1 > /dev/null -ip netns exec "$gw" sysctl -q net.ipv4.conf.all.rp_filter=3D0 >/dev/null =20 # useful for debugging: allows to use 'ping' from clients to gateway. ip netns exec "$gw" sysctl -q net.ipv4.fwmark_reflect=3D1 > /dev/null diff --git a/tools/testing/selftests/net/netfilter/rpath.sh b/tools/testing= /selftests/net/netfilter/rpath.sh index 86ec4e68594d..24ad41d526d9 100755 --- a/tools/testing/selftests/net/netfilter/rpath.sh +++ b/tools/testing/selftests/net/netfilter/rpath.sh @@ -1,8 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 -# return code to signal skipped test -ksft_skip=3D4 +source lib.sh =20 # search for legacy iptables (it uses the xtables extensions if iptables-legacy --version >/dev/null 2>&1; then @@ -32,17 +31,10 @@ if [ -z "$iptables$ip6tables$nft" ]; then exit $ksft_skip fi =20 -sfx=3D$(mktemp -u "XXXXXXXX") -ns1=3D"ns1-$sfx" -ns2=3D"ns2-$sfx" -trap "ip netns del $ns1; ip netns del $ns2" EXIT - -# create two netns, disable rp_filter in ns2 and -# keep IPv6 address when moving into VRF -ip netns add "$ns1" -ip netns add "$ns2" -ip netns exec "$ns2" sysctl -q net.ipv4.conf.all.rp_filter=3D0 -ip netns exec "$ns2" sysctl -q net.ipv4.conf.default.rp_filter=3D0 +trap cleanup_all_ns EXIT + +# create two netns, keep IPv6 address when moving into VRF +setup_ns ns1 ns2 ip netns exec "$ns2" sysctl -q net.ipv6.conf.all.keep_addr_on_down=3D1 =20 # a standard connection between the netns, should not trigger rp filter --=20 2.46.0 From nobody Sun Feb 8 07:50:03 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0583F224891 for ; Thu, 8 May 2025 08:20:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692412; cv=none; b=FnhSzq/obqLCFt4a+2pC/SNNUYyKXSpnouoeSiOcv0wfBF+HlRUj/MAO5z1QRL0HdUtY8on9NDqyCqZKjI7GRaMoO0IAQny5SMJ/3U3K29knBQ8CWo0elty9lY5BCaiTTw9ZLcddNTTTiFF3pGo3My4O+RInH0++rIylcqyJX70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692412; c=relaxed/simple; bh=nfnnrkbD9lHq5M4BurhUV9GrLo0bCdesTsL9mlx9IRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g7mFbAevGtxawlbJU2WmOpjqt+5aeInIdeaSh8tkrGieRB1Y73L9XlyfTGP0BT+kRiXPgbeHlgeSuwl3vkm9/0qoIqD9/ABd5qWNVJHoz/xIi1+IPUbLx+3xT3Z194ZS+y5yU+qxrvZg7XY4jjLqOolb2NHe1WQDYMGN9SUBmhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Mn7ulf2n; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mn7ulf2n" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-740b3a18e26so229384b3a.2 for ; Thu, 08 May 2025 01:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746692410; x=1747297210; darn=lists.linux.dev; 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=iF/sCoumpbrrcZbQjjir0fJBDlQMYwoeVJwZhV5rgpk=; b=Mn7ulf2nToQTOupHfQzTcPCyrgWXngafcBmU0rENtmo5cFPqkgoT4AQ66y+Gz9oB3j NB1nG7QbImy11Y169k8m5iHLVh1cIO4IMAN5THl1sdE3fS9HVrMR8PDpo+ptYYNzOJ9X 8jkn5Rev7AKQwhmOtQSpJ5AuILukV1AmmlFnwwqFPoKZWF/hth9Zzlm6RQ29cDCtSLhD ESC4xAO42KaOOzaOcjOBYvydy8kEtvJ+Ni1uS4FUpa3MDjd3HWe7XdMbB48Ucha5cUek 0ZtRorL2Z0vTp6ZD6Vt7k4l/w2couHkZgmZuzXbRYHCVtpvM128nkkvydJM+Q1AhLbNC ylyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692410; x=1747297210; 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=iF/sCoumpbrrcZbQjjir0fJBDlQMYwoeVJwZhV5rgpk=; b=C0ojsoPWjWnoHuTjyJQqWz5b3OfBbpWMj8irklBHkpEGSCyuJd5gHZg5kBUcyfJwpJ ZWLvcYQBwy98nrmiotOHtTBAsFZXqcYGWP7e1rSwqwjpjmh+mdHNX5B3wk0PV2eqqtds 9L+n5LgdrQ12t9LzYQ5UXrjlxTqIU/ZgkqNGUYVFUIEwrMKHD+iRs8DJMCN57jbfyPBe fdGK3YJYpA5tsvsc6ZzrIDhXCoklalhq5fMzggXfy7Kj+baRwf0QmgwHwYRGTAnkDAyU dtEvEHHYPkrjkg6thi82vAvVjg9mey+10YtBFRQ+yZl+x7xAYEB3tC9hZLcXRvqvo7p1 oHZg== X-Forwarded-Encrypted: i=1; AJvYcCXyn7lHlrSHxDBMybNtQhG8majxsBrrWa28zG8Cv+oHx/pm1bycTsOpi8gvdua2a6LDpi1vtQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yyr0MkR3GeN35atCiP0B8HAkxNuOK3FwZpZr3N5obc+1SEM9uMe V98LdqYUSHW/j2RHtLKPkx2/PKIEgJN1fP1t2ezgCywg99WzdGSs X-Gm-Gg: ASbGncv/4lCOXj9U2OelsBMLLMn8voLd4yAr6vsMu7S5TX2jduCLvyMzKWPZkOUy1Jr E5vdrzll7Wx955aSrw+vWw9L1r66LSuaTIUl5alpLNSAdS3rV5ROUKMLm8aN/cx6S6gEsYZfdk+ nYUcuhxLmHB38xr83Kr8HC7xmXNmlCninJBvWB/XVz3Bix8dyvNzdTUEqz+nW7mdwHk+5eQj0Xw Ka0ZiJQHoY00g5V+sSWOTkIAJhiQ+KyQx46iNdLswj8RnoSUZo16YYupF6LuEHaEBCWIZWbfiJ8 u4pRNCp12ps0TYd5f/ZPuYI858CfmyDOrZ57NVdtmovk50/ZKsJRSEb5q9MV X-Google-Smtp-Source: AGHT+IHz2qi+IhB5F80jpVbH8rKZ54H2Ipi3hZso3Ha/e4qS4CiCojKLLFlE/kbvGrTd/XTIEbRrAA== X-Received: by 2002:a05:6a21:393:b0:1f5:6e00:14db with SMTP id adf61e73a8af0-2159af4bf72mr3663176637.14.1746692410384; Thu, 08 May 2025 01:20:10 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7406a36c523sm10907408b3a.144.2025.05.08.01.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:20:09 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Matthieu Baerts , Mat Martineau , Geliang Tang , Pablo Neira Ayuso , Jozsef Kadlecsik , Andrea Mayer , Paolo Lungaroni , linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Hangbin Liu Subject: [PATCHv2 net-next 6/6] selftests: mptcp: remove rp_filter configuration Date: Thu, 8 May 2025 08:19:10 +0000 Message-ID: <20250508081910.84216-7-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250508081910.84216-1-liuhangbin@gmail.com> References: <20250508081910.84216-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the rp_filter configuration from MPTCP tests, as it is now handled by setup_ns. Acked-by: Matthieu Baerts (NGI0) Signed-off-by: Hangbin Liu --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 99c87cd6e255..55212188871e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -479,8 +479,6 @@ mptcp_lib_ns_init() { local netns for netns in "${@}"; do ip netns exec "${!netns}" sysctl -q net.mptcp.enabled=3D1 - ip netns exec "${!netns}" sysctl -q net.ipv4.conf.all.rp_filter=3D0 - ip netns exec "${!netns}" sysctl -q net.ipv4.conf.default.rp_filter=3D0 done } =20 --=20 2.46.0