From nobody Sun Dec 14 02:01:23 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 45CCF288C0D for ; Wed, 7 May 2025 13:19:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623958; cv=none; b=FQNweWdxib0KrNaEw6/0dF+4WNSbjBJguA0Ash3RG8kZYk6YmvpxBPEHZz56jrd7/X466QwRd47aySudS8i0fWXpQ2KYqavu3j2flQHpwkj5KyOiYUwo4ohwoAJ6Q6qMhuouxmAS5U0ej44X+6HVKHmO0V6ocwMldakLfeX0sA4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623958; c=relaxed/simple; bh=hQhbhaO8Zx7OtDKFPagfIJ00HDVkDQ+YZmYffxnythM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O4WIaZmZLU/kf4ncKh8yVF95HTjndWijrRem5HDwLzL7SxQ1D3WsLc8a0gewsojV1NDRuX9JwNIs0FMxh0gaYI/HD+8ElBt24OARpT8KXC7TyWMMI7l6QsCtdt3uZ6ND3r7R9UibQBI5LVktdCu4Kyko1SvrgocJqTeeL4jnUbE= 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=mkiXSJoh; arc=none smtp.client-ip=209.85.214.171 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="mkiXSJoh" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22c33677183so79983475ad.2 for ; Wed, 07 May 2025 06:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623956; x=1747228756; 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=mkiXSJohHFUeTsAuTfgcM4OOrSSDYa2KkYWlKgL3XFlvTDPWsA1oqSwkutXQSBcw5q xGxqAYI4Q7Eq0S46JjxGp3Sq/BtZBiSeElKWs2oV3tpM3xhbdFN/p5h646i5LtGNT3WQ H9SS87IFmqeWzrVWPtDiR9H6dWF4RiMivV3kr56f5OA6zNH2yh8twJHKdv7Qg5arEU1B a1ABSeZ366nsKmaBvuRmcQtXxwPafxt2eCoix1TJs+j43x8xY/OPnrt8Or+wIEJSPxAq 3RsYQdXRBqam72AFnaM8D8icqbS4uDvvtZHhz+OVQDwi4FGm2/VSiJIBjcAyGUp0s0HM domA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623956; x=1747228756; 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=SXDUI9Pcu5zO2bDRU9nXWxjA06yBkcMxjynuGO53sHRki047bo0TaRvQBMa/Io9aN0 aa9lZaRA/pSK7KNX4Ny3gJ8hCcJPVKPUSMR71cSvyMfrq/9gRuiOy28ZZx7JhwqwlmCL /BYR8g9DCuwjU8bLcwmVO2jLAXQdJKl/hI4x7xnNI1yWHr4JBRTYv9fys9vrePp0O42t piCR5FzXbcQb9wnA24ABDxtLKNmdS8Xukn6r6jdQkUzg7yhanalLfzGLQ3TE+8S/VJHT 8JTMi9Cx4J2n1b4y2wLxmY5qyj1UezHbxtDgCfUEnAIJA1KQCJ5xduCCIg6Hwmyplzkp shhQ== X-Forwarded-Encrypted: i=1; AJvYcCVCYxdOQts7qVe6ljRdHmkIR3/zzDOsfqfu6lfwM1v7E5Dw3VhZ1BrHtGU5wg17u4cdMeXHnA==@lists.linux.dev X-Gm-Message-State: AOJu0YxkuB5q718dF69wO5UChLkVLk8ugbZobmZelPfIGdU2l6Ff1Nsc n/70Uy5dWmzEpZM9/OsIxWZEV+IQeIT00kcGxbWGEz1iF38P4cZv X-Gm-Gg: ASbGncuytAKYDAIwvtsOsoC3P+NI9PZnq3oP8i6YWT1DnPzDfOG4gm3sbKbG+2iMilF SmtJDtkeocWFiflpsEU1YeSSp7+ajdJkpk32reU2hGd/TuW2DsFt5Z9enzDxlCp/OYm1+rjpOoX 5FkmJr+THs+ZXMJF5oeNwxHDk/KgRt8uG3tuV3ayUbbgHrbjlfBCayFUxVc4TWbnojLnSNHiuNg F8J34zTmp1DU9yE9O12Lxr5TEMS1IGufLhBpTpDKXrsxd7FwzMzGJ2rBtHYzjl0+ht0iBic+nwh 7NgxRe0IDuSH4wBxuPr0TOaULkvdtwV8U8+8Uh0kEDx7cGjmYd2IGjSuXSYrjsJlsFgU0LA= X-Google-Smtp-Source: AGHT+IEmSA/X/ltq+9bYqidRcUx+l1yCtCkXp79+kBle4WIzaMF62NW5u2ryRDoKpCzRQfwyr1fwDw== X-Received: by 2002:a17:902:e950:b0:224:194c:694c with SMTP id d9443c01a7336-22e5ea88891mr49968655ad.28.1746623956382; Wed, 07 May 2025 06:19:16 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:15 -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: [PATCH net-next 1/6] selftests: net: disable rp_filter after namespace initialization Date: Wed, 7 May 2025 13:18:51 +0000 Message-ID: <20250507131856.78393-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 --- 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 Dec 14 02:01:23 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 837F614884C for ; Wed, 7 May 2025 13:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623966; cv=none; b=Rvhg54KA0IPH3SdNykzejHVoXfD2RypLosBH8pbTKv9qY082F/paMptitr8JX44q9ddDg8TqVDUtcW+CNQd23wlok0PRNB9OJyAgv5N7A9Mr20ouIDd/ZN7si3dqwZbDjuZTYhr9vZUhrfn8YWBcoiGAfDD1Cu1WppHPmllWztg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623966; c=relaxed/simple; bh=NDqRijYzjhs0y/BEUOAKtrmFA7xwhtMvr8QfCvPf9aE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lUTnjG2VFMmUV06b7aYpCMLaMqQ89lu3b4GVG6Nnx8hASSQLpF1sJXiUmiWL2cxhx/HZShxwuZz6W6BveOZy/EhvXYoMLAvNUerXNm4+Rwif3lLO03BkzNFs7jFaYeyVYV17BYBpEXjNTaXj6twP2MvKFOtWNF2peMOlmp/uXMs= 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=Bzc1ZO0K; arc=none smtp.client-ip=209.85.214.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="Bzc1ZO0K" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2295d78b433so67720385ad.2 for ; Wed, 07 May 2025 06:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623964; x=1747228764; 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=Bzc1ZO0KrXoQYqrU6oXTv8dZYvrQxR2GtU/qWrVgqR49JBAZ67vLoYQC3hzxTN+qdX kA6QRNPBNcaUHeDQIt9CYkYXMI66m4N+6usaqIueiKE0Cq9Fx1yQ1Vs3cgltyBdWTuf+ 5RMTMrzFU12d7a8dbIHnfZUBwHavnZ5v02O4uJyO/OvJ78kX/iIeSXo/Wcxa+Lc1n5sN W5l8d97OkQO1FCjLkFYp8VCLT8UzGnDSIpAangva2E6ZGUHYhfmZG4iHNh8qS6m3sEKe KpBMedWJz53R2ey7umwDK/+4EzrOHVXpTagpkAAOWEg+h7XJxyt6iBuSEY4pzvgC4H3D 368A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623964; x=1747228764; 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=OkJWlkhMNgfIQDIEEa3RtbBmSgIXeO91jj1W5I3vpg3BItnGi9s29AlZB8btuvmRd1 LR8SekpTzb67DuZKRbMAi7JAqrVcJReO6BThD8eU4QSk3Uy9UvzcO32yAjNzf56BJi1U +7F+l0gNPmOFD0OSRIvpQfSCfn0o1rNbhHT3YdLUIo9s86sCszIqEkKTqLwtvBdBDWF0 lC9t08LM4MkcSrB/HXY2ptGXH5Ihy4YNMDMRutQk9aKY0qjJedhd7vp+illKUOlzv8Oa s+ENErVwB/xVJQEGa1MFyXZrKHQ8sqdjxKifXICA7SCO2amKLUzfaVIl9KcM2VZCpN4c FdEw== X-Forwarded-Encrypted: i=1; AJvYcCXAVs29ngzjRfbeUwl31b0rYaTCTHI+3Vh3OYKD5tyWCyKe/fGuDcxSwnxcQIMxZD2NAiIH1w==@lists.linux.dev X-Gm-Message-State: AOJu0YwrAFY8hCkMn11dgSDzMmUOkP4duNpuAmPVCD61+k49EqWECE4s WtR6qRsjx9yAki0pFiKbK6HToZzndrE6m1OK4tOQUSq56Jma6M7h X-Gm-Gg: ASbGncsH3teugDRXqLLa0Og4VxX3AJOMFGvzKMWJV8b6Bsotfmf7AJ0Yhnl6XLY8mO9 opg63tjOnhAA14oGjhOJDHah1BhprlbQD6+X4MAcGpRkofeNyMc9gq7UXJNc2m1PqO262mhrJ2d ror00h1qN1+beQi6AW/NFp0QgZKCP9Ru+jJFj/HBEyQhVTtRMMeO0/wx1Q+/yUZT6riV6KkPcGz suNX73NkKZEIGOXZ3/eDg2YYTUuagJAsZWfCsfRojx4TioLeyXvao0dSQhSIl6DborijSVni46Z cMnBfcURgrE2qtr5Unin36gAHhyhbUNR9BylCJthyiJ65y9tKRdv5M4CO8lF X-Google-Smtp-Source: AGHT+IFSdSQM3IiHqluyQXlAUvMv4gM0CqL/WRQ17JX5c13/+GiFUCTdNuQLWbuZWinMIpGIpqDeYg== X-Received: by 2002:a17:903:2f85:b0:21f:45d:21fb with SMTP id d9443c01a7336-22e5ea64dddmr47456425ad.3.1746623963559; Wed, 07 May 2025 06:19:23 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:23 -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: [PATCH net-next 2/6] selftests: net: remove redundant rp_filter configuration Date: Wed, 7 May 2025 13:18:52 +0000 Message-ID: <20250507131856.78393-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 --- 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 Dec 14 02:01:23 2025 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 D292827713 for ; Wed, 7 May 2025 13:19:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623973; cv=none; b=gEo8p0h30NIcT2m1TZmqA/y46bs6Q2kjdxje//6ef59VSpkMJYozI0N6nWP2TqbWCt7oXWrwv6WcE9a2XTk72/qiES/mwf/zMgLu6VPM0I06im+jM1mNSxFc6CS5uXCFGdO4mIsma1IrnpXu+E7fhwDumfYMGD99ZKl3DfRq0r4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623973; c=relaxed/simple; bh=fYBZ3e80lB7pnNPogmHpxRb6JLRnBdbF4Ja5yF5QpuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qtlkYFLrzNmXlMD1TVokMfUBdanmdpJeN0TiSXpW7vX2lMUuUPrMzDpg0j/zEX7Zic2ZyxwbZak0Zvq2IjZg7izxpQjesO5ZVXEP2qZWWYMAVM32lOhfPhjQTczO9/Nd3dKiaiRNNHoZQNqW30KQtsBKSsa5I5oMgRjQl2fZqAs= 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=Y2pOB8Xm; arc=none smtp.client-ip=209.85.214.174 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="Y2pOB8Xm" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22c33677183so79988025ad.2 for ; Wed, 07 May 2025 06:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623971; x=1747228771; 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=Y2pOB8XmS4b19zirEEgCuzp0T33v2yJ4NRgkuYe8L8TLo3bZWyECpL5gsD1fjZVfRj DY7B771GzyugY1ZftDxIPk75ZMn0q4whG555qoNdp948ZoLEJrZq/YzBsAR+USEMjn6/ /iw5M48mRHUpnyaMjVtrg7sHEgCQWSYO66nyVJnvtSqzqtIDNWBdKyGv8S9Q1CF3MN/0 3ttP6MYtkXET+ENXUp+J/M5JqjaiWZ+ub6pr/54dNHD6S3u2i+xCXCmdpVpaQBqMQtSE TDLhuRbKsR9mAfSYGn0BbwlzP4oVTzmC7kjFeNiA1J58vTwHSlEm9F5zmxn9beLYUCkG iYqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623971; x=1747228771; 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=C0+586AGe967F7vCRqpKHkh92C7JeIcL+bltgKqWJIIevwlJ9cYszmF8tiOe796SS7 yis1tsmHWc/Iinnj9wu9kLJBdEe+u8sSSTOTlR795htGFzsiVKWp/iipDJsH+pBDrxQb kyLWjq7QgsZLJtvL7G8L0HaAHlUvbJD1uRADNS1AcAF3NsDTYooyf+xzjbmkqA6Pfxfl +X0xUva+4awvbDmmmiClsXJTZD7TunSzUHzOP1xmSKh7vwevK33PffYVWYfWGQXq/3V5 sysz++z2svuOSgqrn5wqb5yYKrCk2NUOjmaaitXK3ptfITcc44Pc532ZwV8hQa6zjrU1 VkNQ== X-Forwarded-Encrypted: i=1; AJvYcCWvKINX7s2KqiA/4WpHfIeooJUI1hYQFeQsunqjvhrfToQHyhU87KxnlszcRFmqXFRFJ3fMig==@lists.linux.dev X-Gm-Message-State: AOJu0YzZ8h0nRnb8+jcDhbJjE521gXsDwxLl4PBtxfhhl6XG2AU5Irpe IiocdFiaHUEipiqJxkHkVQ1Ybl6708wYwmMVroGju7Lm7TxnPs0b X-Gm-Gg: ASbGncsJBXAUqeOz9NaIMBq4x20re0s1JolEwB9+n1jyDAJmWztpb67Bcn1bnlsnrA6 UhGGHvqRSJKS9ckWTZupC/OUsDILZorGA23AzIiKYMX884np2LoFx15XdBWVZrzbS7qFv7M2HuK dQqBd0Y3F37SdFUwfUJTXp/DKl7FB/pVs+CJ81JnOGiCu2xQlpD/GOZdxWS8ep++69wJVRW83Wq bvVzCQ0iRNd09OBASNBtde6bJMtPOyL8UcNj1NjS/4zyK7/bO/mRMBWwNJvyNVUWnaEBr8CvwTz GJiZktHW/LhaN/IvLdoqWR1/jtObaKQrhgWZq1g+z22qPxTrV6B+//0Uc52Z X-Google-Smtp-Source: AGHT+IFcB8rrpPc/W8GojrdBVj5ziaCC/Up0DBiCXkXM+BRizqruSdRdtXgKjxFcs3ANOlkhgNgW1g== X-Received: by 2002:a17:902:ef08:b0:22e:485a:b45 with SMTP id d9443c01a7336-22e5ede6e43mr49600015ad.46.1746623970937; Wed, 07 May 2025 06:19:30 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:30 -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: [PATCH net-next 3/6] selftests: net: use setup_ns for bareudp testing Date: Wed, 7 May 2025 13:18:53 +0000 Message-ID: <20250507131856.78393-4-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 --- 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 Dec 14 02:01:23 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 76F85288C18 for ; Wed, 7 May 2025 13:19:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623981; cv=none; b=I6mq0Hfko/rTHFqIufWIZg4u3awwMZxWUEdFROgU9AHKxAps0a+3P7HDAAGMHSZ2oUxMdoI2Avz9wmOpKnNOYg9o30p0+tP2LevEZdEhvNfs42QGgMTIYHy4LVP2DBpN/h+xcgNEKrKfpTbhzmsH7lWhhQYfCKMO5ZuEgx1i3UA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623981; c=relaxed/simple; bh=rUh17m48WTZoyo/o1QILtZNUlKVMOqIM3NF7WqvG//w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i4OCwWjRjfdwCE4v47Pd/bg141Tc/UTLtXhZZVO10phccCyjKnSSFzNDzQg9L+2UQOlgA6oeD++tusrk3Lw0d4GbaQBQ5G0g6GtE+ohCffpXbfvgSvIRwtBf33quBCbTFbIgNuvGpIXx7Lt/F5H6M6CLEaHnOvGwo2Nk81nol4Y= 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=L1xk5GI7; arc=none smtp.client-ip=209.85.214.169 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="L1xk5GI7" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224171d6826so100594575ad.3 for ; Wed, 07 May 2025 06:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623979; x=1747228779; 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=UdYhARpt2I2zanYqf2S7OyCV1snoNnsQ0QZffY/yXJU=; b=L1xk5GI7UEjQz/LalOeT2rWXBw95LWi4ChxuAZ2Teq87xcCA9Ch7j9/eI4ZF9wjxK/ 042GTxk9nCJwnHup27v/reEBQp6TdxiraDkWt9sfNFqczYEuKSe1Qla4UkRi28h89ZTR aC8rhaYAESmDolz4lS5q2ncL0gz3zSw2SKMPlpXRI9MZXgWwH4T8FjC8JvIS4G7aqMi6 emayPkfgk9Zpe93gTOHN+OgCMrBNUzZzNPO1k6Li+jTVm1rfIPJLp8xHDe+mYbOLo85x YcDi24oXMelb1dviyWUmKYUssYM1Y7WgkpFBu2HQRakijLkNU8NRuACrKX5YAZbmTfHa nL7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623979; x=1747228779; 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=UdYhARpt2I2zanYqf2S7OyCV1snoNnsQ0QZffY/yXJU=; b=na43stmkKEDyTjE7FTzDrRubPBrhbWWtBvE6arv4+4nHcsa+zKfdELS0B+vBU510s2 IaDZ4ZCK0wvNxXkIKiBX6YMfvCpNCZ95nm2i9J7vGlRC+W5Y7oCJny2EMlVlty4pzqJT wxyCHNVs+Uz/bvCV0tm1fKv9c5Q6d1US7vO9fEtK0sv/yLZW2Qjpz4A4h7j2zRveESd+ pcvGV451w61728teo6anImmbCV2Yu0gvxVPA2i4dZI+bDabU6GJyL+9QkYXLNwirXBHd U8IcJjDIm4BrNCsmA5eySTX37wu+5Hxbv3uA4ny4cjoRRPcP8BFNfKsgN9GM0U+aFb80 lSSw== X-Forwarded-Encrypted: i=1; AJvYcCVheeBDpfGNUkfMLo8Ppl89RF9njnY2JyqLyc6PYGi9NcBwvj712kF9+voKGgck7YDvW7n6UQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yzg+C+SwLjUSqaP8iKQny4a3Bq9ECQSilF+jQz3usq8uD4iwqDm oewPbS1PYzAi572SGLCzI4W8NrmXcbPcWWkiy/4mTsD4x216COGj X-Gm-Gg: ASbGncuVXD2RfG8AfeBgb2KeKarto4ZQZ+R0kOm0GlC2quLsq/5luI1ykVxA3BOqUO0 lHBqDBOUCII1SYZYJlxusP6KtIy61IrICGA614HgxsB7owQWQCplX5Fhz8/HeEsL8mVdjdyN1Ju MC1R72cwpwlCO+MhQfyEPHuVOz6jmtZYDaEt21DjjSIw5W3GZFk0zNZBsf7anBBjnHpmvdS+y1D 0wx0Zph8S+AStuUzkbOHccCIGX5RIXE0KuxYpyWN4QAS3w81Py6o5HQyLv3u/EyBTBDakqabtHy QOMcp31bJQszJf5Zzj+nS2z6PuMAbsdEixSui2Htaybw+T36gWUhY6h7E1GE X-Google-Smtp-Source: AGHT+IGDn8P3k/M83rQjvATxa3M5ZNh6koz6JGVm8voor5M8hZGEPZ35gpI6htaphSdbTNfwedwsug== X-Received: by 2002:a17:903:2381:b0:224:191d:8a79 with SMTP id d9443c01a7336-22e798bde41mr11877545ad.27.1746623978524; Wed, 07 May 2025 06:19:38 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:37 -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: [PATCH net-next 4/6] selftests: net: use setup_ns for SRv6 tests and remove rp_filter configuration Date: Wed, 7 May 2025 13:18:54 +0000 Message-ID: <20250507131856.78393-5-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 --- .../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 | 77 ++++------------- 6 files changed, 73 insertions(+), 248 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..c08a744bf404 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 @@ -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}" @@ -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 Dec 14 02:01:23 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 00A9425E809 for ; Wed, 7 May 2025 13:19:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623988; cv=none; b=f43B2XfgRizdux20DAkBKsZc0Fb2X59Kdx8KmnGT/OjBH0JXjBSrd8exxh8495n+fcS1h6S/Y7lhLRVZq2Q4RZOIZHN64FinJC+Ih0nPHmX3sQTTWHzsQGWrngmoJrDHhVn+i7++q1vMF1AzQwmDdk6aoAoe+GOQ/65M/l8kyps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623988; c=relaxed/simple; bh=lrL7QCxkalRPHwMpen3EmwhoJvDupaoSUwDZql/gvq8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mu1v7nkMIXzJGadbmfbVYxPBxrDA+pCEkPow5RJYgwHxM0CyVY0prWBiEEtiUUBjjsOwe/UxjYoAVA0uJMlR/5Vwanjlb0ojxWVdR587J2CvPAPEJ/ReHaI1eKoYdpg2HCzCZwljMfzhrjrJAjOsy6lv0JnyDdR4onVzaWB3+so= 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=KSwasu1t; arc=none smtp.client-ip=209.85.214.171 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="KSwasu1t" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22e661313a3so6152505ad.3 for ; Wed, 07 May 2025 06:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623986; x=1747228786; 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=OqHokklDt23W8knG3MI9yzmJbveoaAKaHbHiDTuVpLI=; b=KSwasu1t+QL5hwL7Y5z0cRO9bf2la5b6hZEuj3EgMHFq4EuQogCWQ54kmAANCXDSGK +ZO58dulmdB/B/wLHddkFAmo/n8eWaTm3BrJnOoT6ipleoVP3DOPa0An004EK3fnSv9j dbUyvw5s8fQSDoFP4b6kGDnVPQnSxXgHenwKM5BvClT9vT1ivNvQXUJoxFanMSmRpYNJ Lh8GuQhkWm9ebrZZKT0Jwv6VG3s3CgGJnCb9/hrvkclil1KkGAoXbPhA39u1OHj2Nwbg 7yCvGSCZxEnvKWMMJo8uN9YvXVxxZCzch6Ii4S1rk+hHK1sa5VkPuorrYxyZdn74FMI4 zcyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623986; x=1747228786; 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=OqHokklDt23W8knG3MI9yzmJbveoaAKaHbHiDTuVpLI=; b=IHjyy0/20wy+CoWQTCbkjA6rN4A00xJAYIwAvWYC4dF63GAriZUPTKaFbYgYfqSy/z 9WG797noPxxCMW9pmYAHolD14YtTygX9r5wAeqYYi6OIpd1ctQRWBlyMxm2a4imXRcTi 60yy018MWt1xE3MwtlBFiyWoyq4y/PvUUOsOcXQG8LvWYS1DfrESZajf3LKv3pWH7nWS lwa4lW+SE45aNGKZeVkQqVdQr0qw3EBSOu1ooqQczWhDkm6MLhg6kpYx7mDkDTNU/rpi U9vTnAD1apudFMZgtfvfJvNWFEl1g5rrGN3LSLpHpu0N1/26c0n69DUpqxew1qOwQI2k rkzw== X-Forwarded-Encrypted: i=1; AJvYcCXvXHuq7mzSQkb4+GNroaYMyGMBv9d4eD6OoOPnuHX52Gu2i8/55WjbZmUEqziJI2Zl4N/P9g==@lists.linux.dev X-Gm-Message-State: AOJu0YwyQaP4eWWEOuKXW9GaEpwBA8oq+1GFJ6TF7EzqKk4ih/vd7Xt8 IHFgVdrwRBJ9XiILBBqtQF8DWSid/NbIZZqMeAEovzUhn6zkCWsN X-Gm-Gg: ASbGncsoC+4LH7zWYuE2WoET0P90cWiCcKWBHn0ropVTkfepdgWTPuvqkISu1+KQrll Mm6eRM5DvfSrP+hCqkWmhHs8t2EQacXqi4seyRx6kGBCCW/hGaVntgJjyye1h6YXUUSxcJpKjK/ 9qntDGaW8uqRELnDBIKiU1IykhSr+kx0XqPj5Hon9Q49jTnTDLICxt0uKgyDqSHVnykKITdabtG gZmWM2Albev8PZsykgrNVc1xEbrUnq4GflJyXVL9c+gelVu10Yp1KvAS1+hWvaLcDZ+uXYybXnC XkZYNdFI0Su0yvxpbKVwNYO6VuJOpClW7kpUOUyrkbxwfrsiBR6BV04w4/2K X-Google-Smtp-Source: AGHT+IFfdJWCu3m1y8Hriw4GJJRUvamR/KXJqLxjtGe0UkNbJZ3QilajvtvjyVCu5nAM7PzRiGu+qQ== X-Received: by 2002:a17:902:db0c:b0:223:6657:5008 with SMTP id d9443c01a7336-22e5ea7c30bmr54379525ad.24.1746623986211; Wed, 07 May 2025 06:19:46 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:45 -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: [PATCH net-next 5/6] selftests: netfilter: remove rp_filter configuration Date: Wed, 7 May 2025 13:18:55 +0000 Message-ID: <20250507131856.78393-6-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 manual rp_filter configuration, as setup_ns already sets it appropriately by default Signed-off-by: Hangbin Liu Acked-by: Florian Westphal --- .../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 Dec 14 02:01:23 2025 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.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 1485F280A2E for ; Wed, 7 May 2025 13:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623995; cv=none; b=c0JYC7D1CZJXG/onbxbIqFxWkD+VzdjB3zCwAzQypsq48HLI3IDIn8rU486rIIdY/Nx4BnbHyttht1sOPfCUMM8O7BGXJ6WGN8tzXbmctwJP5QfqHyRBaYFVDXtTgXWsrcWq6m2Gs8tS7gkgwavM2PSDJQwJL4MO8a9+jlxYeb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746623995; c=relaxed/simple; bh=pGCESf98a2q8tFRVKDwEPR9HphxMHhS6pJq4K4rLTvg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uWMwkPieI8t/E2t3CnMKFkMEI1fCPbyhnee8Jpv0s2XsVK74q3tisHXFJytKrQOXJgIB24WJpMR14RLTr9JmzxjFChIGJ3nohEEkTx0P8AMQgViEJJeu4J4KAaUVyLEe4terRP6wDb5LKHdjZvB+vm1Qr6Zu9Rm3ufH+9PiIaAI= 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=Q5P1dRiT; arc=none smtp.client-ip=209.85.215.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="Q5P1dRiT" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-af52a624283so881554a12.0 for ; Wed, 07 May 2025 06:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746623993; x=1747228793; 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=ZWIeCnEAL6ezhpEyDQ2QxTqdF36G5ahedpjkpixynRI=; b=Q5P1dRiTgdel5OmbKsEoJ7OuoIX2uWtezCyP3LC3Mb2f6JBSsNa1IpYFlpy1GxZ+Xw ZwaBpivopuy8aIxMMlmO0N3Xr21iGMNGcXnJ8Uq+ONCA1I/yldC0CqQJjmfisQu9/Ex7 fmA4rIpc0yXSjj3jaNz3/IB/S3p8WPJU4VebfuvTsX3yYeSQ56SkN+4zyeAImU+HMRfr cWhu5QEDlvZutM9fKUQ2lOGKnsaC2WQUY5XHTroUmJYYXcIu1zDX5bN4Ux0trLvdZLWx qU+nfNrEJa0tN1MZw9tLeJ3NbCw/FmYYVD3YwMpGsA3AIVXArambO7TN6tcdwxxsFPra i+rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623993; x=1747228793; 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=ZWIeCnEAL6ezhpEyDQ2QxTqdF36G5ahedpjkpixynRI=; b=bZ8jEQZVF9xB4/Fbb+x+VnW4OTzdB/WUGlWV3OwFKnbM6t2zL34TrqTX2MPokHMHlK AsLMTJom6nESnvy01Unso8OomBPFc7go0UW7RFscMt6D6eSjldPXyjAEAxYMARvnQGlX 5I02WCnkLNXJVeyFauNkKO6f2RoTvvfkIK315PXX4sxIH95RJqcUN0N+9YKalcVFptzZ Bk59SN4+NRy+1NFEk8NWPulGejvbUe4Vb4qIo3SMm2z0Akzre+MzZSuHuV2pORtmXUKf zynN+SZ6ntqtTddy+2QRBUucE9jDZh9kiSNybiHOSYH7IIAYG0WaLAx5U09+EIjpYmFl 34ZA== X-Forwarded-Encrypted: i=1; AJvYcCW/KF/xU68hrnM9B077qPTLj8dknF/XGMz9+R0kt1FQzQrjgI8YC85y2Zuo6+/BqzJhJ0yI5w==@lists.linux.dev X-Gm-Message-State: AOJu0YxJY8Qxk3XjMVXJaXabgKV0s9wEqWp3YWxT63ng2yR+QEDSurbs 8a9wK6J3UfuQLnZyS425TWXdSe7WMtfuV/fApGWJD0HKI+WEHjr1 X-Gm-Gg: ASbGncu1dJ9qrULQyZJv9pTUTtWewX2W/LvMUa2cwzfwTbPmCmHPO28W1wbgU1kVaxO AwlzKRSmQ1vbIOADWcw1xGIiuZ7nOgthWmxcL798R5hkq37HgP2xxla0cS1Qaj9RFuJcHYJ0dHz KAs9tqb1qkDxCWezAUEnkrPMxs7MmtEEyzwQT8e1AxunlyF1UNuda3Oc++1/+RINPOSSREb46RG 7StABGLRgwCR85W9pIdJwMBII8gqc7CvVnMg3kG00ojxrt+x/18FjwBq2BKoeifJ6WDV9Axiwsy F3tN4w+x8e3M8QIBq4hfvEMdFv0KsdtqpLs/pI/W/wZGWqSObGTozAUcPAaA X-Google-Smtp-Source: AGHT+IGWaWfGTs4mdubVYu6seZegE278kHJcKhUfM24Xyh9AmlVDo+zcwuC5LDbCC8DzofCmSPW9EQ== X-Received: by 2002:a17:90b:2e45:b0:30a:9feb:1e0f with SMTP id 98e67ed59e1d1-30aaecdc652mr4538239a91.5.1746623993354; Wed, 07 May 2025 06:19:53 -0700 (PDT) Received: from fedora.dns.podman ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e5e93ee88sm17414765ad.86.2025.05.07.06.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:19:52 -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: [PATCH net-next 6/6] selftests: mptcp: remove rp_filter configuration Date: Wed, 7 May 2025 13:18:56 +0000 Message-ID: <20250507131856.78393-7-liuhangbin@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507131856.78393-1-liuhangbin@gmail.com> References: <20250507131856.78393-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 manual rp_filter configuration from MPTCP tests, as it is now handled by setup_ns. Signed-off-by: Hangbin Liu Acked-by: Matthieu Baerts (NGI0) --- 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