From patchwork Tue Dec 3 14:30:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13892550 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2087.outbound.protection.outlook.com [40.107.236.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FBEF1F7561; Tue, 3 Dec 2024 14:34:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236459; cv=fail; b=op+P5Ya0FapDmWs+Nxko2aQDWwTegYVlXsGdpUfKkflM1m4epTwHhHpn6aTkkdTEPdgRBWBy0/QeYCDDNRU6j2m1hoZRAaccPU975kJjT5crNvMvH1tXoHNqgNdnskfvA5fpPx4/xjC1hijuv1+axmV0YdAMhIILr74VRkvSZvk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236459; c=relaxed/simple; bh=cVfKjVqLaxBjvU8xsYDqwvrVmkq7fEKbZK6IxdezcGo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rxdw5q+Wj2ac1LmzHB13z+tu9zgUz0yAQrPR/pRdU17AGIYdCyhm4D70NCWaadldWzAs96U9GTy4JsqzTOMHGzQEqXkhQn9l7IE2MW3oehLTchTKt1Jt7V2+tIjXW1lDC+V0XXvtFEE2ap4QWOToVbpcZPpH1C5S+FNsnLVelTA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=CqYGXnWQ; arc=fail smtp.client-ip=40.107.236.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="CqYGXnWQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yp3ldFOG5Ihqli8QOJG4ISdOcYhxz255cLk6V+K93PtAOdikAZgRxT0YGkaKVaCOLLbtaOMKfmqfLZtgA34m3BvDiWRzAQCdyYxik3O6YWVjNAQpk+d+uTi4jwv7D0CXo+4sGCyBDV1E2ZcfdzujjeAEhSdomvNuiXSF6o/nrb3aer8hpmB4/di4SEKUjueOhCS4iwjQZl5GqQtcIHEiI3bIvjQceJO7lWI5rMYNrS6etQY4m5ZbmXt64uvOCYqVFfY+Q6FurgZSJloRupIzzwZtzYMsMVx8HPiU8KHO4NdhBUlg2EHYU5DVBtHKpKS7aMtQcPzL9hyXNTYs3mVeVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DVqdvTshHxNki3bZ3TKLjG68UTcnAHsRVq2A6Gcb6kI=; b=bZEYb9NB2krTMgvmxQTdu+Kb5oY/RaBGvUJtLvyC2hemTdoe90QbrKrRS+eo7/SpdV+wLV9BCylLgVUBzn7W5TnfOqWCFEEvs3BBwy5ytLqgxF7nCRaODMF8mXmYGDDO1RAo0AjF5lzE1r8Brq0LXEriSQXoySLXf96B6bViGyTdeaZ4k8AEyMj0s7QOUcv+X1y16muQ+kwxgLXYOshE3bt4aYh6iLEKnvMHfW01YlIqq7z+UKXK4HTUjofkq5+jOFUqwGpvXB/R/gq0OW7xX9AME++oyHchyvZxePohdM0sIbwgR1aWyjvc9hvPB42GImLovPsfHlyZcdtMVEFoYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DVqdvTshHxNki3bZ3TKLjG68UTcnAHsRVq2A6Gcb6kI=; b=CqYGXnWQ3Ms+ZIjAFCoaourT+pqfcCBlw3eY1+zw+e2UXcPWU6/Uj9rwSeJ8X0dmzazqOMHjz0Bh80e/d0j/tyR/MjmU2AUaxPtGkWc4G1AMKoUQQJi8Kat4BMi5eJ6B9q56MWVszg9RQxxDgRGOq8U9mqRYU8sRAz2okFu08FIzMADui7F6ToATSmxueuYzPQ2mbS5tX6HEiRPveNE52M/Jy1DNwasoJujLRJ5ByxU7e41b+j3GjFIIx0uYTcNAo4fYzPUqgaja0i3rLhLHMIAz5g59b8WB3gzKkmrQ4O7ocaXeZ21azM+iC5GNSdkVdTsFso4Arjx5Wi3Xjo6Yaw== Received: from SJ0PR03CA0081.namprd03.prod.outlook.com (2603:10b6:a03:331::26) by MW3PR12MB4348.namprd12.prod.outlook.com (2603:10b6:303:5f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Tue, 3 Dec 2024 14:34:13 +0000 Received: from SJ1PEPF000023D0.namprd02.prod.outlook.com (2603:10b6:a03:331:cafe::e3) by SJ0PR03CA0081.outlook.office365.com (2603:10b6:a03:331::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.19 via Frontend Transport; Tue, 3 Dec 2024 14:34:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ1PEPF000023D0.mail.protection.outlook.com (10.167.244.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 14:34:12 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:34:01 -0800 Received: from localhost.localdomain (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:33:55 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: Simon Horman , Ido Schimmel , "Petr Machata" , , Shuah Khan , Benjamin Poirier , Hangbin Liu , Vladimir Oltean , Subject: [PATCH net-next v1 09/11] selftests: net: lib: Rename ip_link_master() to ip_link_set_master() Date: Tue, 3 Dec 2024 15:30:35 +0100 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D0:EE_|MW3PR12MB4348:EE_ X-MS-Office365-Filtering-Correlation-Id: c20b1ae8-d97c-4f40-cfea-08dd13a78e75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: uCeKIVrP0Op7T+/FeGIBPEibBlgeN3x26+huP8LDDedseHDSw30miEHpdO2gAF8CDNZdp1fYOLdWjLyGTVTANYerrE0g3DuF0MGoBPvYyda151P8sQug4DagNM5yUC65yuCUXePDFbqEIK9hxCj/btSqgzmY2OTxm0tvo6F7A+5j6w3/rZLqyiP2SIThOp26/JPgObn/9KP1+Dxbnhjh1sllnAqsH4Er1q80riVmlN1REHC0+EOiirW2xPFnYE02fjQjVBWAXxkgwG6vHC+xEgWIa+VzARph08G+j/3i5Z85W80+kXfVTvVlX2uF23wLralAZqbNXSFS7KlSPANLpY0d3NzSGmUh+m8/O11BebOI07o4cGBKGAGWXYq3oYDHrn7YClIQKJ+nJE5o+W4T+gJkM3vicPUYfL3WFOFbqAlqs6TcG34HoG4QowcHVfurKR8oudeYvP5PNw6VRFBdOL5fia3qY4QfwhpFO1XbPabS0XYR4ffLK/BM1nRqCaNVshEIQbL3u8NZ36GN2k7kTH7aDeHANjVbhQIZNGN+IjaR1WQZ/M3NFyEMvrypgdblBu6S6HwZ5lztjWv3znBg5TVA60KGQGeX/bM3UMHV8aMsveMZFFSt3BE7YhX2CrZALjvfXlrPN3sBm5+sF2X8RSSS0QiLqyBatrirgGLh/9JIk8lMCW6fsbH7NhqjnxPh3qTNGa9idHy/3TPMxF0bTkjTYIx91wyFH0ejTX5ui9zz/lNGEeOyXY/9DQ9A/v8tEeI68r+Js+NbXOpJE2i4TD2BA9U+nxJb91o0rLshKz+Di7gyaZ9lwTWUbLCm8Ow29oqFlU2X+pn5rRHJBXQvz5lfUN/qXkffqUxFuN904uSJX/Q4yeIsrF/GtjKqdtfPkSoGGX5NmZ/GRbqnbmFBlaqf/dswUdQgTSH78fPVPxIvpNyHOq344/QlzYJ5xpR60K1ChFvrrBoVQ+5RI1s3a+bEb6jUxQIh7fRLEjkw0NTOepKT8MtHrDyBwY+rOCIeXIVXsPL8J0ZLccav3h2J16sMOZKMWtU3HCPivaynLfSJz4sg9YPKbsycVrO68OdWu2IHn+usn7SqTd6BpDuyU0nIM+e/o8Rd6q37CLXjGxGHonwLHTB9SsRnOTdfTLnis124Iww0sisFtLwZZxWjbf4/CyYX0SXgJswJ+VyrJCvjbSArbqelQo/+lzplEqgdzJrKpWlGxLSEZjhLoCBZLH7LTss3SiaYXwVCox0+/49xKNB2cw7niW/zQ7WB7hsL8GS3B37gXrGy1/6BY8Efd/8AwsLFiScCN5fFUKC40owooWr9+2TeccjHofBVUe8N4oodLZZioshv1qM6RwxMAxCMhXSJgPmJn9bqc7Pun0L+Ti5u2VgaEZumh6Dni0cHzR9f6ed/evJuDpEB5tOKNTCZXP18sK11wTPWpFlDGZClIZQS6kbSKizPZBx8GjnJ X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 14:34:12.5467 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c20b1ae8-d97c-4f40-cfea-08dd13a78e75 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D0.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4348 Let's have a verb in that function name to make it clearer what's going on. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- Notes: CC: Shuah Khan CC: Benjamin Poirier CC: Hangbin Liu CC: Vladimir Oltean CC: linux-kselftest@vger.kernel.org tools/testing/selftests/net/fdb_notify.sh | 6 +++--- tools/testing/selftests/net/lib.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/fdb_notify.sh b/tools/testing/selftests/net/fdb_notify.sh index c03151e7791c..c159230c9b62 100755 --- a/tools/testing/selftests/net/fdb_notify.sh +++ b/tools/testing/selftests/net/fdb_notify.sh @@ -49,7 +49,7 @@ test_dup_vxlan_self() { ip_link_add br up type bridge vlan_filtering 1 ip_link_add vx up type vxlan id 2000 dstport 4789 - ip_link_master vx br + ip_link_set_master vx br do_test_dup add "vxlan" dev vx self dst 192.0.2.1 do_test_dup del "vxlan" dev vx self dst 192.0.2.1 @@ -59,7 +59,7 @@ test_dup_vxlan_master() { ip_link_add br up type bridge vlan_filtering 1 ip_link_add vx up type vxlan id 2000 dstport 4789 - ip_link_master vx br + ip_link_set_master vx br do_test_dup add "vxlan master" dev vx master do_test_dup del "vxlan master" dev vx master @@ -79,7 +79,7 @@ test_dup_macvlan_master() ip_link_add br up type bridge vlan_filtering 1 ip_link_add dd up type dummy ip_link_add mv up link dd type macvlan mode passthru - ip_link_master mv br + ip_link_set_master mv br do_test_dup add "macvlan master" dev mv self do_test_dup del "macvlan master" dev mv self diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index 8994fec1c38f..5ea6537acd2b 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -451,7 +451,7 @@ ip_link_add() defer ip link del dev "$name" } -ip_link_master() +ip_link_set_master() { local member=$1; shift local master=$1; shift From patchwork Tue Dec 3 14:30:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13892551 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B8BF1F4704; Tue, 3 Dec 2024 14:34:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236471; cv=fail; b=HejtQxegdkbOxfXQnC6fSPxKEud/NKBygnEXwaAvB8sRlTWGbxjkNoTh84lJ4JbYwakkqxNnZLi0Gm6ioo/gDQClLVsfb2hjxh3ks44xzXFr2mTgC2M8Sa0HaAnAfhJCI1VSsWi4YHEEIdiZWr0qiW/QIxkAyI3tNCm658xvFmk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236471; c=relaxed/simple; bh=RUmjpS00KQPThj9efFSMqJlPjLPKYyp632VyEJwERTY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KgDWw3T5+CrreMuu3cdb+in4icT+FPtkpbTxvmz+tC+YIJREz2NNR/DgAxmPs1r5PGCO00o67gKlJbVHEOG1eizRg7v43yw2FxmfVwX1xNzchEcR/q5xyBWdvGKlltik8VdgcoGKXUM3/dwp2fJRvyVqgm2DTsLj2Yl3Vy7PVeI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=NynRPKFE; arc=fail smtp.client-ip=40.107.93.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="NynRPKFE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b6mwe1CckCOnb9OG+xb8aoTiy313rHwlngCEztfmT4AP8YpCMFXOCBejtxaBXSpLrLzy3UbMEHE0HB3cdL8Z9v/90Z5hfK7vTWoNwj785mlPJAoqzPHRyeLpSMLNv+Wi7/nKOFBEAVCpzIZQ5l6vv+0cvmd+3tjliRD01QrJe9Ofze/djGe8EFZTLaRmUdWXgVgsdHqcXfGvcZj1GBXUiIMUcSEP5z6yt7bOtjjjcNsixBNujeXSH6AFuHq/G7eVydGNxeKll1lwt7MAlRekVcWxNpB+d0sKXrDJnt75cASEK9/cFwJEKxhJLTSkp1wU4ED8CLEBI/HMW9HYui1tbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iemher0mO6qrlOQ5kx+Fwf3R18yaGpgpyBN2/v8lXvg=; b=nbPEJoeRgQgVKoglvxU5qJlsK3I8CpLLp2bRlWs4+7/2nLK2j2BmyMuRR3ARKu30itmyYU5I1hqfSZOWp8qG2GfGn66/oOBGCNyn/JTkEedJIhoJ9IS9ionTdfuEN6vsOaP2C7T2ipfQEIsLFL+gxZ1nqV0KKsP8EM1dQzhHY9s40Eemyku8PMHDSK8o7lxP+BO++bcQq3UtKSlcOWESrA/fUtvkAktDA08bajaT6WjkYJXtejNAuk7LzHb22Z9RQCSHp67xRh81oJ5ObIZuSEpR9whV56AQ8BRDbV1QWHDn3j5Y3Cy0ogBXt/boA9TGys5RTdc5WoRFr1azxSu59w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iemher0mO6qrlOQ5kx+Fwf3R18yaGpgpyBN2/v8lXvg=; b=NynRPKFEISn1RRJXqbmWt5rVDfo4IY8X20a0AnURXS/DsY7XRfTluizxI3GDEF/S2sXGzPSXYxileoKvhzkq1Em/Hb5nAdpCJDdSlWYJ+FIzyQqkr2juKqie7LGrW0FHyAzUkMrQjQ1/rIUmxrCEqvJtBCqWOQfCmvxFcGhdWjt9o/6XyyFKR3NPXg5OqTK3vCrPL+o0LrYvy2M5BTcMNmz9vPko1p252jn5HPG9dgI4OQWlO/eGMGHSsdXDsADNCbgISSexMezudRYo0JzroGFvpVHmJTIY9NR/6t5AtoH/Zf6ATmeK72BI8mo1m9RIraUGkTEqfLDDI+BlVkQpyQ== Received: from SJ0PR03CA0149.namprd03.prod.outlook.com (2603:10b6:a03:33c::34) by PH7PR12MB7377.namprd12.prod.outlook.com (2603:10b6:510:20c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.18; Tue, 3 Dec 2024 14:34:24 +0000 Received: from SJ1PEPF000023D2.namprd02.prod.outlook.com (2603:10b6:a03:33c:cafe::b4) by SJ0PR03CA0149.outlook.office365.com (2603:10b6:a03:33c::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Tue, 3 Dec 2024 14:34:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ1PEPF000023D2.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 14:34:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:34:07 -0800 Received: from localhost.localdomain (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:34:01 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: Simon Horman , Ido Schimmel , "Petr Machata" , , Shuah Khan , Benjamin Poirier , Hangbin Liu , Vladimir Oltean , Subject: [PATCH net-next v1 10/11] selftests: net: lib: Add several autodefer helpers Date: Tue, 3 Dec 2024 15:30:36 +0100 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D2:EE_|PH7PR12MB7377:EE_ X-MS-Office365-Filtering-Correlation-Id: 90241221-1fa7-43cc-fa98-08dd13a7955a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013|7416014; X-Microsoft-Antispam-Message-Info: mpGc8zrvwKSZeLANWT9Xi1FXfRvboijZ8oCRKnj+ZgAePxVMv/Id/OGZ7DcBFTlPCI2OWLF2Eq9KDUP+sa6yvX27PodQ/ORCVK6oIPaJfIng5g65XLocEOlaW9AD2Os5PaG4eMbt2Zd/HC0H0JgOExdv3J7K+K/v/IF7lDb7EeXFXDcMerYXSEKl4cZSkPUK7CrfFVpEwvvZa5PmB03rWKWMa9JhSLF8DVKZZx2OAwXREUnbUoO8qEK7+SW2hQH1JSkInIushnrfJk5wf7frFpN3z+soXsqYCPvu+ic0AZQcNPp8H0gNhhjGEJR8FY1wwVXxyuK6w6sEWi8qc/bKMG0SG41SWMqECt8npBz/JIsHPtpvnimRQ7etUMQf3d6iQHipKV+oGzTsmSVPX8TdqXEf8OvLOdG9+tCQT0zkOeeQfBUs/25nSwPeJAHlIbplFxRGQdIXvHbzoyHgV6j5J5zYGagQiS+w+634h4VifHNNTMBiI/MmliuQzdY4ztzhua4Bc+PoleEej2USEW/u5F0eNk5KJ27CJc7WzcCt8GsVrwplVjQxYFf9wQhH95ZRvHMswnE/GznVu7FWOnfujsQcgE7gBBW9dqdCPlY9EfDapPNn28cdA/NfJMo63zap828t0np0vENgjFuagYEmMNnYuPQDyOUELTCyV6CHVwYjOgtKtnHPxGkj0ZN3+N+CP16OcWU8LB1UOIB+Bj91oL1SsHZqIGJnV7j0xF+cRazR0nHGB5qIkTY1X56KVcEfivcJsWYFbAJWL44JuOyHJNAExdU5VXA0m9ZFz4hLUW2fSKcU2VPGIfyibPoQ5jl6KmLx4QHqjjlJ1pAL4y43dUCwdElCGkr3XM5Haal3Og7hKcfS3vSlZ4HHEyqjqHGv/YkZKilWLtihM0+jn0KN5J15kn7nRhT3HRixTPVniDegrSO316YOK06oq29Ox1ufWZk0yy3n5mcUqlTjNZCvACEWLOz1zY6EuZ1DgppYLBxzttV//s2teYWTW7lhLARohk/1zfca/5nSsz99d6B8U/dxNxGtadZzOQtihPFkYaWoALcjSodHl4zjSL3BdHepBt9Z7TzRiu6+0jg8SndtI1kLKngsb5fXBG1mrAYx92eCvAABkr/OUMG3IQfxvl0GOxiK/qTkgxVG1u34KjsLFHf+QxCsXKsFZtT6L2Yctdqba/kj8E+FmQjBGnaqj+/lEHql4Hvz6dV5hFk70Iv5a3ZP3j0zdJuAN+v+VnT4xT5AOzk2SkNWD3jtV6oWs5Q7Vsyga+IL132NRU/LyY3fWbT+7yPe/Q6n3wGS795kw8f6DwO4fjhhQe5zCIH1CiOYFE4A1sBe2X90l1I4hDCWAMQW6vtlWgrdCQ2uJkItX44iXg4KNkj1/4GMp4JdBUAPSPjQCy6gse9kpRW3yz54SbqpIjdAXO7kYf40LNIxeBnZZfvkJEUUwL/cqt0ONfE+ X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 14:34:24.1462 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90241221-1fa7-43cc-fa98-08dd13a7955a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7377 Add ip_link_set_addr(), ip_link_set_up(), ip_addr_add() and ip_route_add() to the suite of helpers that automatically schedule a corresponding cleanup. When setting a new MAC, one needs to remember the old address first. Move mac_get() from forwarding/ to that end. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- Notes: CC: Shuah Khan CC: Benjamin Poirier CC: Hangbin Liu CC: Vladimir Oltean CC: linux-kselftest@vger.kernel.org tools/testing/selftests/net/forwarding/lib.sh | 7 ---- tools/testing/selftests/net/lib.sh | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 7337f398f9cc..1fd40bada694 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -932,13 +932,6 @@ packets_rate() echo $(((t1 - t0) / interval)) } -mac_get() -{ - local if_name=$1 - - ip -j link show dev $if_name | jq -r '.[]["address"]' -} - ether_addr_to_u64() { local addr="$1" diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index 5ea6537acd2b..2cd5c743b2d9 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -435,6 +435,13 @@ xfail_on_veth() fi } +mac_get() +{ + local if_name=$1 + + ip -j link show dev $if_name | jq -r '.[]["address"]' +} + kill_process() { local pid=$1; shift @@ -459,3 +466,35 @@ ip_link_set_master() ip link set dev "$member" master "$master" defer ip link set dev "$member" nomaster } + +ip_link_set_addr() +{ + local name=$1; shift + local addr=$1; shift + + local old_addr=$(mac_get "$name") + ip link set dev "$name" address "$addr" + defer ip link set dev "$name" address "$old_addr" +} + +ip_link_set_up() +{ + local name=$1; shift + + ip link set dev "$name" up + defer ip link set dev "$name" down +} + +ip_addr_add() +{ + local name=$1; shift + + ip addr add dev "$name" "$@" + defer ip addr del dev "$name" "$@" +} + +ip_route_add() +{ + ip route add "$@" + defer ip route del "$@" +} From patchwork Tue Dec 3 14:30:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13892552 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2060.outbound.protection.outlook.com [40.107.212.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2D2F1F666B; Tue, 3 Dec 2024 14:34:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236486; cv=fail; b=TjN/YzgOfKF7+y+tJf/foTecxji9S5Eal3nDxVMpGb2Jp5r5qeHTGPH+3QfIe+p4FyC5t2vBTAmy7lZUVwaeM6zJ8MpXaSY/Rxm5DBwa0/kfYaxXhA9FJT6xOL+5PT8PAhJpTjbi1ykAD9UcsKLHCue0OzRvtSt92tt6H5HIKfU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733236486; c=relaxed/simple; bh=sa+vZ4cO2nKVCAsPHtSng8OI9lMw+dXg1EIFqUVLVto=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JubTmNMo4QjXdIFXZfgsYYt0cJV0lcAPx/1WPDAZPmOym4CiKg9UnZdZ0HKKHJT2Hpas4CguH77QgmqL8xPZG7gDPNP+8JP15WDf+28yTJu6xHs7D3qpbHXaGrCX5VIGSHt9ZQs9UzRGjezk68caJoKz1qNU+PlfinFmaweaB4M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=cNfgrxUu; arc=fail smtp.client-ip=40.107.212.60 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="cNfgrxUu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vOi/mNTlmBL6uelMLKqQWdoQ2RaOhhQLHRqz2Ovjz5ZQSaucKW8UFSo0gOeSSz3y1GH+WnN+N8FZ+Sjz2L3WQEZ8XUBBg0e/Q/03+GgJnp4fvdmkbZJjKxf1S5ttmmA4+4WEsfSYqIQ7BFN9Ktcn2Y6FcuL4AMyhbMwdmvResqPg3YcPduXGFPr5WzVrNyJ/Qb3/thzuiEAHbiGFBhyhvbqoCeM8qv9G1FN5dx5yJffVlREyRXi8S8A4pLYwkCFB3VoPV7Gy1fLuGJActPB8ReUJIio8NYZXEyYKUIt1KzB/klS2WZqd58PrrSNuZmynmgIaIAHOzwlKAgDsRzXaZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oZq6qzGt8ei5DmYVubXAiDaB7Wew5c75RnjQVh/liIA=; b=NC8K3whIOc0sqSG2XTJCnFysf4wHe+oghlmkYYxEMuEcdFO1s8iGRLyno+eqrmRfQ9HG4rVn01MpYDgNjsjyGImgo0RQugrWIxF+HiMEyxc6wQqJGed2XJzq4NWxDSUnGZoXAPy8bX1+iVne2vgNpaq66iHS6YdZ5oNm2SehuvSgxGp9oqGJHRxFrfMQoQJIfexh64pd+JxfrC6cf2ap/viI6V11Bhn2HII7MZB6evR24merR588AbCOzJ3S5OMiNYjUAiA3q0Qie7rPT9mVUrefTXus3iaSInUyGTQXuWh2RaEFpcFTZNLj/noskjX9g6DCBwX3Iii332QgVRL2iA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oZq6qzGt8ei5DmYVubXAiDaB7Wew5c75RnjQVh/liIA=; b=cNfgrxUu9D02a+LcYkMbAuVl3tc4oBfyyQQIDyMPhf1EUn0XQKKjwuF5qTZd8MwkGpcgBXmdibyEqLgiOJhhZ83PxxJiG+uf/fzpFu8jfqreVFEjOOXgxwr2TjWAPEActWPlJ+Ps4tNJU2d6Cj72OZD87oronSCmoHqoy5KwLgsi+Rhh5zepcszoLicANbE9TJyb3SzfaLFvnpp2oYuOKjWBJpx+ZaBu+qwlQzPWOCsjC4lYPacRxLKoUmMQhVAYclK1U7vRn+0ZLLdsB8uW2EqkkxsDk2TgOkv2oZPdJdyr3F2GzjPA1VGe65SGe0cZ7zA8WVXzOegFhDvA8Q7P6A== Received: from SJ0PR03CA0298.namprd03.prod.outlook.com (2603:10b6:a03:39e::33) by SA1PR12MB7442.namprd12.prod.outlook.com (2603:10b6:806:2b5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.18; Tue, 3 Dec 2024 14:34:30 +0000 Received: from MWH0EPF000971E8.namprd02.prod.outlook.com (2603:10b6:a03:39e:cafe::9f) by SJ0PR03CA0298.outlook.office365.com (2603:10b6:a03:39e::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Tue, 3 Dec 2024 14:34:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000971E8.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 14:34:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:34:14 -0800 Received: from localhost.localdomain (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 06:34:07 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: Simon Horman , Ido Schimmel , "Petr Machata" , , Shuah Khan , Benjamin Poirier , Hangbin Liu , Vladimir Oltean , Subject: [PATCH net-next v1 11/11] selftests: forwarding: Add a selftest for the new reserved_bits UAPI Date: Tue, 3 Dec 2024 15:30:37 +0100 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E8:EE_|SA1PR12MB7442:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dee7c80-d745-4ed9-b93b-08dd13a798d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: bq5mxEMOuFjia2f170TIXttdYoLWidLw//Gb5RCa4UVdDCRdgZHwkIeKLRpmICHYZn/udmAFyGMBveiqX+4VfVcI7wz+nE8sjs6fiuSksY5Tjr1pnursv+O+fYYbA2WNfTF6mCY25VlEhruWjYY90k8XMdr4rGUKbUOrVbyTqBlEHWQfKw/DzFaYqQIdcl+ZCftf8jxx6zp58rBMdWpaZK3gO9mBWTLbN6t+8nPFt4AojwwXt98Y+Hf8LOhiAAdyHaHG0bsUc51jQ6Bf4LrFME9JP2lElMoCVLuH76T9utHZ8ea3R1krtvwj+avuOzbq1ocpnGY9tW1w60EfFttMDgrobPNYSJKCtEIOMRN6kvOvH5c2FgUw0wbaCx7IPfANfCUtBvc9sqGxcJ2nHKiJYS8qtMfSoTFVqxAgDpK/h48HTjKgiFm8iMQ4InbrCnNA521cJ2wTMhd1cXeMPwc2IMCwK6GsCIydiVv/pkp6yZvgCTeMbwFQvRWYzOpU1hpJbGigSO8BbbqoziTkrtg7z2dzBHNAjGDwSLfqogAgJ+5UEN4DG7T7J/Gf5ap9qYObuUG0gU0J3eKXJG+wZhuhSsAu8CW+zIXFkXX3na+SQ9NxToXCrnNLGM5odGGiY1nts9CCPC0kmvZ11BzVMJZwK1qnyM5OTOdOBQYnBNDzI0lcAdSuTSgEl6NpaIR9IbtEq1jErF6uC0xuW0Pev3uK4IHQGvOGDRjTiiYbmxMI9llgAI5wB9faNI/TXM5WqBqdE1BW/wgDXP15M3mwM3DgUJVB8trTEZA22guZGABHtV/ePXPdYaYGHFY0jdbxlVr+JQ0C87613+SvY8p96+Bm+qpnykqJIXKJBpPTuUvLsmZ25+aki9KzDD4vjy8MUpya5HPzjsB18XxkgnSCzwApVDRxYXeX2nMlkR3jwg0dew/EQTsjCkAJHIZpQ6dd/qkqiByGxVF+QbywCIpu0ZOFk+HlkoEm+6C2k6hDlTNR6sn/Zb8qeSlLY53BTO7IqX30CsopmvN5Oe61bNhQw/X1R2hi+zH3wotg8lboeE8lG+pXYdA/hYNFsgDg82fbSla1oho5Nc8+dFBdu2Lrice29ieWsXuwPlM/mgCiBTU+axjmQddNPbJVDW2Bq/ezqDXlr99wSNQLCtpT7ze+NZCAe6TZzgYI3HLhVlkSuKON3+oon3zaDaZ+/UIqHjhin8KHveu7HgGtJkfM1s0DNN8FJaTqJyzWGV0Zwzdmn354LdyQF59et2Z8KCwRMsxdBqjJ5Y+PBdIiU2JEv+JfEqJIBuTS0qBUbXq3q99XTvbObsmw+w4AqUPZ5wSLYsc3x8oz2967Dko4sTgWe1c9HMkg/M3gqtp1IT+rkbqOqngKjzbukMvg6GqY90QPvUXJu7pKOQx1lqGYRQjLKOwX3QTbdGy7nIgqFKRAuL+KK+2tCW7b54mjkvKOVaPGy/oIf9gI X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 14:34:29.9354 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dee7c80-d745-4ed9-b93b-08dd13a798d0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000971E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7442 Run VXLAN packets through a gateway. Flip individual bits of the packet and/or reserved bits of the gateway, and check that the gateway treats the packets as expected. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- Notes: CC: Shuah Khan CC: Benjamin Poirier CC: Hangbin Liu CC: Vladimir Oltean CC: linux-kselftest@vger.kernel.org .../net/forwarding/vxlan_reserved.sh | 352 ++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/vxlan_reserved.sh diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh new file mode 100755 index 000000000000..46c31794b91b --- /dev/null +++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh @@ -0,0 +1,352 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# +--------------------+ +# | H1 (vrf) | +# | + $h1 | +# | | 192.0.2.1/28 | +# +----|---------------+ +# | +# +----|--------------------------------+ +# | SW | | +# | +--|------------------------------+ | +# | | + $swp1 BR1 (802.1d) | | +# | | | | +# | | + vx1 (vxlan) | | +# | | local 192.0.2.17 | | +# | | id 1000 dstport $VXPORT | | +# | +---------------------------------+ | +# | | +# | 192.0.2.32/28 via 192.0.2.18 | +# | | +# | + $rp1 | +# | | 192.0.2.17/28 | +# +--|----------------------------------+ +# | +# +--|----------------------------------+ +# | | | +# | + $rp2 | +# | 192.0.2.18/28 | +# | | +# | VRP2 (vrf) | +# +-------------------------------------+ + +: ${VXPORT:=4789} +: ${ALL_TESTS:=" + default_test + plain_test + reserved_0_test + reserved_10_test + reserved_31_test + reserved_56_test + reserved_63_test + "} + +NUM_NETIFS=4 +source lib.sh + +h1_create() +{ + simple_if_init $h1 192.0.2.1/28 + defer simple_if_fini $h1 192.0.2.1/28 + + tc qdisc add dev $h1 clsact + defer tc qdisc del dev $h1 clsact + + tc filter add dev $h1 ingress pref 77 \ + prot ip flower skip_hw ip_proto icmp action drop + defer tc filter del dev $h1 ingress pref 77 +} + +switch_create() +{ + ip_link_add br1 type bridge vlan_filtering 0 mcast_snooping 0 + # Make sure the bridge uses the MAC address of the local port and not + # that of the VxLAN's device. + ip_link_set_addr br1 $(mac_get $swp1) + ip_link_set_up br1 + + ip_link_set_up $rp1 + ip_addr_add $rp1 192.0.2.17/28 + ip_route_add 192.0.2.32/28 nexthop via 192.0.2.18 + + ip_link_set_master $swp1 br1 + ip_link_set_up $swp1 +} + +vrp2_create() +{ + simple_if_init $rp2 192.0.2.18/28 + defer simple_if_fini $rp2 192.0.2.18/28 +} + +setup_prepare() +{ + h1=${NETIFS[p1]} + swp1=${NETIFS[p2]} + + rp1=${NETIFS[p3]} + rp2=${NETIFS[p4]} + + vrf_prepare + defer vrf_cleanup + + forwarding_enable + defer forwarding_restore + + h1_create + switch_create + + vrp2_create +} + +vxlan_header_bytes() +{ + local vni=$1; shift + local -a extra_bits=("$@") + local -a bits + local i + + for ((i=0; i < 64; i++)); do + bits[i]=0 + done + + # Bit 4 is the I flag and is always on. + bits[4]=1 + + for i in ${extra_bits[@]}; do + bits[i]=1 + done + + # Bits 32..55 carry the VNI + local mask=0x800000 + for ((i=0; i < 24; i++)); do + bits[$((i + 32))]=$(((vni & mask) != 0)) + ((mask >>= 1)) + done + + local bytes + for ((i=0; i < 8; i++)); do + local byte=0 + local j + for ((j=0; j < 8; j++)); do + local bit=${bits[8 * i + j]} + ((byte += bit << (7 - j))) + done + bytes+=$(printf %02x $byte): + done + + echo ${bytes%:} +} + +neg_bytes() +{ + local bytes=$1; shift + + local -A neg=([0]=f [1]=e [2]=d [3]=c [4]=b [5]=a [6]=9 [7]=8 + [8]=7 [9]=6 [a]=5 [b]=4 [c]=3 [d]=2 [e]=1 [f]=0 [:]=:) + local out + local i + + for ((i=0; i < ${#bytes}; i++)); do + local c=${bytes:$i:1} + out+=${neg[$c]} + done + echo $out +} + +vxlan_ping_do() +{ + local count=$1; shift + local dev=$1; shift + local next_hop_mac=$1; shift + local dest_ip=$1; shift + local dest_mac=$1; shift + local vni=$1; shift + local reserved_bits=$1; shift + + local vxlan_header=$(vxlan_header_bytes $vni $reserved_bits) + + $MZ $dev -c $count -d 100msec -q \ + -b $next_hop_mac -B $dest_ip \ + -t udp sp=23456,dp=$VXPORT,p=$(: + )"$vxlan_header:"$( : VXLAN + )"$dest_mac:"$( : ETH daddr + )"00:11:22:33:44:55:"$( : ETH saddr + )"08:00:"$( : ETH type + )"45:"$( : IP version + IHL + )"00:"$( : IP TOS + )"00:54:"$( : IP total length + )"99:83:"$( : IP identification + )"40:00:"$( : IP flags + frag off + )"40:"$( : IP TTL + )"01:"$( : IP proto + )"00:00:"$( : IP header csum + )"$(ipv4_to_bytes 192.0.2.3):"$( : IP saddr + )"$(ipv4_to_bytes 192.0.2.1):"$( : IP daddr + )"08:"$( : ICMP type + )"00:"$( : ICMP code + )"8b:f2:"$( : ICMP csum + )"1f:6a:"$( : ICMP request identifier + )"00:01:"$( : ICMP request seq. number + )"4f:ff:c5:5b:00:00:00:00:"$( : ICMP payload + )"6d:74:0b:00:00:00:00:00:"$( : + )"10:11:12:13:14:15:16:17:"$( : + )"18:19:1a:1b:1c:1d:1e:1f:"$( : + )"20:21:22:23:24:25:26:27:"$( : + )"28:29:2a:2b:2c:2d:2e:2f:"$( : + )"30:31:32:33:34:35:36:37" +} + +vxlan_device_add() +{ + ip_link_add vx1 up type vxlan id 1000 \ + local 192.0.2.17 dstport "$VXPORT" \ + nolearning noudpcsum tos inherit ttl 100 "$@" + ip_link_set_master vx1 br1 +} + +vxlan_all_reserved_bits() +{ + local i + + for ((i=0; i < 64; i++)); do + if ((i == 4 || i >= 32 && i < 56)); then + continue + fi + echo $i + done +} + +vxlan_ping_vanilla() +{ + vxlan_ping_do 10 $rp2 $(mac_get $rp1) 192.0.2.17 $(mac_get $h1) 1000 +} + +vxlan_ping_reserved() +{ + for bit in $(vxlan_all_reserved_bits); do + vxlan_ping_do 1 $rp2 $(mac_get $rp1) \ + 192.0.2.17 $(mac_get $h1) 1000 "$bit" + ((n++)) + done +} + +vxlan_ping_test() +{ + local what=$1; shift + local get_stat=$1; shift + local expect=$1; shift + + RET=0 + + local t0=$($get_stat) + + "$@" + check_err $? "Failure when running $@" + + local t1=$($get_stat) + local delta=$((t1 - t0)) + + ((expect == delta)) + check_err $? "Expected to capture $expect packets, got $delta." + + log_test "$what" +} + +__default_test_do() +{ + local n_allowed_bits=$1; shift + local what=$1; shift + + vxlan_ping_test "$what: clean packets" \ + "tc_rule_stats_get $h1 77 ingress" \ + 10 vxlan_ping_vanilla + + local t0=$(link_stats_get vx1 rx errors) + vxlan_ping_test "$what: mangled packets" \ + "tc_rule_stats_get $h1 77 ingress" \ + $n_allowed_bits vxlan_ping_reserved + local t1=$(link_stats_get vx1 rx errors) + + RET=0 + local expect=$((39 - n_allowed_bits)) + local delta=$((t1 - t0)) + ((expect == delta)) + check_err $? "Expected $expect error packets, got $delta." + log_test "$what: drops reported" +} + +default_test_do() +{ + vxlan_device_add + __default_test_do 0 "Default" +} + +default_test() +{ + in_defer_scope \ + default_test_do +} + +plain_test_do() +{ + vxlan_device_add reserved_bits 0xf7ffffff000000ff + __default_test_do 0 "reserved_bits 0xf7ffffff000000ff" +} + +plain_test() +{ + in_defer_scope \ + plain_test_do +} + +reserved_test() +{ + local bit=$1; shift + + local allowed_bytes=$(vxlan_header_bytes 0xffffff $bit) + local reserved_bytes=$(neg_bytes $allowed_bytes) + local reserved_bits=${reserved_bytes//:/} + + vxlan_device_add reserved_bits 0x$reserved_bits + __default_test_do 1 "reserved_bits 0x$reserved_bits" +} + +reserved_0_test() +{ + in_defer_scope \ + reserved_test 0 +} + +reserved_10_test() +{ + in_defer_scope \ + reserved_test 10 +} + +reserved_31_test() +{ + in_defer_scope \ + reserved_test 31 +} + +reserved_56_test() +{ + in_defer_scope \ + reserved_test 56 +} + +reserved_63_test() +{ + in_defer_scope \ + reserved_test 63 +} + +trap cleanup EXIT + +setup_prepare +setup_wait +tests_run + +exit $EXIT_STATUS