From patchwork Fri Feb 14 16:18:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13975207 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2052.outbound.protection.outlook.com [40.107.212.52]) (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 EC3D62753FD for ; Fri, 14 Feb 2025 16:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549960; cv=fail; b=AtUoBzpFIA19/AQ6TK5no/aDZGhZGNcWgvgLgMGC+uyKMDiC6W9/5Tz6pX2t0mBg+uPM+Gk9HpZzdRAG8G4wnuvmyPcTYS/dM2+fU55HGuzrlGiOUqGOlBU0tsqGTq37fR78CnNwX9DbpBcpRjBt9G1CxsCLu/pci/7+j7T6EGQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549960; c=relaxed/simple; bh=wSymqzz7rxwOlVJ/pbjKx++OCr227vtTEVuyoxDP2Ek=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qnpqx9/hZpdhYsmUL5qqsRMqZiw6gd7XTlaIgGMXPIJPAZP0+C+CRjlu0YtFZfGIVyWmkqId3xAGcurITOXpMA6AgGv6HdORVlyEevAYVZRkXUDaaHPOww0BUeH89z2NVUWa2CtGXWoRj3tSSQ/3tx2FrkiyS2CzsIfMZXoZHNQ= 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=aWB4bzcS; arc=fail smtp.client-ip=40.107.212.52 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="aWB4bzcS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fiq26Zse6T6HLc5DW+uhhTqrDy51MLYnSC8OI4CCINjtofvMni69uKvUSZAbTSCeUnkTAPim3AjoDn4U8+0mx3o6kl6yZo2VGtumuc0WOVVYyXv29ph5c3cLzYA0S8yoAwXM85wkQCqIZsPxvkkkuykyoB37xb7cGith3983LcFOsInXh6eGCce+qd9HvvGD5a2/dDvHNauPi90FJJBof5pJIjIFs5N1eUaMvYxnYRRaDCAqFv1UjzQzzCyVCJDcPGNDnjyM0YbEibZWNnXHyF2eA3gvFeKDK6SrYwIrpPiaX6tpYi2iFcrdfKIDRIHPK3LOlMReuJA9XeUU4nA+Pg== 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=dx31xe6hJ7OkeovnABQgl2ODAJmzdf3zz+eTNYke4k4=; b=dMgwtEFj9EthAoJG3XYRCbV1lxMEvXc6DcHXnbBubzEQ+hvJv6YJmkTg5LpeHDJW1VG+7sS6Jl+on6mLSg7/jSDA5WUOjRRZe2jYpzvycbBcTpVuXr4f3LoBp8Xg4w2xryaqMIvD54gaa7Txjkpl9pt49yFHMocGpJEqFO83i2Sp4HWOctpoFB7E3vGN5ycCEtCAKK39s2gY2is241Fa+6Q0Ry9uX5QJC/Pboyl/VWGKJkiOXd1hXRwrmZV0suiMy93qvrVAi1DOS/1Lhd9AtL8SwwrvjAVuAzSSpawIivi9RYXcGv4tBRmC8oNGcKcs/x3j2dXPq5p7bh08ruqm7g== 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=dx31xe6hJ7OkeovnABQgl2ODAJmzdf3zz+eTNYke4k4=; b=aWB4bzcSxI9PfsHLF0u3njZAvoIFtcGM0bt4A3/EORdP9RTadjEpkyDuF8D1MnTPbVl41VjCidxlls3frXXSi54swgHmLHaWbVk8orTLktKlny9hNWQgnmzo5+y15JmCBQmcRnQa3+LeruzfqFWbiDpJEPkIPdXxv9uOHhjGbo51Vqhi2y+RQH99l3m6YopRj3+F2QoZs2uS7nXu0CMrRXZAW5AKAdrzQIJ/E69EMvAm0lTTeKZvdIw9vYGhwkgqpOvlOEe3qpYHH63Jkx4Xt6/PZWs9MC8VH9b4aBAPBY4YPW5ylXJX9YG1jJebdB3BwU+rlYdIddTGuUCVjG2k9w== Received: from CH0PR04CA0033.namprd04.prod.outlook.com (2603:10b6:610:77::8) by MN0PR12MB5713.namprd12.prod.outlook.com (2603:10b6:208:370::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Fri, 14 Feb 2025 16:19:14 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:610:77:cafe::dc) by CH0PR04CA0033.outlook.office365.com (2603:10b6:610:77::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Fri, 14 Feb 2025 16:19:14 +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 DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Fri, 14 Feb 2025 16:19:13 +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; Fri, 14 Feb 2025 08:18:59 -0800 Received: from fedora.mtl.com (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.14; Fri, 14 Feb 2025 08:18:53 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , CC: Ido Schimmel , Petr Machata , , Andrew Lunn , Nikolay Aleksandrov , Roopa Prabhu , Menglong Dong , Guillaume Nault Subject: [PATCH net-next v2 1/5] vxlan: Drop 'changelink' parameter from vxlan_dev_configure() Date: Fri, 14 Feb 2025 17:18:20 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E2:EE_|MN0PR12MB5713:EE_ X-MS-Office365-Filtering-Correlation-Id: f43a08de-33b3-4b4e-f077-08dd4d13523e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: RzBJJK4u6D79huWBeCC8M9FQq96FzPbzJniwCOH2LGy0YlQc1R4qftJrbpksrUw8vsgDtAkxrMdlDV6RBjJojhMO5dxtNtslq+ZXICRIDNirruAmWGXVjPREZtEBMid0XRmDmpO8LwrGnd7h6kspcMSfiwEn06s2TVTwZLqGE9CSKHtufVs5nDfZeAHlB2aUYO9KIRMK+XDI6tS8OjyT190M9Ol5mCRLC74mm2uZ06ZOkoPD/0kX4NhGpiUoCn/V5nWlb6kezXmrah2ReniHpA6B9GmxR4dcD8irMQodzqDV4Sum59rVw6n9kNwwrVavThSrJ23lnTcgNNj9B7Gqne/hViNGzj1nwvEmyZm6ffscKOtiA1no7das2OaoKT8aIyohlSfB/ioaPXSJyY5tKfAH03YkFoD0ce3TpZrXmEOtHm65yrLl3MBk7cUIScEM6YAZu8RsRWi2yXpBmDiLwTmXwRu/cj2x6ftEDLDnqpUajFMF2pVnWRq1BwbF5JikIONedQTX4qxc1aHc9Y8j7Fz0o6eI6GqiKMPHzpBWBwogumThuhyErS0nfgiW/LKFDXtOle+FVxQLzSVebfcWwtS9ZhlAxM9JIhvzwBhKquJaH3eZzEglqcZV0qUafcD+sLloE1TM9rG2t0Yhwi6i7Ewn44+Vp0rfN2SU52zFEjxrT/XQ7VJe8H1z4HOuOr2pLmHatOAFMzEsj/4/6MEapy94FkpWlehbZyXo4rOjiFa8JKyPpkUiMbNWtmA6ixYMymyBl2yQZbOU1t0sBa7+sTjeloZNfxSClUGmQZqb+0qspEFgzVxyk8G6Sv9LfpaVI3etwl69/IL1mcEUQ0KDan4no37sCNzIQoUkeYHCGusW9NBE+C7YzlZz7BQiPvddAqPul79BXlxsnGFAmEIx4oai1JbU+qBM1qmGfU0lTIRVPlDA6oBZLker9H2/hempsQ3giJ9HHdg5r8WxX42jbRWWjsRAGnVr5p/pCRC8tw/UV30MbNYQz+TGDpSb4p7OkO5KbIH+GguqUWTaRDsYIp3U8W4o27lKzMFc2kL+lJzOlDS7pE3pb93VynSA2cyKBNdpoohWKUmr/dWZ4YcV1VT0U0eLKfRz5I6t5O2Qlh5Q4xQvNM5LASBTu2CwDlmfzLvrrDbAJVzAaCI/sGpyQBFExjK/0w/TE5uzjQzzBtZzSCTnbBlme/kssnekFhtQLov+Weqnx88RceGZa54Wt+4c/u29QpdsHIFFfAVaj9ytEb4nXulsDbaIEQoewXm3Jac7JxhIUECv/RVU7SV+K+rQEhr7D8Vyx7MFaZnQSh/KAB4FyOMd9imaTwn70DzxqoGtr/780nicjEIVxpVJI2HWjsoMhhzu9X6gZARttFEwiPMflz870csSRjfI4zlkq8hr+xqqhypfZh1fcd+MnCFMIgzXYOWVVZ+OjYcoKUcGfrPGcpwquIUwWgwIirWrD1Z6Y3wZlhHW2WB6SdjR0v6Tmvuq7RHTHywrAUjT6YI= 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)(7416014)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 16:19:13.4333 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f43a08de-33b3-4b4e-f077-08dd4d13523e 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5713 X-Patchwork-Delegate: kuba@kernel.org vxlan_dev_configure() only has a single caller that passes false for the changelink parameter. Drop the parameter and inline the sole value. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- Notes: v2: - New patch. --- CC: Andrew Lunn CC: Nikolay Aleksandrov CC: Roopa Prabhu CC: Menglong Dong CC: Guillaume Nault drivers/net/vxlan/vxlan_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index b1158a1bb855..ec0aee1d5b91 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -3936,7 +3936,7 @@ static void vxlan_config_apply(struct net_device *dev, } static int vxlan_dev_configure(struct net *src_net, struct net_device *dev, - struct vxlan_config *conf, bool changelink, + struct vxlan_config *conf, struct netlink_ext_ack *extack) { struct vxlan_dev *vxlan = netdev_priv(dev); @@ -3947,7 +3947,7 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev, if (ret) return ret; - vxlan_config_apply(dev, conf, lowerdev, src_net, changelink); + vxlan_config_apply(dev, conf, lowerdev, src_net, false); return 0; } @@ -3965,7 +3965,7 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev, int err; dst = &vxlan->default_dst; - err = vxlan_dev_configure(net, dev, conf, false, extack); + err = vxlan_dev_configure(net, dev, conf, extack); if (err) return err; From patchwork Fri Feb 14 16:18:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13975209 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2070.outbound.protection.outlook.com [40.107.94.70]) (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 B74922753FD for ; Fri, 14 Feb 2025 16:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549972; cv=fail; b=lTqgXGKwVr0GER1fdYmY2cpz22bhygZf/XYjubY2DqH7AtoZx55pQhkS3IWDwppTu71Ka8ayjXGlxTFoY5Fl4pzplpbPJjXBTXHYvz91Yz6mywiYq5n/LR/y0TyY5yTvBxCCUWkIRqAASBdxe9hyuH+EXyXipAUBYroMQQRtV5U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549972; c=relaxed/simple; bh=7JZunx0YZ6PMcmEnBJSirKzbxLCDajsM6gsBfC2svr4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VUJt3m9k0lnrQ12ggby8uGz3arEmgst87RQdR2RbzIN2jNK+6ZSPh7SYXAepXpUah4fxullf0r//UPfMFkgSHw7Npr1DQSK3k9pzDRVilIq8Gt0apZo1dZ6h5JXpCV3IZ5agXBTodw/+HEFTaBJZYth/XgbwM4d1HMK+dlp4IB0= 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=gAjnjb9e; arc=fail smtp.client-ip=40.107.94.70 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="gAjnjb9e" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fITXkYfAKFz0J5XXUSrFnUh48ieEWTI/0cTu2/sI7jHlRoDHlws5lok8zbQsroP9iLHbRXXFcdDf7xuMj2kgUk3W9AQRRXQS8LRv2bnpJx+ZGzzoApz7TkAawRoOB/dKNrcb6brfZf+tAHOG0L3uNhpgJIbkZGtHyaapvhhOoRbIF08OC0hSYDR/3QwMtiog3KWN07/+twNwNgY7QrPZNFCIMXNDjEMykjjKJI59ElvSdvSw1xmclJgG0DjqQem1hU1CNrQITQsNm/kGqpnbZYZzhBoK4vrFgYVKSXAX707pdam2jr59rU79IyyTgxoVKF26UUEuYHo5pJkuPxisaA== 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=Oy9AzTMbLO0uz0V4Wq59iTR8Arn+DiswL+6tRw3H42g=; b=d9/SebWSAp2CXTxrzCwEPzNXuSd1ubjawToJcvSxTfzU+H5f9QLtddsr4ehCCCcLZ8417K2rdJpKRih4QrRKK3XXKnbrayOJWxcaaGgN1D4ZImu0ZVUB7qZ0nL9uk3lYOAMDqNAnU6++S5dfJ78Sb6jz0JiyZJCmOiU+nqijIPKmbyHV1AOUvXOQlw63d5FZLSUBQv74lsZSoxw/DrLqTtnfiwVJYodXtMGYfp8qNUXQJfWbX4ovFao5tbdLDS4o/jOPIgIFtcfpg91Tce/4ws23S5bMt6hHs9mfQGvrCSjngDqguWeBe2jdwma5rd/V8nJkx8ySIUZgLuhikWnDDg== 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=Oy9AzTMbLO0uz0V4Wq59iTR8Arn+DiswL+6tRw3H42g=; b=gAjnjb9eKcrRIwfkZcNb8NtafwpbeR2x9aMTOJxNPbi7rbRLlguoPOi62B8HSyBNVMgoJAn9vJbnGMYK9hWSKJclktkUvODyfHPlOkpULaKJjrkMXGVa59ibBeSWtioKRbi3sf2N1OvxoXab68MbBhcALP5kOJsRfYAkHeUaHSr4ehhQdFZ0JMqCByA9LO4dFRwYXKaMQO0ZRw/YM0soubWJfCvM45DeiwUDYu5jozpYHnnA1eKN/c28yUB1YP9cmn5NNjN9DXilBSpIeduFjFzXMp8ULYK0dW4oSW5nJuqoVbzXIzumI3l48VIP+pnqCrsa550nEECLuxqKZ6K4XA== Received: from DS7P222CA0029.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::28) by IA0PR12MB8225.namprd12.prod.outlook.com (2603:10b6:208:408::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.13; Fri, 14 Feb 2025 16:19:18 +0000 Received: from DS3PEPF000099DF.namprd04.prod.outlook.com (2603:10b6:8:2e:cafe::b2) by DS7P222CA0029.outlook.office365.com (2603:10b6:8:2e::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Fri, 14 Feb 2025 16:19:18 +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 DS3PEPF000099DF.mail.protection.outlook.com (10.167.17.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Fri, 14 Feb 2025 16:19:17 +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; Fri, 14 Feb 2025 08:19:04 -0800 Received: from fedora.mtl.com (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.14; Fri, 14 Feb 2025 08:18:59 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , CC: Ido Schimmel , Petr Machata , , Andrew Lunn , Nikolay Aleksandrov , Roopa Prabhu , Menglong Dong , Guillaume Nault Subject: [PATCH net-next v2 2/5] vxlan: Join / leave MC group after remote changes Date: Fri, 14 Feb 2025 17:18:21 +0100 Message-ID: <056c8f4765a52179630b904e95fc4e3f26c02f2a.1739548836.git.petrm@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DF:EE_|IA0PR12MB8225:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bf9e8de-dad7-4694-b43b-08dd4d1354a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: Iw9uele4Hi5+Bxyd7IHXI5KjAtUi0B++oWdW1ulBEauGKKCtP3XBDhM5w7xWfyWtOgqHb1RbXgFsPsaP3BsLDGj3IDmDYTza1qZMUhUDTBlpuAK4XvA+DLyF2Cv1647xFj/yHbR3dpd4u55LQemmU4NB3HrUKW4B5TfxY70bXOBOCN90uf6b8yGRu/K3cMgHLcr1OruThre4OmWcsJpcrl4h3SlExpR67HFtMnJbG7DgYRObO/4ujrGMjx+tSGFI16hMvHI2+M0TTCzBFqBF1lwTpsiCUPRLi48b6Uo1GUVB77cj13KCoahCBUvRNMPmP7e5LURlqdJkbdGaQ2o0sL8hsaPMbmgos2mlJQcCZMHMbTjuwRcA63SKIE4H4YHbHy9uLKP8b98wAr4xzB7QUqe7UkJl0EEP/k31b1zLlAu8hoRgU2m8F4hbP3VSnhBMpZAxguueAv/++ws2OwzZZvT05xsVnzzappXYYg8xekODcquOTxlfvb/mpUSsQOG5xsCgBs37lDwvxo0sMYCGrEs4KFbqKrzVelS6Gtt7BaqW/nyvdgTljqX6m1mmDipZCZSgq7Q5huoeyfR66f3+JOWYbOoyf4+CCCKbUdfK1XBaK2cf0IdMlA0CAFvpLippWHCRnNf4JBKH3s3HYfZojxzcLwlIYYaAe83DQdGFIjkciWH801RDpAhTp2N2rJb1haZvFm4GmJPPo911l8Ijuy2b1M0a3SDQ0394LFY+4E3gijFTrDRM6IgfT5bmmPcdRLK84Zu68OZ/RLnOvVZj2VIKrPa4lmkgs/B7WOtOZ2jBBmSx+J9+m+LSDAtIWtO397hVNcP40RAEywCuohFmFQwrOvpF9mtEf22nlR4/4TX4mN4sHljTZ45mEx6IN6OtoFsr0EV7fIFs+SNRxOr+j3QwDEu/CUfdc5OB7bGdxmjTS3qF4WCYuU2WlkxFBMcVOsZWqzH/IqTpdqQ6t+7dCgBNqTSuRpLwT7ht8FokQco66j9+hQ3oyL/chI3dunGbm5B7QHjIuanzqErdc/h8DrcRI7UGMHYpc0UwjYZmhxwSLjLSKty42lCzyYmQkKy4e/o+FxaV0TMpuXR3sV9Euf2Dza9I86OTra6s+7h03j8yhiZXuvX61oMLWdbQVPcQ0Jh5KJ896MuLlsbuJDZHY1H+ngjvV4um/gPBPQgOKHyIc9WPYpFlsqt7LdNFHMRAxRNB1oNbopULdywQKC6DSBppLRVQxf1RQvdpDE9UOKU+do2mm+bnvkUnXan0nJKedPe6pg/MxEcV1oi19863fQyR1uP3tq4faf17n3t2GDHbznmB1XpEjKucIi8eduQFmyZaPake9DBCZwTeQYULSN1kFRUrTwpBqKug2d2l3DyrYPTiDk7wpvp1McBmTpizn2JT7wyfQmPFcikafJ3lt/hpV8H6VTNSI60ewfHem6WKSvJMdHdxOt+I++OAza2n/tdJoslEHkb5IJg4D/rNXE9VcRDCDlq+hUI5arOT5/c= 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)(7416014)(376014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 16:19:17.5041 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8bf9e8de-dad7-4694-b43b-08dd4d1354a9 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: DS3PEPF000099DF.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8225 X-Patchwork-Delegate: kuba@kernel.org When a vxlan netdevice is brought up, if its default remote is a multicast address, the device joins the indicated group. Therefore when the multicast remote address changes, the device should leave the current group and subscribe to the new one. Similarly when the interface used for endpoint communication is changed in a situation when multicast remote is configured. This is currently not done. Both vxlan_igmp_join() and vxlan_igmp_leave() can however fail. So it is possible that with such fix, the netdevice will end up in an inconsistent situation where the old group is not joined anymore, but joining the new group fails. Should we join the new group first, and leave the old one second, we might end up in the opposite situation, where both groups are joined. Undoing any of this during rollback is going to be similarly problematic. One solution would be to just forbid the change when the netdevice is up. However in vnifilter mode, changing the group address is allowed, and these problems are simply ignored (see vxlan_vni_update_group()): # ip link add name br up type bridge vlan_filtering 1 # ip link add vx1 up master br type vxlan external vnifilter local 192.0.2.1 dev lo dstport 4789 # bridge vni add dev vx1 vni 200 group 224.0.0.1 # tcpdump -i lo & # bridge vni add dev vx1 vni 200 group 224.0.0.2 18:55:46.523438 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) 18:55:46.943447 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) # bridge vni dev vni group/remote vx1 200 224.0.0.2 Having two different modes of operation for conceptually the same interface is silly, so in this patch, just do what the vnifilter code does and deal with the errors by crossing fingers real hard. The vnifilter code leaves old before joining new, and in case of join / leave failures does not roll back the configuration changes that have already been applied, but bails out of joining if it could not leave. Do the same here: leave before join, apply changes unconditionally and do not attempt to join if we couldn't leave. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- Notes: v2: - Adjust the code so that it is closer to vnifilter. Expand the commit message the explain in detail which aspects of vnifilter code were emulated. --- CC: Andrew Lunn CC: Nikolay Aleksandrov CC: Roopa Prabhu CC: Menglong Dong CC: Guillaume Nault drivers/net/vxlan/vxlan_core.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index ec0aee1d5b91..588ab2c16c67 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -4419,6 +4419,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], struct netlink_ext_ack *extack) { struct vxlan_dev *vxlan = netdev_priv(dev); + bool rem_ip_changed, change_igmp; struct net_device *lowerdev; struct vxlan_config conf; struct vxlan_rdst *dst; @@ -4442,8 +4443,13 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], if (err) return err; + rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip); + change_igmp = vxlan->dev->flags & IFF_UP && + (rem_ip_changed || + dst->remote_ifindex != conf.remote_ifindex); + /* handle default dst entry */ - if (!vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip)) { + if (rem_ip_changed) { u32 hash_index = fdb_head_index(vxlan, all_zeros_mac, conf.vni); spin_lock_bh(&vxlan->hash_lock[hash_index]); @@ -4487,6 +4493,9 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], } } + if (change_igmp && vxlan_addr_multicast(&dst->remote_ip)) + err = vxlan_multicast_leave(vxlan); + if (conf.age_interval != vxlan->cfg.age_interval) mod_timer(&vxlan->age_timer, jiffies); @@ -4494,7 +4503,12 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], if (lowerdev && lowerdev != dst->remote_dev) dst->remote_dev = lowerdev; vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true); - return 0; + + if (!err && change_igmp && + vxlan_addr_multicast(&dst->remote_ip)) + err = vxlan_multicast_join(vxlan); + + return err; } static void vxlan_dellink(struct net_device *dev, struct list_head *head) From patchwork Fri Feb 14 16:18:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13975208 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2084.outbound.protection.outlook.com [40.107.96.84]) (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 7ABF62676CD; Fri, 14 Feb 2025 16:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549967; cv=fail; b=Mz3afn0MQvc89eyFmK19W02qA1ZVXPTAyNtMhgiHeW1UcaI+RVrSSghlP05BeAEFyulYF8G7InWpuUB9aP6ooWVcA7TskVUFeidRD0txUPXfR+UfKshhPJp01sgSI4MRWa8IB1vaO10v92fyiPctASFyDQzfZ3GE+JIH28LmE4A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549967; c=relaxed/simple; bh=KDlBNGscFqhHj5Akip6PuuUtcr2xGUYlnTdwl5CJJsU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t0nhbl3UFHaEH6mdDpgPwanqQU/W6p1fhu08/A71qCaFKACmkVUSb4lHq9VYKXwmIGUY6Vs7Esjs+fsMnxDbBcQeTe+KUn/qiXL9B8XI7qNTEhhzzq96EfD8Nxlc5xzypm9AXcicAVsp+FvG51Tjz9NQp7fcfhuTIPZ0srq7bo4= 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=UBltOYl9; arc=fail smtp.client-ip=40.107.96.84 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="UBltOYl9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SPBXYL8l/S1oEYeTnLiupqVjFJhjTEO8RUJ5VmkQMV4BCDUhP+j2e8DOpiR1mnvkG+HGIqP7zPMpApe2S7fy+H12jtH8hfJevSH9G7gvbEsmKCck5dk3bKF69PhxiyT/2bCmavf7uYvYhDwCUK2M09CfC2phSCSsej0Nq00bCatQc98qW/bVohiWl2mTA9CWitesdEFwBdSmr9cjQpr/Uim+BhAI4gkxAIwhb5qSdYAXzgjZeDm1itZ1hYS3J3KIPKamIqPO+anDeBMyFB1tCc6BkfGsLY/ZcvIUElMcUcUPOaoMHvIWxOUtExvrl2qZ1YjHlMZbkl6AP+TS/A3dSg== 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=LlkE5zVQk6F2H1Rkl177/CHBtGiLSSvmAtSSyKAnwh8=; b=VbkU+s5fwTn80m/lvMEhkk2iqv5+CrnQMD2XpPqiezYpe9DtV5yk0AoqcPGNdweIWh9DcbpCxLtcZ4vdgP+WcYv+vqROVvO7irzdX8xhjUXQcDNtJXuHIcfU+UZrHFe+yvvat4pOoBxGlaPMJE7f9tXKbbMHNoizX2m1B81s952btXE156CdISRJGsVIeqobNzmOIVUcCn9c0AYGOQ2p9xdDi9enFlkcX2RACFzOOHrPW0+ga1SPSEDp1zdHxY6WDbH0d5U6Ak8AuJgiSBJVk2OyjFODAlUrXm5y0I6od6auj2wdKFHbcaYhF1ETTxosIc1vi8eAp+x5F1R+VQBc/A== 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=LlkE5zVQk6F2H1Rkl177/CHBtGiLSSvmAtSSyKAnwh8=; b=UBltOYl9WlooMr2Wv2pbjowgvEk+6rYJToMn05UgxpM8z/LTrwCOyLIb3R5/8DYlgf8MQ8xG/owVtJqXlDcr+FkiHCRIZbvUJdYhLgq+9Badw7dbYbdYYoq42MarkMGLPUsZdXcSPLj2IiOI/XVyuhxexdW8J88IhHyIW6Is+Vm1zWeOX0HuqWu+7kcMlwfF3Uj80CcSJ6+/jTWRpgBm3R+KaAsEUqhQcCNS4UQg5p+q7G3Wlb0iblMEZuN8Es84wB7ST2fsEvdwGhCI0prWVzbdsHya1b2GrvUiuzml/lKyLmWkfQg+jsv6yKqMA+jStkViC0hcPFqDPixedNndoQ== Received: from DS7P222CA0027.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::35) by CY5PR12MB6226.namprd12.prod.outlook.com (2603:10b6:930:22::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.14; Fri, 14 Feb 2025 16:19:20 +0000 Received: from DS3PEPF000099DF.namprd04.prod.outlook.com (2603:10b6:8:2e:cafe::63) by DS7P222CA0027.outlook.office365.com (2603:10b6:8:2e::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Fri, 14 Feb 2025 16:19:20 +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 DS3PEPF000099DF.mail.protection.outlook.com (10.167.17.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Fri, 14 Feb 2025 16:19:20 +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; Fri, 14 Feb 2025 08:19:10 -0800 Received: from fedora.mtl.com (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.14; Fri, 14 Feb 2025 08:19:05 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , CC: Ido Schimmel , Petr Machata , , Nikolay Aleksandrov , Shuah Khan , Subject: [PATCH net-next v2 3/5] selftests: forwarding: lib: Move require_command to net, generalize Date: Fri, 14 Feb 2025 17:18:22 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DF:EE_|CY5PR12MB6226:EE_ X-MS-Office365-Filtering-Correlation-Id: 2763c842-535c-4030-008a-08dd4d13567d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: Gi6IkTX6vXUeWBeq5DiEZ2EBIv2OV6m+hNAj5NCmDCfbcvI+F19v3Y8oZIyoyKvjnCMerdaYlobWRff6/rVplGpO5/1qmnJ3QZm04AMxYAtqZ1c8YQr2cNY7bvnmvExZ4vzDZJYdo9mYxF6EOG1hhPKCSA+ix2B9GlrAIUOQoMu9oXwnxeK018qAO1k25C8wOPrHGilwUzotMH9ZJ6JcD4iQCKeWnkm1pEwocS12p4S39WajkqTVnPJZrpTpnqrTGyuPum24Z5IzxydAXN6D5pNsl7hXqTPYPSKTfDzzfatZ5kRVc7WJWUzOkblL55KGYxcIH7cGMlo/DdbAoufncQ4iV0NC1hfLyndeoqHIKlOBnzXGlK11ERgjYEI3K0Xxdsvazy6rTl6vPWhRPeUcb1W2RvrFJjDA9VtOeAZSCeyx5FuWPuHOVfpZGUnbXgltB+2R9rOaF56Ts0vSap2uAzuVI3VxBc+GkWbSEbnS8MVPS4qH1tFWTIUX4nkiE4y4mBt0N0QvUITH1j8n96PsOf0Ly/vFmxGPPRoJHXhjQTv60iIIu63ur4JqKs/UDSm4ZzFf6yCeaHCYNMNhtPon6mdCNMJtWvVFdgohQ6aZN3ogkS9Ezjw5hWGJ7BdsjOiROF0vJfM8yaoKm7PZiOx0UySUV9rhjCJK2sgrDuWjlQLboTuOYiQgS/ZIYucYyl9+eAeU80rhbEKFbfTGyK+6gsPyYgw/8TqjBvsTqcklBD9D3GaWoCap+1tN6YJK2pVkFbJL1wdktdDNJSS8pXOon5GcEvloIN5EfaED2qeeYsYInW7VIYNX69rr3V6t9DQiRAg9HU0faB6e8qvdtmhWyUk7U3XIwnztQ6n0E79ENc5exPzHIA5gtbTZwygPmDBCd/6LJBFvq4BTgB3bR3OVfYrs2H0SMM4ynsIHPd1IMR2r/ftIT7VfHlNA6R4gHOK/zM1+C1byepWlnRojh4OCmCwKijS1lVZhsTgwSJaqvAdXWmVm2sSofPWxD+e9UKXdHUOkDCqrHmjvaaUNga5ZK0MIfRvOP50GwLru73yTECi3SxuQvPLIq7tHKznipliAFJScCqG37yhLJRR9o60QJuYg7aU+tqBo8U800zzlHY6wo3hmHBlzMxQkr09LvYbNks/lXQviQWTwlt50AcLGxLT5oz8yN+qoFbxMKJqriZqzgkiHAJdzlF9oa9DpMmceIPLws0w2U+7+sKj/IFUdyWDDgUDn9n3iAqr86NxvPWBtWUAqv3PMNC6oD+xkvRz7Tt8JQhLRXL5KSgp9GnLl3nqlXL/xQ2iEpnVmYBNFiOo5Sa505WHFewPysvMkBQ//lf10AOfHoOcddoJJ3ha55fGbEOc3Cut67l407stmzfEXS0XTjukYIAk38d1z69i+ISMYyC5eckvajfkny0a/O4cxmCj9mDCtFvHZQNjdbVi4DaRSTmUZY45f719CS/IMlP0AAO0BpICSpyhp9+PiMBkEsvEeLzBVcc1ZbjojN4g= 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)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 16:19:20.5666 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2763c842-535c-4030-008a-08dd4d13567d 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: DS3PEPF000099DF.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6226 X-Patchwork-Delegate: kuba@kernel.org This helper could be useful to more than just forwarding tests. Move it upstairs and port over to log_test_skip(). Split the function into two parts: the bit that actually checks and reports skip, which is in a new function check_command(). And a bit that exits the test script if the check fails. This allows users consistent checking behavior while giving an option to bail out from a single test without bailing out of the whole script. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: Nikolay Aleksandrov --- Notes: CC: Simon Horman CC: Shuah Khan CC: linux-kselftest@vger.kernel.org tools/testing/selftests/net/forwarding/lib.sh | 10 ---------- tools/testing/selftests/net/lib.sh | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 8de80acf249e..508f3c700d71 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -291,16 +291,6 @@ if [[ "$CHECK_TC" = "yes" ]]; then check_tc_version fi -require_command() -{ - local cmd=$1; shift - - if [[ ! -x "$(command -v "$cmd")" ]]; then - echo "SKIP: $cmd not installed" - exit $ksft_skip - fi -} - # IPv6 support was added in v3.0 check_mtools_version() { diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index 0bd9a038a1f0..975be4fdbcdb 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -450,6 +450,25 @@ kill_process() { kill $pid && wait $pid; } 2>/dev/null } +check_command() +{ + local cmd=$1; shift + + if [[ ! -x "$(command -v "$cmd")" ]]; then + log_test_skip "$cmd not installed" + return $EXIT_STATUS + fi +} + +require_command() +{ + local cmd=$1; shift + + if ! check_command "$cmd"; then + exit $EXIT_STATUS + fi +} + ip_link_add() { local name=$1; shift From patchwork Fri Feb 14 16:18:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13975210 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2073.outbound.protection.outlook.com [40.107.237.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 18EF12676CD; Fri, 14 Feb 2025 16:19:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549979; cv=fail; b=Y+MH40D6RBnQJ5YZ4QQiWzJ0oBpdqUSrgxfZ5oLkTCqC/oUk2/4QYQeaXQJH0ZdFvMc0qm/+y5cKKT8jS6KtFsqpJqFgYwpnKV0JypzvxhiJk0rgxy+449SocL3qVPNFgMsxw+h2Hn0ptmwJfkLSicMjkE3hy/0ZeNCOgxQ4zDk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549979; c=relaxed/simple; bh=FErlX1RMbmxusG3Jd5/UOdTKdnEFR0Vvy5cuZxkRsm0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MLd5tuKqYq7MPzrdExr5T7QawS4/8c7PJb89BCzynb5q7Mc7H+a0e2WUsK3B8Uj+6OhEcIx1Rai0s/R0oqLs0UJcTDtb8ggDo0Ou5j1vPNINwH0hlHmoQGZEWJFnxPxdOWEya3YWRl3SshGusRJtJgY0zXv+593Q+9FzMkdPm4Y= 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=Vk8hCOQq; arc=fail smtp.client-ip=40.107.237.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="Vk8hCOQq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Isy0I03GYosMs03NBXTAv8tuOix54WbF2eXjZCqyzxPpd1lcULG+QZk+6bTb67b4DNDARxGQl9Rp/f7mcMzeLNQls1SPLElVtYHFnDROoOfbuohlUkb15L4oxOPv2/Muiz6BszRzBoP7Ro8kuyLX+dWEaW7Fpb6hJV1KLEm7+YGwcnDVW3m1azRhJwUm+3X0/5QS5oDtijbDaD96aeTxbvVXippyBhHxCQk+jCrSOuiJVk/bLgJGaglMo3oJM/SbR6pmIJhEQIdtBGnrpBXgT+mQQcxsmhtHSExd9kFJZF7E/L/BhzL51ihZphkPhM5Pfsh+imRDed9UTqOVrzjkag== 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=NCSKERS2mQwbMjcbxMx22ExK2cMFq15Hq9GUrnZl9JI=; b=egzOxLVaTIBhRwOL4yqeWIdfHdDgWF4EDkbBnIH4zLqTRKdSy69nnZlNCpjqXdO2VH1DSdq49kapykAiu9WJJgTzlEG0ihMB4n/YdhHUyeZ1aoEXHf3tE5kKNxqkAH0ypcAcZHgfV67LzQ9ErH14JUhHgf4alp3FZPwQG6XdAZuonchDr8f7yTj88qvOUAjD0haVLTEQOVgwl9NAAAcNHcTneTQE2MRF3AanpWB+aVff+FOqvjmNYmZY0CpdHwzSLO2mcBA/6OGMrT8nd6AoEqUsn4pD4S33oQIJQQ4UYwuWen/OiH1/AzlaCL2A1mCakXlzZmf8+S/FTYudZBNadg== 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=NCSKERS2mQwbMjcbxMx22ExK2cMFq15Hq9GUrnZl9JI=; b=Vk8hCOQqRn4Ir5Fq9emCLnlHInLT8TbziQCLCvkPgUdoG/N5uoxg0Q6pro+HF5ze62QExliY+SXeQFioTjuXfOAXb811Vn5Uy2mY1b9yTVWZugIicxF4z6TgbFYhIQKH3jmhU50xeRVew5/2L7iTtWq/27EFGAp8nyp8I1CR1ncdNMYyC4eAuRkFUuffC/FvDjHt7wPchh+S6g+xBqtHolg0Yq0m0KlWEf6zBH8UdiDperE1gbyaXLoHpxhy5LJAL8eJi9OBih8bOgzTfgHrLVKS7SvkVrTKRK0lMsZ0spIvaU9cgfhQfru8lNaDQQz2KGoXdWTKs4ia4UyyYeU7pQ== Received: from BN9PR03CA0300.namprd03.prod.outlook.com (2603:10b6:408:f5::35) by CY8PR12MB7217.namprd12.prod.outlook.com (2603:10b6:930:5b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.22; Fri, 14 Feb 2025 16:19:31 +0000 Received: from MN1PEPF0000F0E3.namprd04.prod.outlook.com (2603:10b6:408:f5:cafe::4e) by BN9PR03CA0300.outlook.office365.com (2603:10b6:408:f5::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.14 via Frontend Transport; Fri, 14 Feb 2025 16:19:30 +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 MN1PEPF0000F0E3.mail.protection.outlook.com (10.167.242.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Fri, 14 Feb 2025 16:19:30 +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; Fri, 14 Feb 2025 08:19:15 -0800 Received: from fedora.mtl.com (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.14; Fri, 14 Feb 2025 08:19:10 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , CC: Ido Schimmel , Petr Machata , , Nikolay Aleksandrov , Shuah Khan , Subject: [PATCH net-next v2 4/5] selftests: test_vxlan_fdb_changelink: Convert to lib.sh Date: Fri, 14 Feb 2025 17:18:23 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E3:EE_|CY8PR12MB7217:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e2574ab-561a-4b7e-047c-08dd4d135c98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: 93IrwUERwyjnLQqGyEl5JAR9I9ledCRdeSOWHhlE1EWSCraof/09kjHFNhUnVPCrZ2dSHOET6nlyDR4V4cVnxS9RXv7OUoMzQNODG7mNZzdMIyZV19sKU6parKlf6bItOBMkrOgG5gzrqsYG7noamyqN0AJCCbEJevAOQu0XJ2/lf4Du4gVvzWDpNpnMeYJN5pr+U9LepIrs14tNk71LBbaPFuxTqzDN1macoR2QfjP4udIWNG0XUCAyxCUXKd5VhR2B1edRX6gx6P0g7ha/nZfTq8UPPc6RLAQru6dWMa3Urhxtg2Hu02ppBVfTPoDpOXJ9zcqyqhc2LsSecQ/+cUlKS10FHj1d6JDayTKwG/p/4Y3FTSK36BbUbDutNi10W4+wg5xpdA++nt/p8Cqf+zPuAKKlMR9vPgLy7Whf+38CiEiL3niCiD5D1RVRxgva8BRbS64/uw97ft74jUI0ihtddNjVEbjJNW/wJkntUZEXojXUbPXn6V0q2+tvJtGlkE72gNdBJLKGIPnN0MnrksKQMe/jkYl6qTVGCNoIqCdmmpGiP7O9ggiGvUXhvulk0JWUUch0R5aSo0RYcEwoVuzmvkgW7x4Zi3TUbwGesvn7fw3rlcDKxmbqySN+V8EsrCHK/vV86cH9adf0wHjL3eqQ0EYlKCEgrXh+nQItEnjZXbZbkirBzG057brQBhhky1hAe0ZuEsPiJwNwn7BntAUQX5bQTKwQzm6PIhI1B1DpZaZwMcBA2GVN043/D6FWWt8FarTI85tpYQwuLYm1VC+rl7jyXypbxCbNhfAEa8Q+Rqp25bNUYm93T3UDHh5CAcq9S4EYkektI3OBi5QyfuebIjWTNZt1QvTEW0ejHUnrvxmBPakdDXzdjkPp2YcCo+OF9i9Pj69YkGHPhCjeVnUGKvgw1YB+JmcU4f4eMSxdSKlr1uzo7au0sLkfXnZ4gZdgcd4A9dvh+qbmQTxRefMvRSshpYubxw5k9gBlbHOsikNuVQJyn84S9AGjzlJyOQ+Vkn19jZPviGRd+CPAKMzRw6PvoFjjYD6mw5Vy+el3QgdNeuo6K3ehVAKttRu7guSXKwgvHlOhiw+BQnqDEP8sY24yG5U6/auvsidEn4eyKmapMfpu3G2smlKEbpE7FBiI/PxGtdM4nQq2vqkBZuPbxqV09Qg3JaLCExh4L8kbob+1VqCFb7ya/8yj47o5gesc8fqk5X0B2+PO6KKUjPP9KWo3KKVbuYEn+DtTp7M4ZLoRsVFUOgXR7IKqo7z2xtu3s5hruvk+umrmX5RR+TqAO3VUn4hPpNxTt3l1DBf0d7R2zri8AuKOQFP5ooqN2SSGXyR/PGu8DT1pfmj6bg4TIcI7URh1V4rrVxvy7WV1NwlQ3gkqr9gLi+8A3OCIoBvN62HwwbZfDWsWQ0or1kxcFB1fLS0ipr+/+WrnL5FmoHuhaqWC/jt0c/6lruenctAwrQvzo+uhO2nlrq0CjJJoWCVWz9t1qqM10XgO4bg= 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)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 16:19:30.7787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e2574ab-561a-4b7e-047c-08dd4d135c98 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: MN1PEPF0000F0E3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7217 X-Patchwork-Delegate: kuba@kernel.org Instead of inlining equivalents, use lib.sh-provided primitives. Use defer to manage vx lifetime. This will make it easier to extend the test in the next patch. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: Nikolay Aleksandrov --- Notes: CC: Simon Horman CC: Shuah Khan CC: linux-kselftest@vger.kernel.org .../net/test_vxlan_fdb_changelink.sh | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh b/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh index 2d442cdab11e..6f2bca4b346c 100755 --- a/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh +++ b/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh @@ -1,29 +1,38 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -# Check FDB default-remote handling across "ip link set". +ALL_TESTS=" + test_set_remote +" +source lib.sh check_remotes() { local what=$1; shift local N=$(bridge fdb sh dev vx | grep 00:00:00:00:00:00 | wc -l) - echo -ne "expected two remotes after $what\t" - if [[ $N != 2 ]]; then - echo "[FAIL]" - EXIT_STATUS=1 - else - echo "[ OK ]" - fi + ((N == 2)) + check_err $? "expected 2 remotes after $what, got $N" } -ip link add name vx up type vxlan id 2000 dstport 4789 -bridge fdb ap dev vx 00:00:00:00:00:00 dst 192.0.2.20 self permanent -bridge fdb ap dev vx 00:00:00:00:00:00 dst 192.0.2.30 self permanent -check_remotes "fdb append" +# Check FDB default-remote handling across "ip link set". +test_set_remote() +{ + RET=0 -ip link set dev vx type vxlan remote 192.0.2.30 -check_remotes "link set" + ip_link_add vx up type vxlan id 2000 dstport 4789 + bridge fdb ap dev vx 00:00:00:00:00:00 dst 192.0.2.20 self permanent + bridge fdb ap dev vx 00:00:00:00:00:00 dst 192.0.2.30 self permanent + check_remotes "fdb append" + + ip link set dev vx type vxlan remote 192.0.2.30 + check_remotes "link set" + + log_test 'FDB default-remote handling across "ip link set"' +} + +trap defer_scopes_cleanup EXIT + +tests_run -ip link del dev vx exit $EXIT_STATUS From patchwork Fri Feb 14 16:18:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13975211 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) (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 048CC2676CF; Fri, 14 Feb 2025 16:19:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549982; cv=fail; b=rCoxkC3kBe7bJOdzo89n9Y/RuFMncjMrykwffNTobnXVFwhS0FJ570dYmku+XVSOHhVlPggQmUOFcymLhL/SgGKQsQ03ITDDzisqt1sNt//YtUfigY4dyJqj2ZW6+1v8sQpO+VteFzPpR5/Xzwtdol9TWPfenBDDHHGemFHMm2E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739549982; c=relaxed/simple; bh=+wbcbyXnXvn1PMP9ymid+vdhhzJIeOlZcycTthupwoU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ncvou/nj1GsnM1U2+rMW7xNXpopLhzABUVxwdY+nFGotDaFbiAhGThDq9Kp0WfRcA3eOvb18x97udSoAlnnU3nEiMdamEOGRowjqDnNePzop7wUDfOGhy6+ZwbGzXdNrzrRbsrzRYPI1jzM6Aw/lq9/ZvTKXkp4rYbbtavPp++s= 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=eVxhKRPO; arc=fail smtp.client-ip=40.107.223.56 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="eVxhKRPO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JhG0gX1/3moI3gohl6Gm02ZvqcXrwO8XEPVDy2TSDrozb8IdiIESB+RZlG2FJeZtxM6xQ7MjzFYcfzfIi2c2L9wDt2Gw3YXjQ50qwjJ+V9zInaE6zAkn7Y61l+932yIVEBbRuz4LGRBvwT9Zj52tdGjCl5itMlHNTjz9wjWQJwoZ+6ow6FriSTUlQdOcaadeRuc5soC/jtDviD+Ep75pE39Kv76890ZfWjNLkuXAIXDVFQ50fiw3WeQxBVC56xah3cTl3H7FelmIc3PVsKqq9EJ2tEgq+H60ifx0f429I25O04r5T0W04HTJw3FG546MyNxqgeoZ1gAHSfj93rpihA== 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=1mKSnH03/+WnGU1/2SdKtQRHTDHaRyS3u5W4LHT2oMU=; b=orNe4leUZlbqt7MNC6FlMfClrh7PnWS1mOTIBjcoT+55qU1vGqx30T3ghzRuHe6rYt4v/0FRWSA4w9E9YPt3DxMnpyEmnUIpGOi+sxsA7q8dEhMNGzMWacs4YGnjIfxBFCQGiSbRvb7sBY0cFkpupT+GwerpTM0PjuNQa03U6HaNCnAURqHq0kn1wNQGthu3yxIzLnvswXGBbEBBc0G0ndU29WpceBSfdKiZYkeXsT0PthHk4R/EP7/zbKdx1PbxCfF/1mcEssovjC6BtQw6aJAKyOJKMaqKvaCniK2eJ/+D9DeOcjVSEE2fCVD3t3UHfwc4dwxfUTkmVmwV2V1q0A== 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=1mKSnH03/+WnGU1/2SdKtQRHTDHaRyS3u5W4LHT2oMU=; b=eVxhKRPOLQOipJK9y1SVgupvcjGFk06UYiSlRr9Vd7P4LyzSLIclU5GfFSED0ZTYdXb2HiGH3DXbY+Ouf9ZFgncpEEx8oTK6cZcWb7y/V42VrFflCIDZvaG1ZB2/xV5wGOP5x6hlMAJZfAqoS122jh5lL/kQkkt7T01n+xXfCxGYv1dhuCUhmx5EINg7n6aa4gqvL+alk+4KZ2/+WD5NhF8LplQItjUc6wjqcPKTgtPIzN00zcO5x5KNMtnIIDJhfXc+pOzd6ih/yEM4mdSssKdzbqAK5P+KzWD7C2akGfZajKZ0VEmObDkCypgDV6QK9TCNpV7fUrfOWaOpN9nzsg== Received: from MN0PR04CA0021.namprd04.prod.outlook.com (2603:10b6:208:52d::32) by CH3PR12MB8581.namprd12.prod.outlook.com (2603:10b6:610:15d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Fri, 14 Feb 2025 16:19:36 +0000 Received: from MN1PEPF0000F0E5.namprd04.prod.outlook.com (2603:10b6:208:52d:cafe::49) by MN0PR04CA0021.outlook.office365.com (2603:10b6:208:52d::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Fri, 14 Feb 2025 16:19:36 +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 MN1PEPF0000F0E5.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Fri, 14 Feb 2025 16:19:35 +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; Fri, 14 Feb 2025 08:19:20 -0800 Received: from fedora.mtl.com (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.14; Fri, 14 Feb 2025 08:19:15 -0800 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , CC: Ido Schimmel , Petr Machata , , Nikolay Aleksandrov , Shuah Khan , Subject: [PATCH net-next v2 5/5] selftests: test_vxlan_fdb_changelink: Add a test for MC remote change Date: Fri, 14 Feb 2025 17:18:24 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E5:EE_|CH3PR12MB8581:EE_ X-MS-Office365-Filtering-Correlation-Id: 53626a83-1c5f-4767-10e9-08dd4d135f56 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: QtuTrPUMcpzpEELvXlEUuGspf7A0SoG2WmVdny4qE+/sQ+NC5AAZLBLpg8EPRWGwUwqpxBCQwI+5QyVmGZ1WdfNAMC5QGxP1szemzMBfalVYNQ2UNHEskiXwOl+20HkxX5u4LY3CD2lEHUl4RbaM6OPWiBlM/fNVXsTMMC4D9TsGVcgNg3u8qLr5dpP5MgA3pV7/A5dN93KyNViqp8adSkaOkLYmC7P3g+yQXPro49o+GvAZkjB9XsmlzjVEOoQPHMueYMVBO+1wuDzQjOuANci58ylNYk78Loso14FuqMspy52B573RX8W9x3kd1cpPkKILwnekVAex+PcgYMX9oL5InHfuIn3Cvq5+vLCJHYgYQEfVqLCfl2DkK7dvFMsT/lqb05wCmCc3MDK05bl2qFnQrcw2nE5cURINdsxpFWaVVzKHBucoHvNtdBIa7o0xBJLxrTRUr26XwqJaVbNK9XjyZxwsiGcdzhzo6fiT1v/kVejD86aVwsqHph1nVgBFynEy7jUCJs9QOPnvDH7YTfMfLL2hrB4LTgvtBUvVIIVUBaJOqRZBPRd2rh4FT8SiA3bmnaoWURgpU5koigxt0Xo8oZOKJj1sIxbyuqXlziNm/lwbHdTaHRZW5XL7z8z7sNn81JKkXT1TDO4LkOsTC27FC4NOe158eZEYx9BcU4ePVxdwQ7ZTvEmkfAsox5vWcG9F8lgXqufaDW5c7zNjFgUeSLXWQSPjPApcRonj5j4xAAFwF/LrkgxBwxIvmAgnSPewSpAYfhGQgjAFONlLqD8wgW2OXlQxye41vDkPVyJA9OJnzdy/TJV91YFy+yLF0XtodatfT+fM3KmZzUl5pPMNbFCYQiuV7tEkfg3fHs51c70yUstgPQFFQWW2zdVEwjDEl7S7W57jbFoER9t4fnQnG1CDQb+j+9g+AbtSBAg7768LvDBttTVIElbpMvJun+SL9opZIn7L6juyqj89+KC97d0JbrqQUtaUgGf5NIl/PYydUXIOoKZ/L7BJtQg4CNhhhfloTJFvswx/TE2WxLloE0H/FwD9DI1LrzKosJjaCd2rxb8YlZMPC529qCI3cjH7IoC/oOJqN5e2+hZ8sIr6kYIiIzMlZRwZxGhksHzjXjDdLN2qhAYDlgLzcj2Q5ejpGXDEZYuBJeBPyExxUCJ1gjRzGlTgv3An8reXdt01QUCCWzXSHSMg4dm6JrFsg2MujlHKndjApBJZT8UHFfvPHhuPONAfiHhPyEv5ak18uIlYHJO/VSL4iRhDI7gKkQ1SkQKb5h8+yYYHozOdRJjoPDlP3bcdO981546Vko+TNftis9NWKIEBrd4jnsu1nRTgt85pIxj0BLUeUP/OR6Sf9xV/ByeHShFJk9llCQZGBcs67jBUJc4oIXG8xeMhODyiM3LJ0jVbx0GyX4+E/2C3tyfflD5Gro7vMlxcebMo6BxDUsjy5jaDF9tfOKzFxrVBosfKhOXuYegrVLClXWkrR8UaRQ/VwEIHoQ4ZkLk= 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)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 16:19:35.3640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 53626a83-1c5f-4767-10e9-08dd4d135f56 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: MN1PEPF0000F0E5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8581 X-Patchwork-Delegate: kuba@kernel.org Changes to MC remote need to be reflected in actual group memberships. Add a test to verify that it is the case. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: Nikolay Aleksandrov --- Notes: CC: Simon Horman CC: Shuah Khan CC: linux-kselftest@vger.kernel.org .../net/test_vxlan_fdb_changelink.sh | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh b/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh index 6f2bca4b346c..062f957950af 100755 --- a/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh +++ b/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh @@ -3,6 +3,7 @@ ALL_TESTS=" test_set_remote + test_change_mc_remote " source lib.sh @@ -31,6 +32,81 @@ test_set_remote() log_test 'FDB default-remote handling across "ip link set"' } +fmt_remote() +{ + local addr=$1; shift + + if [[ $addr == 224.* ]]; then + echo "group $addr" + else + echo "remote $addr" + fi +} + +change_remote() +{ + local remote=$1; shift + + ip link set dev vx type vxlan $(fmt_remote $remote) dev v1 +} + +check_membership() +{ + local check_vec=("$@") + + local memberships + memberships=$( + netstat -n --groups | + sed -n '/^v1\b/p' | + grep -o '[^ ]*$' + ) + check_err $? "Couldn't obtain group memberships" + + local item + for item in "${check_vec[@]}"; do + eval "local $item" + echo "$memberships" | grep -q "\b$group\b" + check_err_fail $fail $? "$group is_ex reported in IGMP query response" + done +} + +test_change_mc_remote() +{ + check_command netstat || return + + ip_link_add v1 up type veth peer name v2 + ip_link_set_up v2 + + RET=0 + + ip_link_add vx up type vxlan dstport 4789 \ + local 192.0.2.1 $(fmt_remote 224.1.1.1) dev v1 vni 1000 + + check_membership "group=224.1.1.1 fail=0" \ + "group=224.1.1.2 fail=1" \ + "group=224.1.1.3 fail=1" + + log_test "MC group report after VXLAN creation" + + RET=0 + + change_remote 224.1.1.2 + check_membership "group=224.1.1.1 fail=1" \ + "group=224.1.1.2 fail=0" \ + "group=224.1.1.3 fail=1" + + log_test "MC group report after changing VXLAN remote MC->MC" + + RET=0 + + change_remote 192.0.2.2 + check_membership "group=224.1.1.1 fail=1" \ + "group=224.1.1.2 fail=1" \ + "group=224.1.1.3 fail=1" + + log_test "MC group report after changing VXLAN remote MC->UC" +} + trap defer_scopes_cleanup EXIT tests_run